Skip to content

tz converts, clean up #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahjyrkia merged 1 commit into from
Dec 8, 2025
Merged

tz converts, clean up #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions python/common/recluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,10 @@ def calculate_cluster_features(df: pd.DataFrame, cluster_id_vars_on_2nd_level: l

if "tst_median" in df.columns:
df["tst_median"] = pd.to_datetime(df["tst_median"], errors="coerce", utc=True)
df["tst_median_ns"] = df["tst_median"].view("int64")
df["tst_median_ns"] = df["tst_median"].astype("int64")
else:
df["tst_median_ns"] = pd.Series(index=df.index, dtype="float64")

if "oday" in df.columns:
df["oday"] = pd.to_datetime(df["oday"], errors="coerce")

clust_counts = df.drop_duplicates(
subset=[
Expand All @@ -450,17 +448,14 @@ def calculate_cluster_features(df: pd.DataFrame, cluster_id_vars_on_2nd_level: l

if "tst_median_ns" in median_vars.columns:
median_vars["tst_median"] = pd.to_datetime(median_vars["tst_median_ns"], utc=True)
median_vars["tst_median"] = median_vars["tst_median"].dt.tz_convert("Europe/Helsinki")
median_vars = median_vars.drop(columns=["tst_median_ns"])

res = median_vars.merge(clust_counts, on=cluster_id_vars_on_2nd_level, how="outer")
res = res.merge(clust_delay_feats, on=cluster_id_vars_on_2nd_level, how="outer")

if "oday" in df.columns:
res["oday_min"] = df["oday"].min()
res["oday_max"] = df["oday"].max()
else:
res["oday_min"] = pd.NaT
res["oday_max"] = pd.NaT
res["oday_min"] = df["oday"].min()
res["oday_max"] = df["oday"].max()

return res

Expand Down
2 changes: 0 additions & 2 deletions python/common/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ def get_target_oday(offset=1):
return start_date

def get_season(month, seasons_and_months):
logger.debug(month)
logger.debug(seasons_and_months)
if month is None or pd.isna(month):
return None

Expand Down