Skip to content

Commit

Permalink
fix(era5_aggregate): fix boundary id column name error
Browse files Browse the repository at this point in the history
  • Loading branch information
yannforget committed Jan 2, 2025
1 parent dda0207 commit 89c53ab
Showing 1 changed file with 3 additions and 37 deletions.
40 changes: 3 additions & 37 deletions era5_aggregate/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def era5_aggregate(

weekly = aggregate_per_week(
daily=daily,
column_uid=boundaries_column_uid,
column_uid="boundary_id",
use_epidemiological_weeks=False,
sum_aggregation=sum_aggregation,
)
Expand All @@ -106,7 +106,7 @@ def era5_aggregate(

epi_weekly = aggregate_per_week(
daily=daily,
column_uid=boundaries_column_uid,
column_uid="boundary_id",
use_epidemiological_weeks=True,
sum_aggregation=sum_aggregation,
)
Expand All @@ -117,7 +117,7 @@ def era5_aggregate(

monthly = aggregate_per_month(
daily=daily,
column_uid=boundaries_column_uid,
column_uid="boundary_id",
sum_aggregation=sum_aggregation,
)

Expand Down Expand Up @@ -248,37 +248,3 @@ def get_daily(
)

return daily


def temporal_aggregation(
daily: xr.Dataset, column_uid: str, variable: str, frequency: str = "weekly"
) -> pl.DataFrame:
if variable == "total_precipitation":
sum_aggregation = True
else:
sum_aggregation = False

if frequency == "weekly":
df = aggregate_per_week(
daily=daily,
column_uid=column_uid,
use_epidemiological_weeks=False,
sum_aggregation=sum_aggregation,
)
elif frequency == "epi_weekly":
df = aggregate_per_week(
daily=daily,
column_uid=column_uid,
use_epidemiological_weeks=True,
sum_aggregation=sum_aggregation,
)
elif frequency == "monthly":
df = aggregate_per_month(
daily=daily, column_uid=column_uid, sum_aggregation=sum_aggregation
)
else:
msg = f"Unsupported frequency: {frequency}"
current_run.log_error(msg)
raise ValueError(msg)

return df

0 comments on commit 89c53ab

Please sign in to comment.