mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-07-21 17:28:11 +00:00
8bf798daeb
Bare `except:` catches SystemExit and KeyboardInterrupt, which can: - Mask Ctrl+C handling during long optimization runs - Hide critical system signals - Make debugging harder Replacement by `except Exception:` preserves the same error handling while respecting system-level exceptions. Co-authored-by: Milo @KeloYuan Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
90 lines
3.0 KiB
Python
90 lines
3.0 KiB
Python
from typing import Optional
|
|
|
|
from pydantic import Field, computed_field, field_validator
|
|
|
|
from akkudoktoreos.config.configabc import SettingsBaseModel
|
|
from akkudoktoreos.core.coreabc import get_prediction
|
|
from akkudoktoreos.prediction.elecpriceabc import ElecPriceProvider
|
|
from akkudoktoreos.prediction.elecpriceenergycharts import (
|
|
ElecPriceEnergyChartsCommonSettings,
|
|
)
|
|
from akkudoktoreos.prediction.elecpricefixed import ElecPriceFixedCommonSettings
|
|
from akkudoktoreos.prediction.elecpriceimport import ElecPriceImportCommonSettings
|
|
|
|
|
|
def elecprice_provider_ids() -> list[str]:
|
|
"""Valid elecprice provider ids."""
|
|
try:
|
|
prediction_eos = get_prediction()
|
|
except Exception:
|
|
# Prediction may not be initialized
|
|
# Return at least provider used in example
|
|
return ["ElecPriceAkkudoktor"]
|
|
|
|
return [
|
|
provider.provider_id()
|
|
for provider in prediction_eos.providers
|
|
if isinstance(provider, ElecPriceProvider)
|
|
]
|
|
|
|
|
|
class ElecPriceCommonSettings(SettingsBaseModel):
|
|
"""Electricity Price Prediction Configuration."""
|
|
|
|
provider: Optional[str] = Field(
|
|
default=None,
|
|
json_schema_extra={
|
|
"description": "Electricity price provider id of provider to be used.",
|
|
"examples": ["ElecPriceAkkudoktor"],
|
|
},
|
|
)
|
|
|
|
charges_kwh: Optional[float] = Field(
|
|
default=None,
|
|
ge=0,
|
|
json_schema_extra={
|
|
"description": "Electricity price charges [amount/kWh]. Will be added to variable market price.",
|
|
"examples": [0.21],
|
|
},
|
|
)
|
|
|
|
vat_rate: Optional[float] = Field(
|
|
default=1.19,
|
|
ge=0,
|
|
json_schema_extra={
|
|
"description": "VAT rate factor applied to electricity price when charges are used.",
|
|
"examples": [1.19],
|
|
},
|
|
)
|
|
|
|
elecpricefixed: ElecPriceFixedCommonSettings = Field(
|
|
default_factory=ElecPriceFixedCommonSettings,
|
|
json_schema_extra={"description": "Fixed electricity price provider settings."},
|
|
)
|
|
|
|
elecpriceimport: ElecPriceImportCommonSettings = Field(
|
|
default_factory=ElecPriceImportCommonSettings,
|
|
json_schema_extra={"description": "Import provider settings."},
|
|
)
|
|
|
|
energycharts: ElecPriceEnergyChartsCommonSettings = Field(
|
|
default_factory=ElecPriceEnergyChartsCommonSettings,
|
|
json_schema_extra={"description": "Energy Charts provider settings."},
|
|
)
|
|
|
|
@computed_field # type: ignore[prop-decorator]
|
|
@property
|
|
def providers(self) -> list[str]:
|
|
"""Available electricity price provider ids."""
|
|
return elecprice_provider_ids()
|
|
|
|
# Validators
|
|
@field_validator("provider", mode="after")
|
|
@classmethod
|
|
def validate_provider(cls, value: Optional[str]) -> Optional[str]:
|
|
if value is None or value in elecprice_provider_ids():
|
|
return value
|
|
raise ValueError(
|
|
f"Provider '{value}' is not a valid electricity price provider: {elecprice_provider_ids()}."
|
|
)
|