Car status 'Cheap, but home battery first' (v3.1.19)

User 10.10.: the dashboard said 'too little surplus' while the price was below
the cheap threshold and only the home-battery rule for PV hours held the car
back. New car status billig_akku for exactly that case.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: xchillxx

custom_components/surplus_pilot/coordinator.py

@@ -120,6 +120,7 @@
     "netz_pflicht": "Abfahrtsziel, aus dem Netz (günstigste Slots)",
     "netz_billig": "Strom gerade billig, PV reicht nicht", "pflicht_minimum": "Abfahrtsziel, Mindeststrom",
     "zu_wenig_ueberschuss": "zu wenig Überschuss", "pflicht": "Abfahrtsziel aus PV",
+    "billig_akku": "Strom billig, aber Hausakku zuerst",
     "pflicht_und_rest": "Abfahrtsziel + Rest", "vorrang_rest": "Vorrang, morgen keine PV-Chance",
     "rest": "Rest nach den Geräten", "haelt_minimum": "hält Minimum", "ladelimit_erreicht": "Ladelimit erreicht",
 }

custom_components/surplus_pilot/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/xchillxx/surplus-pilot/issues",
   "requirements": [],
-  "version": "3.1.18"
+  "version": "3.1.19"
 }

custom_components/surplus_pilot/planner.py

@@ -523,29 +523,31 @@ def _grid_slot_now(inp: Inputs, dep: Departure, uncovered_kwh: float,
 
 
 def _cheap_topup_now(inp: Inputs, dep: Departure | None,
-                     surplus: float) -> tuple[bool, float, tuple[datetime, datetime] | None]:
+                     surplus: float) -> tuple[bool, float, tuple[datetime, datetime] | None, bool]:
     """Grid top-up while the price is below the cheap threshold — only for
     energy the PV forecast won't bring anyway before the next departure
     (24 h without one), and only in the cheapest published slots until then
     (10.10. live: charged at 05:00 for 18.9 ct, the midday before the
     departure was 17.2 ct). The block is planned even while the price is
-    still above the threshold, so the devices know it in advance."""
+    still above the threshold, so the devices know it in advance. Last value:
+    the price is cheap now but only the home-battery rule for PV hours holds
+    it back (status `billig_akku` instead of "too little surplus")."""
     car = inp.car
     if (inp.cheap_target_soc is None or inp.cheap_threshold is None
             or car is None or car.soc is None or not car.present):
-        return False, 0.0, None
+        return False, 0.0, None, False
     target = min(inp.cheap_target_soc, car.limit_soc)
     if car.soc >= target:
-        return False, 0.0, None
+        return False, 0.0, None, False
     if inp.battery_feeds_car:
         # the home battery covers any import first: with energy left it
         # would just empty itself into the car (10.10. live: 05:00, battery
         # 36 -> 12 % in 45 min, then the house bought at 22-24 ct all
         # morning); and with PV for the car there's no top-up at all
         if surplus >= car.min_kw:
-            return False, 0.0, None
+            return False, 0.0, None, False
         if inp.battery_soc is not None and inp.battery_soc > inp.battery_min_soc + CHEAP_BATTERY_MARGIN:
-            return False, 0.0, None
+            return False, 0.0, None, False
     need = (target - car.soc) / 100.0 * car.capacity_kwh / car.efficiency
     end = dep.start if dep is not None else inp.now + timedelta(hours=24)
     pv, _ = forecast_surplus_kwh(inp.forecast, inp.now, end, inp.base_kw + 0.3, CHEAP_FORECAST_TRUST)
@@ -554,10 +556,12 @@ def _cheap_topup_now(inp: Inputs, dep: Departure | None,
         battery_missing = max(0.0, (100.0 - inp.battery_soc) / 100.0 * inp.battery_capacity_kwh)
     from_grid = need - max(0.0, pv - battery_missing)
     if from_grid <= 0.5:
-        return False, 0.0, None
+        return False, 0.0, None, False
     in_block, block = _cheapest_free_slot_now(inp, end, from_grid, car.max_kw)
     now_ok = inp.price_now is not None and inp.price_now <= inp.cheap_threshold
-    return in_block and now_ok, from_grid, block
+    waits = (now_ok and not in_block and not inp.battery_feeds_car and inp.pv_kw > inp.base_kw + 0.3
+             and not cheap_pv_battery_ok(inp))
+    return in_block and now_ok, from_grid, block, waits
 
 
 def cheap_pv_battery_ok(inp: Inputs) -> bool:
@@ -668,8 +672,9 @@ def make_plan(inp: Inputs) -> Plan:
     budget = {"pv_kw": inp.pv_kw, "grundlast_kw": inp.base_kw, "akku_ziel_kw": target_b}
 
     grid_reason = "netz_pflicht"
+    cheap_waits = False
     if not grid and car_ok and inp.allow_grid_for_car:
-        cheap, cheap_kwh, cheap_block = _cheap_topup_now(inp, dep, surplus)
+        cheap, cheap_kwh, cheap_block, cheap_waits = _cheap_topup_now(inp, dep, surplus)
         block = block or cheap_block
         if cheap:
             grid, grid_reason = True, "netz_billig"
@@ -709,7 +714,7 @@ def make_plan(inp: Inputs) -> Plan:
             if must_kw > MUST_MIN_SURPLUS_KW and car_must > 0 and _lift_to_min(inp, dep, need_kwh, surplus):
                 car_kw, car_reason = car.min_kw, "pflicht_minimum"  # battery/grid fill the gap
             else:
-                car_kw, car_reason = 0.0, "zu_wenig_ueberschuss"
+                car_kw, car_reason = 0.0, "billig_akku" if cheap_waits else "zu_wenig_ueberschuss"
         else:
             car_reason = ("pflicht" if topup < 0.05 else "pflicht_und_rest") if car_must > 0 else (
                 "vorrang_rest" if car_first else "rest")

custom_components/surplus_pilot/sensor.py

@@ -15,7 +15,7 @@
                   "ueberschuss", "akku_reicht", "akku_reserve", "kein_ueberschuss", "akku_reicht_nicht", "zu_kurz",
                   "manuell", "unbekannt"]
 CAR_REASONS = ["kein_auto", "nicht_da", "ladelimit_erreicht", "netz_pflicht", "netz_billig", "pflicht_minimum",
-               "zu_wenig_ueberschuss", "pflicht", "pflicht_und_rest", "vorrang_rest", "rest", "haelt_minimum",
+               "zu_wenig_ueberschuss", "billig_akku", "pflicht", "pflicht_und_rest", "vorrang_rest", "rest", "haelt_minimum",
                "pausiert", "unbekannt"]
 
 

custom_components/surplus_pilot/strings.json

@@ -244,6 +244,7 @@
           "netz_billig": "Grid: cheap price, PV won't do it",
           "pflicht_minimum": "Departure target, minimum current",
           "zu_wenig_ueberschuss": "Not enough surplus",
+          "billig_akku": "Cheap, but home battery first",
           "pflicht": "Departure target (PV)",
           "pflicht_und_rest": "Departure target + rest",
           "vorrang_rest": "Charging first (no PV chance tomorrow)",

custom_components/surplus_pilot/translations/de.json

@@ -244,6 +244,7 @@
           "netz_billig": "Netz: billig, PV reicht nicht",
           "pflicht_minimum": "Abfahrtsziel, Mindeststrom",
           "zu_wenig_ueberschuss": "Zu wenig Überschuss",
+          "billig_akku": "Billig, aber Hausakku zuerst",
           "pflicht": "Abfahrtsziel (PV)",
           "pflicht_und_rest": "Abfahrtsziel + Rest",
           "vorrang_rest": "Lädt vorrangig (morgen keine PV-Chance)",

custom_components/surplus_pilot/translations/en.json

@@ -244,6 +244,7 @@
           "netz_billig": "Grid: cheap price, PV won't do it",
           "pflicht_minimum": "Departure target, minimum current",
           "zu_wenig_ueberschuss": "Not enough surplus",
+          "billig_akku": "Cheap, but home battery first",
           "pflicht": "Departure target (PV)",
           "pflicht_und_rest": "Departure target + rest",
           "vorrang_rest": "Charging first (no PV chance tomorrow)",

tests/test_planner.py

@@ -447,6 +447,9 @@ def inp_at(t, pv, battery, running=False, locked=False):
         return inp
 
     assert not P.make_plan(inp_at(now, 4.5, 34.0)).car_grid            # today: battery too low
+    # 15:15 live: PV 2.4 kW, battery 21 %, 17.2 ct below the threshold -> the status names the battery
+    assert P.make_plan(inp_at(now.replace(hour=15, minute=15), 2.4, 21.0)).car_reason == "billig_akku"
+    assert P.make_plan(inp_at(now.replace(hour=15, minute=15), 2.4, 60.0)).car_reason == "netz_billig"
     assert P.make_plan(inp_at(now, 4.5, 55.0)).car_grid                # full enough: PV + grid
     assert P.make_plan(inp_at(now, 4.5, 47.0, running=True)).car_grid  # running: down to 45 %
     stop = inp_at(now, 4.5, 44.0, running=True)