aioWiserHeatAPI 1.5.17__tar.gz → 1.5.18__tar.gz

{aiowiserheatapi-1.5.17 → aiowiserheatapi-1.5.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.17
+Version: 1.5.18
 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.17
+# Drayton Wiser Hub API Async v1.5.18
 
 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.18
+
+* Better handle client response exeption and fit into retry routing
+
 ### v1.5.17
 
 * Fixed error setting opentherm endpoint for fw above 4.32.46

{aiowiserheatapi-1.5.17 → aiowiserheatapi-1.5.18}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.5.17
+# Drayton Wiser Hub API Async v1.5.18
 
 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.18
+
+* Better handle client response exeption and fit into retry routing
+
 ### v1.5.17
 
 * Fixed error setting opentherm endpoint for fw above 4.32.46

{aiowiserheatapi-1.5.17 → aiowiserheatapi-1.5.18}/aioWiserHeatAPI/__init__.py

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

{aiowiserheatapi-1.5.17 → aiowiserheatapi-1.5.18}/aioWiserHeatAPI/rest_controller.py

@@ -9,6 +9,7 @@ from datetime import datetime
 from typing import Optional
 
 import aiohttp
+import aiohttp.client_exceptions
 import aiohttp.http_exceptions
 
 from . import _LOGGER
@@ -95,7 +96,7 @@ class _WiserRestController(object):
         http_version = aiohttp.HttpVersion11
         self._last_exception = None
 
-        for i in range(0, 5):
+        for i in range(5):
             if i > 0:
                 await asyncio.sleep(REST_RETRY_BACKOFF[i])
             try:
@@ -120,7 +121,7 @@ class _WiserRestController(object):
                     "Request successful and took %ss",
                     (datetime.now() - start_time).total_seconds(),
                 )
-                return response
+
             except WiserHubRESTError as ex:
                 # if json error try http1.1
                 _LOGGER.debug("%s. Retrying in %.1fs", ex, REST_RETRY_BACKOFF[i])
@@ -135,19 +136,25 @@ class _WiserRestController(object):
                 # Connection timed out or failed.  Try it again
                 _LOGGER.debug("%s. Retrying in %.1fs", ex, REST_RETRY_BACKOFF[i])
                 self._last_exception = ex
+            except Exception as ex:
+                # Unknown error
+                _LOGGER.debug("%s. Retrying in %.1fs", ex, REST_RETRY_BACKOFF[i])
+                self._last_exception = ex
+            else:
+                return response
 
         raise WiserHubConnectionError(self._last_exception)
 
-    async def _execute_request(  # noqa
+    async def _execute_request(
         self,
         action: WiserRestActionEnum,
         url: str,
-        data: dict = None,
+        data: dict | None = None,
         raise_for_endpoint_error: bool = True,
         http_version=aiohttp.HttpVersion11,
     ):
-        """
-        Send request 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
@@ -224,7 +231,10 @@ class _WiserRestController(object):
                 f"Connection error trying to communicate with Wiser Hub "
                 f"{self._wiser_connection_info.host} for url {url}.  Error is {ex}"
             ) from ex
-        except aiohttp.http_exceptions.TransferEncodingError as ex:
+        except (
+            aiohttp.client_exceptions.ClientPayloadError,
+            aiohttp.http_exceptions.TransferEncodingError,
+        ) as ex:
             raise WiserHubConnectionError(
                 f"Response payload incomplete error trying to communicate with Wiser Hub "
                 f"{self._wiser_connection_info.host} for url {url}.  Error is {ex}"
@@ -363,4 +373,6 @@ class _WiserRestController(object):
                 f"{schedule_type}/{schedule_id}",
                 schedule_data,
             )
+        else:
+            result = None
         return result

{aiowiserheatapi-1.5.17 → aiowiserheatapi-1.5.18}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.17
+Version: 1.5.18
 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.17
+# Drayton Wiser Hub API Async v1.5.18
 
 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.18
+
+* Better handle client response exeption and fit into retry routing
+
 ### v1.5.17
 
 * Fixed error setting opentherm endpoint for fw above 4.32.46