Merge pull request #3727 from springfall2008/copilot/fix-ev-charging-houseload-issue

Fix: LoadML component ignores car_charging_hold switch changes at runtime

Author: springfall2008

apps/predbat/load_ml_component.py

@@ -318,15 +318,26 @@ async def _fetch_load_data(self):
                 load_power_data, load_minutes_age = self.base.minute_data_load(self.now_utc, "load_power", days_to_fetch, required_unit="W", load_scaling=1.0, interpolate=True, pad=False)
                 load_minutes = self.base.fill_load_from_power(load_minutes, load_power_data)
 
+            # Re-read car charging settings dynamically so switch changes are picked up without a restart.
+            # Note: car_charging_from_battery does not affect EV subtraction from load history; it only controls
+            # whether the battery is allowed to discharge for car charging in the prediction model.
+            car_charging_hold = self.get_arg("car_charging_hold", True)
+            car_energy_reported_load = self.get_arg("car_energy_reported_load", True)
+            if not car_energy_reported_load:
+                # Car energy is not part of the house load (outside CT clamp), so don't subtract it
+                car_charging_hold = False
+            car_charging_energy_scale = self.get_arg("car_charging_energy_scale", 1.0)
+            self.log("ML Component: Car charging hold {}, car energy reported load {}".format(car_charging_hold, car_energy_reported_load))
+
             car_charging_energy = {}
             if self.get_arg("car_charging_energy", default=None, indirect=False):
-                car_charging_energy = self.base.minute_data_import_export(days_to_fetch, self.now_utc, "car_charging_energy", scale=self.car_charging_energy_scale, required_unit="kWh", pad=False)
+                car_charging_energy = self.base.minute_data_import_export(days_to_fetch, self.now_utc, "car_charging_energy", scale=car_charging_energy_scale, required_unit="kWh", pad=False)
 
             max_minute = max(load_minutes.keys()) if load_minutes else 0
             max_minute = (max_minute // 5) * 5  # Align to 5-minute intervals
             load_minutes_new = {}
 
-            if self.car_charging_hold and car_charging_energy:
+            if car_charging_hold and car_charging_energy:
                 # Use improved car subtraction method that handles timing misalignment and gaps
                 self.log("ML Component: Applying improved car charging subtraction with hold and interpolation")
                 load_minutes_new = self.car_subtraction(load_minutes, car_charging_energy, step=PREDICT_STEP, interpolate_gaps=True, max_gap_minutes=60, smoothing_window=3)
@@ -336,7 +347,7 @@ async def _fetch_load_data(self):
                 total_load_energy = 0
                 for minute in range(max_minute, -PREDICT_STEP, -PREDICT_STEP):
                     car_delta = 0.0
-                    if self.car_charging_hold:
+                    if car_charging_hold:
                         load_now = self.get_from_incrementing(load_minutes, minute, PREDICT_STEP, backwards=True)
                         if load_now >= self.car_charging_threshold * PREDICT_STEP:
                             car_delta = self.car_charging_rate * PREDICT_STEP

apps/predbat/tests/test_load_ml.py

@@ -2329,6 +2329,15 @@ async def test_step_size_calculation():
         mock_base_step_size.minute_data_load = MagicMock(return_value=(load_data, 1.0))
         mock_base_step_size.minute_data_import_export = MagicMock(return_value={})
         mock_base_step_size.fill_load_from_power = MagicMock(side_effect=lambda x, y: x)
+        # Override get_arg to disable car_charging_hold (test the non-car-charging branch)
+        original_get_arg = mock_base_step_size.get_arg
+
+        def mock_get_arg_no_car_hold(key, default=None, indirect=True, combine=False, attribute=None, index=None, domain=None, can_override=True, required_unit=None):
+            if key == "car_charging_hold":
+                return False
+            return original_get_arg(key, default=default, indirect=indirect, combine=combine, attribute=attribute, index=index, domain=domain, can_override=can_override, required_unit=required_unit)
+
+        mock_base_step_size.get_arg = mock_get_arg_no_car_hold
 
         component = LoadMLComponent(mock_base_step_size, load_ml_enable=True)
         # Override default values for testing
@@ -2340,8 +2349,6 @@ async def test_step_size_calculation():
         component.ml_time_decay_days = 7
         component.ml_max_load_kw = 23.0
         component.ml_max_model_age_hours = 48
-        # IMPORTANT: Disable car charging hold to test the non-car-charging branch (the bug scenario)
-        component.car_charging_hold = False
 
         result_data, result_age, result_now, result_pv, result_temp, result_import_rates, result_export_rates = await component._fetch_load_data()