diff --git a/backend/services/planning_engine.py b/backend/services/planning_engine.py index a889cb1..5555be9 100644 --- a/backend/services/planning_engine.py +++ b/backend/services/planning_engine.py @@ -71,7 +71,7 @@ NEG_BUY_CHARGE_SHORTFALL_PENALTY_CZK_KWH = 100.0 PRE_NEG_CHARGE_PENALTY_CZK_KWH = 400.0 PRE_NEG_BATT_EXPORT_SHORTFALL_PENALTY_CZK_KWH = 80.0 PRE_NEG_BATT_EXPORT_MIN_SELL_CZK_KWH = 1.0 -PLANNER_BUILD_TAG = "2026-05-31-kv1-evening-push-morning-peak-v52" +PLANNER_BUILD_TAG = "2026-05-31-evening-push-override-retry-v53" # Ranní slabá FVE: neaplikovat pv_store ge_pv=0 (jinak curtail při sell < večerní peak). DAWN_LOW_PV_NO_CURTAIL_W = 1500 # Mimo evening_push: preferovat bd pro dům místo gi, když buy >> acq (účinná cena importu). @@ -2188,6 +2188,51 @@ def solve_dispatch_two_pass( return results2, ms1 + ms2, snap2 +def _evening_push_override_for_solve( + evening_push_ts_override: Optional[set[int]], + *, + relaxed_expensive_import: bool, + relaxed_neg_buy_charge: bool, + relaxed_neg_prep_window: bool, + neg_sell_phases_fallback: bool, +) -> Optional[set[int]]: + """Po Infeasible nesmí retry držet hysterézní push z minulého běhu.""" + if evening_push_ts_override is None: + return None + if ( + relaxed_expensive_import + or relaxed_neg_buy_charge + or relaxed_neg_prep_window + or neg_sell_phases_fallback + ): + return None + return set(evening_push_ts_override) + + +def _filter_evening_push_override_indices( + slots: list[PlanningSlot], + override_ts: set[int], + *, + battery: Any, + grid: Any, + discharge_export_ok: set[int] | None, +) -> set[int]: + """Hysterézní push jen na sloty, kde dnes smí a dává smysl tvrdý ge_bat push.""" + out: set[int] = set() + for t in override_ts: + if t < 0 or t >= len(slots): + continue + if discharge_export_ok is not None and t not in discharge_export_ok: + continue + if _battery_export_push_defer_to_pv(slots[t]): + continue + push_floor_w = _evening_push_battery_export_w(slots[t], battery, grid) + if push_floor_w < GE_MIN_EXPORT_W: + continue + out.add(t) + return out + + def solve_dispatch( slots: list[PlanningSlot], battery, @@ -2600,6 +2645,8 @@ def solve_dispatch( night_self_consume_discourage_ts: set[int] = set() post_evening_push_night_ts: set[int] = set() evening_push_hysteresis_retained = False + push_override_raw: Optional[set[int]] = None + push_override_eff: Optional[set[int]] = None if om == "AUTO": per_slot_discharge_wh_pre = max( float(battery.max_discharge_power_w) @@ -2633,8 +2680,25 @@ def solve_dispatch( kv1_evening_push=kv1_evening_push_pre, ) ) - if evening_push_ts_override is not None: - evening_push_ts = set(evening_push_ts_override) + push_override_raw = _evening_push_override_for_solve( + evening_push_ts_override, + relaxed_expensive_import=relaxed_expensive_import, + relaxed_neg_buy_charge=relaxed_neg_buy_charge, + relaxed_neg_prep_window=relaxed_neg_prep_window, + neg_sell_phases_fallback=neg_sell_phases_fallback, + ) + push_override_eff = None + if push_override_raw: + push_override_eff = _filter_evening_push_override_indices( + slots, + push_override_raw, + battery=battery, + grid=grid, + discharge_export_ok=discharge_export_slots, + ) + evening_push_hysteresis_retained = False + if push_override_eff: + evening_push_ts = push_override_eff evening_push_hysteresis_retained = True else: evening_push_ts = computed_evening_push_ts @@ -4411,6 +4475,12 @@ def solve_dispatch( else _evening_night_peak_sell_czk(slots) ), "evening_push_hysteresis_retained": bool(evening_push_hysteresis_retained), + "evening_push_override_dropped_on_retry": bool( + evening_push_ts_override is not None and push_override_raw is None + ), + "evening_push_override_filtered_empty": bool( + push_override_raw and not push_override_eff + ), "kv1_evening_push_morning_peak_rule": _kv1_block_export_fixed_evening_push( grid, purchase_fixed=purchase_fixed_pre, diff --git a/backend/tests/test_planning_dispatch_milp.py b/backend/tests/test_planning_dispatch_milp.py index 6204e64..d1f3d82 100644 --- a/backend/tests/test_planning_dispatch_milp.py +++ b/backend/tests/test_planning_dispatch_milp.py @@ -19,6 +19,8 @@ from services.planning_engine import ( _evening_push_calendar_segments, _evening_push_soc_budget_calendar_segments, _evening_push_discharge_budget_wh, + _evening_push_override_for_solve, + _filter_evening_push_override_indices, _primary_night_export_segment_indices, _in_evening_push_hour_window, _in_night_battery_export_window, @@ -2837,6 +2839,64 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase): self.assertLessEqual(len(push), 4) self.assertEqual(push, [0, 1, 2, 3][: len(push)]) + def test_evening_push_override_cleared_on_relaxed_retry(self) -> None: + """v53: hysterézní override se nepřenáší do Infeasible retry větví.""" + kept = _evening_push_override_for_solve( + {2, 5}, + relaxed_expensive_import=False, + relaxed_neg_buy_charge=False, + relaxed_neg_prep_window=False, + neg_sell_phases_fallback=False, + ) + self.assertEqual(kept, {2, 5}) + dropped = _evening_push_override_for_solve( + {2, 5}, + relaxed_expensive_import=True, + relaxed_neg_buy_charge=False, + relaxed_neg_prep_window=False, + neg_sell_phases_fallback=False, + ) + self.assertIsNone(dropped) + + def test_evening_push_override_filters_defer_pv(self) -> None: + prague = ZoneInfo("Europe/Prague") + slots = [ + PlanningSlot( + interval_start=datetime(2026, 5, 30, 18, 0, tzinfo=prague).astimezone(timezone.utc), + buy_price=3.0, + sell_price=4.0, + pv_a_forecast_w=8000, + pv_b_forecast_w=0, + load_baseline_w=500, + ev1_connected=False, + ev2_connected=False, + allow_discharge_export=True, + ), + PlanningSlot( + interval_start=datetime(2026, 5, 30, 22, 0, tzinfo=prague).astimezone(timezone.utc), + buy_price=3.0, + sell_price=6.0, + pv_a_forecast_w=0, + pv_b_forecast_w=0, + load_baseline_w=500, + ev1_connected=False, + ev2_connected=False, + allow_discharge_export=True, + ), + ] + battery = _battery(uc_wh=64_000.0) + battery.max_discharge_power_w = 18_000 + grid = SimpleNamespace(max_export_power_w=13_500) + out = _filter_evening_push_override_indices( + slots, + {0, 1}, + battery=battery, + grid=grid, + discharge_export_ok={0, 1}, + ) + self.assertNotIn(0, out) + self.assertIn(1, out) + def test_kv1_evening_push_profitable_vs_morning_zone_peak(self) -> None: """v52: KV1 večer ≥ ranní max (5–11) − degrad; pod prahem ne.""" prague = ZoneInfo("Europe/Prague") diff --git a/docs/04-modules/planning.md b/docs/04-modules/planning.md index 2251cdf..f3677a7 100644 --- a/docs/04-modules/planning.md +++ b/docs/04-modules/planning.md @@ -123,7 +123,9 @@ flowchart TD - **`evening_early`** beze změny — export jen v `evening_push_ts` (ne rozprostřeně po celé noci). - Snap: `kv1_evening_push_morning_peak_rule`. Tag **`2026-05-31-kv1-evening-push-morning-peak-v52`**. -**Funkce:** … Tag: **`2026-05-30-post-push-night-battery-v47`** (spot); KV1 v52 viz výše. +8. **v53 — rolling hysteréze push:** při Infeasible retry se **`evening_push_ts_override` zahodí**; filtr override slotů (export maska, bez defer PV). Snap: `evening_push_override_dropped_on_retry`. Tag **`2026-05-31-evening-push-override-retry-v53`**. + +**Funkce:** … Tag: **`2026-05-30-post-push-night-battery-v47`** (spot); KV1 v52 / home-01 v53 viz výše. ### Arbitráž baterie — účtování mezi sloty (povinné čtení) diff --git a/docs/planning-changelog.md b/docs/planning-changelog.md index f1a10ce..72c97a3 100644 --- a/docs/planning-changelog.md +++ b/docs/planning-changelog.md @@ -5,6 +5,18 @@ Formát: **datum (ISO)** · stručný důvod · soubory · chování / ověřen --- +## 2026-05-31 — home-01: Infeasible při rolling hysteréze push (v53) + +**Problém:** Po v52 KV1 OK, **home-01** občas **`Solver: Infeasible`** — rolling replan držel `evening_push_ts` z minulého běhu (hystereze) i v retry větvích; tvrdý `ge_bat` push při nízkém SoC / změně slotů. + +**Změna (v53):** `_evening_push_override_for_solve` — override **vypnout** při jakémkoli relaxed retry; `_filter_evening_push_override_indices` — jen sloty s `allow_discharge_export`, bez defer PV, s dosažitelným push floorem. Snap: `evening_push_override_dropped_on_retry`. + +Tag **`2026-05-31-evening-push-override-retry-v53`**. + +**Ověření:** `pytest … -k stale_evening_push_override`; rolling home-01 bez RuntimeError. + +--- + ## 2026-05-31 — KV1: večerní push vs ranní max sell (v52) **Problém:** KV1 večer **~3,3 Kč** neprodával do sítě (`evening_push` prázdný: `sell < acq+spread` ≈ 6,65), vývoz až **úsvit ~2,8 Kč** před `sell<0` (08:15). Příčina: pravidla **v41 `evening_early`** + **v47 push profitabilita** z home-01 na fixní acquisition.