Merge branch 'springfall2008:main' into main

Author: dragon2611

.cspell/custom-dictionary-workspace.txt

@@ -202,6 +202,7 @@ enph
 enphase
 enphaseenergy
 Enpower
+entityfilter
 entrez
 epod
 epvtoday
@@ -477,6 +478,7 @@ overfitting
 oversizing
 overvoltage
 ownerapi
+pac
 parseable
 pbat
 pbgw
@@ -633,6 +635,7 @@ startswith
 startt
 stdlib
 stepline
+stevekirtley
 Storion
 Stromligning
 strptime

apps/predbat/car_charger_control.py

@@ -714,6 +714,7 @@ def load_component_class(component_info):
             "load_ml_source": {"required": False, "config": "load_ml_source", "default": False},
             "load_ml_max_days_history": {"required": False, "config": "load_ml_max_days_history", "default": 28},
             "load_ml_database_days": {"required": False, "config": "load_ml_database_days", "default": 90},
+            "load_ml_retrain_interval_hours": {"required": False, "config": "load_ml_retrain_interval_hours", "default": 2},
         },
         "phase": 2,  # Load ML in phase 2 so that any Predbat cloud components (such as GEcloud) have been started and initialised pv_today, etc
         "can_restart": True,

apps/predbat/compare.py

@@ -883,6 +883,13 @@
         "type": "switch",
         "default": True,
     },
+    {
+        "name": "octopus_intelligent_charger_follows_car",
+        "friendly_name": "Drive the charger to the Intelligent dispatches when Octopus drives the car",
+        "type": "switch",
+        "default": False,
+        "enable": "expert_mode",
+    },
     {
         "name": "octopus_saving_auto_join",
         "friendly_name": "Octopus Saving Session Auto Join",
@@ -2842,6 +2849,7 @@
     "enphase_automatic": {"type": "boolean"},
     "enphase_automatic_ignore_pv": {"type": "boolean"},
     "octopus_intelligent_slot": {"type": "sensor|sensor_list", "sensor_type": "boolean|action", "entries": "num_cars", "optional_entries": True},
+    "octopus_intelligent_planned_slot": {"type": "sensor|sensor_list", "sensor_type": "boolean", "entries": "num_cars", "optional_entries": True},
     "octopus_ready_time": {"type": "sensor|sensor_list", "sensor_type": "string", "entries": "num_cars", "optional_entries": True},
     "octopus_charge_limit": {"type": "sensor|sensor_list", "sensor_type": "float", "entries": "num_cars", "optional_entries": True},
     "octopus_slot_low_rate": {"type": "boolean"},
@@ -2900,6 +2908,7 @@
     "enable_coarse_fine_levels": {"type": "boolean"},
     "load_power_fill_enable": {"type": "boolean"},
     "load_ml_enable": {"type": "boolean"},
+    "load_ml_retrain_interval_hours": {"type": "integer", "min": 1, "max": 48},
     "gateway_device_id": {"type": "string", "empty": False},
     "gateway_mqtt_host": {"type": "string", "empty": False},
     "gateway_mqtt_port": {"type": "integer", "zero": False},

apps/predbat/components.py

@@ -171,3 +171,7 @@
 # need the same answer to "which of these two states is the more significant one to show".
 CHARGE_STATE_PRECEDENCE = ["Charging", "Freeze charging", "Hold charging"]
 EXPORT_STATE_PRECEDENCE = ["Exporting", "Freeze exporting", "Hold exporting"]
+
+# A log text that repeats (an API response, an Intelligent slot list) is logged in full again after this long, so
+# the full text is never only in a rotated-out log file; in between it is logged as one short line
+REPEAT_FULL_LOG_SECONDS = 3600

apps/predbat/config.py

@@ -790,25 +790,32 @@ def execute_plan(self):
                         # Don't disable discharge during force charge/discharge slots but otherwise turn it off to prevent
                         # from draining the battery
                         if not isExporting:
-                            if inverter.inv_has_timed_pause:
-                                if resetPause:
-                                    inverter.adjust_pause_mode(pause_discharge=True)
-                                    pause_discharge_requested = True
-                                    resetPause = False
+                            # Not while this inverter is actually charging, unless it can pause: the battery is being
+                            # filled from the grid, so it cannot be feeding the car. A discharge rate of 0 adds nothing
+                            # then, and some GivEnergy inverters will not grid-charge at all with it at 0 and the SoC on
+                            # the reserve (#5419); pinning reserve just above a rising SoC costs a write for every 1% of
+                            # the climb (#3899). Both are left to reset below for the duration, and applied once charging
+                            # stops - which is the point the inverter returns to demand and the hold starts to mean
+                            # something. A timed pause is one latched write that blocks only discharge, so it stays on
+                            # through the charge, covering the moments the inverter reaches its target before Predbat
+                            # sees it. The sibling iBoost hold below already sits out a charge for the same reason.
+                            hold_deferred = (not inverter.inv_has_timed_pause) and status_per_inverter.get(inverter.id) == "Charging"
+                            if hold_deferred:
+                                self.log("Inverter {} is charging, so the hold for car {} leaves the discharge rate and reserve alone until charging stops".format(inverter.id, car_n))
                             else:
-                                if discharge_rate is None:
-                                    discharge_rate = 0
-                                # Not while actually charging: the battery is being filled from the grid, so it
-                                # cannot be feeding the car, and pinning reserve just above a rising SoC costs a
-                                # write for every 1% of the climb (#3899). Left to reset below for the duration,
-                                # and latched at the SoC reached once charging stops - which is the point the
-                                # inverter returns to demand and the hold starts to mean something. The sibling
-                                # iBoost hold below already sits out a charge for the same reason.
-                                if self.set_reserve_enable and status != "Charging":
-                                    inverter.adjust_reserve(min(inverter.soc_percent + 1, 100))
-                                    resetReserve = False
+                                if inverter.inv_has_timed_pause:
+                                    if resetPause:
+                                        inverter.adjust_pause_mode(pause_discharge=True)
+                                        pause_discharge_requested = True
+                                        resetPause = False
+                                else:
+                                    if discharge_rate is None:
+                                        discharge_rate = 0
+                                    if self.set_reserve_enable:
+                                        inverter.adjust_reserve(min(inverter.soc_percent + 1, 100))
+                                        resetReserve = False
+                                self.log("Disabling battery discharge whilst car {} is charging".format(car_n))
                             carHolding = True
-                            self.log("Disabling battery discharge whilst car {} is charging".format(car_n))
                             if ("Hold for car" not in status) and (status_hold_car == ""):
                                 if status == "Demand":
                                     status = "Hold for car"