pyhive-integration 1.0.8.dev5__tar.gz → 1.0.8.dev7__tar.gz

{pyhive_integration-1.0.8.dev5/pyhive_integration.egg-info → pyhive_integration-1.0.8.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhive-integration
-Version: 1.0.8.dev5
+Version: 1.0.8.dev7
 Summary: A Python library to interface with the Hive API
 Home-page: https://github.com/Pyhive/pyhiveapi
 Author: KJonline24

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7/pyhive_integration.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhive-integration
-Version: 1.0.8.dev5
+Version: 1.0.8.dev7
 Summary: A Python library to interface with the Hive API
 Home-page: https://github.com/Pyhive/pyhiveapi
 Author: KJonline24

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/setup.py

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

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/alarm.py

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

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/api/hive_api.py

@@ -33,7 +33,7 @@ class HiveApi:
             "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",

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/api/hive_async_api.py

@@ -43,7 +43,7 @@ class HiveApiAsync:
             "long_lived": "https://api.prod.bgchprod.info/omnia/accessTokens",
             "weather": "https://weather.prod.bgchprod.info/weather",
         }
-        self.timeout = 10
+        self.timeout = 5
         self.json_return = {
             "original": "No response to Hive API request",
             "parsed": "No response to Hive API request",
@@ -84,7 +84,7 @@ class HiveApiAsync:
             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

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/camera.py

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

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/heating.py

@@ -54,7 +54,6 @@ class HiveHeating:
         """
         from datetime import datetime
 
-        f_state = None
         state = None
         final = None
 
@@ -62,6 +61,16 @@ class HiveHeating:
             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 @@ class HiveHeating:
                 }
                 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 @@ class HiveHeating:
         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 @@ class Climate(HiveHeating):
                         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):

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/hotwater.py

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

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/light.py

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

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/plug.py

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

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/sensor.py

@@ -160,4 +160,5 @@ class Sensor(HiveSensor):
                         device["haName"],
                     )
                     return cached
+            device.setdefault("status", {"state": None})
             return device

{pyhive_integration-1.0.8.dev5 → pyhive_integration-1.0.8.dev7}/src/session.py

@@ -540,7 +540,7 @@ class HiveSession:
                     except HiveAuthError as retry_err:
                         raise HiveReauthRequired from retry_err
                 api_call_duration = time.monotonic() - api_call_start
-                if api_call_duration > 8:
+                if api_call_duration > 3:
                     _LOGGER.warning(
                         "Hive API response took %.1fs — marking poll as slow.",
                         api_call_duration,