aioWiserHeatAPI 1.5.12__tar.gz → 1.5.14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.12
+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.12
+# 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,18 @@ 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
+* Add connection timeout to new retry function
+* Increase http timeout from 10s to 20s
+
 ### v1.5.12
 
 * Improve performance of hub read and retries

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

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.5.12
+# 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,18 @@ 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
+* Add connection timeout to new retry function
+* Increase http timeout from 10s to 20s
+
 ### v1.5.12
 
 * Improve performance of hub read and retries

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

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

{aioWiserHeatAPI-1.5.12 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/const.py

@@ -33,7 +33,7 @@ TRV_BATTERY_LEVEL_MAPPING = {
 REST_RETRY_BACKOFF = [0.1, 0.5, 1, 3, 5]
 REST_BACKOFF_FACTOR = 1
 REST_RETRIES = 3
-REST_TIMEOUT = 10
+REST_TIMEOUT = 20
 
 # Text Values
 TEXT_AUTO = "Auto"
@@ -59,6 +59,7 @@ TEXT_UNKNOWN = "Unknown"
 TEXT_WEEKDAYS = "Weekdays"
 TEXT_WEEKENDS = "Weekends"
 TEXT_ALL = "All"
+TEXT_UNABLE = "Unable"
 
 # Day Value Lists
 WEEKDAYS = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]

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

@@ -4,6 +4,7 @@ from .const import (
     WISERHEATINGACTUATOR,
     WiserTempLimitsEnum,
 )
+from .helpers.capabilities import _WiserClimateCapabilities
 from .helpers.device import _WiserDevice
 from .helpers.equipment import _WiserEquipment
 from .helpers.temp import _WiserTemperatureFunctions as tf
@@ -136,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:
@@ -165,58 +166,13 @@ 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)
 
-    # added by LGO
-    @property
-    def active_power(self) -> int:
-        """Get active power"""
-        return self._device_type_data.get("ActivePower", 0)
-
-    @property
-    def total_active_power(self) -> int:
-        """Get total active power"""
-        return self._device_type_data.get("TotalActivePower", 0)
-
-    @property
-    def operation_status(self) -> str:
-        """Get Operation status"""
-        return self._device_type_data.get("OperationStatus", TEXT_UNKNOWN)
-
-    @property
-    def fault_status(self) -> str:
-        """Get Fault status"""
-        return self._device_type_data.get("FaultStatus", TEXT_UNKNOWN)
-
-    # equipment for energy management
-    @property
-    def equipment_type(self) -> str:
-        """Get Equipment type"""
-        return self._device_type_data.get("EquipmentType", TEXT_UNKNOWN)
-
-    @property
-    def equipment_family(self) -> str:
-        """Get Equipment family"""
-        return self._device_type_data.get("EquipmentFamily", TEXT_UNKNOWN)
-
-    @property
-    def installation_type(self) -> str:
-        """Get Installation type"""
-        return self._device_type_data.get("InstallationType", TEXT_UNKNOWN)
-
-    @property
-    def number_of_phases(self) -> int:
-        """Get Installation type"""
-        return self._device_type_data.get("NumberOfPhases", 0)
-
-
-# End added by LGO
-
 
 class _WiserHeatingActuatorCollection(object):
     """Class holding all wiser heating actuators"""

{aioWiserHeatAPI-1.5.12 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/helpers/equipment.py

@@ -2,7 +2,6 @@
 Handles equipment data
 """
 
-
 from ..const import TEXT_UNKNOWN
 
 
@@ -97,6 +96,26 @@ class _WiserEquipment:
         """Get equipment family"""
         return self._data.get("EquipmentFamily", TEXT_UNKNOWN)
 
+    @property
+    def equipment_name(self) -> str:
+        """Get equipment name"""
+        return self._data.get("EquipmentName", TEXT_UNKNOWN)
+
+    @property
+    def product_type(self) -> str:
+        """Get equipment name"""
+        return self._data.get("ProductType", TEXT_UNKNOWN)
+
+    @property
+    def functional_control_mode(self) -> str:
+        """Get functional control mode"""
+        return self._data.get("FunctionalControlMode", TEXT_UNKNOWN)
+
+    @property
+    def pcm_mode(self) -> bool:
+        """Get Pcm Mode"""
+        return self._data.get("PcmMode", False)
+
     @property
     def direction(self) -> str:
         """Get flow direction"""

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

@@ -2,7 +2,7 @@
 Handles power tag energy devices
 """
 
-from .const import TEXT_UNKNOWN
+from .const import TEXT_UNABLE, TEXT_UNKNOWN
 from .helpers.device import _WiserDevice
 from .helpers.equipment import _WiserEquipment
 
@@ -11,19 +11,14 @@ class _WiserPowerTagEnergy(_WiserDevice):
     """Class representing a Wiser Power Tag Energy device"""
 
     @property
-    def direction(self) -> str:
-        """Get flow direction"""
-        return self._device_type_data.get("Direction", TEXT_UNKNOWN)
-
-    @property
-    def equipment_id(self) -> int:
-        """Get equipment id"""
-        return self._device_type_data.get("EquipmentId", 0)
+    def delivered_power(self) -> int:
+        """Get current power of device"""
+        return self.equipment.power.current_summation_delivered
 
     @property
     def energy_export(self) -> str:
         """Get energy export status"""
-        return self._device_type_data.get("EnergyExport", TEXT_UNKNOWN)
+        return self._device_type_data.get("EnergyExport", TEXT_UNABLE)
 
     @property
     def equipment(self) -> str:
@@ -34,11 +29,6 @@ class _WiserPowerTagEnergy(_WiserDevice):
             else None
         )
 
-    @property
-    def fault_status(self) -> str:
-        """Get fault status"""
-        return self._device_type_data.get("FaultStatus", TEXT_UNKNOWN)
-
     @property
     def grid_limit(self) -> int:
         """Get grid limit"""
@@ -49,35 +39,15 @@ class _WiserPowerTagEnergy(_WiserDevice):
         """Get grid limit uom"""
         return self._device_type_data.get("GridLimitUom", TEXT_UNKNOWN)
 
-    @property
-    def installation_type(self) -> str:
-        """Get installation type"""
-        return self._device_type_data.get("InstallationType", TEXT_UNKNOWN)
-
-    @property
-    def number_of_phases(self) -> int:
-        """Get number of phases"""
-        return self._device_type_data.get("NumberOfPhases", 0)
-
-    @property
-    def operating_status(self) -> str:
-        """Get operating status"""
-        return self._device_type_data.get("OperatingStatus", TEXT_UNKNOWN)
-
-    @property
-    def raw_total_active_power(self) -> int:
-        """Get raw total active power of device"""
-        return self._device_type_data.get("RawTotalActivePower", 0)
-
     @property
     def instantaneous_power(self) -> int:
         """Get current power of device"""
         return self.equipment.power.total_active_power
 
     @property
-    def delivered_power(self) -> int:
-        """Get current power of device"""
-        return self.equipment.power.current_summation_delivered
+    def raw_total_active_power(self) -> int:
+        """Get raw total active power of device"""
+        return self._device_type_data.get("RawTotalActivePower", None)
 
     @property
     def received_power(self) -> int:
@@ -89,6 +59,11 @@ class _WiserPowerTagEnergy(_WiserDevice):
         """Get rfid of device"""
         return self._data.get("RfId", 0)
 
+    @property
+    def self_consumption(self) -> bool:
+        """Get self consumption"""
+        return self._device_type_data.get("SelfConsumption", False)
+
 
 class _WiserPowerTagEnergyCollection:
     """Class representing collection of Power Tag Energy devices"""
@@ -113,7 +88,11 @@ class _WiserPowerTagEnergyCollection:
         return: _WiserPowerTagEnergy object
         """
         try:
-            return [power_tag for power_tag in self.all if power_tag.id == device_id][0]
+            return [
+                power_tag
+                for power_tag in self.all
+                if power_tag.id == device_id
+            ][0]
         except IndexError:
             return None
 
@@ -125,7 +104,9 @@ class _WiserPowerTagEnergyCollection:
         """
         try:
             return [
-                power_tag for power_tag in self.all if power_tag.id == equipment_id
+                power_tag
+                for power_tag in self.all
+                if power_tag.id == equipment_id
             ][0]
         except IndexError:
             return None

{aioWiserHeatAPI-1.5.12 → 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
@@ -74,6 +76,8 @@ class _WiserRestController(object):
         self._extra_config_file = None
         self._extra_config: _WiserExtraConfig = None
 
+        self._last_exception = None
+
     def remove_control_characters(self, data: str):
         """Remove control charactwers from string."""
         return re.sub(r"[\x00-\x1f]", "", data)
@@ -86,19 +90,33 @@ 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):
             if i > 0:
                 await asyncio.sleep(REST_RETRY_BACKOFF[i])
             try:
+                start_time = datetime.now()
+                _LOGGER.debug(
+                    "URL: %s, Attempt: %i, Http: %s",
+                    url.format(
+                        self._wiser_connection_info.host,
+                        self._wiser_connection_info.port,
+                    ),
+                    i + 1,
+                    http_version,
+                )
                 response = await self._execute_request(
                     action,
                     url,
                     data,
                     raise_for_endpoint_error,
                     http_version,
-                    i + 1,
+                )
+                _LOGGER.debug(
+                    "Request successful and took %ss",
+                    (datetime.now() - start_time).total_seconds(),
                 )
                 return response
             except WiserHubRESTError as ex:
@@ -106,18 +124,23 @@ class _WiserRestController(object):
                 _LOGGER.debug(
                     "%s. Retrying in %.1fs", ex, REST_RETRY_BACKOFF[i]
                 )
+                self._last_exception = ex
                 http_version = aiohttp.HttpVersion11
             except WiserHubResponseError as ex:
                 # If response error try http1.0
                 _LOGGER.debug(
                     "%s. Retrying in %.1fs", ex, REST_RETRY_BACKOFF[i]
                 )
+                self._last_exception = ex
                 http_version = aiohttp.HttpVersion10
+            except WiserHubConnectionError as ex:
+                # Connection timed out or failed.  Try it again
+                _LOGGER.debug(
+                    "%s. Retrying in %.1fs", ex, REST_RETRY_BACKOFF[i]
+                )
+                self._last_exception = ex
 
-        raise WiserHubConnectionError(
-            f"Unable to get a valid response from the Wiser hub. "
-            f"{self._wiser_connection_info.host} for url {url}"
-        )
+        raise WiserHubConnectionError(self._last_exception)
 
     async def _execute_request(  # noqa
         self,
@@ -126,7 +149,6 @@ class _WiserRestController(object):
         data: dict = None,
         raise_for_endpoint_error: bool = True,
         http_version=aiohttp.HttpVersion11,
-        attempt: int = 1,
     ):
         """
         Send request to hub and raise errors if fails
@@ -143,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:
@@ -157,16 +182,12 @@ class _WiserRestController(object):
             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 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.12 → 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.12 → 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.12 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI/system.py

@@ -403,6 +403,17 @@ class _WiserSystem(object):
             self._summer_discomfort_prevention = enabled
             return True
 
+    @property
+    def type_comm(self) -> str:
+        """Get type of zigbee device """
+        return self._device_data.get("Type", TEXT_UNKNOWN)  
+
+    @property
+    def uuid(self) -> str:
+        """Get UUID zigbee"""
+        return self._device_data.get("UUID", TEXT_UNKNOWN)
+    
+
     # End Added LGO
 
     @property

{aioWiserHeatAPI-1.5.12 → 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.12 → aiowiserheatapi-1.5.14}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.12
+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.12
+# 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,18 @@ 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
+* Add connection timeout to new retry function
+* Increase http timeout from 10s to 20s
+
 ### v1.5.12
 
 * Improve performance of hub read and retries