feat: Updated underlying intelligent bump charge API due to deprecation warning (30 minutes dev time)

Author: BottlecapDave

.husky/prepare-commit-msg

@@ -1 +1 @@
-exec < /dev/tty && npx cz --hook || true
+# exec < /dev/tty && npx cz --hook || true

custom_components/octopus_energy/api_client/__init__.py

@@ -223,27 +223,21 @@
 }}'''
 
 intelligent_turn_on_bump_charge_mutation = '''mutation {{
-	triggerBoostCharge(
-    input: {{
-      accountNumber: "{account_id}"
-    }}
-  ) {{
-		krakenflexDevice {{
-			 krakenflexDeviceId
-		}}
-	}}
+	updateBoostCharge(input: {{
+    deviceId: "{device_id}"
+    action: BOOST
+  }}) {{
+    id
+  }}
 }}'''
 
 intelligent_turn_off_bump_charge_mutation = '''mutation {{
-	deleteBoostCharge(
-    input: {{
-      accountNumber: "{account_id}"
-    }}
-  ) {{
-		krakenflexDevice {{
-			 krakenflexDeviceId
-		}}
-	}}
+	updateBoostCharge(input: {{
+    deviceId: "{device_id}"
+    action: CANCEL
+  }}) {{
+    id
+  }}
 }}'''
 
 intelligent_turn_on_smart_charge_mutation = '''mutation {{
@@ -1593,7 +1587,7 @@ async def async_update_intelligent_car_target_time(
       raise TimeoutException()
 
   async def async_turn_on_intelligent_bump_charge(
-      self, account_id: str,
+      self, device_id: str,
     ):
     """Turn on an intelligent bump charge"""
     await self.async_refresh_token()
@@ -1603,7 +1597,7 @@ async def async_turn_on_intelligent_bump_charge(
       client = self._create_client_session()
       url = f'{self._base_url}/v1/graphql/'
       payload = { "query": intelligent_turn_on_bump_charge_mutation.format(
-        account_id=account_id,
+        device_id=device_id,
       ) }
 
       headers = { "Authorization": f"JWT {self._graphql_token}", integration_context_header: request_context }
@@ -1615,7 +1609,7 @@ async def async_turn_on_intelligent_bump_charge(
       raise TimeoutException()
 
   async def async_turn_off_intelligent_bump_charge(
-      self, account_id: str,
+      self, device_id: str,
     ):
     """Turn off an intelligent bump charge"""
     await self.async_refresh_token()
@@ -1625,7 +1619,7 @@ async def async_turn_off_intelligent_bump_charge(
       client = self._create_client_session()
       url = f'{self._base_url}/v1/graphql/'
       payload = { "query": intelligent_turn_off_bump_charge_mutation.format(
-        account_id=account_id,
+        device_id=device_id,
       ) }
 
       headers = { "Authorization": f"JWT {self._graphql_token}", integration_context_header: request_context }

custom_components/octopus_energy/electricity/previous_accumulative_cost_override.py

@@ -130,8 +130,8 @@ async def async_update(self):
             self._standing_charge is None or
             self._rates[0]["start"] != period_from or
             self._rates[-1]["end"] != period_to or
-            self._standing_charge[0]["start"] != period_from or
-            self._standing_charge[-1]["end"] != period_to):
+            self._standing_charge["start"] != period_from or
+            self._standing_charge["end"] != period_to):
 
           _LOGGER.debug(f"Retrieving rates and standing charge overrides for '{self._mpan}/{self._serial_number}' ({period_from} - {period_to})...")
           [rate_data, standing_charge] = await asyncio.gather(

custom_components/octopus_energy/gas/previous_accumulative_cost_override.py

@@ -131,8 +131,8 @@ async def async_update(self):
             self._standing_charge is None or
             self._rates[0]["start"] != period_from or
             self._rates[-1]["end"] != period_to or
-            self._standing_charge[0]["start"] != period_from or
-            self._standing_charge[-1]["end"] != period_to):
+            self._standing_charge["start"] != period_from or
+            self._standing_charge["end"] != period_to):
 
           _LOGGER.debug(f"Retrieving rates and standing charge overrides for '{self._mprn}/{self._serial_number}' ({period_from} - {period_to})...")
           [rate_data, standing_charge] = await asyncio.gather(

custom_components/octopus_energy/intelligent/bump_charge.py

@@ -80,7 +80,7 @@ async def async_turn_on(self):
     """Turn on the switch."""
     try:
       await self._client.async_turn_on_intelligent_bump_charge(
-        self._account_id
+        self._device.id
       )
     except Exception as e:
       if self._is_mocked:
@@ -96,7 +96,7 @@ async def async_turn_off(self):
     """Turn off the switch."""
     try:
       await self._client.async_turn_off_intelligent_bump_charge(
-        self._account_id
+        self._device.id
       )
     except Exception as e:
       if self._is_mocked: