-
-
Notifications
You must be signed in to change notification settings - Fork 115
Energydataservice timezone aware changes #3699
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ | |
| rate dictionaries. | ||
| """ | ||
|
|
||
| from datetime import datetime | ||
| from datetime import datetime, timezone | ||
| from utils import dp4 | ||
|
|
||
|
|
||
|
|
@@ -68,55 +68,76 @@ def fetch_energidataservice_rates(self, entity_id, adjust_key=None): | |
|
|
||
| return rate_data | ||
|
|
||
| def minute_data_hourly_rates(self, data, forecast_days, midnight_utc, rate_key, from_key, adjust_key=None, scale=1.0, use_cent=False): | ||
| def minute_data_hourly_rates( | ||
| self, | ||
| data, | ||
| forecast_days, | ||
| midnight_utc, | ||
| rate_key, | ||
| from_key, | ||
| adjust_key=None, | ||
| scale=1.0, | ||
| use_cent=False, | ||
| ): | ||
| """ | ||
| Convert 15-minute rate data into a per-minute dict keyed by minute offset from midnight_utc. | ||
| FIXED: Handles timezone/DST correctly. | ||
| """ | ||
| rate_data = {} | ||
| min_minute = -forecast_days * 24 * 60 | ||
| max_minute = forecast_days * 24 * 60 | ||
| interval_minutes = 15 # new feed granularity | ||
| interval_minutes = 15 # default granularity | ||
|
|
||
| # Find gap between two entries in minutes | ||
| if len(data) < 2: | ||
| pass | ||
| # Normalize midnight to naive (local comparison baseline) | ||
| if midnight_utc.tzinfo is not None: | ||
| midnight = midnight_utc.astimezone(timezone.utc).replace(tzinfo=None) | ||
| else: | ||
| midnight = midnight_utc | ||
|
Comment on lines
+91
to
+95
|
||
|
|
||
| # Detect interval dynamically | ||
| if len(data) >= 2: | ||
| t0 = self._parse_iso(data[0].get(from_key)) | ||
| t1 = self._parse_iso(data[1].get(from_key)) | ||
| if t0 and t1: | ||
| interval_minutes = int((t1 - t0).total_seconds() / 60) | ||
| if interval_minutes <= 15 or interval_minutes > 60: | ||
| interval_minutes = 15 | ||
| delta = int((t1 - t0).total_seconds() / 60) | ||
| if 15 <= delta <= 60: | ||
| interval_minutes = delta | ||
|
|
||
| for entry in data: | ||
| start_time_str = entry.get(from_key) | ||
| rate = entry.get(rate_key, 0) * scale | ||
|
|
||
| if not use_cent: | ||
| # Keep behavior: convert DKK → øre (or cents) if use_cent is False | ||
| rate = rate * 100.0 | ||
|
|
||
| # Parse time robustly | ||
| start_time = self._parse_iso(start_time_str) | ||
| if start_time is None: | ||
| self.log(f"Warn: Invalid time format '{start_time_str}' in data") | ||
| continue | ||
|
|
||
| # Support naive/aware midnight_utc gracefully | ||
| try: | ||
| start_minute = int((start_time - midnight_utc).total_seconds() / 60) | ||
| except TypeError: | ||
| # If midnight_utc is naive, drop tzinfo from start_time for subtraction | ||
| start_minute = int((start_time.replace(tzinfo=None) - midnight_utc).total_seconds() / 60) | ||
| # Normalize timezone properly | ||
| if start_time.tzinfo is not None: | ||
| start_time = start_time.astimezone(timezone.utc).replace(tzinfo=None) | ||
|
|
||
| # Compute minute offset safely | ||
| start_minute = int((start_time - midnight).total_seconds() / 60) | ||
| end_minute = start_minute + interval_minutes | ||
|
|
||
| # Fill each minute in the 15-min slot | ||
| # Fill each minute in interval | ||
| for minute in range(start_minute, end_minute): | ||
| if min_minute <= minute < max_minute: | ||
| rate_data[minute] = dp4(rate) | ||
|
|
||
| # Fill missing minutes at the start of the data set without shifting timestamps | ||
| if rate_data and 0 not in rate_data: | ||
| min_key = min(rate_data.keys()) | ||
| if min_key > 0: | ||
| first_rate = rate_data[min_key] | ||
| for minute in range(0, min_key): | ||
| # Use the rate from 24 hours ahead if available, otherwise replicate the first valid rate | ||
| rate_data[minute] = rate_data.get(minute + 24 * 60, first_rate) | ||
|
|
||
| if adjust_key: | ||
| # hook for intelligent adjustments | ||
| pass | ||
|
|
||
| return rate_data | ||
|
|
@@ -134,11 +155,13 @@ def _parse_iso(self, s): | |
| def _tariff_for(self, tariffs, start_time_str): | ||
| if not tariffs or not start_time_str: | ||
| return 0 | ||
| s = str(start_time_str) | ||
| dt = self._parse_iso(s) | ||
|
|
||
| dt = self._parse_iso(start_time_str) | ||
| if not dt: | ||
| return tariffs.get(s, 0) | ||
| hhmm = f"{dt.hour:02d}:{dt.minute:02d}" # 08:15 | ||
| h = str(dt.hour) # "8" | ||
| hh = f"{dt.hour:02d}" # "08" | ||
| return tariffs.get(hhmm, tariffs.get(h, tariffs.get(hh, tariffs.get(s, 0)))) | ||
| return tariffs.get(str(start_time_str), 0) | ||
|
|
||
| hhmm = f"{dt.hour:02d}:{dt.minute:02d}" | ||
| h = str(dt.hour) | ||
| hh = f"{dt.hour:02d}" | ||
|
|
||
| return tariffs.get(hhmm, tariffs.get(h, tariffs.get(hh, tariffs.get(str(start_time_str), 0)))) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The docstring says this converts “15-minute rate data”, but the implementation detects the interval dynamically (15–60 min) and is also used for hourly data. Please update the docstring to describe interval-agnostic expansion to per-minute slots to avoid misleading future readers.