Bump version to 1.0.8.dev7 and add defensive null state handling with temperature validation

Added setdefault() calls to ensure device status dictionaries exist with None values when devices are offline or slow polls occur, preventing KeyError exceptions. Implemented temperature value validation in getCurrentTemperature() to catch and log non-numeric values before processing. Added None checks in getState() before comparing temperatures. Reduced API timeout from 10s to 5s and fixed timeout parameter

Author: Khole Jones

setup.py

@@ -17,7 +17,7 @@ def requirements_from_file(filename="requirements.txt"):
 
 
 setup(
-    version="1.0.8.dev6",
+    version="1.0.8.dev7",
     packages=["apyhiveapi", "apyhiveapi.api", "apyhiveapi.helper"],
     package_dir={"apyhiveapi": "src"},
     package_data={"data": ["*.json"]},

src/alarm.py

@@ -131,4 +131,5 @@ async def getAlarm(self, device: dict):
             await self.session.helper.errorCheck(
                 device["device_id"], "ERROR", device["deviceData"]["online"]
             )
+            device.setdefault("status", {"state": None, "mode": None})
             return device

src/api/hive_api.py

@@ -33,7 +33,7 @@ def __init__(self, hiveSession=None, websession=None, token=None):
             "actions": "/actions",
             "nodes": "/nodes/{0}/{1}",
         }
-        self.timeout = 10
+        self.timeout = 5
         self.json_return = {
             "original": "No response to Hive API request",
             "parsed": "No response to Hive API request",

src/api/hive_async_api.py

@@ -84,7 +84,7 @@ async def request(
             auth_token[-4:] if len(auth_token) >= 4 else auth_token,
         )
 
-        timeout = ClientTimeout(total=10)
+        timeout = ClientTimeout(total=self.timeout)
         req_start = time.monotonic()
         async with self.websession.request(
             method, url, headers=headers, data=data, timeout=timeout

src/camera.py

@@ -189,4 +189,5 @@ async def getCamera(self, device: dict):
             await self.session.helper.errorCheck(
                 device["device_id"], "ERROR", device["deviceData"]["online"]
             )
+            device.setdefault("status", {"state": None})
             return device

src/heating.py

@@ -54,14 +54,23 @@ async def getCurrentTemperature(self, device: dict):
         """
         from datetime import datetime
 
-        f_state = None
         state = None
         final = None
 
         try:
             data = self.session.data.products[device["hiveID"]]
             state = data["props"]["temperature"]
 
+            try:
+                state = float(state)
+            except (ValueError, TypeError):
+                _LOGGER.debug(
+                    "Non-numeric temperature value '%s' for %s.",
+                    state,
+                    device.get("haName", device.get("hiveID")),
+                )
+                return None
+
             if device["hiveID"] in self.session.data.minMax:
                 if self.session.data.minMax[device["hiveID"]]["TodayDate"] == str(
                     datetime.date(datetime.now())
@@ -94,8 +103,7 @@ async def getCurrentTemperature(self, device: dict):
                 }
                 self.session.data.minMax[device["hiveID"]] = data
 
-            f_state = round(float(state), 1)
-            final = f_state
+            final = round(state, 1)
         except KeyError as e:
             _LOGGER.error(e)
 
@@ -159,12 +167,13 @@ async def getState(self, device: dict):
         try:
             current_temp = await self.getCurrentTemperature(device)
             target_temp = await self.getTargetTemperature(device)
-            if current_temp < target_temp:
-                state = "ON"
-            else:
-                state = "OFF"
-            final = HIVETOHA[self.heatingType].get(state, state)
-        except KeyError as e:
+            if current_temp is not None and target_temp is not None:
+                if current_temp < target_temp:
+                    state = "ON"
+                else:
+                    state = "OFF"
+                final = HIVETOHA[self.heatingType].get(state, state)
+        except (KeyError, TypeError) as e:
             _LOGGER.error(e)
 
         return final
@@ -503,6 +512,17 @@ async def getClimate(self, device: dict):
                         device["haName"],
                     )
                     return cached
+            device.setdefault(
+                "status",
+                {
+                    "current_temperature": None,
+                    "target_temperature": None,
+                    "action": None,
+                    "mode": None,
+                    "boost": None,
+                    "state": None,
+                },
+            )
             return device
 
     async def getScheduleNowNextLater(self, device: dict):

src/hotwater.py

@@ -271,6 +271,7 @@ async def getWaterHeater(self, device: dict):
                         device["haName"],
                     )
                     return cached
+            device.setdefault("status", {"current_operation": None})
             return device
 
     async def getScheduleNowNextLater(self, device: dict):

src/light.py

@@ -428,6 +428,7 @@ async def getLight(self, device: dict):
                         device["haName"],
                     )
                     return cached
+            device.setdefault("status", {"state": None})
             return device
 
     async def turnOn(self, device: dict, brightness: int, color_temp: int, color: list):

src/plug.py

@@ -188,6 +188,7 @@ async def getSwitch(self, device: dict):
                         device["haName"],
                     )
                     return cached
+            device.setdefault("status", {"state": None})
             return device
 
     async def getSwitchState(self, device: dict):

src/sensor.py

@@ -160,4 +160,5 @@ async def getSensor(self, device: dict):
                         device["haName"],
                     )
                     return cached
+            device.setdefault("status", {"state": None})
             return device