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

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

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

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

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

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

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

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

@@ -4,6 +4,7 @@
 import asyncio
 import json
 import logging
+import time
 from typing import Optional
 
 import requests
@@ -42,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,12 +85,20 @@ class HiveApiAsync:
         )
 
         timeout = ClientTimeout(total=10)
+        req_start = time.monotonic()
         async with self.websession.request(
             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):

{pyhive_integration-1.0.8.dev4 → pyhive_integration-1.0.8.dev6}/src/heating.py

@@ -495,13 +495,14 @@ 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
+            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.dev4 → pyhive_integration-1.0.8.dev6}/src/hotwater.py

@@ -263,13 +263,14 @@ 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
+            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.dev4 → pyhive_integration-1.0.8.dev6}/src/light.py

@@ -420,13 +420,14 @@ 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
+            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.dev4 → pyhive_integration-1.0.8.dev6}/src/plug.py

@@ -180,13 +180,14 @@ 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
+            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.dev4 → pyhive_integration-1.0.8.dev6}/src/sensor.py

@@ -152,11 +152,12 @@ 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
+            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.dev4 → pyhive_integration-1.0.8.dev6}/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.
@@ -525,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:
@@ -537,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 > 3:
+                    _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:
@@ -588,6 +599,7 @@ class HiveSession:
             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)
             )