pyhive-integration 1.0.8.dev2__tar.gz → 1.0.8.dev4__tar.gz

{pyhive_integration-1.0.8.dev2/pyhive_integration.egg-info → pyhive_integration-1.0.8.dev4}/PKG-INFO

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4/pyhive_integration.egg-info}/PKG-INFO

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4}/setup.py

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4}/src/api/hive_async_api.py

@@ -1,13 +1,14 @@
 """Hive API Module."""
 
 # pylint: skip-file
+import asyncio
 import json
 import logging
 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,8 +83,9 @@ class HiveApiAsync:
             auth_token[-4:] if len(auth_token) >= 4 else auth_token,
         )
 
+        timeout = ClientTimeout(total=10)
         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()
             if str(resp.status).startswith("20"):
@@ -163,6 +165,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.dev2 → pyhive_integration-1.0.8.dev4}/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.dev2 → pyhive_integration-1.0.8.dev4}/src/heating.py

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4}/src/hotwater.py

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4}/src/light.py

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4}/src/plug.py

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4}/src/sensor.py

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

{pyhive_integration-1.0.8.dev2 → pyhive_integration-1.0.8.dev4}/src/session.py

@@ -357,6 +357,11 @@ class HiveSession:
         else:
             expiry_time = self.tokens.tokenCreated + (self.tokens.tokenExpiry * 0.95)
             # Refresh at 95% of token lifetime to prevent expiration during API calls
+            _LOGGER.debug(
+                "Session token expiry time ( Current: %s | Expiry: %s)",
+                datetime.now(),
+                expiry_time,
+            )
             if datetime.now() >= expiry_time:
                 async with self._refreshLock:
                     # Re-check after acquiring lock — another caller may have already refreshed
@@ -365,10 +370,14 @@ class HiveSession:
                     )
                     if datetime.now() < expiry_time:
                         return result
+                    actual_expiry = self.tokens.tokenCreated + self.tokens.tokenExpiry
                     _LOGGER.debug(
-                        "Token nearing expiry (created: %s, expiry window: %s), refreshing.",
+                        "Session Token created: %s | Actual expiry: %s | "
+                        "Early refresh (×0.95): %s | Now: %s",
                         self.tokens.tokenCreated,
-                        self.tokens.tokenExpiry,
+                        actual_expiry,
+                        expiry_time,
+                        datetime.now(),
                     )
                     try:
                         result = await self.auth.refresh_token(
@@ -376,11 +385,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()
@@ -571,6 +586,12 @@ 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.config.lastUpdate = (
+                datetime.now() - self.config.scanInterval + timedelta(seconds=30)
+            )
+            get_nodes_successful = False
         except (
             OSError,
             RuntimeError,
@@ -673,15 +694,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]
@@ -704,6 +716,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