Mirrors/EOS
1
0
Fork 0
mirror of https://github.com/Akkudoktor-EOS/EOS.git synced 2025-04-19 08:55:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix URL in elecprice

Browse Source
This commit is contained in:
Andreas 2025-01-02 14:49:31 +01:00 committed by Andreas
parent ed79cacf63
commit 1ccedea984
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/akkudoktoreos/prediction/elecpriceakkudoktor.py
View File

@ -23,8 +23,8 @@ logger = get_logger(__name__)
class AkkudoktorElecPriceMeta(PydanticBaseModel): class AkkudoktorElecPriceMeta(PydanticBaseModel):
start_timestamp: int start_timestamp: str
end_timestamp: int end_timestamp: str
start: str start: str
end: str end: str
@ -159,9 +159,9 @@ class ElecPriceAkkudoktor(ElecPriceProvider):
""" """
source = "https://api.akkudoktor.net" source = "https://api.akkudoktor.net"
# Try to take data from 7 days back for prediction - usually only some hours back are available # Try to take data from 7 days back for prediction - usually only some hours back are available
date = to_datetime(self.start_datetime - to_duration("7 days"), as_string="Y-M-D") date = to_datetime(self.start_datetime - to_duration("7 days"), as_string="YYYY-MM-DD")
last_date = to_datetime(self.end_datetime, as_string="Y-M-D") last_date = to_datetime(self.end_datetime, as_string="YYYY-MM-DD")
url = f"{source}/prices?date={date}&last_date={last_date}&tz={self.config.timezone}" url = f"{source}/prices?start={date}&end={last_date}&tz={self.config.timezone}"
response = requests.get(url) response = requests.get(url)
logger.debug(f"Response from {url}: {response}") logger.debug(f"Response from {url}: {response}")
response.raise_for_status() # Raise an error for bad responses response.raise_for_status() # Raise an error for bad responses
@ -212,6 +212,7 @@ class ElecPriceAkkudoktor(ElecPriceProvider):
for i in range(values_len): for i in range(values_len):
original_datetime = akkudoktor_data.values[i].start original_datetime = akkudoktor_data.values[i].start
dt = to_datetime(original_datetime, in_timezone=self.config.timezone) dt = to_datetime(original_datetime, in_timezone=self.config.timezone)
akkudoktor_value = akkudoktor_data.values[i] akkudoktor_value = akkudoktor_data.values[i]
price_wh = ( price_wh = (
akkudoktor_value.marketpriceEurocentPerKWh / (100 * 1000) + charges_kwh / 1000 akkudoktor_value.marketpriceEurocentPerKWh / (100 * 1000) + charges_kwh / 1000
@ -254,7 +255,6 @@ class ElecPriceAkkudoktor(ElecPriceProvider):
# Repeat the mean on the 8 day array to cover the missing hours # Repeat the mean on the 8 day array to cover the missing hours
dt = self[-1].date_time.add(hours=1) # type: ignore dt = self[-1].date_time.add(hours=1) # type: ignore
value = self._calculate_weighted_mean(dt.day_of_week, dt.hour) value = self._calculate_weighted_mean(dt.day_of_week, dt.hour)
record = ElecPriceDataRecord( record = ElecPriceDataRecord(
date_time=dt, date_time=dt,
elecprice_marketprice_wh=value, elecprice_marketprice_wh=value,