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,