Merge pull request #4068 from springfall2008/fix/misc

Reset GECloud defaults after 24 hours, Add 100w base load default, catch crash with MinuteData array

Author: springfall2008

apps/predbat/fetch.py

@@ -457,6 +457,7 @@ def previous_days_modal_filter(self, data):
                 self.log("Gap starting at {} ({} minutes) for {} minutes".format(gap_start_timestamp.strftime(TIME_FORMAT), gap_start, gap_length))
 
         # Do the filling
+        len_data = len(data) if isinstance(data, MinuteArray) else 99999999
         for gap in gap_list:
             gap_start_minute_previous = gap[0]
             gap_minutes = gap[1]
@@ -467,7 +468,7 @@ def previous_days_modal_filter(self, data):
             # gap_start_minute_previous is the highest index (earliest in gap)
             # We fill from there down to the end of the gap
 
-            minute_previous = gap_end_minute_previous
+            minute_previous = min(gap_end_minute_previous, len_data - 1)
             gap_day = None
             while minute_previous > gap_start_minute_previous and minute_previous >= 0:
                 # Change of day?
@@ -2184,7 +2185,7 @@ def fetch_config_options(self):
         self.inverter_loss = 1.0 - self.get_arg("inverter_loss")
         self.inverter_hybrid = self.get_arg("inverter_hybrid")
         self.pv_ac_limit = self.get_arg("pv_ac_limit", 0.0) / MINUTE_WATT
-        self.base_load = self.get_arg("base_load", 0) / 1000.0
+        self.base_load = self.get_arg("base_load", 100) / 1000.0
 
         # Charge curve
         if self.args.get("battery_charge_power_curve", "") == "auto":

apps/predbat/gecloud.py

@@ -248,7 +248,7 @@ def initialize(self, ge_cloud_direct, api_key, automatic):
         self.evc_devices_dict = {}
         self.evc_device_list = []
         self.settings_from_cache = False
-        self.default_options_done = False
+        self.default_options_stamp = None
 
         # API request metrics for monitoring
         self.requests_total = 0
@@ -1093,8 +1093,10 @@ async def run(self, seconds, first):
                 if self.automatic:
                     await self.async_automatic_config(self.devices_dict)
 
-            if not self.default_options_done and self.get_state_wrapper(f"switch.{self.prefix}_set_read_only", default="off") != "on":
-                self.default_options_done = True
+            now_utc = self.now_utc_exact
+            options_due = self.default_options_stamp is None or (now_utc - self.default_options_stamp) >= timedelta(hours=24)
+            if options_due and self.get_state_wrapper(f"switch.{self.prefix}_set_read_only", default="off") != "on":
+                self.default_options_stamp = now_utc
                 for device in self.device_list:
                     await self.enable_default_options(device, self.settings[device])
 

apps/predbat/predbat.py

@@ -36,7 +36,7 @@
 import requests
 import asyncio
 
-THIS_VERSION = "v8.40.8"
+THIS_VERSION = "v8.40.9"
 
 from download import predbat_update_move, predbat_update_download, check_install, resolve_predbat_repository, DEFAULT_PREDBAT_REPOSITORY
 from const import MINUTE_WATT

apps/predbat/tests/test_ge_cloud.py

@@ -58,7 +58,7 @@ def __init__(self):
         self.gateway_device = None
         self._now_utc_exact = datetime.now(timezone.utc)
         self.settings_from_cache = False
-        self.default_options_done = False
+        self.default_options_stamp = None
         self._read_only = False
 
         class MockHAInterface:
@@ -239,6 +239,7 @@ def test_ge_cloud(my_predbat=None):
         ("enable_defaults", _test_enable_default_options, "Enable default options"),
         ("enable_defaults_read_only", _test_run_read_only_skips_reset, "Enable defaults skipped in read-only mode"),
         ("enable_defaults_after_read_only", _test_run_enables_reset_after_read_only, "Enable defaults on first non-read-only run"),
+        ("enable_defaults_24h", _test_run_enables_reset_after_24h, "Enable defaults re-runs after 24 hours"),
         ("download_single", _test_download_ge_data_single_day, "Download single day"),
         ("download_multi", _test_download_ge_data_multi_day, "Download multi-day"),
         ("download_pagination", _test_download_ge_data_pagination, "Download pagination"),
@@ -3646,8 +3647,8 @@ async def test():
             print("ERROR: enable_default_options should NOT be called in read-only mode, got calls for: {}".format(enable_default_calls))
             return 1
 
-        if ge_cloud.default_options_done:
-            print("ERROR: default_options_done should remain False when skipped due to read-only mode")
+        if ge_cloud.default_options_stamp is not None:
+            print("ERROR: default_options_stamp should remain None when skipped due to read-only mode")
             return 1
 
         return 0
@@ -3675,8 +3676,8 @@ async def test():
         if enable_default_calls:
             print("ERROR: enable_default_options should NOT be called in read-only mode, got: {}".format(enable_default_calls))
             return 1
-        if ge_cloud.default_options_done:
-            print("ERROR: default_options_done should be False after read-only first run")
+        if ge_cloud.default_options_stamp is not None:
+            print("ERROR: default_options_stamp should be None after read-only first run")
             return 1
 
         # Disable read-only — next 10-minute settings tick should trigger the reset
@@ -3692,15 +3693,62 @@ async def test():
         if enable_default_calls != ["inv001"]:
             print("ERROR: Expected enable_default_options called for inv001, got: {}".format(enable_default_calls))
             return 1
-        if not ge_cloud.default_options_done:
-            print("ERROR: default_options_done should be True after reset ran")
+        if ge_cloud.default_options_stamp is None:
+            print("ERROR: default_options_stamp should be set after reset ran")
             return 1
 
-        # Verify the reset does not run again on subsequent ticks
+        # Verify the reset does not run again on subsequent ticks within 24 hours
         enable_default_calls.clear()
         await ge_cloud.run(seconds=1200, first=False)
         if enable_default_calls:
-            print("ERROR: enable_default_options should not be called again after default_options_done=True")
+            print("ERROR: enable_default_options should not be called again within 24 hours")
+            return 1
+
+        return 0
+
+    return run_async(test())
+
+
+def _test_run_enables_reset_after_24h(my_predbat):
+    """enable_default_options re-runs after 24 hours have elapsed"""
+
+    async def test():
+        ge_cloud = MockGECloudDirect()
+        ge_cloud.automatic = False
+        ge_cloud._read_only = False
+
+        enable_default_calls = []
+        _make_run_mocks(ge_cloud, enable_default_calls)
+
+        # First run — should call enable_default_options
+        result = await ge_cloud.run(seconds=0, first=True)
+        if not result:
+            print("ERROR: run() should return True on first run")
+            return 1
+        if not enable_default_calls:
+            print("ERROR: enable_default_options should be called on first run")
+            return 1
+
+        # Subsequent run within 24 hours — should NOT call again
+        enable_default_calls.clear()
+        ge_cloud._now_utc_exact = ge_cloud.default_options_stamp + timedelta(hours=23, minutes=59)
+        await ge_cloud.run(seconds=600, first=False)
+        if enable_default_calls:
+            print("ERROR: enable_default_options should not be called again within 24 hours")
+            return 1
+
+        # Run after 24 hours have elapsed — should call again
+        enable_default_calls.clear()
+        ge_cloud._now_utc_exact = ge_cloud.default_options_stamp + timedelta(hours=24)
+        result = await ge_cloud.run(seconds=1200, first=False)
+        if not result:
+            print("ERROR: run() should return True on 24h run")
+            return 1
+        if not enable_default_calls:
+            print("ERROR: enable_default_options should be called again after 24 hours")
+            return 1
+        if enable_default_calls != ["inv001"]:
+            print("ERROR: Expected enable_default_options called for inv001, got: {}".format(enable_default_calls))
             return 1
 
         return 0

apps/predbat/tests/test_model.py

@@ -561,7 +561,7 @@ def run_model_tests(my_predbat):
     failed |= simple_scenario("battery_charge", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10)
 
     failed |= simple_scenario("battery_charge_low_off", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10, set_charge_low_power=False, keep=5, assert_keep=24.59)
-    failed |= simple_scenario("battery_charge_low_on", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10, set_charge_low_power=True, keep=5, assert_keep=88.89)
+    failed |= simple_scenario("battery_charge_low_on", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10, set_charge_low_power=True, keep=5, assert_keep=88.8947)
     failed |= simple_scenario(
         "battery_charge_low_on_monitor", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10, set_charge_low_power=True, keep=5, assert_keep=24.59, set_charge_window=False
     )
@@ -573,7 +573,7 @@ def run_model_tests(my_predbat):
         "battery_charge_low_temp2", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10, set_charge_low_power=False, keep=5, assert_keep=80.00, battery_temperature=1
     )
     failed |= simple_scenario(
-        "battery_charge_low_temp3", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10, set_charge_low_power=True, keep=5, assert_keep=88.89, battery_temperature=1
+        "battery_charge_low_temp3", my_predbat, 0, 0, assert_final_metric=import_rate * 10, assert_final_soc=10, with_battery=True, charge=10, battery_size=10, set_charge_low_power=True, keep=5, assert_keep=88.8947, battery_temperature=1
     )
 
     if failed:

apps/predbat/tests/test_previous_days_modal.py

@@ -8,7 +8,7 @@
 # pylint: disable=line-too-long
 # pylint: disable=attribute-defined-outside-init
 
-from utils import dp2, dp4
+from utils import dp2, dp4, MinuteArray
 from const import PREDICT_STEP
 
 
@@ -331,6 +331,47 @@ def mock_get_arg(key, default=None):
     else:
         print("Partial day (<16h gaps) correctly filled from {} kWh to {} kWh (proportional)".format(dp2(initial_day2_total), dp2(day2_filled_total)))
 
+    # Test 6: MinuteArray with a gap whose end falls beyond the array boundary
+    # Regression test for IndexError: array assignment index out of range.
+    # The gap-detection loop checks minute_previous + PREDICT_STEP beyond max_minute,
+    # so a gap near the end of the array gets an end index that exceeds len(array).
+    print("Test 6: MinuteArray gap whose end overshoots array boundary (regression)")
+
+    my_predbat.days_previous = [1, 2]
+    my_predbat.days_previous_weight = [1.0, 1.0]
+    my_predbat.load_minutes_age = 2
+    my_predbat.load_filter_modal = False
+
+    # Build 2 days of data as a plain dict, with a gap at the very end of day 2
+    # (i.e. near index max(data.keys())) so the gap-detection look-ahead lands
+    # one PREDICT_STEP beyond the array boundary.
+    dict_data = {}
+    day_kwh = 20.0
+    step_inc = day_kwh / (24 * 60)
+    for day in range(1, 3):
+        running_total = 0
+        for minute in range(0, 24 * 60):
+            running_total += step_inc
+            dict_data[day * 24 * 60 - minute] = dp4(running_total)
+
+    # Erase the last PREDICT_STEP worth of entries in day 2 to create a trailing gap
+    # that the look-ahead will extend one step beyond the array end.
+    max_key = max(dict_data.keys())
+    for k in range(max_key - PREDICT_STEP * 10, max_key + 1):
+        dict_data.pop(k, None)
+
+    # Convert to MinuteArray sized exactly to the remaining max key + 2,
+    # mirroring what minute_data_load does (pad=False path).
+    size = max(dict_data.keys()) + 2
+    minute_array = MinuteArray(dict_data, size)
+
+    try:
+        my_predbat.previous_days_modal_filter(minute_array)
+        print("MinuteArray boundary gap filled without error")
+    except IndexError as exc:
+        print("ERROR: IndexError raised during MinuteArray gap filling: {}".format(exc))
+        failed = True
+
     # Restore original get_arg method
     my_predbat.get_arg = original_get_arg
 

apps/predbat/utils.py

@@ -1144,6 +1144,7 @@ def find_charge_rate(
     # Real achieved max rate
     max_rate_real = get_charge_rate_curve_cached(round(soc, 1), max_rate, soc_max, max_rate, battery_charge_power_curve_tuple, battery_rate_min, battery_temperature, battery_temperature_curve_tuple) * battery_rate_max_scaling
 
+    min_battery_rate = max(400, int(round(battery_rate_min * MINUTE_WATT)))
     if set_charge_low_power:
         minutes_left = window["end"] - minutes_now - margin
         abs_minutes_left = window["end"] - minutes_now
@@ -1190,7 +1191,7 @@ def find_charge_rate(
                 )
             )
 
-        while rate_w >= 400:
+        while rate_w >= min_battery_rate:
             rate = rate_w / MINUTE_WATT
             if rate_w >= min_rate_w:
                 charge_now = soc

docs/apps-yaml.md

@@ -1698,7 +1698,7 @@ weirdness you may have from your inverter and battery setup.
 Sometimes the load predictions can yield near zero data due to inaccuracy of data (e.g. a second PV system not tracked, car data being unreliable, poor sensors).
 In order to not get unrealistically low values you can set a base load value (in watts) which Predbat will use as a minimum load for a slot duration.
 
-To set a base load set **base_load** as an integer value in watts.
+To set a base load set **base_load** as an integer value in watts. The default is 100 watts if not specified.
 
 ```yaml
    base_load: 300

docs/customisation.md

@@ -369,6 +369,7 @@ Set the list of [devices to notify](apps-yaml.md#notify_devices) in `apps.yaml`.
 lowest possible rate to meet the charge target. This is only really effective for charge windows longer than a single slot.
 If this setting is turned on, it is strongly recommended that you create a [battery_power_charge_curve in apps.yaml](apps-yaml.md#battery-chargedischarge-curves)
 as otherwise the low power charge may not reach the charge target in time.
+The minimum requested charge rate used in this mode is 400 watts (subject to inverter/battery minimum rate limits).
 This setting is off by default.
 
 The YouTube video [low power charging and charging curve](https://youtu.be/L2vY_Vj6pQg?si=0ZiIVrDLHkeDCx7h)