Octopus intelligent detection fix (#4204)

Author: springfall2008

apps/predbat/octopus.py

@@ -683,7 +683,7 @@ async def async_update_intelligent_devices(self, account_id):
         """
         import_tariff = self.tariffs.get("import", {})
         tariffCode = import_tariff.get("tariffCode", "")
-        if "INTELLI-" not in tariffCode:
+        if not self.is_intelligent_go_tariff(tariffCode):
             return
         deviceID = import_tariff.get("deviceID", None)
         if deviceID:
@@ -1217,6 +1217,16 @@ def _get_rate_for_time(self, rates_list, timestamp, now=None):
                     best_rate = rate.get("value_inc_vat", None)
         return best_rate
 
+    @staticmethod
+    def is_intelligent_go_tariff(tariff_code):
+        """
+        Determine whether a tariff code is an Intelligent GO (IOG) tariff.
+        """
+        if not tariff_code:
+            return False
+        else:
+            return ("INTELLI-" in tariff_code) or ("IOG-" in tariff_code)
+
     async def async_get_day_night_rates(self, url, product_code="", tariff_code=""):
         """
         Get day and night rates from Octopus.
@@ -1235,7 +1245,7 @@ async def async_get_day_night_rates(self, url, product_code="", tariff_code=""):
         self.log("Info: OctopusAPI: Day rate entries: {} night rate entries: {}".format(len(result_day) if result_day else 0, len(result_night) if result_night else 0))
         if result_day and result_night:
             # Select night window based on tariff type
-            if ("INTELLI" in tariff_code) or ("IOG-" in tariff_code):
+            if self.is_intelligent_go_tariff(tariff_code):
                 window = OCTOPUS_NIGHT_RATE_WINDOWS["iog"]
             elif tariff_code and "GO-" in tariff_code:
                 window = OCTOPUS_NIGHT_RATE_WINDOWS["go"]

apps/predbat/predbat.py

@@ -35,7 +35,7 @@
 import pytz
 import asyncio
 
-THIS_VERSION = "v8.44.5"
+THIS_VERSION = "v8.44.6"
 
 from download import predbat_update_move, predbat_update_download, check_install, DEFAULT_PREDBAT_REPOSITORY
 from const import MINUTE_WATT

apps/predbat/tests/test_octopus_day_night_rates.py

@@ -368,6 +368,48 @@ async def mock_fetch7(url, **kwargs):
     else:
         print("PASS: None returned when timestamp falls exactly on valid_to boundary")
 
+    # ------------------------------------------------------------------
+    # Test 9: is_intelligent_go_tariff — shared IOG/Intelligent detection helper.
+    # Covers the bug where async_update_intelligent_devices only checked for
+    # "INTELLI-" and missed plain "IOG-" tariff codes.
+    # ------------------------------------------------------------------
+    print("\n*** Test 9: is_intelligent_go_tariff detects INTELLI and IOG- tariff codes ***")
+    intelligent_go_cases = [
+        ("E-1R-INTELLI-VAR-25-01-01-H", True),
+        ("E-1R-IOG-SMB-TOU-25-12-12-H", True),
+        ("E-1R-INTELLI-FLUX-IMPORT-23-07-14-A", True),
+        ("E-1R-GO-VAR-22-10-14-H", False),
+        ("E-2R-VAR-22-11-01-A", False),
+        ("", False),
+    ]
+    case_failed = False
+    for tariff_code, expected in intelligent_go_cases:
+        actual = OctopusAPI.is_intelligent_go_tariff(tariff_code)
+        if actual != expected:
+            print(f"ERROR: is_intelligent_go_tariff({tariff_code!r}) returned {actual}, expected {expected}")
+            failed = True
+            case_failed = True
+    if not case_failed:
+        print("PASS: is_intelligent_go_tariff correctly classifies INTELLI, IOG-, and non-intelligent tariff codes")
+
+    # ------------------------------------------------------------------
+    # Test 10: async_update_intelligent_devices regression — an IOG-only tariff
+    # code (no "INTELLI" substring) must still be treated as an intelligent
+    # tariff and proceed to fetch devices, rather than returning early.
+    # ------------------------------------------------------------------
+    print("\n*** Test 10: async_update_intelligent_devices proceeds for IOG-only tariff code ***")
+    api10 = OctopusAPI(my_predbat, key="test-key", account_id="test-account", automatic=False)
+    api10.tariffs = {"import": {"tariffCode": "E-1R-IOG-SMB-TOU-25-12-12-H", "deviceID": "test-device-789"}}
+    api10.async_get_intelligent_devices = AsyncMock(return_value={})
+
+    await api10.async_update_intelligent_devices("test-account")
+
+    if api10.async_get_intelligent_devices.call_count != 1:
+        print(f"ERROR: Expected async_get_intelligent_devices to be called for IOG-only tariff code, got {api10.async_get_intelligent_devices.call_count} calls")
+        failed = True
+    else:
+        print("PASS: async_update_intelligent_devices proceeds for IOG-only tariff code (no INTELLI substring)")
+
     # ------------------------------------------------------------------
     if failed:
         print("\n**** ❌ async_get_day_night_rates tests FAILED ****")