mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-09-11 10:26:38 +00:00
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>
This commit is contained in:
co-authored by
dr-dimitri
Normann
parent
5b584cbb57
commit
1abdd345c4
@@ -15,6 +15,7 @@ from typing import List, Optional, Type
|
||||
import numpy as np
|
||||
import pytest
|
||||
import pytest_asyncio
|
||||
from pendulum import UTC
|
||||
from pydantic import Field
|
||||
|
||||
from akkudoktoreos.core.coreabc import get_database
|
||||
@@ -44,7 +45,7 @@ class EnergyRecord(DataRecord):
|
||||
)
|
||||
|
||||
|
||||
class EnergySequence(DataSequence):
|
||||
class EnergySequence(DataSequence[EnergyRecord]):
|
||||
records: List[EnergyRecord] = Field(
|
||||
default_factory=list,
|
||||
json_schema_extra={"description": "List of energy records"},
|
||||
@@ -58,7 +59,7 @@ class EnergySequence(DataSequence):
|
||||
return "energy_test"
|
||||
|
||||
|
||||
class PriceSequence(DataSequence):
|
||||
class PriceSequence(DataSequence[EnergyRecord]):
|
||||
"""Price data — overrides tiers to keep 15-min resolution for 2 weeks."""
|
||||
|
||||
records: List[EnergyRecord] = Field(
|
||||
@@ -78,7 +79,7 @@ class PriceSequence(DataSequence):
|
||||
return [(to_duration("14 days"), to_duration("1 hour"))]
|
||||
|
||||
|
||||
class EnergyProvider(DataProvider):
|
||||
class EnergyProvider(DataProvider[EnergyRecord]):
|
||||
records: List[EnergyRecord] = Field(
|
||||
default_factory=list,
|
||||
json_schema_extra={"description": "List of energy records"},
|
||||
@@ -101,7 +102,7 @@ class EnergyProvider(DataProvider):
|
||||
return self.provider_id()
|
||||
|
||||
|
||||
class PriceProvider(DataProvider):
|
||||
class PriceProvider(DataProvider[EnergyRecord]):
|
||||
records: List[EnergyRecord] = Field(
|
||||
default_factory=list,
|
||||
json_schema_extra={"description": "List of price records"},
|
||||
@@ -181,7 +182,7 @@ def _reset_singletons() -> None:
|
||||
"""
|
||||
for cls in (EnergySequence, PriceSequence, EnergyProvider, PriceProvider, EnergyContainer):
|
||||
try:
|
||||
cls.reset_instance()
|
||||
getattr(cls, "reset_instance")()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
@@ -691,7 +692,7 @@ class TestDataSequenceCompactIntegrity:
|
||||
# DatabaseTimestamp already imported at top of file
|
||||
db_max_epoch = int(DatabaseTimestamp.to_datetime(db_max_ts).timestamp())
|
||||
two_weeks_cutoff_epoch = ((db_max_epoch - 14*24*3600) // 3600) * 3600
|
||||
two_weeks_cutoff_dt = DateTime.fromtimestamp(two_weeks_cutoff_epoch, tz="UTC")
|
||||
two_weeks_cutoff_dt = DateTime.fromtimestamp(two_weeks_cutoff_epoch, tz=UTC)
|
||||
|
||||
old_records = [r for r in seq.records if r.date_time and r.date_time < two_weeks_cutoff_dt]
|
||||
|
||||
@@ -986,7 +987,7 @@ class TestDataSequenceSparseGuard:
|
||||
margin_sec = (max_offset + 2 * interval_minutes + 1) * 60
|
||||
raw_base_epoch = window_end_epoch - margin_sec
|
||||
base_epoch = (raw_base_epoch // interval_sec) * interval_sec
|
||||
base = DateTime.fromtimestamp(base_epoch, tz="UTC")
|
||||
base = DateTime.fromtimestamp(base_epoch, tz=UTC)
|
||||
|
||||
dts = []
|
||||
for off in offsets_minutes:
|
||||
|
||||
Reference in New Issue
Block a user