Typing corrections

Author: bouwew

plugwise/constants.py

@@ -500,9 +500,9 @@ class ThermoLoc(TypedDict, total=False):
     """Thermo Location class."""
 
     name: str
-    primary: set[str]
+    primary: list[str]
     primary_prio: int
-    secondary: set[str]
+    secondary: list[str]
 
 
 class ActuatorData(TypedDict, total=False):
@@ -516,12 +516,19 @@ class ActuatorData(TypedDict, total=False):
     upper_bound: float
 
 
+class MemberData:
+    """ZoneData Member data class."""
+
+    primary: list[str]
+    secondary: list[str]
+
+
 class ZoneData(TypedDict, total=False):
     """The Climate Data class, covering the collected and ordered output-data per location."""
 
     dev_class: str
     name: str
-    members: dict[str, set[str]]
+    members: dict[MemberData]
     climate_mode: str
     # Extra for Adam Master Thermostats
     control_state: str | bool
@@ -572,13 +579,26 @@ class DeviceData(TypedDict, total=False):
     select_gateway_mode: str
     select_regulation_mode: str
 
+    # Single thermostat (Anna)
+    # Presets:
+    active_preset: str | None
+    preset_modes: list[str] | None
+    # Schedules:
+    available_schedules: list[str]
+    select_schedule: str
+
+    climate_mode: str
+    # Extra for Adam Master Thermostats
+    control_state: str | bool
+
     # Dict-types
     binary_sensors: SmileBinarySensors
     max_dhw_temperature: ActuatorData
     maximum_boiler_temperature: ActuatorData
     sensors: SmileSensors
     switches: SmileSwitches
     temperature_offset: ActuatorData
+    thermostat: ActuatorData
 
 
 @dataclass

plugwise/data.py

@@ -15,6 +15,7 @@
     OFF,
     ActuatorData,
     DeviceData,
+    ZoneData,
 )
 from plugwise.helper import SmileHelper
 from plugwise.util import remove_empty_platform_dicts
@@ -151,7 +152,7 @@ def _update_for_cooling(self, device: DeviceData) -> None:
             self._count += 2  # add 4, remove 2
 
 
-    def _get_location_data(self, loc_id: str) -> DeviceData:
+    def _get_location_data(self, loc_id: str) -> ZoneData:
         """Helper-function for _all_device_data() and async_update().
 
         Provide device-data, based on Location ID (= loc_id).
@@ -237,14 +238,19 @@ def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None:
                     self._count += 1
 
 
-    def _device_data_climate(self, location_id: str, device: DeviceData, data: DeviceData) -> None:
+    def _device_data_climate(
+        self,
+        location_id: str,
+        device: DeviceData | ZoneData,
+        data: DeviceData | ZoneData
+    ) -> None:
         """Helper-function for _get_device_data().
 
         Determine climate-control device data.
         """
         loc_id = location_id
-        if (dev_loc := device.get("location")) is not None:
-            loc_id = dev_loc
+        if device.get("location") is not None:
+            loc_id = device["location"]
 
         # Presets
         data["preset_modes"] = None
@@ -285,7 +291,7 @@ def check_reg_mode(self, mode: str) -> bool:
         )
 
     def _get_schedule_states_with_off(
-        self, location: str, schedules: list[str], selected: str, data: DeviceData
+        self, location: str, schedules: list[str], selected: str, data: DeviceData | ZoneData
     ) -> None:
         """Collect schedules with states for each thermostat.
 

plugwise/helper.py

@@ -262,7 +262,7 @@ def __init__(self) -> None:
         self.smile_type: str
         self.smile_zigbee_mac_address: str | None
         self.therms_with_offset_func: list[str] = []
-        self.zone_data: ZoneData = {}
+        self.zone_data: dict[str, ZoneData] = {}
         SmileCommon.__init__(self)
 
     def _all_appliances(self) -> None:

plugwise/legacy/helper.py

@@ -90,7 +90,7 @@ def __init__(self) -> None:
         self.smile_name: str
         self.smile_type: str
         self.smile_zigbee_mac_address: str | None
-        self.zone_data: ZoneData = {}
+        self.zone_data: dict[str, ZoneData] = {}
         SmileCommon.__init__(self)
 
     def _all_appliances(self) -> None:
@@ -336,7 +336,7 @@ def _power_data_from_modules(self) -> DeviceData:
     def _appliance_measurements(
         self,
         appliance: etree,
-        data: DeviceData,
+        data: DeviceData | ZoneData,
         measurements: dict[str, DATA | UOM],
     ) -> None:
         """Helper-function for _get_measurement_data() - collect appliance measurement data."""
@@ -368,7 +368,10 @@ def _appliance_measurements(
         self._count += len(data) - 3
 
     def _get_actuator_functionalities(
-        self, xml: etree, device: DeviceData, data: DeviceData
+        self,
+        xml: etree,
+        device: DeviceData | ZoneData,
+        data: DeviceData | ZoneData
     ) -> None:
         """Helper-function for _get_measurement_data()."""
         for item in ACTIVE_ACTUATORS:

plugwise/smile.py

@@ -127,7 +127,7 @@ async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
-        self.zone_data: ZoneData = {}
+        self.zone_data: dict[str, ZoneData] = {}
         try:
             await self.full_update_device()
             self.get_all_devices()

plugwise/util.py

@@ -27,6 +27,7 @@
     SensorType,
     SpecialType,
     SwitchType,
+    ZoneData,
 )
 
 from defusedxml import ElementTree as etree
@@ -122,7 +123,7 @@ def common_match_cases(
     measurement: str,
     attrs: DATA | UOM,
     location: etree,
-    data: DeviceData,
+    data: DeviceData | ZoneData,
 ) -> None:
     """Helper-function for common match-case execution."""
     value = location.text in ("on", "true")