aioWiserHeatAPI 1.6.0__tar.gz → 1.6.2__tar.gz

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.6.0
+Version: 1.6.2
 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.6.0
+# Drayton Wiser Hub API Async v1.6.2
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,13 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.6.2
+* Refactor: Removed unused imports causing error in python3.13
+* Fix: Add equipment data during deviuce build process
+
+### v1.6.1
+* Added: support for temperature and humidity sensors
+
 ### v1.6.0
 * Refactored how devices are enumerated
 * BREAKING CHANGE - threshold sensor is now a device attribute and not its own device

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.6.0
+# Drayton Wiser Hub API Async v1.6.2
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -52,6 +52,13 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.6.2
+* Refactor: Removed unused imports causing error in python3.13
+* Fix: Add equipment data during deviuce build process
+
+### v1.6.1
+* Added: support for temperature and humidity sensors
+
 ### v1.6.0
 * Refactored how devices are enumerated
 * BREAKING CHANGE - threshold sensor is now a device attribute and not its own device

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/aioWiserHeatAPI/__init__.py

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

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/aioWiserHeatAPI/devices.py

@@ -2,14 +2,12 @@
 Module to manage all devices
 """
 
-import enum
 from dataclasses import dataclass
 from typing import Any
 
 from .binary_sensor import (
     _WiserBinarySensor,
     _WiserBinarySensorCollection,
-    _WiserWindowDoorSensor,
 )
 from .boiler_interface import _WiserBoilerInterface, _WiserBoilerInterfaceCollection
 from .button_panel import _WiserButtonPanel, _WiserButtonPanelCollection
@@ -46,6 +44,7 @@ from .shutter import _WiserShutter, _WiserShutterCollection
 from .smartplug import _WiserSmartPlug, _WiserSmartPlugCollection
 from .smartvalve import _WiserSmartValve, _WiserSmartValveCollection
 from .smokealarm import _WiserSmokeAlarm, _WiserSmokeAlarmCollection
+from .temp_humidity import _WiserTempHumidity, _WiserTempHumidityCollection
 from .ufh import _WiserUFHController, _WiserUFHControllerCollection
 
 
@@ -143,6 +142,11 @@ PRODUCT_TYPE_CONFIG = {
         collection=_WiserButtonPanelCollection,
         endpoint=WISERBUTTONPANEL,
     ),
+    "TempHumidity": DeviceConfig(
+        device_class=_WiserTempHumidity,
+        collection=_WiserTempHumidityCollection,
+        endpoint=None,
+    ),
 }
 
 ANCILLARY_SENSOR_CONFIG = {
@@ -159,110 +163,6 @@ ANCILLARY_SENSOR_CONFIG = {
 }
 
 
-class _WiserDeviceTypeEnum(enum.Enum):
-    iTRV = "SmartValve"
-    RoomStat = "RoomStat"
-    SmartPlug = "SmartPlug"
-    HeatingActuator = "HeatingActuator"
-    UnderFloorHeating = "UnderFloorHeating"
-    Shutter = "Shutter"
-    OnOffLight = "Light"
-    DimmableLight = "Light"
-    PowerTagE = "PTE"
-    SmokeAlarmDevice = "SmokeAlarmDevice"
-    WindowDoorSensor = "BinarySensor"
-    BoilerInterface = "BoilerInterface"
-    CFMT = "HeatingActuator"
-    ButtonPanel = "ButtonPanel"
-
-
-PRODUCT_TYPE_CONFIG_OLD = {
-    "iTRV": {
-        "class": _WiserSmartValve,
-        "collection": _WiserSmartValveCollection,
-        "endpoint": WISERSMARTVALVE,
-        "heating": True,
-    },
-    "RoomStat": {
-        "class": _WiserRoomStat,
-        "collection": _WiserRoomStatCollection,
-        "endpoint": WISERROOMSTAT,
-        "heating": True,
-    },
-    "HeatingActuator": {
-        "class": _WiserHeatingActuator,
-        "collection": _WiserHeatingActuatorCollection,
-        "endpoint": WISERHEATINGACTUATOR,
-        "heating": True,
-        "has_v2_equipment": True,
-    },
-    "UnderFloorHeating": {
-        "class": _WiserUFHController,
-        "collection": _WiserUFHControllerCollection,
-        "endpoint": WISERUFHCONTROLLER,
-        "heating": True,
-    },
-    "SmartPlug": {
-        "class": _WiserSmartPlug,
-        "collection": _WiserSmartPlugCollection,
-        "endpoint": WISERSMARTPLUG,
-        "schedule_type": WiserScheduleTypeEnum.onoff,
-        "has_v2_equipment": True,
-    },
-    "Shutter": {
-        "class": _WiserShutter,
-        "collection": _WiserShutterCollection,
-        "endpoint": WISERSHUTTER,
-        "schedule_type": WiserScheduleTypeEnum.level,
-    },
-    "OnOffLight": {
-        "class": _WiserLight,
-        "collection": _WiserLightCollection,
-        "endpoint": WISERLIGHT,
-        "schedule_type": WiserScheduleTypeEnum.level,
-    },
-    "DimmableLight": {
-        "class": _WiserDimmableLight,
-        "collection": _WiserLightCollection,
-        "endpoint": WISERLIGHT,
-        "schedule_type": WiserScheduleTypeEnum.level,
-    },
-    "PowerTagE": {
-        "class": _WiserPowerTagEnergy,
-        "collection": _WiserPowerTagEnergyCollection,
-        "endpoint": WISERPOWERTAGENERGY,
-        "has_v2_equipment": True,
-    },
-    "SmokeAlarmDevice": {
-        "class": _WiserSmokeAlarm,
-        "collection": _WiserSmokeAlarmCollection,
-        "endpoint": WISERSMOKEALARM,
-    },
-    "WindowDoorSensor": {
-        "class": _WiserWindowDoorSensor,
-        "collection": _WiserBinarySensorCollection,
-        "endpoint": WISERBINARYSENSOR,
-    },
-    "BoilerInterface": {
-        "class": _WiserBoilerInterface,
-        "collection": _WiserBoilerInterfaceCollection,
-        "endpoint": WISERBOILERINTERFACE,
-    },
-    "CFMT": {
-        "class": _WiserHeatingActuator,
-        "collection": _WiserHeatingActuatorCollection,
-        "endpoint": WISERHEATINGACTUATOR,
-        "heating": True,
-        "has_v2_equipment": True,
-    },
-    "ButtonPanel": {
-        "class": _WiserButtonPanel,
-        "collection": _WiserButtonPanelCollection,
-        "endpoint": WISERBUTTONPANEL,
-    },
-}
-
-
 class _WiserDeviceCollection:
     """Class holding all wiser devices"""
 
@@ -310,7 +210,23 @@ class _WiserDeviceCollection:
                     device_type
                 ].collection()
 
-            if device_type_data := self._domain_data.get(device_type):
+            if device_type == "TempHumidity":
+                # This is a workaround for temp humidity device(s)
+                for device in self._domain_data.get("Device"):
+                    if device.get("ProductType") == "TemperatureHumiditySensor":
+                        device_config = PRODUCT_TYPE_CONFIG[device_type]
+                        device_class = device_config.device_class
+                        self._device_collection[device_type]._items.append(
+                            device_class(
+                                self._wiser_rest_controller,
+                                device_config.endpoint,
+                                device,
+                                {},
+                                None,
+                            )
+                        )
+
+            elif device_type_data := self._domain_data.get(device_type):
                 # We have this device type in data
                 device_config = PRODUCT_TYPE_CONFIG[device_type]
 
@@ -344,6 +260,10 @@ class _WiserDeviceCollection:
                     else:
                         device_schedule = None
 
+                    # If has equipment data add to device info
+                    if equipment_id := device.get("EquipmentId"):
+                        device["EquipmentData"] = self._get_equipment_data(equipment_id)
+
                     # Add device to collection
                     self._device_collection[device_type]._items.append(
                         device_class(
@@ -483,6 +403,14 @@ class _WiserDeviceCollection:
         except KeyError:
             return None
 
+    @property
+    def temp_humidity_sensors(self):
+        """Return all temp humidity sensors"""
+        try:
+            return self._device_collection["TempHumidity"]
+        except KeyError:
+            return None
+
     def get_by_id(self, device_id: int) -> _WiserDevice:
         """
         Gets a device object from the devices id

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/aioWiserHeatAPI/helpers/misc.py

@@ -1,8 +1,4 @@
-from pathlib import Path, _ignore_error as pathlib_ignore_error
-from typing import Union
-
 import aiofiles.os as os
-import enum
 
 
 async def file_exists(file: str) -> bool:

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/aioWiserHeatAPI/ptc.py

@@ -140,15 +140,6 @@ class _WiserPowerTagControl(_WiserElectricalDevice):
         """Get energy export status"""
         return self._device_type_data.get("EnergyExport", TEXT_UNABLE)
 
-    @property
-    def equipment(self) -> _WiserEquipment | None:
-        """Get equipment data"""
-        return (
-            _WiserEquipment(self._device_type_data.get("EquipmentData"))
-            if self._device_type_data.get("EquipmentData")
-            else None
-        )
-
     @property
     def rfid(self) -> int:
         """Get rfid of device"""

aiowiserheatapi-1.6.2/aioWiserHeatAPI/temp_humidity.py

@@ -0,0 +1,50 @@
+from aioWiserHeatAPI.helpers.threshold import _WiserThresholdSensor
+
+from .helpers.battery import _WiserBattery
+from .helpers.device import _WiserDevice
+
+
+class _WiserTempHumidity(_WiserDevice):
+    """Class representing a Temp Humidity device"""
+
+    def __init__(self, *args):
+        """Initialise."""
+        super().__init__(*args)
+        self._threshold_sensors: list[_WiserThresholdSensor] = []
+
+    @property
+    def battery(self) -> _WiserBattery:
+        """Get the battery information for the device"""
+        return _WiserBattery(self._data)
+
+    @property
+    def threshold_sensors(self) -> list[_WiserThresholdSensor]:
+        """Get threshold sensors."""
+        return self._threshold_sensors
+
+
+class _WiserTempHumidityCollection:
+    """Class holding all wiser temp humidity sensors"""
+
+    def __init__(self):
+        self._items = []
+
+    @property
+    def all(self) -> list[_WiserTempHumidity]:
+        return list(self._items)
+
+    @property
+    def count(self) -> int:
+        return len(self.all)
+
+    # Roomstats
+    def get_by_id(self, temphum_id: int) -> _WiserTempHumidity:
+        """
+        Gets a temp humidity object from the device id
+        param id: id of device
+        return: _WiserTempHumidity object
+        """
+        for temphum in self.all:
+            if temphum.id == temphum_id:
+                return temphum
+        return None

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.6.0
+Version: 1.6.2
 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.6.0
+# Drayton Wiser Hub API Async v1.6.2
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,6 +72,13 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.6.2
+* Refactor: Removed unused imports causing error in python3.13
+* Fix: Add equipment data during deviuce build process
+
+### v1.6.1
+* Added: support for temperature and humidity sensors
+
 ### v1.6.0
 * Refactored how devices are enumerated
 * BREAKING CHANGE - threshold sensor is now a device attribute and not its own device

{aiowiserheatapi-1.6.0 → aiowiserheatapi-1.6.2}/aioWiserHeatAPI.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ aioWiserHeatAPI/smartplug.py
 aioWiserHeatAPI/smartvalve.py
 aioWiserHeatAPI/smokealarm.py
 aioWiserHeatAPI/system.py
+aioWiserHeatAPI/temp_humidity.py
 aioWiserHeatAPI/ufh.py
 aioWiserHeatAPI/wiserhub.py
 aioWiserHeatAPI.egg-info/PKG-INFO