fix(octopus): keep Intelligent dispatch markers when export/gas rates are fetched (springfall2008#5286)

fetch_octopus_rates() replaced self.io_adjusted on every call, so the export
and gas fetches that follow the import fetch reset it to {} - every
BottlecapDave IOG user with metric_octopus_export or metric_octopus_gas set
lost all is_intelligent_adjusted markers. Regression from springfall2008#2826, which
dropped the old "only when adjust_key is set" guard.

Among other things this left dynamic_load_car_strip_feed_rates() with
nothing to strip, so a car cancelled by springfall2008#5229 still left its dispatch priced
cheap and the house battery was planned into it.

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

Author: chalfontchubby

apps/predbat/octopus.py

@@ -3839,7 +3839,8 @@ def fetch_octopus_rates(self, entity_id, adjust_key=None):
         Fetch the Octopus rates from the sensor
 
         :param entity_id: The entity_id of the sensor
-        :param adjust_key: The key use to find Octopus Intelligent adjusted rates
+        :param adjust_key: The key use to find Octopus Intelligent adjusted rates. self.io_adjusted is only
+            replaced when this is given, so a fetch without it (export, gas) keeps the import's markers
         """
         data_all = []
         rate_data = {}
@@ -3904,7 +3905,11 @@ def fetch_octopus_rates(self, entity_id, adjust_key=None):
                 rate_key = "price"
                 from_key = "from"
                 to_key = "till"
-            rate_data, self.io_adjusted = minute_data(data_all, self.forecast_days + 1, self.midnight_utc, rate_key, from_key, backwards=False, to_key=to_key, adjust_key=adjust_key, scale=scale)
+            rate_data, io_adjusted = minute_data(data_all, self.forecast_days + 1, self.midnight_utc, rate_key, from_key, backwards=False, to_key=to_key, adjust_key=adjust_key, scale=scale)
+            # A fetch without adjust_key has no markers to give, so it must not wipe the ones an earlier
+            # import fetch found (#5286)
+            if adjust_key:
+                self.io_adjusted = io_adjusted
 
         return rate_data
 

apps/predbat/tests/test_fetch_octopus_rates.py

@@ -32,6 +32,7 @@ def test_fetch_octopus_rates(my_predbat):
     # Setup test environment
     old_forecast_days = my_predbat.forecast_days
     old_midnight_utc = my_predbat.midnight_utc
+    old_io_adjusted = my_predbat.io_adjusted
 
     my_predbat.forecast_days = 2
     my_predbat.midnight_utc = datetime.strptime("2025-01-01T00:00:00+00:00", "%Y-%m-%dT%H:%M:%S%z")
@@ -204,6 +205,27 @@ def test_fetch_octopus_rates(my_predbat):
         print("ERROR: Expected minute 0 to be marked as intelligent adjusted")
         failed = True
 
+    # Test 5a: A later fetch without adjust_key (export or gas, which fetch_rates() reads after import)
+    # must keep the import's dispatch markers (#5286)
+    print("*** Test 5a: Fetch without adjust_key keeps the import's intelligent adjusted markers")
+
+    my_predbat.ha_interface.dummy_items["sensor.octopus_export"] = {
+        "state": "15.0",
+        "rates": [
+            {"value_inc_vat": 15.0, "valid_from": "2025-01-01T00:00:00+00:00", "valid_to": "2025-01-01T01:00:00+00:00"},
+        ],
+    }
+    rate_data = my_predbat.fetch_octopus_rates("sensor.octopus_export")
+
+    if not rate_data:
+        print("ERROR: Expected export rate data for Test 5a")
+        failed = True
+    elif my_predbat.io_adjusted.get(0, False) and not my_predbat.io_adjusted.get(30, False):
+        print("Test 5a passed - export fetch kept the import's intelligent adjusted markers")
+    else:
+        print("ERROR: Expected minute 0 still marked (and minute 30 not) after the export fetch, got {}".format(sorted(my_predbat.io_adjusted)[:5]))
+        failed = True
+
     # Test 5b: Missing day-rate events - no legacy 'all_rates' sensor fallback (#1699)
     print("*** Test 5b: Missing previous/current day-rate events warn about 'rates', not 'all_rates'")
 
@@ -275,6 +297,7 @@ def test_fetch_octopus_rates(my_predbat):
     # Restore original values
     my_predbat.forecast_days = old_forecast_days
     my_predbat.midnight_utc = old_midnight_utc
+    my_predbat.io_adjusted = old_io_adjusted
 
     if not failed:
         print("**** All fetch_octopus_rates tests PASSED ****")