aioWiserHeatAPI 1.5.13__tar.gz → 1.5.14__tar.gz

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.13
+Version: 1.5.14
 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.13
+# Drayton Wiser Hub API Async v1.5.14
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,12 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.14
+
+* Fix presets not using defined boost temp
+* Set return value of energy sensors to None if not provided by hub
+* Updated headers for hub query
+
 ### v1.5.13
 
 * Updates to support v2 hub functions - @LGO44

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.5.13
+# Drayton Wiser Hub API Async v1.5.14
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -52,6 +52,12 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.14
+
+* Fix presets not using defined boost temp
+* Set return value of energy sensors to None if not provided by hub
+* Updated headers for hub query
+
 ### v1.5.13
 
 * Updates to support v2 hub functions - @LGO44

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/__init__.py

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

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/heating_actuator.py

@@ -4,9 +4,9 @@ from .const import (
     WISERHEATINGACTUATOR,
     WiserTempLimitsEnum,
 )
+from .helpers.capabilities import _WiserClimateCapabilities
 from .helpers.device import _WiserDevice
 from .helpers.equipment import _WiserEquipment
-from .helpers.capabilities import _WiserClimateCapabilities
 from .helpers.temp import _WiserTemperatureFunctions as tf
 from .rest_controller import _WiserRestController
 
@@ -137,7 +137,7 @@ class _WiserHeatingActuator(_WiserDevice):
     @property
     def delivered_power(self) -> int:
         """Get the amount of power delivered over time"""
-        return self._device_type_data.get("CurrentSummationDelivered", 0)
+        return self._device_type_data.get("CurrentSummationDelivered", None)
 
     @property
     def equipment_id(self) -> int:
@@ -166,13 +166,14 @@ class _WiserHeatingActuator(_WiserDevice):
     @property
     def instantaneous_power(self) -> int:
         """Get the amount of current passing through the device now"""
-        return self._device_type_data.get("InstantaneousDemand", 0)
+        return self._device_type_data.get("InstantaneousDemand", None)
 
     @property
     def output_type(self) -> str:
         """Get output type"""
         return self._device_type_data.get("OutputType", TEXT_UNKNOWN)
 
+
 class _WiserHeatingActuatorCollection(object):
     """Class holding all wiser heating actuators"""
 

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/pte.py

@@ -47,7 +47,7 @@ class _WiserPowerTagEnergy(_WiserDevice):
     @property
     def raw_total_active_power(self) -> int:
         """Get raw total active power of device"""
-        return self._device_type_data.get("RawTotalActivePower", 0)
+        return self._device_type_data.get("RawTotalActivePower", None)
 
     @property
     def received_power(self) -> int:

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/rest_controller.py

@@ -12,6 +12,7 @@ import aiohttp
 
 from . import _LOGGER
 from .const import (
+    DEFAULT_BOOST_DELTA,
     REST_RETRY_BACKOFF,
     REST_TIMEOUT,
     WISERHUBDOMAIN,
@@ -34,6 +35,7 @@ class WiserAPIParams:
 
     passive_mode_increment = 0.5
     stored_manual_target_temperature_alt_source = "current"
+    boost_temp_delta = DEFAULT_BOOST_DELTA
 
 
 # Connection info class
@@ -88,7 +90,7 @@ class _WiserRestController(object):
         raise_for_endpoint_error: bool = True,
     ):
         """Function to retry on response errors due to inconsistant isues reading from the hub."""
-        http_version = aiohttp.HttpVersion10
+        http_version = aiohttp.HttpVersion11
         self._last_exception = None
 
         for i in range(0, 5):
@@ -163,6 +165,9 @@ class _WiserRestController(object):
         kwargs = {}
         kwargs["headers"] = {
             "SECRET": self._wiser_connection_info.secret,
+            "Accept-Encoding": "gzip, deflate, br",
+            "Accept": "*/*",
+            "User-Agent": "HomeAssistant",
         }
 
         # if data is not None:
@@ -183,7 +188,6 @@ class _WiserRestController(object):
                 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

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/room.py

@@ -68,9 +68,6 @@ class _WiserRoom(object):
             "max": 18,
         }
 
-        self._boost_temperature_delta = DEFAULT_BOOST_DELTA
-        # self.stored_manual_target_temperature_alt_source = "current"
-
         # Add device id to schedule
         if self._schedule:
             self.schedule._assignments.append(
@@ -237,10 +234,7 @@ class _WiserRoom(object):
 
     @property
     def boost_temperature_delta(self) -> float:
-        return self._boost_temperature_delta
-
-    def set_boost_temperature_delta(self, temperature_delta: float):
-        self._boost_temperature_delta = temperature_delta
+        return self._wiser_rest_controller._api_parameters.boost_temp_delta
 
     @property
     def capabilities(self) -> _WiserClimateCapabilities:
@@ -456,7 +450,7 @@ class _WiserRoom(object):
 
     async def set_preset(self, preset: WiserPresetOptionsEnum | str):
         """Set the preset mode"""
-        if type(preset) == WiserPresetOptionsEnum:
+        if isinstance(preset, WiserPresetOptionsEnum):
             preset = preset.value
 
         # Is it valid preset option?
@@ -469,9 +463,9 @@ class _WiserRoom(object):
                 # Lookup boost duration
                 duration = WISER_BOOST_DURATION[preset]
                 _LOGGER.debug(
-                    f"Boosting by {self._boost_temperature_delta}C for {duration} mins"
+                    f"Boosting by {self.boost_temperature_delta}C for {duration} mins"
                 )
-                await self.boost(self._boost_temperature_delta, duration)
+                await self.boost(self.boost_temperature_delta, duration)
         else:
             raise ValueError(
                 f"{preset} is not a valid preset.  Valid presets are {self.available_presets}"

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/smartplug.py

@@ -17,7 +17,7 @@ class _WiserSmartPlug(_WiserElectricalDevice):
     @property
     def delivered_power(self) -> int:
         """Get the amount of current throught the plug over time"""
-        return self._device_type_data.get("CurrentSummationDelivered", -1)
+        return self._device_type_data.get("CurrentSummationDelivered", None)
 
     @property
     def equipment_id(self) -> int:
@@ -36,7 +36,7 @@ class _WiserSmartPlug(_WiserElectricalDevice):
     @property
     def instantaneous_power(self) -> int:
         """Get the amount of current throught the plug now"""
-        return self._device_type_data.get("InstantaneousDemand", -1)
+        return self._device_type_data.get("InstantaneousDemand", None)
 
     @property
     def manual_state(self) -> str:

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/wiserhub.py

@@ -166,6 +166,7 @@ class WiserAPI:
             WiserHubConnectionError,
             WiserHubAuthenticationError,
             WiserHubRESTError,
+            Exception,
         ) as ex:
             _LOGGER.debug("Update from Wiser hub failed. %s", ex)
             raise ex
@@ -266,6 +267,7 @@ class WiserAPI:
             WiserHubConnectionError,
             WiserHubAuthenticationError,
             WiserHubRESTError,
+            Exception,
         ) as ex:
             raise ex
 

{aioWiserHeatAPI-1.5.13 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.13
+Version: 1.5.14
 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.13
+# Drayton Wiser Hub API Async v1.5.14
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,12 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.14
+
+* Fix presets not using defined boost temp
+* Set return value of energy sensors to None if not provided by hub
+* Updated headers for hub query
+
 ### v1.5.13
 
 * Updates to support v2 hub functions - @LGO44