Merge master (0.19.1, TARIFF-24) into OPT-27 so the work has the weather hold to build on

release/1.0 (4a1f6cc) does not yet contain TARIFF-24 (PR #212, merged into
hotfix-0.19.1, then master 2932f3a). OPT-27 is about that code (the 1.5x
no-weather widening, _wx_track/weather_held), so it needs it. This is the
planned master -> release/1.0 merge's content, taken at 2932f3a; clean merge,
no conflicts.

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
glenn schrooyen
2026-10-29 20:21:32 +01:00
co-authored by Claude
10 changed files with 1018 additions and 67 deletions
+6 -2
View File
@@ -23,7 +23,7 @@ from . import arbitrage, messages, peakguard, uitext
from .maintenance import CHARGE as M_CHARGE, DRAIN as M_DRAIN, HOLD as M_HOLD
from .maintenance import IDLE as M_IDLE, next_slot_start
from .packmode import CHEAP_HOURS, GRID_CHARGE_MODES, LEFTOVER_SOLAR, SOLAR_FIRST
from .price import Absence, Uncertainty, brussels, _cover_table
from .price import Absence, brussels, _cover_table
from .static_tariff import static_plan
from .tariff import BILLING_TZ
from .uimodel import REGION_PRESETS, options_to_ui
@@ -279,7 +279,11 @@ def trade_verdict(c, plan, now):
return None, "no_prices"
verdict = plan.arbitrage(peak_guard_active=guard,
min_spread_eur_kwh=arbitrage.threshold_eur_kwh(c.o),
uncertainty=frozenset({Uncertainty.NO_WEATHER}),
uncertainty=arbitrage.weather_uncertainty(
bool(getattr(c, "modes_on", False)),
getattr(c, "solar_fc", None),
bool(getattr(c, "weather_held",
lambda _n: False)(now))),
now=now)
return verdict.match(
allowed=lambda v: (v, "allowed"),