Skip to content

Commit 520b2dd

Browse files
datetime pandas fix
Signed-off-by: travis-recurve <[email protected]>
1 parent 542cc28 commit 520b2dd

File tree

1 file changed

+19
-7
lines changed

1 file changed

+19
-7
lines changed

gridmeter/gridmeter/_utils/data.py

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
from copy import deepcopy
2-
from typing import Optional
32

43
from gridmeter._utils.data_settings import Data_Settings
54
from gridmeter._utils import const as _const
65
import pandas as pd
76
import numpy as np
87

8+
from typing import Optional
9+
10+
11+
def is_datetime(x: pd.Series) -> bool:
12+
is_dt = [
13+
pd.api.types.is_datetime64_any_dtype(x),
14+
# pd.api.types.is_datetime64_ns_dtype(x),
15+
# pd.api.types.is_datetime64_dtype(x),
16+
# isinstance(x.dtype, pd.DatetimeTZDtype)
17+
]
18+
19+
return any(is_dt)
20+
921

1022
class Data:
1123
def __init__(self,
12-
loadshape_df: Optional[pd.DataFrame]= None,
13-
time_series_df: Optional[pd.DataFrame]= None,
14-
features_df: Optional[pd.DataFrame]= None,
15-
settings: Optional[Data_Settings]= None
24+
loadshape_df: Optional[pd.DataFrame] = None,
25+
time_series_df: Optional[pd.DataFrame] = None,
26+
features_df: Optional[pd.DataFrame] = None,
27+
settings: Optional[Data_Settings] = None
1628
):
1729
if settings is None:
1830
if loadshape_df is None:
@@ -380,8 +392,8 @@ def _convert_timeseries_to_loadshape(
380392
raise ValueError(f"Missing columns in time_series_df: {missing_columns}")
381393

382394
# Check that the datetime column is actually of type datetime
383-
if base_df["datetime"].dtypes in _const.datetime_types:
384-
base_df["datetime"] = pd.to_datetime(base_df["datetime"], utc=True)
395+
if is_datetime(base_df["datetime"]):
396+
base_df["datetime"] = pd.to_datetime(base_df["datetime"], utc=True) #TODO: should this be utc=True? should this be applied to all datetime types?
385397
else:
386398
raise ValueError("The 'datetime' column must be of datetime type")
387399

0 commit comments

Comments
 (0)