Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 10 additions & 7 deletions watttime/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,13 +395,16 @@ def _parse_historical_forecast_json(
Returns:
pd.DataFrame: A pandas DataFrame containing the parsed historical forecast data.
"""
out = pd.DataFrame()
for json in json_list:
for entry in json.get("data", []):
_df = pd.json_normalize(entry, record_path=["forecast"])
_df = _df.assign(generated_at=pd.to_datetime(entry["generated_at"]))
out = pd.concat([out, _df], ignore_index=True)
return out
data = []
for j in json_list:
for gen_at in j["data"]:
for point_time in gen_at["forecast"]:
point_time["generated_at"] = gen_at["generated_at"]
data.append(point_time)
df = pd.DataFrame.from_records(data)
df["point_time"] = pd.to_datetime(df["point_time"])
df["generated_at"] = pd.to_datetime(df["generated_at"])
return df

def get_forecast_json(
self,
Expand Down