pyhive-integration 1.0.8.dev6__tar.gz → 1.0.8.dev8__tar.gz

{pyhive_integration-1.0.8.dev6/pyhive_integration.egg-info → pyhive_integration-1.0.8.dev8}/PKG-INFO

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

{pyhive_integration-1.0.8.dev6 → pyhive_integration-1.0.8.dev8/pyhive_integration.egg-info}/PKG-INFO

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

{pyhive_integration-1.0.8.dev6 → pyhive_integration-1.0.8.dev8}/setup.py

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

{pyhive_integration-1.0.8.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/src/api/hive_async_api.py

@@ -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.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/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.dev6 → pyhive_integration-1.0.8.dev8}/src/session.py

@@ -108,6 +108,7 @@ class HiveSession:
         self.deviceList = {}
         self.hub_id = None
         self._lastPollSlow = False
+        self._slowPollThreshold = timedelta(seconds=3)
 
     def openFile(self, file: str):
         """Open a file.
@@ -226,6 +227,29 @@ class HiveSession:
         if "ExpiresIn" in data:
             self.tokens.tokenExpiry = timedelta(seconds=data["ExpiresIn"])
 
+        _LOGGER.debug(
+            "updateTokens — IdToken: len=%d tail=…%s | "
+            "AccessToken: len=%d tail=…%s | "
+            "RefreshToken: %s | "
+            "ExpiresIn: %s | tokenCreated: %s | tokenExpiry: %s",
+            len(self.tokens.tokenData.get("token", "")),
+            self.tokens.tokenData.get("token", "")[-4:],
+            len(self.tokens.tokenData.get("accessToken", "")),
+            self.tokens.tokenData.get("accessToken", "")[-4:],
+            (
+                "present (len=%d tail=…%s)"
+                % (
+                    len(self.tokens.tokenData.get("refreshToken", "")),
+                    self.tokens.tokenData.get("refreshToken", "")[-4:],
+                )
+                if self.tokens.tokenData.get("refreshToken")
+                else "not present"
+            ),
+            data.get("ExpiresIn", "N/A"),
+            self.tokens.tokenCreated,
+            self.tokens.tokenExpiry,
+        )
+
         return self.tokens
 
     async def login(self):
@@ -255,7 +279,8 @@ class HiveSession:
             raise
 
         if result and "AuthenticationResult" in result:
-            _LOGGER.debug("Login successful, tokens received.")
+            auth_keys = list(result["AuthenticationResult"].keys())
+            _LOGGER.debug("Login successful — AuthenticationResult keys: %s", auth_keys)
             await self.updateTokens(result)
         return result
 
@@ -284,7 +309,10 @@ class HiveSession:
             raise
 
         if result and "AuthenticationResult" in result:
-            _LOGGER.debug("2FA login successful, tokens received.")
+            auth_keys = list(result["AuthenticationResult"].keys())
+            _LOGGER.debug(
+                "2FA login successful — AuthenticationResult keys: %s", auth_keys
+            )
             await self.updateTokens(result)
         return result
 
@@ -311,9 +339,11 @@ class HiveSession:
             raise
 
         if result and "AuthenticationResult" in result:
-            _LOGGER.debug("Device login successful, tokens received.")
+            auth_keys = list(result["AuthenticationResult"].keys())
+            _LOGGER.debug(
+                "Device login successful — AuthenticationResult keys: %s", auth_keys
+            )
             await self.updateTokens(result)
-            self.tokens.tokenExpiry = timedelta(seconds=0)
         return result
 
     async def _retryDeviceLogin(self):
@@ -386,6 +416,11 @@ class HiveSession:
                         )
 
                         if result and "AuthenticationResult" in result:
+                            auth_keys = list(result["AuthenticationResult"].keys())
+                            _LOGGER.debug(
+                                "Token refresh — AuthenticationResult keys: %s",
+                                auth_keys,
+                            )
                             await self.updateTokens(result)
                             new_expiry = (
                                 self.tokens.tokenCreated + self.tokens.tokenExpiry
@@ -535,12 +570,28 @@ class HiveSession:
                         "falling back to full device re-login."
                     )
                     await self._retryDeviceLogin()
-                    try:
-                        api_resp_d = await self.api.getAll()
-                    except HiveAuthError as retry_err:
-                        raise HiveReauthRequired from retry_err
+                    last_auth_err = None
+                    for api_retry_delay in (0, 2, 5):
+                        try:
+                            if api_retry_delay:
+                                _LOGGER.debug(
+                                    "Retrying API call in %ss after device re-login.",
+                                    api_retry_delay,
+                                )
+                                await asyncio.sleep(api_retry_delay)
+                            api_resp_d = await self.api.getAll()
+                            last_auth_err = None
+                            break
+                        except HiveAuthError as retry_err:
+                            _LOGGER.warning(
+                                "API call still rejected after device re-login (attempt delay=%ss).",
+                                api_retry_delay,
+                            )
+                            last_auth_err = retry_err
+                    if last_auth_err is not None:
+                        raise HiveReauthRequired from last_auth_err
                 api_call_duration = time.monotonic() - api_call_start
-                if api_call_duration > 3:
+                if api_call_duration > self._slowPollThreshold:
                     _LOGGER.warning(
                         "Hive API response took %.1fs — marking poll as slow.",
                         api_call_duration,
@@ -595,7 +646,9 @@ class HiveSession:
             get_nodes_successful = True
         except HiveReauthRequired:
             _LOGGER.error("Reauthentication required, propagating to caller.")
-            self.config.lastUpdate = datetime.now()
+            self.config.lastUpdate = (
+                datetime.now() - self.config.scanInterval + timedelta(seconds=30)
+            )
             raise
         except asyncio.TimeoutError:
             _LOGGER.warning("Hive API request timed out — keeping cached device data.")