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

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

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

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

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

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

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

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

@@ -1,13 +1,15 @@
 """Hive API Module."""
 
 # pylint: skip-file
+import asyncio
 import json
 import logging
+import time
 from typing import Optional
 
 import requests
 import urllib3
-from aiohttp import ClientResponse, ClientSession, web_exceptions
+from aiohttp import ClientResponse, ClientSession, ClientTimeout, web_exceptions
 from pyquery import PyQuery
 
 from ..helper.const import HTTP_FORBIDDEN, HTTP_UNAUTHORIZED
@@ -82,12 +84,21 @@ class HiveApiAsync:
             auth_token[-4:] if len(auth_token) >= 4 else auth_token,
         )
 
+        timeout = ClientTimeout(total=10)
+        req_start = time.monotonic()
         async with self.websession.request(
-            method, url, headers=headers, data=data
+            method, url, headers=headers, data=data, timeout=timeout
         ) as resp:
             resp_body = await resp.text()
+            req_duration = time.monotonic() - req_start
+            _LOGGER.debug(
+                "API %s %s completed in %.2fs — HTTP %s",
+                method.upper(),
+                url,
+                req_duration,
+                resp.status,
+            )
             if str(resp.status).startswith("20"):
-                _LOGGER.debug("API response %s from %s", resp.status, url)
                 return resp
 
         if resp.status in (HTTP_UNAUTHORIZED, HTTP_FORBIDDEN):
@@ -163,6 +174,9 @@ class HiveApiAsync:
             resp = await self.request("get", url)
             json_return.update({"original": resp.status})
             json_return.update({"parsed": await resp.json(content_type=None)})
+        except asyncio.TimeoutError:
+            _LOGGER.warning("Hive API request timed out fetching all nodes.")
+            raise
         except (OSError, RuntimeError, ZeroDivisionError):
             await self.error()
 

{pyhive_integration-1.0.8.dev3 → pyhive_integration-1.0.8.dev5}/src/api/hive_auth_async.py

@@ -625,7 +625,7 @@ class HiveAuthAsync:
                 _LOGGER.error("Token refresh failed: cannot reach Cognito endpoint.")
                 raise HiveApiError from err
 
-        _LOGGER.debug("Token refresh completed successfully.")
+        _LOGGER.debug("Cognito token refresh completed successfully.")
         return result
 
     async def forget_device(self, access_token, device_key):

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

@@ -495,6 +495,14 @@ class Climate(HiveHeating):
             await self.session.helper.errorCheck(
                 device["device_id"], "ERROR", device["deviceData"]["online"]
             )
+            if self.session._lastPollSlow:
+                cached = self.session.devices.get(device["hiveID"])
+                if cached is not None:
+                    _LOGGER.debug(
+                        "Returning cached state for offline climate %s (slow poll).",
+                        device["haName"],
+                    )
+                    return cached
             return device
 
     async def getScheduleNowNextLater(self, device: dict):

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

@@ -263,6 +263,14 @@ class WaterHeater(HiveHotwater):
             await self.session.helper.errorCheck(
                 device["device_id"], "ERROR", device["deviceData"]["online"]
             )
+            if self.session._lastPollSlow:
+                cached = self.session.devices.get(device["hiveID"])
+                if cached is not None:
+                    _LOGGER.debug(
+                        "Returning cached state for offline water heater %s (slow poll).",
+                        device["haName"],
+                    )
+                    return cached
             return device
 
     async def getScheduleNowNextLater(self, device: dict):

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

@@ -420,6 +420,14 @@ class Light(HiveLight):
             await self.session.helper.errorCheck(
                 device["device_id"], "ERROR", device["deviceData"]["online"]
             )
+            if self.session._lastPollSlow:
+                cached = self.session.devices.get(device["hiveID"])
+                if cached is not None:
+                    _LOGGER.debug(
+                        "Returning cached state for light %s (slow poll).",
+                        device["haName"],
+                    )
+                    return cached
             return device
 
     async def turnOn(self, device: dict, brightness: int, color_temp: int, color: list):

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

@@ -180,6 +180,14 @@ class Switch(HiveSmartPlug):
             await self.session.helper.errorCheck(
                 device["device_id"], "ERROR", device["deviceData"]["online"]
             )
+            if self.session._lastPollSlow:
+                cached = self.session.devices.get(device["hiveID"])
+                if cached is not None:
+                    _LOGGER.debug(
+                        "Returning cached state for offline switch %s (slow poll).",
+                        device["haName"],
+                    )
+                    return cached
             return device
 
     async def getSwitchState(self, device: dict):

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

@@ -152,4 +152,12 @@ class Sensor(HiveSensor):
             await self.session.helper.errorCheck(
                 device["device_id"], "ERROR", device["deviceData"]["online"]
             )
+            if self.session._lastPollSlow:
+                cached = self.session.devices.get(device["hiveID"])
+                if cached is not None:
+                    _LOGGER.debug(
+                        "Returning cached state for offline sensor %s (slow poll).",
+                        device["haName"],
+                    )
+                    return cached
             return device

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

@@ -107,6 +107,7 @@ class HiveSession:
         self.devices = {}
         self.deviceList = {}
         self.hub_id = None
+        self._lastPollSlow = False
 
     def openFile(self, file: str):
         """Open a file.
@@ -358,7 +359,7 @@ class HiveSession:
             expiry_time = self.tokens.tokenCreated + (self.tokens.tokenExpiry * 0.95)
             # Refresh at 95% of token lifetime to prevent expiration during API calls
             _LOGGER.debug(
-                "Checking token expiry time ( Current: %s | Expiry: %s)",
+                "Session token expiry time ( Current: %s | Expiry: %s)",
                 datetime.now(),
                 expiry_time,
             )
@@ -372,7 +373,7 @@ class HiveSession:
                         return result
                     actual_expiry = self.tokens.tokenCreated + self.tokens.tokenExpiry
                     _LOGGER.debug(
-                        "Token created: %s | Actual expiry: %s | "
+                        "Session Token created: %s | Actual expiry: %s | "
                         "Early refresh (×0.95): %s | Now: %s",
                         self.tokens.tokenCreated,
                         actual_expiry,
@@ -385,11 +386,17 @@ class HiveSession:
                         )
 
                         if result and "AuthenticationResult" in result:
-                            _LOGGER.debug("Token refresh successful.")
                             await self.updateTokens(result)
+                            new_expiry = (
+                                self.tokens.tokenCreated + self.tokens.tokenExpiry
+                            )
+                            _LOGGER.debug(
+                                "Session Token refresh successful. New expiry: %s",
+                                new_expiry,
+                            )
                     except (HiveRefreshTokenExpired, HiveFailedToRefreshTokens) as exc:
                         _LOGGER.warning(
-                            "Token refresh failed (%s), falling back to device login.",
+                            "Session Token refresh failed (%s), falling back to device login.",
                             type(exc).__name__,
                         )
                         await self._retryDeviceLogin()
@@ -519,6 +526,7 @@ class HiveSession:
             elif self.tokens is not None:
                 await self.hiveRefreshTokens()
                 _LOGGER.debug("Fetching all devices from Hive API.")
+                api_call_start = time.monotonic()
                 try:
                     api_resp_d = await self.api.getAll()
                 except HiveAuthError:
@@ -531,6 +539,15 @@ class HiveSession:
                         api_resp_d = await self.api.getAll()
                     except HiveAuthError as retry_err:
                         raise HiveReauthRequired from retry_err
+                api_call_duration = time.monotonic() - api_call_start
+                if api_call_duration > 8:
+                    _LOGGER.warning(
+                        "Hive API response took %.1fs — marking poll as slow.",
+                        api_call_duration,
+                    )
+                    self._lastPollSlow = True
+                else:
+                    self._lastPollSlow = False
                 if operator.contains(str(api_resp_d["original"]), "20") is False:
                     raise HTTPException
                 elif api_resp_d["parsed"] is None:
@@ -580,6 +597,13 @@ class HiveSession:
             _LOGGER.error("Reauthentication required, propagating to caller.")
             self.config.lastUpdate = datetime.now()
             raise
+        except asyncio.TimeoutError:
+            _LOGGER.warning("Hive API request timed out — keeping cached device data.")
+            self._lastPollSlow = True
+            self.config.lastUpdate = (
+                datetime.now() - self.config.scanInterval + timedelta(seconds=30)
+            )
+            get_nodes_successful = False
         except (
             OSError,
             RuntimeError,
@@ -682,15 +706,6 @@ class HiveSession:
                 a = self.data["actions"][action]  # noqa: F841
                 eval("self." + ACTIONS)
 
-        _LOGGER.debug(
-            "Device discovery found: %d climate, %d light, %d switch, %d sensor, %d camera, %d alarm.",
-            len(self.deviceList["climate"]),
-            len(self.deviceList["light"]),
-            len(self.deviceList["switch"]),
-            len(self.deviceList["sensor"]),
-            len(self.deviceList["camera"]),
-            len(self.deviceList["alarm_control_panel"]),
-        )
         hive_type = HIVE_TYPES["Heating"] + HIVE_TYPES["Switch"] + HIVE_TYPES["Light"]
         for aProduct in self.data.products:
             p = self.data.products[aProduct]
@@ -713,6 +728,17 @@ class HiveSession:
             if self.data.products[aProduct]["type"] in hive_type:
                 self.config.mode.append(p["id"])
 
+        _LOGGER.debug(
+            "Device discovery found: %d parent, %d binary_sensor, %d climate, %d light, %d sensor, %d switch, %d water_heater",
+            len(self.deviceList.get("parent", [])),
+            len(self.deviceList.get("binary_sensor", [])),
+            len(self.deviceList.get("climate", [])),
+            len(self.deviceList.get("light", [])),
+            len(self.deviceList.get("sensor", [])),
+            len(self.deviceList.get("switch", [])),
+            len(self.deviceList.get("water_heater", [])),
+        )
+
         return self.deviceList
 
     @staticmethod