mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-08-30 04:06:37 +00:00
Bobby NoelteandGitHub
ba76087db9
Add new provider class for electricity fees providers. Add the generic providers: - ElecFeeFixed - ElecFeeImport The providers provide predictions for: - elecfee_consumption_amt_wh: Total fixed fee for consumed energy per Wh [amount/Wh]. This is the accumulation of all fixed per-Wh fees payable on "consumed energy - such as network charge, concession fee, and electricity charge - into a single amount. - elecfee_consumption_percent_amt: Total fixed surcharge on consumed energy, given as a percentage of the monetary amount already charged for that energy [%]. This is the accumulation of all percentage-based surcharges payable on top of the consumed-energy fee - such as VAT - into a single percentage. This is a percentage of the fee amount, not a per-Wh rate. - elecfee_feedin_amt_wh: Total fixed deduction from feed-in energy per Wh [amount/Wh]. This is the accumulation of all fixed per-Wh charges deducted from feed-in energy - such as metering fees or grid-operator handling "charges - into a single amount. Applied after the percentage-based deduction, i.e. it reduces the price by a flat amount per Wh rather than by a share of the raw price. - elecfee_feedin_percent_amt: Total percentage deducted from the raw feed-in price (spot price) [%]. This is the accumulation of all percentage-based deductions payable on the feed-in tariff - such as a marketing or balancing fee retained by the aggregator - into a single percentage. It is applied as `raw_price * (100 - percent) / 100`, i.e. it scales down the raw price rather than adding a surcharge to it. A new _apply_fee() method is added to the base class for ElecPrice and FeedInTariff to be used to add the fees in a consistent way. Fees are taken from the active ElecFee provider and applied to the raw prices given to the _apply_fee() method. The optional application of fees is added to: - ElecPriceAkkudoktor - ElecPriceFixed - ElecPriceEnergyCharts - ElecPriceSMARD - FeedInTariffEnergyCharts - FeedInTariffFixed - FeedInTariffSMARD The import providers ElecPriceImport and FeedInTariffImport do not apply fees by intentention. The following providers currently do not handle fees defined by ElecFee: - ElecPriceTibber - FeedInTariffAkkudoktor - FeedInTariffDvhubOnline - FeedInTariffTibber The tests for this feature are either added or existing tests are extended. The documentation was extended for the electricity fee provider settings. Besides this feature further improvements are added: * feat: add SMARD quarter-hour electricty price and feed-in tariff provider * feat: to_series method for TimeWindows and ValueTimeWindows Additional to to_array the time window sequence can now also produce a pandas series. Test have been extended to cover the series generation. * feat: use time windows in fixed feedin tariff provider Feedin tariff can now be configured by time windows - not a single value. * feat: EOSdash select for PVLib inverters and modules Provide PVLib inverter and module names in config selection. * feat: EOSdash lazy select for big option sets Add a new form for lazy selection of big option sets. Filtering and generation of the option set is done server-side. * fix: use raw data for ETS/ median prediction Use to raw time series data for ETS/ median prediction to avoid interference by e.g. dynamic grid charges. * fix: EOSdash config drops by type only on details resolve Drop configuration by type and path. Prevents dropping of configuration items with same type and level but different path. * fix: EOSdash configuration section closes on update Open section if searching or if last update touched this category — including updates on deeply nested sub-fields. * chore: make elecfeefixed, elecpricefixed and feedintarifffixed warn about no windows and default to 0 Missining configuration creates default 0 value and a warning instead of an exception. * fix: test setup for providers Reset db state on each test run. * chore: improve config option naming for elecpricefixed. * chore: adapt elecpricefixed test to changed time_windows naming * chore: factorized common price provider helpers to priceabc.py Factorized common price provider helpers to priceabc.py. Add tests for these helpers. Reduce/ change testing of elecpriceabc.py and feedintariffabc.py to cover only specifics. Rest of testing is already covered by test_priceabc.py. * chore: update version Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
42 lines
1.5 KiB
Python
42 lines
1.5 KiB
Python
# ruff: noqa: S101
|
|
|
|
from unittest.mock import patch
|
|
|
|
from akkudoktoreos.core.coreabc import get_ems
|
|
from akkudoktoreos.prediction.elecpriceenergycharts import EnergyChartsElecPrice
|
|
from akkudoktoreos.prediction.elecpricesmard import ElecPriceSMARD
|
|
from akkudoktoreos.prediction.feedintariffsmard import FeedInTariffSMARD
|
|
from akkudoktoreos.utils.datetimeutil import to_datetime
|
|
|
|
|
|
def test_feed_in_tariff_smard_reuses_raw_smard_market_prices(config_eos):
|
|
"""The feed-in provider delegates to SMARD and stores no import-price components."""
|
|
config_eos.merge_settings_from_dict(
|
|
{
|
|
"elecprice": {"provider": "ElecPriceSMARD"},
|
|
"feedintariff": {
|
|
"direct_marketing_enabled": True,
|
|
"provider": "FeedInTariffSMARD",
|
|
},
|
|
}
|
|
)
|
|
get_ems().set_start_datetime(
|
|
to_datetime("2026-08-01 00:00:00", in_timezone="Europe/Berlin")
|
|
)
|
|
provider = FeedInTariffSMARD()
|
|
data = EnergyChartsElecPrice(
|
|
license_info="CC BY 4.0 Bundesnetzagentur | SMARD.de",
|
|
unix_seconds=[1785535200],
|
|
price=[169.44],
|
|
unit="EUR/MWh",
|
|
deprecated=False,
|
|
)
|
|
|
|
with patch.object(ElecPriceSMARD, "_request_forecast", return_value=data) as request:
|
|
result = provider._request_forecast(start_date="2026-08-01", force_update=True)
|
|
|
|
assert provider.enabled()
|
|
assert result is data
|
|
assert provider._parse_data(result).iloc[0] == 169.44 / 1_000_000
|
|
request.assert_called_once_with(start_date="2026-08-01", force_update=True)
|