aioWiserHeatAPI 1.5.4__tar.gz → 1.5.5__tar.gz

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.4
+Version: 1.5.5
 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.1
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.5.4
+# Drayton Wiser Hub API Async v1.5.5
 
 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.5
+
+* Added addtional v2 hub attributes and switches
+
 ### v1.5.4
 
 * Fixed issue whereby json conversion errors due to control characters in string

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.5.4
+# Drayton Wiser Hub API Async v1.5.5
 
 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.5
+
+* Added addtional v2 hub attributes and switches
+
 ### v1.5.4
 
 * Fixed issue whereby json conversion errors due to control characters in string

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/__init__.py

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

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/heating_actuator.py

@@ -1,4 +1,9 @@
-from .const import TEMP_OFF, TEXT_UNKNOWN, WISERHEATINGACTUATOR, WiserTempLimitsEnum
+from .const import (
+    TEMP_OFF,
+    TEXT_UNKNOWN,
+    WISERHEATINGACTUATOR,
+    WiserTempLimitsEnum,
+)
 from .helpers.device import _WiserDevice
 from .helpers.equipment import _WiserEquipment
 from .helpers.temp import _WiserTemperatureFunctions as tf
@@ -8,7 +13,9 @@ from .rest_controller import _WiserRestController
 class _WiserTemperatureSensor:
     """Data structure for plug in temp sensor"""
 
-    def __init__(self, data: dict, wiser_rest_controller: _WiserRestController, id):
+    def __init__(
+        self, data: dict, wiser_rest_controller: _WiserRestController, id
+    ):
         self._data = data
         self._id = id
         self._wiser_rest_controller = wiser_rest_controller
@@ -45,7 +52,9 @@ class _WiserTemperatureSensor:
             return await self._send_command(
                 {
                     "FloorTemperatureSensor": {
-                        "MaximumTemperature": tf._to_wiser_temp(temp, "floorHeatingMax")
+                        "MaximumTemperature": tf._to_wiser_temp(
+                            temp, "floorHeatingMax"
+                        )
                     }
                 }
             )
@@ -66,7 +75,9 @@ class _WiserTemperatureSensor:
             return await self._send_command(
                 {
                     "FloorTemperatureSensor": {
-                        "MinimumTemperature": tf._to_wiser_temp(temp, "floorHeatingMin")
+                        "MinimumTemperature": tf._to_wiser_temp(
+                            temp, "floorHeatingMin"
+                        )
                     }
                 }
             )
@@ -85,7 +96,9 @@ class _WiserTemperatureSensor:
     @property
     def temperature_offset(self) -> float:
         """Get the temperature offset"""
-        return tf._from_wiser_temp(self._data.get("Offset", None), "floorHeatingOffset")
+        return tf._from_wiser_temp(
+            self._data.get("Offset", None), "floorHeatingOffset"
+        )
 
     async def set_temperature_offset(self, temp: float):
         """Set the temperature offset"""
@@ -116,7 +129,8 @@ class _WiserHeatingActuator(_WiserDevice):
     def current_temperature(self) -> float:
         """Get the current measured temperature"""
         return tf._from_wiser_temp(
-            self._device_type_data.get("MeasuredTemperature", TEMP_OFF), "current"
+            self._device_type_data.get("MeasuredTemperature", TEMP_OFF),
+            "current",
         )
 
     @property
@@ -158,6 +172,51 @@ class _WiserHeatingActuator(_WiserDevice):
         """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.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/helpers/capabilities.py

@@ -177,7 +177,9 @@ class _WiserHubFeatureCapabilitiesInfo:
     @property
     def automations(self) -> _WiserHubAutomationCapabilities:
         """Get automation capabilities"""
-        return _WiserHubAutomationCapabilities(self._data.get("Automation", {}))
+        return _WiserHubAutomationCapabilities(
+            self._data.get("Automation", {})
+        )
 
     @property
     def pte(self) -> _WiserHubPTECapabilities:
@@ -195,12 +197,12 @@ class _WiserClimateCapabilities(object):
     @property
     def heating_supported(self) -> bool:
         """Get heating supported value"""
-        return self._data.get("HeatingSupported")
+        return self._data.get("HeatingSupported", False)
 
     @property
     def cooling_supported(self) -> bool:
         """Get cooling supported value"""
-        return self._data.get("CoolingSupported")
+        return self._data.get("CoolingSupported", False)
 
     @property
     def minimum_heat_set_point(self) -> int:
@@ -240,18 +242,18 @@ class _WiserClimateCapabilities(object):
     @property
     def open_window_detection(self) -> bool:
         """Get open window detection value"""
-        return self._data.get("OpenWindowDetection")
+        return self._data.get("OpenWindowDetection", False)
 
     @property
     def hydronic_channel_selection(self) -> bool:
         """Get hydronic channel selection value"""
         if self._data:
-            return self._data.get("HydronicChannelSelection")
+            return self._data.get("HydronicChannelSelection", False)
         return None
 
     @property
     def on_off_supported(self) -> bool:
         """Get on off supported value"""
         if self._data:
-            return self._data.get("OnOffSupported")
+            return self._data.get("OnOffSupported", False)
         return None

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/helpers/device.py

@@ -25,6 +25,7 @@ class _WiserDevice(object):
         device_type_data: dict,
         schedule: dict = None,
     ):
+        self._away_action = None
         self._data = data
         self._device_type_data = device_type_data
         self._wiser_rest_controller = wiser_rest_controller
@@ -169,6 +170,26 @@ class _WiserDevice(object):
         """Get zwave network information"""
         return _WiserSignalStrength(self._data)
 
+    # Added by LGO
+    @property
+    def endpoint(self) -> int:
+        """Get endpoint"""
+        return self._device_type_data.get("Endpoint", 0)
+
+    # Device type Zigbee
+    @property
+    def type_comm(self) -> str:
+        """Get type of zigbee device"""
+        return self._data.get("Type", TEXT_UNKNOWN)
+
+    # UUID Zigbee
+    @property
+    def uuid(self) -> str:
+        """Get UUID zigbee"""
+        return self._device_type_data.get("UUID", TEXT_UNKNOWN)
+
+    # END Added by LGO
+
 
 class _WiserElectricalDevice(_WiserDevice):
     """Class representing a wiser electrical device"""
@@ -209,11 +230,11 @@ class _WiserElectricalDevice(_WiserDevice):
         return self._device_type_data.get("AwayAction", TEXT_UNKNOWN)
 
     async def set_away_mode_action(
-        self, action: Union[WiserAwayActionEnum, WiserShutterAwayActionEnum, str]
+        self,
+        action: Union[WiserAwayActionEnum, WiserShutterAwayActionEnum, str],
     ) -> bool:
-        if (
-            type(action) == WiserAwayActionEnum
-            or type(action) == WiserShutterAwayActionEnum
+        if isinstance(action, WiserAwayActionEnum) or isinstance(
+            action, WiserShutterAwayActionEnum
         ):
             action = action.value
 
@@ -223,7 +244,8 @@ class _WiserElectricalDevice(_WiserDevice):
                 return True
         else:
             raise ValueError(
-                f"{action} is not a valid away mode action.  Valid modes are {self.available_away_mode_actions}"
+                f"{action} is not a valid away mode action.  "
+                f"Valid modes are {self.available_away_mode_actions}"
             )
 
     @property
@@ -237,7 +259,7 @@ class _WiserElectricalDevice(_WiserDevice):
         return self._device_type_data.get("Mode", TEXT_UNKNOWN)
 
     async def set_mode(self, mode: Union[WiserDeviceModeEnum, str]) -> bool:
-        if type(mode) == WiserDeviceModeEnum:
+        if isinstance(mode, WiserDeviceModeEnum):
             mode = mode.value
         if is_value_in_list(mode, self.available_modes):
             return await self._send_command({"Mode": mode.title()})

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/light.py

@@ -1,7 +1,13 @@
 import inspect
-from . import _LOGGER
 
-from .const import TEXT_ON, TEXT_OFF, TEXT_UNKNOWN, WISERDEVICE, WiserDeviceModeEnum
+from . import _LOGGER
+from .const import (
+    TEXT_OFF,
+    TEXT_ON,
+    TEXT_UNKNOWN,
+    WISERDEVICE,
+    WiserDeviceModeEnum,
+)
 from .helpers.device import _WiserElectricalDevice
 
 
@@ -49,7 +55,7 @@ class _WiserLight(_WiserElectricalDevice):
                 self._device_type_data = result
         if result:
             _LOGGER.debug(
-                "Wiser smart plug - {} command successful".format(
+                "Wiser light - {} command successful".format(
                     inspect.stack()[1].function
                 )
             )
@@ -69,7 +75,9 @@ class _WiserLight(_WiserElectricalDevice):
     @property
     def is_dimmable(self) -> bool:
         """Get if the light is dimmable"""
-        return True if self._device_type_data.get("IsDimmable", False) else False
+        return (
+            True if self._device_type_data.get("IsDimmable", False) else False
+        )
 
     @property
     def is_on(self) -> bool:
@@ -91,14 +99,18 @@ class _WiserLight(_WiserElectricalDevice):
         Turn on the light at current brightness level
         return: boolean
         """
-        return await self._send_command({"RequestOverride": {"State": TEXT_ON}})
+        return await self._send_command(
+            {"RequestOverride": {"State": TEXT_ON}}
+        )
 
     async def turn_off(self) -> bool:
         """
         Turn off the light
         return: boolean
         """
-        return await self._send_command({"RequestOverride": {"State": TEXT_OFF}})
+        return await self._send_command(
+            {"RequestOverride": {"State": TEXT_OFF}}
+        )
 
 
 class _WiserDimmableLight(_WiserLight):
@@ -118,10 +130,17 @@ class _WiserDimmableLight(_WiserLight):
         """Set current brightness percentage"""
         if percentage >= 0 and percentage <= 100:
             return await self._send_command(
-                {"RequestOverride": {"State": TEXT_ON, "Percentage": percentage}}
+                {
+                    "RequestOverride": {
+                        "State": TEXT_ON,
+                        "Percentage": percentage,
+                    }
+                }
             )
         else:
-            raise ValueError(f"Brightness level percentage must be between 0 and 100")
+            raise ValueError(
+                f"Brightness level percentage must be between 0 and 100"
+            )
 
     @property
     def manual_level(self) -> int:
@@ -137,7 +156,9 @@ class _WiserDimmableLight(_WiserLight):
     def output_range(self) -> _WiserOutputRange:
         """Get output range min/max."""
         # TODO: Add setter for min max values
-        return _WiserOutputRange(self._device_type_data.get("OutputRange", None))
+        return _WiserOutputRange(
+            self._device_type_data.get("OutputRange", None)
+        )
 
     @property
     def scheduled_percentage(self) -> int:
@@ -179,7 +200,9 @@ class _WiserLightCollection(object):
     @property
     def onoff_lights(self) -> list:
         return list(
-            onoff_lights for onoff_lights in self.all if not onoff_lights.is_dimmable
+            onoff_lights
+            for onoff_lights in self.all
+            if not onoff_lights.is_dimmable
         )
 
     def get_by_id(self, id: int) -> _WiserLight:
@@ -200,7 +223,9 @@ class _WiserLightCollection(object):
         return: _WiserLight object
         """
         try:
-            return [light for light in self.all if light.light_id == light_id][0]
+            return [light for light in self.all if light.light_id == light_id][
+                0
+            ]
         except IndexError:
             return None
 

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/room.py

@@ -44,7 +44,9 @@ class _WiserRoom(object):
         self._devices = devices
         self._enable_automations = enable_automations
         self._extra_config = (
-            self._wiser_rest_controller._extra_config.config("Rooms", str(self.id))
+            self._wiser_rest_controller._extra_config.config(
+                "Rooms", str(self.id)
+            )
             if self._wiser_rest_controller._extra_config
             else None
         )
@@ -53,7 +55,12 @@ class _WiserRoom(object):
         )
 
         self._name = room.get("Name")
-        self._window_detection_active = room.get("WindowDetectionActive", TEXT_UNKNOWN)
+        self._include_in_summer_comfort = room.get(
+            "IncludeInSummerComfort", False
+        )
+        self._window_detection_active = room.get(
+            "WindowDetectionActive", TEXT_UNKNOWN
+        )
 
         self._default_extra_config = {
             "passive_mode": False,
@@ -66,7 +73,9 @@ class _WiserRoom(object):
 
         # Add device id to schedule
         if self._schedule:
-            self.schedule._assignments.append({"id": self.id, "name": self.name})
+            self.schedule._assignments.append(
+                {"id": self.id, "name": self.name}
+            )
 
     def _effective_heating_mode(self, mode: str, temp: float) -> str:
         if mode.casefold() == TEXT_MANUAL.casefold() and temp == TEMP_OFF:
@@ -76,7 +85,9 @@ class _WiserRoom(object):
         return WiserHeatingModeEnum.auto.value
 
     async def _send_command(
-        self, cmd: dict, method: WiserRestActionEnum = WiserRestActionEnum.PATCH
+        self,
+        cmd: dict,
+        method: WiserRestActionEnum = WiserRestActionEnum.PATCH,
     ):
         """
         Send control command to the room
@@ -135,7 +146,9 @@ class _WiserRoom(object):
     def passive_mode_lower_temp(self) -> float:
         if self._extra_config and "min" in self._extra_config:
             return min(self._extra_config["min"], self.passive_mode_upper_temp)
-        return min(self._default_extra_config["min"], self.passive_mode_upper_temp)
+        return min(
+            self._default_extra_config["min"], self.passive_mode_upper_temp
+        )
 
     @property
     def passive_mode_upper_temp(self) -> float:
@@ -155,10 +168,14 @@ class _WiserRoom(object):
             if not self.is_away_mode:
                 # Set to min of temp range when initialised
                 if enable and self.mode != WiserHeatingModeEnum.off.value:
-                    await self.set_target_temperature(self.passive_mode_lower_temp)
+                    await self.set_target_temperature(
+                        self.passive_mode_lower_temp
+                    )
 
                 # Set target temp back to last manual temp if in manual mode
-                if (not enable) and self.mode == WiserHeatingModeEnum.manual.value:
+                if (
+                    not enable
+                ) and self.mode == WiserHeatingModeEnum.manual.value:
                     await self.set_target_temperature(
                         self.stored_manual_target_temperature
                     )
@@ -206,7 +223,9 @@ class _WiserRoom(object):
         """Get boost end timestamp"""
         if self._data.get("OverrideTimeoutUnixTime", 0) == 0:
             return None
-        return datetime.fromtimestamp(self._data.get("OverrideTimeoutUnixTime", 0))
+        return datetime.fromtimestamp(
+            self._data.get("OverrideTimeoutUnixTime", 0)
+        )
 
     @property
     def boost_time_remaining(self) -> datetime:
@@ -242,7 +261,9 @@ class _WiserRoom(object):
     @property
     def current_target_temperature(self) -> float:
         """Get current target temperature for the room"""
-        return tf._from_wiser_temp(self._data.get("DisplayedSetPoint", TEMP_MINIMUM))
+        return tf._from_wiser_temp(
+            self._data.get("DisplayedSetPoint", TEMP_MINIMUM)
+        )
 
     @property
     def current_temperature(self) -> float:
@@ -309,7 +330,8 @@ class _WiserRoom(object):
             True
             if "Away"
             in self._data.get(
-                "SetpointOrigin", self._data.get("SetPointOrigin", TEXT_UNKNOWN)
+                "SetpointOrigin",
+                self._data.get("SetPointOrigin", TEXT_UNKNOWN),
             )
             else False
         )
@@ -321,7 +343,8 @@ class _WiserRoom(object):
             True
             if "Boost"
             in self._data.get(
-                "SetpointOrigin", self._data.get("SetPointOrigin", TEXT_UNKNOWN)
+                "SetpointOrigin",
+                self._data.get("SetPointOrigin", TEXT_UNKNOWN),
             )
             else False
         )
@@ -340,13 +363,17 @@ class _WiserRoom(object):
     def is_heating(self) -> bool:
         """Get if the room is currently heating"""
         return (
-            True if self._data.get("ControlOutputState", TEXT_OFF) == TEXT_ON else False
+            True
+            if self._data.get("ControlOutputState", TEXT_OFF) == TEXT_ON
+            else False
         )
 
     @property
     def manual_target_temperature(self) -> float:
         """Get current target temperature for manual mode"""
-        return tf._from_wiser_temp(self._data.get("ManualSetPoint", TEMP_MINIMUM))
+        return tf._from_wiser_temp(
+            self._data.get("ManualSetPoint", TEMP_MINIMUM)
+        )
 
     @property
     def mode(self) -> str:
@@ -373,7 +400,9 @@ class _WiserRoom(object):
                             self.stored_manual_target_temperature
                         )
             elif mode == WiserHeatingModeEnum.auto.value:
-                await self._send_command({"Mode": WiserHeatingModeEnum.auto.value})
+                await self._send_command(
+                    {"Mode": WiserHeatingModeEnum.auto.value}
+                )
 
             self._mode = mode
             return True
@@ -439,8 +468,8 @@ class _WiserRoom(object):
             elif preset.lower().startswith(TEXT_BOOST.lower()):
                 # Lookup boost duration
                 duration = WISER_BOOST_DURATION[preset]
-                _LOGGER.info(
-                    f"Boosting by {self._boost_temperature_delta} for {duration}"
+                _LOGGER.debug(
+                    f"Boosting by {self._boost_temperature_delta}C for {duration} mins"
                 )
                 await self.boost(self._boost_temperature_delta, duration)
         else:
@@ -466,7 +495,9 @@ class _WiserRoom(object):
     @property
     def scheduled_target_temperature(self) -> float:
         """Get the scheduled target temperature for the room"""
-        return tf._from_wiser_temp(self._data.get("ScheduledSetPoint", TEMP_MINIMUM))
+        return tf._from_wiser_temp(
+            self._data.get("ScheduledSetPoint", TEMP_MINIMUM)
+        )
 
     @property
     def smartvalve_ids(self) -> list:
@@ -507,6 +538,55 @@ class _WiserRoom(object):
         """Get the id of the underfloor heating controller relay ids"""
         return sorted(self._data.get("UfhRelayIds", []))
 
+    # Added by LGO
+    @property
+    def include_in_summer_comfort(self) -> bool:
+        """Get the status of participate to the summer comfort"""
+        return self._data.get("IncludeInSummerComfort")
+
+    async def set_include_in_summer_comfort(self, enabled: bool):
+        """Set the status of participate to the summer comfort"""
+        if await self._send_command({"IncludeInSummerComfort": enabled}):
+            self._include_in_summer_comfort = enabled
+            return True
+
+    @property
+    def hvac_mode(self) -> str:
+        """Get the HVAC mode of the room"""
+        return self._data.get("HVACMode", TEXT_UNKNOWN)
+
+    @property
+    def floor_sensor_state(self) -> str:
+        """Get the state of the floor sensor"""
+        return self._data.get("FloorSensorState", TEXT_UNKNOWN)
+
+    @property
+    def occupancy(self) -> str:
+        """Get the occupancy of the room"""
+        return self._data.get("Occupancy", TEXT_UNKNOWN)
+
+    @property
+    def occupancy_capable(self) -> bool:
+        """Get the occupancy of the room"""
+        return self._data.get("OccupancyCapable", False)
+
+    @property
+    def occupied_heating_set_point(self) -> int:
+        """Get the setpoint when the room is occupied"""
+        return self._data.get("OccupiedHeatingSetPoint", 85)
+
+    @property
+    def unoccupied_heating_set_point(self) -> int:
+        """Get the setpoint when the room is unoccupied"""
+        return self._data.get("UnoccupiedHeatingSetPoint", 65)
+
+    @property
+    def climate_demand_for_ui(self) -> int:
+        """Get the climate demand for UI"""
+        return self._data.get("ClimateDemandForUI", 0)
+
+    # End Added by LGO
+
     @property
     def window_detection_active(self) -> bool:
         """Get or set if window detection is active"""
@@ -545,7 +625,9 @@ class _WiserRoom(object):
                 "RequestOverride": {
                     "Type": "Boost",
                     "DurationMinutes": duration,
-                    "IncreaseSetPointBy": tf._to_wiser_temp(inc_temp, "boostDelta"),
+                    "IncreaseSetPointBy": tf._to_wiser_temp(
+                        inc_temp, "boostDelta"
+                    ),
                 }
             }
         )
@@ -592,7 +674,10 @@ class _WiserRoom(object):
         return: boolean
         """
         # Set manual temp in stored config
-        if self.mode == WiserHeatingModeEnum.manual.value and not self.is_passive_mode:
+        if (
+            self.mode == WiserHeatingModeEnum.manual.value
+            and not self.is_passive_mode
+        ):
             await self._update_extra_config("manual_temp", temp)
 
         return await self._send_command(
@@ -621,7 +706,9 @@ class _WiserRoom(object):
         return: boolean
         """
         if await self.cancel_boost():
-            return await self.set_target_temperature(self.schedule.next.setting)
+            return await self.set_target_temperature(
+                self.schedule.next.setting
+            )
 
     async def cancel_overrides(self) -> bool:
         """
@@ -707,9 +794,11 @@ class _WiserRoomCollection:
         return: _WiserRoom object
         """
         try:
-            return [room for room in self._rooms if room.name.lower() == name.lower()][
-                0
-            ]
+            return [
+                room
+                for room in self._rooms
+                if room.name.lower() == name.lower()
+            ][0]
         except IndexError:
             return None
 
@@ -719,7 +808,9 @@ class _WiserRoomCollection:
         param schedule_id: the id of the schedule
         return: _WiserRoom object
         """
-        return [room for room in self._rooms if room.schedule_id == schedule_id][0]
+        return [
+            room for room in self._rooms if room.schedule_id == schedule_id
+        ][0]
 
     def get_by_device_id(self, device_id: int) -> _WiserRoom:
         """

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/shutter.py

@@ -38,6 +38,12 @@ class _WiserLiftMovementRange(object):
             return self._data.get("LiftCloseTime")
         return None
 
+    async def set_close_time(self, time: int):
+        """Set close time"""
+        return await self._shutter_instance._send_command(
+            {"LiftOpenTime": self.open_time, "LiftCloseTime": time}
+        )
+
     @property
     def tilt_time(self) -> int:
         """Get tilt time value"""
@@ -58,7 +64,9 @@ class _WiserLiftMovementRange(object):
 
     async def set_tilt_angle_closed(self, angle: int):
         """Set tilt angle closed"""
-        return await self._shutter_instance._send_command({"TiltAngleClosed": angle})
+        return await self._shutter_instance._send_command(
+            {"TiltAngleClosed": angle}
+        )
 
     @property
     def tilt_angle_open(self) -> int:
@@ -69,7 +77,9 @@ class _WiserLiftMovementRange(object):
 
     async def set_tilt_angle_open(self, angle: int):
         """Set tilt angle open"""
-        return await self._shutter_instance._send_command({"TiltAngleOpen": angle})
+        return await self._shutter_instance._send_command(
+            {"TiltAngleOpen": angle}
+        )
 
     @property
     def tilt_enabled(self) -> bool:
@@ -82,12 +92,6 @@ class _WiserLiftMovementRange(object):
         """Set tilt enable"""
         return await self._shutter_instance._send_command({"TiltEnabled": en})
 
-    async def set_close_time(self, time: int):
-        """Set close time"""
-        return await self._shutter_instance._send_command(
-            {"LiftOpenTime": self.open_time, "LiftCloseTime": time}
-        )
-
 
 class _WiserShutter(_WiserElectricalDevice):
     """Class representing a Wiser Shutter device"""
@@ -112,7 +116,7 @@ class _WiserShutter(_WiserElectricalDevice):
                 self._device_type_data = result
         if result:
             _LOGGER.debug(
-                "Wiser smart plug - {} command successful".format(
+                "Wiser shutter - {} command successful".format(
                     inspect.stack()[1].function
                 )
             )
@@ -141,7 +145,9 @@ class _WiserShutter(_WiserElectricalDevice):
     @property
     def drive_config(self) -> _WiserLiftMovementRange:
         """Get open and close time drive config"""
-        return _WiserLiftMovementRange(self, self._device_type_data.get("DriveConfig"))
+        return _WiserLiftMovementRange(
+            self, self._device_type_data.get("DriveConfig")
+        )
 
     @property
     def is_lift_position_supported(self) -> bool:
@@ -156,19 +162,28 @@ class _WiserShutter(_WiserElectricalDevice):
     @property
     def is_open(self) -> bool:
         """Get if the shutter is open"""
-        return True if self._device_type_data.get("CurrentLift", 0) == 100 else False
+        return (
+            True
+            if self._device_type_data.get("CurrentLift", 0) == 100
+            else False
+        )
 
     @property
     def is_closed(self) -> bool:
         """Get if the shutter is closed"""
-        return True if self._device_type_data.get("CurrentLift", 0) == 0 else False
+        return (
+            True
+            if self._device_type_data.get("CurrentLift", 0) == 0
+            else False
+        )
 
     @property
     def is_closing(self) -> bool:
         """Get if shutter is moving-opening"""
         return (
             True
-            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN) == "Closing"
+            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN)
+            == "Closing"
             else False
         )
 
@@ -177,7 +192,8 @@ class _WiserShutter(_WiserElectricalDevice):
         """Get if shutter is moving-opening"""
         return (
             True
-            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN) == "Opening"
+            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN)
+            == "Opening"
             else False
         )
 
@@ -186,7 +202,8 @@ class _WiserShutter(_WiserElectricalDevice):
         """Get if shutter is not moving"""
         return (
             True
-            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN) == "Stopped"
+            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN)
+            == "Stopped"
             else False
         )
 
@@ -195,7 +212,8 @@ class _WiserShutter(_WiserElectricalDevice):
         """Get if shutter is moving"""
         return (
             True
-            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN) != "Stopped"
+            if self._device_type_data.get("LiftMovement", TEXT_UNKNOWN)
+            != "Stopped"
             else False
         )
 
@@ -239,14 +257,51 @@ class _WiserShutter(_WiserElectricalDevice):
         """Get target tilt of shutter"""
         return self._device_type_data.get("TargetTilt", 0)
 
+    @property
+    def respect_summer_comfort(self) -> bool:
+        """Get if the shutter respect summer comfort"""
+        return self._device_type_data.get("RespectSummerComfort", False)
+
+    async def set_respect_summer_comfort(self, en: bool):
+        """Set respect summer comfort"""
+        if await self._send_command({"RespectSummerComfort": en}):
+            return True
+
+    @property
+    def summer_comfort_lift(self) -> int:
+        """Get the shutter summer comfort lift"""
+        return self._device_type_data.get("SummerComfortLift")
+
+    async def set_summer_comfort_lift(self, lift: int):
+        if await self._send_command({"SummerComfortLift": lift}):
+            self._summer_comfort_lift = lift
+            return True
+
+    @property
+    def summer_comfort_tilt(self) -> int:
+        """Get the shutter summer comfort tilt"""
+        return self._device_type_data.get("SummerComfortTilt")
+
+    async def set_summer_comfort_tilt(self, tilt: int):
+        if await self._send_command({"SummerComfortTilt": tilt}):
+            self._summer_comfort_tilt = tilt
+            return True
+
     async def open(self, percentage: int = 100):
         """Fully open shutter"""
         if percentage >= 0 and percentage <= 100:
             return await self._send_command(
-                {"RequestAction": {"Action": "LiftTo", "Percentage": percentage}}
+                {
+                    "RequestAction": {
+                        "Action": "LiftTo",
+                        "Percentage": percentage,
+                    }
+                }
             )
         else:
-            raise ValueError("Shutter open percentage must be between 0 and 100")
+            raise ValueError(
+                "Shutter open percentage must be between 0 and 100"
+            )
 
     async def close(self):
         """Fully close shutter"""
@@ -258,24 +313,33 @@ class _WiserShutter(_WiserElectricalDevice):
         """Stop shutter during movement"""
         return await self._send_command({"RequestAction": {"Action": "Stop"}})
 
-    async def open_tilt(self, percentage: int = 90):
-        """Open shutter tilt to percentage"""
-        if percentage >= 0 and percentage <= 90:
+    async def open_tilt(self, percentage: int = 100):
+        """Open tilt shutter to percentage"""
+        if percentage >= 0 and percentage <= 100:
             return await self._send_command(
-                {"RequestAction": {"Action": "TiltTo", "Percentage": percentage}}
+                {
+                    "RequestAction": {
+                        "Action": "TiltTo",
+                        "Percentage": percentage,
+                    }
+                }
             )
         else:
-            raise ValueError("Shutter tilt percentage must be between 0 and 100")
+            raise ValueError(
+                "Shutter tilt percentage must be between 0 and 100"
+            )
 
     async def close_tilt(self):
-        """Fully close shutter tilt"""
+        """Fully close tilt shutter"""
         return await self._send_command(
             {"RequestAction": {"Action": "TiltTo", "Percentage": 0}}
         )
 
     async def stop_tilt(self):
-        """Stop shutter tilt during movement"""
-        return await self._send_command({"RequestAction": {"Action": "StopTilt"}})
+        """Stop tilt shutter during movement"""
+        return await self._send_command(
+            {"RequestAction": {"Action": "StopTilt"}}
+        )
 
 
 class _WiserShutterCollection(object):
@@ -315,7 +379,9 @@ class _WiserShutterCollection(object):
         """
         try:
             return [
-                shutter for shutter in self.all if shutter.shutter_id == shutter_id
+                shutter
+                for shutter in self.all
+                if shutter.shutter_id == shutter_id
             ][0]
         except IndexError:
             return None

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/smartplug.py

@@ -105,6 +105,8 @@ class _WiserSmartPlugCollection(object):
         return: _WiserSmartPlug object
         """
         try:
-            return [smartplug for smartplug in self.all if smartplug.id == id][0]
+            return [smartplug for smartplug in self.all if smartplug.id == id][
+                0
+            ]
         except IndexError:
             return None

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI/system.py

@@ -49,7 +49,8 @@ class _WiserSystem(object):
             self._data.get("FeatureCapability", {})
         )
         self._cloud_data = _WiserCloud(
-            self._system_data.get("CloudConnectionStatus"), self._data.get("Cloud", {})
+            self._system_data.get("CloudConnectionStatus"),
+            self._data.get("Cloud", {}),
         )
         self._device_data = self._get_system_device(device_data)
         self._network_data = _WiserNetwork(
@@ -61,7 +62,9 @@ class _WiserSystem(object):
             self._system_data.get("OpenThermConnectionStatus", TEXT_UNKNOWN),
         )
         self._signal = _WiserSignalStrength(self._device_data)
-        self._upgrade_data = _WiserFirmareUpgradeInfo(self._data.get("UpgradeInfo", {}))
+        self._upgrade_data = _WiserFirmareUpgradeInfo(
+            self._data.get("UpgradeInfo", {})
+        )
         self._zigbee_data = _WiserZigbee(self._data.get("Zigbee", {}))
 
         # Variables to hold values for settabel values
@@ -74,15 +77,41 @@ class _WiserSystem(object):
         self._away_mode_target_temperature = self._system_data.get(
             "AwayModeSetPointLimit"
         )
-        self._comfort_mode_enabled = self._system_data.get("ComfortModeEnabled")
+        self._comfort_mode_enabled = self._system_data.get(
+            "ComfortModeEnabled"
+        )
         self._degraded_mode_target_temperature = self._system_data.get(
             "DegradedModeSetpointThreshold"
         )
         self._eco_mode_enabled = self._system_data.get("EcoModeEnabled")
-        self._hub_time = datetime.fromtimestamp(self._system_data.get("UnixTime"))
+        self._hub_time = datetime.fromtimestamp(
+            self._system_data.get("UnixTime")
+        )
         self._override_type = self._system_data.get("OverrideType", "")
         self._timezone_offset = self._system_data.get("TimeZoneOffset")
-        self._valve_protection_enabled = self._system_data.get("ValveProtectionEnabled")
+        self._valve_protection_enabled = self._system_data.get(
+            "ValveProtectionEnabled"
+        )
+
+        # Added by LGO
+        # Summer comfort
+        self._summer_comfort_enabled = self._system_data.get(
+            "SummerComfortEnabled"
+        )
+        self._indoor_discomfort_temperature = self._system_data.get(
+            "IndoorDiscomfortTemperature"
+        )
+        self._outdoor_discomfort_temperature = self._system_data.get(
+            "OutdoorDiscomfortTemperature"
+        )
+        self._summer_comfort_available = self._system_data.get(
+            "SummerComfortAvailable"
+        )
+        self._summer_discomfort_prevention = self._system_data.get(
+            "SummerDiscomfortPrevention"
+        )
+
+        # End Added by LGO
 
     def _get_system_device(self, device_data: dict):
         for device in device_data:
@@ -101,10 +130,14 @@ class _WiserSystem(object):
                 f"{WISERSYSTEM}/{path}", cmd
             )
         else:
-            result = await self._wiser_rest_controller._send_command(WISERSYSTEM, cmd)
+            result = await self._wiser_rest_controller._send_command(
+                WISERSYSTEM, cmd
+            )
         if result:
             _LOGGER.debug(
-                "Wiser hub - {} command successful".format(inspect.stack()[1].function)
+                "Wiser hub - {} command successful".format(
+                    inspect.stack()[1].function
+                )
             )
             return True
         return False
@@ -120,7 +153,9 @@ class _WiserSystem(object):
         return self._automatic_daylight_saving
 
     async def set_automatic_daylight_saving_enabled(self, enabled: bool):
-        if await self._send_command({"AutomaticDaylightSaving": str(enabled).lower()}):
+        if await self._send_command(
+            {"AutomaticDaylightSaving": str(enabled).lower()}
+        ):
             self._automatic_daylight_saving = enabled
             return True
 
@@ -130,7 +165,9 @@ class _WiserSystem(object):
         return True if self._override_type == "Away" else False
 
     async def set_away_mode_enabled(self, enabled: bool):
-        if await self._send_command({"RequestOverride": {"Type": 2 if enabled else 0}}):
+        if await self._send_command(
+            {"RequestOverride": {"Type": 2 if enabled else 0}}
+        ):
             self._override_type = "Away" if enabled else ""
             return True
 
@@ -140,7 +177,9 @@ class _WiserSystem(object):
         return self._away_mode_affects_hotwater
 
     async def set_away_mode_affects_hotwater(self, enabled: bool = False):
-        if await self._send_command({"AwayModeAffectsHotWater": str(enabled).lower()}):
+        if await self._send_command(
+            {"AwayModeAffectsHotWater": str(enabled).lower()}
+        ):
             self._away_mode_affects_hotwater = enabled
             return True
 
@@ -159,9 +198,9 @@ class _WiserSystem(object):
     def boiler_fuel_type(self) -> str:
         """Get boiler fuel type setting"""
         # TODO: Add ability to set to 1 of 3 types
-        return self._system_data.get("BoilerSettings", {"FuelType": TEXT_UNKNOWN}).get(
-            "FuelType"
-        )
+        return self._system_data.get(
+            "BoilerSettings", {"FuelType": TEXT_UNKNOWN}
+        ).get("FuelType")
 
     @property
     def brand_name(self) -> str:
@@ -312,6 +351,60 @@ class _WiserSystem(object):
         """Get zwave network information"""
         return self._signal
 
+    # Added LGO
+    @property
+    def summer_comfort_enabled(self) -> bool:
+        """Get whether summer comfort mode is enabled"""
+        return self._summer_comfort_enabled
+
+    async def set_summer_comfort_enabled(self, enabled: bool):
+        """Set whether summer comfort mode is enabled"""
+        if await self._send_command({"SummerComfortEnabled": enabled}):
+            self._summer_comfort_enabled = enabled
+            return True
+
+    @property
+    def indoor_discomfort_temperature(self) -> float:
+        """Get indoor discomfort temperature for summer comfort"""
+        return tf._from_wiser_temp(self._indoor_discomfort_temperature)
+
+    async def set_indoor_discomfort_temperature(self, temp: float):
+        """Set indoor discomfort temperature for summer comfort"""
+        temp = tf._to_wiser_temp(temp)
+        if await self._send_command({"IndoorDiscomfortTemperature": temp}):
+            self._away_mode_target_temperature = tf._to_wiser_temp(temp)
+            return True
+
+    @property
+    def outdoor_discomfort_temperature(self) -> float:
+        """Get outdoor discomfort temperature for summer comfort"""
+        return tf._from_wiser_temp(self._outdoor_discomfort_temperature)
+
+    async def set_outdoor_discomfort_temperature(self, temp: float):
+        """Set outdoor discomfort temperature for summer comfort"""
+        temp = tf._to_wiser_temp(temp)
+        if await self._send_command({"OutdoorDiscomfortTemperature": temp}):
+            self._away_mode_target_temperature = tf._to_wiser_temp(temp)
+            return True
+
+    @property
+    def summer_comfort_available(self) -> bool:
+        """Get whether summer comfort mode is available"""
+        return self._summer_comfort_available
+
+    @property
+    def summer_discomfort_prevention(self) -> bool:
+        """Get summer discomfort prevention"""
+        return self._summer_discomfort_prevention
+
+    async def set_summer_discomfort_prevention(self, enabled: bool):
+        """Set summer discomfort prevention"""
+        if await self._send_command({"SummerDiscomfortPrevention": enabled}):
+            self._summer_discomfort_prevention = enabled
+            return True
+
+    # End Added LGO
+
     @property
     def sunrise_times(self) -> list:
         """Get sunrise times"""
@@ -377,7 +470,9 @@ class _WiserSystem(object):
                 "RequestOverride": {
                     "Type": "Boost",
                     "DurationMinutes": duration,
-                    "IncreaseSetPointBy": tf._to_wiser_temp(inc_temp, "boostDelta"),
+                    "IncreaseSetPointBy": tf._to_wiser_temp(
+                        inc_temp, "boostDelta"
+                    ),
                 }
             }
         )

{aioWiserHeatAPI-1.5.4 → aioWiserHeatAPI-1.5.5}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.4
+Version: 1.5.5
 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.1
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.5.4
+# Drayton Wiser Hub API Async v1.5.5
 
 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.5
+
+* Added addtional v2 hub attributes and switches
+
 ### v1.5.4
 
 * Fixed issue whereby json conversion errors due to control characters in string