fix max limitu

backend/services/planning_engine.py

@@ -789,10 +789,8 @@ def solve_dispatch(
     )
 
     # --- Proměnné ---
-    # gi[t] horní mez: site breaker (max_import_power_w) je fyzický strop.
-    # Pro robustnost (forecast PV/load nemusí sedět) používáme měkký cap: dovolíme gi nominálně
-    # až ~breaker + BMS max charge, ale překročení breakeru je penalizované (viz gi_over).
-    gi_upper = float(grid.max_import_power_w) + float(battery.max_charge_power_w)
+    # Import ze sítě: tvrdý strop = site breaker (max_import_power_w).
+    gi_upper = float(grid.max_import_power_w)
     gi  = [pulp.LpVariable(f"gi_{t}",  0, gi_upper)                        for t in range(T)]
     gi_over = [
         pulp.LpVariable(f"gi_over_{t}", 0, max(0.0, gi_upper - float(grid.max_import_power_w)))
@@ -1018,6 +1016,11 @@ def solve_dispatch(
         )
         pv_total_ub = float(s.pv_a_forecast_w) + float(s.pv_b_forecast_w)
 
+        # Součet nabíjení z FVE + ze sítě nesmí překročit max_charge_power_w baterie.
+        prob += bc_pv[t] + bc_gi[t] <= battery.max_charge_power_w
+        # Breaker: import ze site je tvrdě omezen (gi_over jen numerická pojistka).
+        prob += gi[t] <= gi_upper
+
         if om == "AUTO":
             load_site_expr = float(s.load_baseline_w) + ev_total_t + hp[t]
             prob += pv_ld[t] + pv_sp[t] == pv_a_net + pv_b_effective
@@ -1088,13 +1091,14 @@ def solve_dispatch(
         if z_gen_cutoff is not None and not allow_gen_cutoff:
             prob += z_gen_cutoff[t] == 0
 
-        # Záporná nákupní cena → cap import (baseline domu + akumulace + řízené zátěže)
+        # Záporná nákupní cena → import jen na load + nabíjení + EV + TČ (stále ≤ breaker).
         if s.buy_price < 0:
-            prob += gi[t] <= (
-                s.load_baseline_w
+            prob += gi[t] <= min(
+                gi_upper,
+                float(s.load_baseline_w)
                 + battery.max_charge_power_w
                 + sum(v.max_charge_power_w for v in vehicles)
-                + heat_pump.rated_heating_power_w
+                + heat_pump.rated_heating_power_w,
             )
 
         # Záporný prodej (sell < 0): baterii v tomhle okně nevybíjíme (dump má proběhnout předtím).

backend/tests/test_planning_dispatch_milp.py

@@ -1782,5 +1782,62 @@ class LoadFirstDispatchTests(unittest.TestCase):
         self.assertEqual(r.export_mode, "PV_SURPLUS")
 
 
+class SitePowerCapTests(unittest.TestCase):
+    """Tvrdé limity site import a součtu nabíjení baterie."""
+
+    def test_grid_charge_respects_import_and_battery_caps(self) -> None:
+        """home-01 typ: CHARGE slot nesmí překročit 17 kW import ani 18 kW do baterie."""
+        base = datetime(2026, 5, 22, 8, 45, tzinfo=timezone.utc)
+        slots = [
+            PlanningSlot(
+                interval_start=base,
+                buy_price=0.7,
+                sell_price=2.5,
+                pv_a_forecast_w=5000,
+                pv_b_forecast_w=0,
+                load_baseline_w=1961,
+                ev1_connected=False,
+                ev2_connected=False,
+                is_predicted_price=False,
+                allow_charge=True,
+                allow_discharge_export=False,
+            )
+        ]
+        battery = _battery(uc_wh=64_000.0)
+        battery.max_charge_power_w = 18_000
+        battery.max_discharge_power_w = 18_000
+        hp = SimpleNamespace(rated_heating_power_w=0, tuv_min_temp_c=45.0, tuv_target_temp_c=55.0)
+        grid = SimpleNamespace(max_import_power_w=17_000, max_export_power_w=13_500)
+        vehicles = [
+            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),
+        ]
+        soc0 = 0.5 * battery.usable_capacity_wh
+        results, _, _ = solve_dispatch(
+            slots,
+            battery,
+            hp,
+            grid,
+            [None, None],
+            vehicles,
+            soc0,
+            50.0,
+            operating_mode="AUTO",
+        )
+        r = results[0]
+        self.assertLessEqual(
+            r.grid_setpoint_w,
+            17_000,
+            msg="import ze site ≤ max_import_power_w",
+        )
+        self.assertGreaterEqual(r.grid_setpoint_w, 0)
+        self.assertLessEqual(
+            r.battery_setpoint_w,
+            18_000,
+            msg="nabíjení baterie ≤ max_charge_power_w",
+        )
+        self.assertGreater(r.battery_setpoint_w, 0)
+
+
 if __name__ == "__main__":
     unittest.main()