Fix typing 2

Author: bouwew

plugwise/helper.py

@@ -5,6 +5,7 @@
 
 import asyncio
 import datetime as dt
+from typing import Any, cast
 
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from aiohttp import BasicAuth, ClientError, ClientResponse, ClientSession, ClientTimeout
@@ -100,9 +101,9 @@ def check_model(name: str | None, vendor_name: str | None) -> str | None:
     return name
 
 
-def _get_actuator_functionalities(xml: etree) -> DeviceData:
+def _get_actuator_functionalities(xml: etree) -> dict[str, Any]:
     """Helper-function for _get_appliance_data()."""
-    data: DeviceData = {}
+    data: dict[str, Any] = {}
     for item in ACTIVE_ACTUATORS:
         temp_dict: dict[str, float] = {}
         for key in LIMITS:
@@ -114,7 +115,7 @@ def _get_actuator_functionalities(xml: etree) -> DeviceData:
                 temp_dict.update({key: format_measure(function.text, TEMP_CELSIUS)})
 
         if temp_dict:
-            data[item] = temp_dict  # type: ignore [literal-required]
+            data[item] = temp_dict
 
     return data
 
@@ -849,9 +850,9 @@ def _rule_ids_by_tag(self, tag: str, loc_id: str) -> dict[str, str]:
     def _appliance_measurements(
         self,
         appliance: etree,
-        data: DeviceData,
+        data: dict[str, Any],
         measurements: dict[str, DATA | UOM],
-    ) -> DeviceData:
+    ) -> None:
         """Helper-function for _get_appliance_data() - collect appliance measurement data."""
         for measurement, attrs in measurements.items():
             p_locator = f'.//logs/point_log[type="{measurement}"]/period/measurement'
@@ -870,28 +871,28 @@ def _appliance_measurements(
                 if new_name := getattr(attrs, ATTR_NAME, None):
                     measurement = new_name
 
-                data[measurement] = appl_p_loc.text  # type: ignore [literal-required]
+                data[measurement] = appl_p_loc.text
                 # measurements with states "on" or "off" that need to be passed directly
                 if measurement not in ["dhw_mode", "regulation_mode"]:
-                    data[measurement] = format_measure(appl_p_loc.text, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT))  # type: ignore [literal-required]
+                    data[measurement] = format_measure(
+                        appl_p_loc.text, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
+                    )
 
                 # Anna: save cooling-related measurements for later use
                 # Use the local outdoor temperature as reference for turning cooling on/off
                 if measurement == "cooling_activation_outdoor_temperature":
-                    self._cooling_activation_outdoor_temp = data[measurement]  # type: ignore [literal-required]
+                    self._cooling_activation_outdoor_temp = data[measurement]
                 if measurement == "cooling_deactivation_threshold":
-                    self._cooling_deactivation_threshold = data[measurement]  # type: ignore [literal-required]
+                    self._cooling_deactivation_threshold = data[measurement]
                 if measurement == "outdoor_air_temperature":
-                    self._outdoor_temp = data[measurement]  # type: ignore [literal-required]
+                    self._outdoor_temp = data[measurement]
 
             i_locator = f'.//logs/interval_log[type="{measurement}"]/period/measurement'
             if (appl_i_loc := appliance.find(i_locator)) is not None:
                 name = f"{measurement}_interval"
-                data[name] = format_measure(appl_i_loc.text, ENERGY_WATT_HOUR)  # type: ignore [literal-required]
-
-        return data
+                data[name] = format_measure(appl_i_loc.text, ENERGY_WATT_HOUR)
 
-    def _wireless_availablity(self, appliance: etree, data: DeviceData) -> None:
+    def _wireless_availablity(self, appliance: etree, data: dict[str, Any]) -> None:
         """Helper-function for _get_appliance_data().
         Collect the availablity-status for wireless connected devices.
         """
@@ -914,10 +915,10 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
         Collect the appliance-data based on device id.
         Determined from APPLIANCES, for legacy from DOMAIN_OBJECTS.
         """
-        data: DeviceData = {}
+        data: dict[str, Any] = {}
         # P1 legacy has no APPLIANCES, also not present in DOMAIN_OBJECTS
         if self._smile_legacy and self.smile_type == "power":
-            return data
+            return cast(DeviceData, data)
 
         measurements = DEVICE_MEASUREMENTS
         if d_id == self._heater_id:
@@ -927,11 +928,10 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
             appliance := self._appliances.find(f'./appliance[@id="{d_id}"]')
         ) is not None:
 
-            data = self._appliance_measurements(appliance, data, measurements)
-            data.update(self._get_lock_state(appliance))
+            self._appliance_measurements(appliance, data, measurements)
+            self._get_lock_state(appliance, data)
             for toggle, name in TOGGLES.items():
-                if self._get_toggle_state(appliance, toggle, name) is not None:
-                    data.update(self._get_toggle_state(appliance, toggle, name))
+                self._get_toggle_state(appliance, toggle, name, data)
 
             if appliance.find("type").text in ACTUATOR_CLASSES:
                 data.update(_get_actuator_functionalities(appliance))
@@ -988,7 +988,7 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
         if not self._cooling_present and "cooling_state" in data:
             data.pop("cooling_state")
 
-        return data
+        return cast(DeviceData, data)
 
     def _rank_thermostat(
         self,
@@ -1342,11 +1342,10 @@ def _object_value(self, obj_id: str, measurement: str) -> float | int | None:
 
         return val
 
-    def _get_lock_state(self, xml: etree) -> DeviceData:
+    def _get_lock_state(self, xml: etree, data: dict[str, Any]) -> None:
         """Helper-function for _get_appliance_data().
         Adam & Stretches: obtain the relay-switch lock state.
         """
-        data: DeviceData = {}
         actuator = "actuator_functionalities"
         func_type = "relay_functionality"
         if self._stretch_v2:
@@ -1357,29 +1356,19 @@ def _get_lock_state(self, xml: etree) -> DeviceData:
             if (found := xml.find(locator)) is not None:
                 data["lock"] = found.text == "true"
 
-        return data
-
     def _get_toggle_state(
-        self, xml: etree, toggle: str, name: str
-    ) -> DeviceData | None:
+        self, xml: etree, toggle: str, name: str, data: dict[str, Any]
+    ) -> None:
         """Helper-function for _get_appliance_data().
         Obtain the toggle state of 'toggle'.
         """
-        data: DeviceData = {}
         if xml.find("type").text == "heater_central":
             locator = "./actuator_functionalities/toggle_functionality"
-            if not (found := xml.findall(locator)):
-                return None
-
-            for item in found:
-                if (toggle_type := item.find("type")) is not None:
-                    if toggle_type.text == toggle:
-                        data.update({name: item.find("state").text == "on"})
-
-            if data:
-                return data
-
-        return None
+            if found := xml.findall(locator):
+                for item in found:
+                    if (toggle_type := item.find("type")) is not None:
+                        if toggle_type.text == toggle:
+                            data.update({name: item.find("state").text == "on"})
 
     def _update_device_with_dicts(
         self,