oprava home-01: Infeasible při rolling hysteréze push (v53)

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,