aioWiserHeatAPI 1.5.9__tar.gz → 1.5.10__tar.gz

{aioWiserHeatAPI-1.5.9 → aioWiserHeatAPI-1.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.9
+Version: 1.5.10
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -18,7 +18,7 @@ Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.5.8
+# Drayton Wiser Hub API Async v1.5.10
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,10 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.10
+
+* Add retry routine to prevent hub response errors
+
 ### v1.5.9
 
 * Force schedules endpoint to use http/1.0

{aioWiserHeatAPI-1.5.9 → aioWiserHeatAPI-1.5.10}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.5.8
+# Drayton Wiser Hub API Async v1.5.10
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -52,6 +52,10 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.10
+
+* Add retry routine to prevent hub response errors
+
 ### v1.5.9
 
 * Force schedules endpoint to use http/1.0

{aioWiserHeatAPI-1.5.9 → aioWiserHeatAPI-1.5.10}/aioWiserHeatAPI/__init__.py

@@ -3,6 +3,6 @@ import logging
 name = "aioWiserHeatAPI"
 __all__ = ["wiserAPI", "wiserDiscovery"]
 
-__VERSION__ = "1.5.9"
+__VERSION__ = "1.5.10"
 
 _LOGGER = logging.getLogger(__name__)

{aioWiserHeatAPI-1.5.9 → aioWiserHeatAPI-1.5.10}/aioWiserHeatAPI/exceptions.py

@@ -3,6 +3,10 @@ class WiserHubConnectionError(Exception):
     pass
 
 
+class WiserHubResponseError(Exception):
+    """Response error mainly for bad request"""
+
+
 class WiserHubAuthenticationError(Exception):
     pass
 

{aioWiserHeatAPI-1.5.9 → aioWiserHeatAPI-1.5.10}/aioWiserHeatAPI/rest_controller.py

@@ -20,6 +20,7 @@ from .exceptions import (
     WiserExtraConfigError,
     WiserHubAuthenticationError,
     WiserHubConnectionError,
+    WiserHubResponseError,
     WiserHubRESTError,
 )
 from .helpers.extra_config import _WiserExtraConfig
@@ -81,17 +82,49 @@ class _WiserRestController(object):
         url: str,
         data: dict = None,
         raise_for_endpoint_error: bool = True,
+    ):
+        """Function to retry on response errors due to inconsistant isues reading from the hub."""
+        backoff = [1, 2, 3, 5, 10]
+        http_version = aiohttp.HttpVersion11
+        for i in range(0, 5):
+            if i > 2:
+                http_version = aiohttp.HttpVersion10
+            try:
+                response = await self._execute_request(
+                    action,
+                    url,
+                    data,
+                    raise_for_endpoint_error,
+                    http_version,
+                    i + 1,
+                )
+                return response
+            except WiserHubResponseError as ex:
+                # Last 2 attempts try http 1.0
+                _LOGGER.debug("%s. Retrying in %is", ex, backoff[i])
+                # Backing off pause
+                await asyncio.sleep(backoff[i])
+
+        raise WiserHubConnectionError(
+            f"Unable to get a valid response from the Wiser hub. "
+            f"{self._wiser_connection_info.host} for url {url}"
+        )
+
+    async def _execute_request(  # noqa
+        self,
+        action: WiserRestActionEnum,
+        url: str,
+        data: dict = None,
+        raise_for_endpoint_error: bool = True,
+        http_version=aiohttp.HttpVersion11,
+        attempt: int = 1,
     ):
         """
-        Send patch update to hub and raise errors if fails
+        Send request to hub and raise errors if fails
         param url: url of hub rest api endpoint
         param patchData: json object containing command and values to set
         return: boolean
         """
-        if url in [WISERHUBDOMAIN]:
-            http_version = aiohttp.HttpVersion11
-        else:
-            http_version = aiohttp.HttpVersion10
 
         url = url.format(
             self._wiser_connection_info.host,
@@ -101,22 +134,31 @@ class _WiserRestController(object):
         kwargs = {}
         kwargs["headers"] = {
             "SECRET": self._wiser_connection_info.secret,
-            "Content-Type": "application/json;charset=UTF-8",
+            "Connection": "close",
         }
 
-        if data is not None:
+        # if data is not None:
+        if data:
             kwargs["json"] = data
+            kwargs["headers"].update(
+                {
+                    "Content-Type": "application/json;charset=UTF-8",
+                }
+            )
         if self._timeout is not None:
             kwargs["timeout"] = self._timeout
 
         try:
+            _LOGGER.debug(
+                "URL: %s, Attempt: %i, Http: %s", url, attempt, http_version
+            )
             async with aiohttp.ClientSession(
                 version=http_version,
             ) as session:
-                async with getattr(session, action.value)(
-                    url,
-                    **kwargs,
+                async with session.request(
+                    action.value, url, **kwargs
                 ) as response:
+                    # await asyncio.sleep(1)
                     if not response.ok:
                         self._process_nok_response(
                             response, url, data, raise_for_endpoint_error
@@ -149,7 +191,7 @@ class _WiserRestController(object):
                 f"{self._wiser_connection_info.host} for url {url}.  Error is {ex}"
             ) from ex
         except aiohttp.ClientResponseError as ex:
-            raise WiserHubConnectionError(
+            raise WiserHubResponseError(
                 f"Response error trying to communicate with Wiser Hub "
                 f"{self._wiser_connection_info.host} for url {url}.  Error is {ex}"
             ) from ex
@@ -166,6 +208,8 @@ class _WiserRestController(object):
         data: dict,
         raise_for_endpoint_error: bool = True,
     ):
+        if response.status == 400:
+            _LOGGER.debug("400 error")
         if response.status == 401:
             raise WiserHubAuthenticationError(
                 f"Error authenticating to Wiser Hub "

{aioWiserHeatAPI-1.5.9 → aioWiserHeatAPI-1.5.10}/aioWiserHeatAPI/wiserhub.py

@@ -56,7 +56,7 @@ from .schedule import WiserScheduleTypeEnum, _WiserScheduleCollection
 from .system import _WiserSystem
 
 
-class WiserAPI(object):
+class WiserAPI:
     """
     Main api class to access all entities and attributes of wiser system
     """
@@ -67,12 +67,10 @@ class WiserAPI(object):
         secret: str,
         port: Optional[int] = 80,
         units: Optional[WiserUnitsEnum] = WiserUnitsEnum.metric,
-        session: Optional[aiohttp.ClientSession] = None,
         extra_config_file: Optional[str] = None,
         enable_automations: Optional[bool] = True,
     ):
         # Connection variables
-        self._session = session
         self._wiser_api_connection = _WiserConnectionInfo()
         self._wiser_rest_controller = None
 

{aioWiserHeatAPI-1.5.9 → aioWiserHeatAPI-1.5.10}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.9
+Version: 1.5.10
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -18,7 +18,7 @@ Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.5.8
+# Drayton Wiser Hub API Async v1.5.10
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,10 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.10
+
+* Add retry routine to prevent hub response errors
+
 ### v1.5.9
 
 * Force schedules endpoint to use http/1.0