Typing corrections

Author: bouwew

plugwise/constants.py

@@ -521,7 +521,7 @@ class ZoneData(TypedDict, total=False):
 
     dev_class: str
     name: str
-    members: dict[str, set[str]]
+    members: dict[str, list[str]]
     climate_mode: str
     # Extra for Adam Master Thermostats
     control_state: str | bool
@@ -572,13 +572,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

@@ -151,7 +151,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,7 +237,12 @@ 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.

plugwise/legacy/helper.py

@@ -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()