zas oprava

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-evening-push-override-retry-v53"
+PLANNER_BUILD_TAG = "2026-05-31-evening-push-relaxed-clear-v54"
 # 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).
@@ -2112,6 +2112,23 @@ def _pv_forced_vent_export_allowed(
     return False
 
 
+def _solve_dispatch_relax_carryover(snap: dict[str, Any]) -> dict[str, Any]:
+    """Pass2 two-pass: neopakovat Infeasible řetězec, pokud pass1 skončil v nouzovém režimu."""
+    inp = snap.get("inputs")
+    if not isinstance(inp, dict):
+        return {}
+    out: dict[str, Any] = {}
+    for key in (
+        "relaxed_expensive_import",
+        "relaxed_neg_buy_charge",
+        "relaxed_neg_prep_window",
+        "neg_sell_phases_fallback",
+    ):
+        if inp.get(key):
+            out[key] = True
+    return out
+
+
 def solve_dispatch_two_pass(
     slots: list[PlanningSlot],
     battery,
@@ -2163,6 +2180,7 @@ def solve_dispatch_two_pass(
         return results1, ms1, snap1
 
     slots2 = _slots_with_charge_acquisition(slots, acq2)
+    relax_carry = _solve_dispatch_relax_carryover(snap1)
     results2, ms2, snap2 = solve_dispatch(
         slots2,
         battery,
@@ -2176,7 +2194,8 @@ def solve_dispatch_two_pass(
         operating_mode=operating_mode,
         charge_commitment_prev_w=charge_commitment_prev_w,
         planner_version=planner_version,
-        evening_push_ts_override=evening_push_ts_override,
+        evening_push_ts_override=None,
+        **relax_carry,
     )
     if isinstance(snap2.get("inputs"), dict):
         snap2["inputs"]["acquisition_pass1_czk_kwh"] = round(acq1, 6)
@@ -2702,6 +2721,9 @@ def solve_dispatch(
             evening_push_hysteresis_retained = True
         else:
             evening_push_ts = computed_evening_push_ts
+        if relaxed_neg_prep_window:
+            evening_push_ts = set()
+            evening_push_hysteresis_retained = False
     last_pos_sell_pre_neg_buy = _last_non_negative_sell_before_neg_buy(
         slots, first_neg_buy_idx
     )
@@ -4481,6 +4503,7 @@ def solve_dispatch(
             "evening_push_override_filtered_empty": bool(
                 push_override_raw and not push_override_eff
             ),
+            "evening_push_cleared_on_relaxed_prep": bool(relaxed_neg_prep_window),
             "kv1_evening_push_morning_peak_rule": _kv1_block_export_fixed_evening_push(
                 grid,
                 purchase_fixed=purchase_fixed_pre,

backend/tests/test_planning_dispatch_milp.py

@@ -2897,6 +2897,60 @@ class ChargeAcquisitionArbitrageTests(unittest.TestCase):
         self.assertNotIn(0, out)
         self.assertIn(1, out)
 
+    def test_relaxed_neg_prep_clears_computed_evening_push(self) -> None:
+        """v54: relaxed_neg_prep_window vypne tvrdý ge_bat push (ne jen hysterézní override)."""
+        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=0,
+                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
+        battery.planner_neg_sell_prep_soc_percent = 80
+        battery.planner_neg_sell_full_soc_tail_slots = 4
+        grid = SimpleNamespace(
+            max_export_power_w=13_500,
+            max_import_power_w=17_000,
+            block_export_on_negative_sell=False,
+            purchase_pricing_mode="spot",
+        )
+        _results, _ms, snap = solve_dispatch(
+            slots,
+            battery,
+            SimpleNamespace(rated_heating_power_w=0, tuv_min_temp_c=45.0, tuv_target_temp_c=55.0),
+            grid,
+            [None, None],
+            [
+                SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
+                SimpleNamespace(max_charge_power_w=0, battery_capacity_kwh=1.0, default_target_soc_pct=80.0),
+            ],
+            current_soc_wh=16_000.0,
+            current_tuv_temp_c=55.0,
+            relaxed_neg_prep_window=True,
+        )
+        self.assertEqual(snap["inputs"].get("evening_push_ts"), [])
+        self.assertTrue(snap["inputs"].get("evening_push_cleared_on_relaxed_prep"))
+
     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")

docs/04-modules/planning.md

@@ -125,7 +125,9 @@ flowchart TD
 
 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.
+9. **v54 — relaxed prep + two-pass:** při **`relaxed_neg_prep_window`** i vypočtený **`evening_push_ts = ∅`** (tvrdý push off); pass2 two-pass **nepoužívá override** a dědí relax vlajky z pass1. Snap: `evening_push_cleared_on_relaxed_prep`. Tag **`2026-05-31-evening-push-relaxed-clear-v54`**.
+
+**Funkce:** … Tag: **`2026-05-30-post-push-night-battery-v47`** (spot); KV1 v52 / home-01 v54 viz výše.
 
 ### Arbitráž baterie — účtování mezi sloty (povinné čtení)
 

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: tvrdý evening push po relaxed prep (v54)
+
+**Problém:** v53 maže jen **hysterézní override**, ne **vypočtený** `evening_push_ts`. Po `relaxed_neg_prep_window` (typicky home-01 ~25 % SoC + neg den 31.5.) zůstávaly tvrdé `ge_bat`/`z_export` v push slotech → **`Solver: Infeasible`** i po celém retry řetězci. Pass2 two-pass znovu aplikoval override bez carryover relaxace.
+
+**Změna (v54):** při `relaxed_neg_prep_window` → `evening_push_ts = ∅`; `_solve_dispatch_relax_carryover` — pass2 dědí nouzové vlajky z pass1, `evening_push_ts_override=None`. Snap: `evening_push_cleared_on_relaxed_prep`.
+
+Tag **`2026-05-31-evening-push-relaxed-clear-v54`**.
+
+**Ověření MCP (home-01):** `planner_build_tag` = v54; po ručním replanu `relaxed_neg_prep_window: true`, `evening_push_ts: []`, run `status = active`.
+
+---
+
 ## 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ů.