Files
EOS/src/akkudoktoreos/prediction/feedintariffakkudoktor.py
T
1abdd345c4 fix: unify mypy environments for local checks and CI (#1291)
The isolated pre-commit mypy hook previously omitted runtime type information that
make mypy used, hiding errors involving dependencies such as Pydantic and Pendulum.
Makefile, pre-commit and CI now run the same full-project typing policy in the
development environment defined by uv.lock.

- Use uv run --locked --exact --extra dev and the same mypy arguments for Makefile
  and the local hook. Check all of src and tests, including on configuration-only
  changes.
- Pin Python 3.13 for local development and the pre-commit CI job, and install the
  locked pre-commit version in CI.
- Disable incremental analysis because existing Pendulum cache state changes mypy 2.3.1
  diagnostics. Document the policy, the performance tradeoff and the existing typing debt.
- Add a regression test that exercises Makefile, the hook and the CI command in a
  temporary project, accepting valid dependency types and detecting deliberate
  Pydantic/Pendulum assignment errors.

Resolve the newly detected mypy diagnostics.

- Enable the numpydantic and Pydantic mypy plugins, retaining strict Pydantic
  constructor typing with init_typed = true. Validate raw/coercible payloads through model_validate.
- Propagate concrete record, provider and time-window types through generic collections,
  factories and lookup methods. Preserve runtime field inspection and generated time-window
  documentation.
- Align Pendulum annotations with actual factory/arithmetic results while retaining Pydantic
  validation adapters at runtime. Correct optional values, array boundaries, REST handlers
  and plotting interfaces.
- Add pinned scipy-stubs and types-psutil, update uv.lock, and supply the plugins' dependencies.
- Add runtime regression coverage for validated path defaults, normalized time-series metadata,
  generic field inspection, invalid timestamps and unsupported provider imports.

Runtime and compatibility details:

- Validate path defaults as Path objects while retaining raw string defaults needed by
  migration serialization with exclude_defaults.
- Normalize feed-in tariff lists and default charge rates to NumPy arrays; reject missing
  timestamps/uninitialized values explicitly. Importing into a provider without import support
  returns HTTP 400.
- Public JSON schemas and OpenAPI structure match main (excluding the generated version).

Signed-off-by: dr-dimitry

Signed-off-by: dr-dimitry
Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
Co-authored-by: dr-dimitri <87113560+dr-dimitri@users.noreply.github.com>
Co-authored-by: Normann <github@koldrack.com>
2026-09-10 23:20:35 +02:00

148 lines
5.6 KiB
Python

"""Provide feed-in tariff data from Akkudoktor market prices."""
import time
from datetime import datetime
from typing import Optional
import numpy as np
import pandas as pd
import requests
from loguru import logger
from akkudoktoreos.config.configabc import SettingsBaseModel
from akkudoktoreos.core.cache import cache_in_file
from akkudoktoreos.prediction.elecpriceakkudoktor import (
AkkudoktorElecPrice,
ElecPriceAkkudoktor,
)
from akkudoktoreos.prediction.feedintariffabc import FeedInTariffProvider
from akkudoktoreos.utils.datetimeutil import to_datetime, to_duration
class FeedInTariffAkkudoktorCommonSettings(SettingsBaseModel):
"""Settings for the Akkudoktor feed-in tariff provider.
The public Akkudoktor price endpoint only needs the timezone already
configured in ``general.timezone``, so no provider-specific values are
currently required.
"""
class FeedInTariffAkkudoktor(FeedInTariffProvider):
"""Use raw Akkudoktor day-ahead market prices as feed-in tariff data.
The upstream aWATTar endpoint currently supplies hourly values. EOS stores
those source values unchanged; consumers requesting a shorter interval can
forward-fill them onto the optimization grid.
Electricity export charges and VAT are intentionally not added. Prices
returned in EUR/MWh are converted to EUR/Wh and stored under
``feed_in_tariff_wh``.
"""
highest_orig_datetime: Optional[datetime] = None
def historic_hours_min(self) -> int:
"""Keep enough history for weekly seasonal price extrapolation."""
return 24 * 35
@classmethod
def provider_id(cls) -> str:
"""Return the unique provider identifier."""
return "FeedInTariffAkkudoktor"
@cache_in_file(with_ttl="1 hour")
def _request_forecast(self) -> AkkudoktorElecPrice:
"""Fetch market prices from the public Akkudoktor API."""
if not self.ems_start_datetime:
raise ValueError(f"Start DateTime not set: {self.ems_start_datetime}")
start_date = to_datetime(
self.ems_start_datetime - to_duration("35 days"), as_string="YYYY-MM-DD"
)
end_date = to_datetime(self.end_datetime, as_string="YYYY-MM-DD")
timezone = self.config.general.timezone
url = f"https://api.akkudoktor.net/prices?start={start_date}&end={end_date}&tz={timezone}"
max_attempts = 3
last_exc: Optional[Exception] = None
for attempt in range(1, max_attempts + 1):
try:
response = requests.get(url, timeout=(5, 20))
logger.debug("Response from {}: {}", url, response)
response.raise_for_status()
data = ElecPriceAkkudoktor._validate_data(response.content)
self.update_datetime = to_datetime(in_timezone=timezone)
return data
except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as exc:
last_exc = exc
logger.warning(
"Akkudoktor feed-in tariff request attempt {}/{} failed: {}",
attempt,
max_attempts,
exc,
)
if attempt < max_attempts:
time.sleep(2 * attempt)
raise last_exc # type: ignore[misc]
def _parse_data(self, data: AkkudoktorElecPrice) -> pd.Series:
"""Convert raw EUR/MWh values to a timezone-aware EUR/Wh series."""
series = pd.Series(dtype=float)
for value in data.values:
timestamp = to_datetime(value.start, in_timezone=self.config.general.timezone)
series.at[timestamp] = value.marketprice / 1_000_000
return series
async def _update_data(self, force_update: Optional[bool] = False) -> None:
"""Update raw prices and extrapolate any missing horizon values."""
if not self.ems_start_datetime:
raise ValueError(f"Start DateTime not set: {self.ems_start_datetime}")
try:
data = self._request_forecast(force_update=force_update) # type: ignore[call-arg]
series = self._parse_data(data)
if series.empty:
raise ValueError("No Akkudoktor feed-in tariff data available")
self.highest_orig_datetime = to_datetime(
series.index.max(), in_timezone=self.config.general.timezone
)
await self.key_from_series("feed_in_tariff_wh", series)
except Exception as exc:
if self.highest_orig_datetime is None:
raise
logger.warning(
"Akkudoktor feed-in tariff update failed ({}); retaining existing data.",
exc,
)
if self.highest_orig_datetime is None:
raise ValueError("Highest original datetime not available")
history = np.asarray(
await self.key_to_array(
key="feed_in_tariff_wh",
end_datetime=to_datetime(self.highest_orig_datetime),
fill_method="linear",
),
dtype=np.float64,
)
covered_hours = (
int((self.highest_orig_datetime - self.ems_start_datetime).total_seconds() // 3600) + 1
)
needed_hours = self.config.prediction.hours - max(covered_hours, 0)
if needed_hours <= 0:
return
prediction = self._predict(history, needed_hours)
prediction_series = pd.Series(
data=prediction,
index=[
self.highest_orig_datetime + to_duration(f"{i + 1} hours")
for i in range(len(prediction))
],
)
await self.key_from_series("feed_in_tariff_wh", prediction_series)