Further typing fixes

Author: bouwew

plugwise/common.py

@@ -147,6 +147,8 @@ def _count_data_items(self, data: GwEntityData) -> None:
             self._count += len(data["sensors"]) - 1
         if "switches" in data:
             self._count += len(data["switches"]) - 1
+        if "weather" in data:
+            self._count += len(data["weather"]) - 1
         self._count += len(data)
 
     def _power_data_peak_value(self, loc: Munch, legacy: bool) -> Munch:

plugwise/constants.py

@@ -521,8 +521,7 @@ class ThermoLoc(TypedDict, total=False):
     secondary: list[str]
 
 
-@dataclass
-class WeatherData:
+class WeatherData(TypedDict, total=False):
     """Smile Weather data class."""
 
     humidity: int

plugwise/helper.py

@@ -44,6 +44,7 @@
     SensorType,
     ThermoLoc,
     ToggleNameType,
+    WeatherType,
 )
 from plugwise.exceptions import (
     ConnectionFailedError,
@@ -527,7 +528,12 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
 
         Collect the appliance-data based on entity_id.
         """
-        data: GwEntityData = {"binary_sensors": {}, "sensors": {}, "switches": {}}
+        data: GwEntityData = {
+            "binary_sensors": {},
+            "sensors": {},
+            "switches": {},
+            "weather": {},
+        }
         # Get P1 smartmeter data from LOCATIONS
         entity = self.gw_entities[entity_id]
         # !! DON'T CHANGE below two if-lines, will break stuff !!
@@ -771,29 +777,33 @@ def _get_gateway_measurements(self, entity_id: str, data: GwEntityData) -> None:
         """
         measurements = DEVICE_MEASUREMENTS
         if self._is_thermostat and entity_id == self.gateway_id:
-            data["weather"] =  {}
             for measurement, attrs in measurements.items():
                 value = self._object_value(self._home_location, measurement, attrs)
                 if value is not None:
                     if measurement == "wind_vector":
-                        value = value.split(",")
+                        value_list: list[str] = str(value).split(",")
                         data["weather"]["wind_speed"] = format_measure(
-                            value[0].strip("("), getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
+                            value_list[0].strip("("),
+                            getattr(attrs, ATTR_UNIT_OF_MEASUREMENT),
                         )
                         data["weather"]["wind_bearing"] = format_measure(
-                            value[1].strip(")"), getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
+                            value_list[1].strip(")"),
+                            getattr(attrs, ATTR_UNIT_OF_MEASUREMENT),
                         )
                         self._count += 2
                     else:
-                        data["weather"][measurement] = value
+                        key = cast(WeatherType, measurement)
+                        data["weather"][key] = value
                         self._count += 1
 
-    def _object_value(self, obj_id: str, measurement: str, attrs: str) -> float | int | str| None:
+    def _object_value(
+        self, obj_id: str, measurement: str, attrs: DATA | UOM
+    ) -> float | int | str | None:
         """Helper-function for smile.py: _get_entity_data().
 
         Obtain the value/state for the given object from a location in DOMAIN_OBJECTS
         """
-        value: float | int | str | None = None
+        value: str = ""
         search = self._domain_objects
         locator = f'./location[@id="{obj_id}"]/logs/point_log[type="{measurement}"]/period/measurement'
         if (found := search.find(locator)) is not None:
@@ -802,14 +812,20 @@ def _object_value(self, obj_id: str, measurement: str, attrs: str) -> float | in
                 case "humidity":
                     return int(float(value))
                 case "outdoor_temperature":
-                    return format_measure(value, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT))
+                    return format_measure(
+                        value, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
+                    )
                 case "solar_irradiance":
-                    return format_measure(value, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT))
+                    return format_measure(
+                        value, getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)
+                    )
                 case "weather_description":
                     return value
                 case "wind_vector":
                     return value
 
+        return None
+
     def _process_c_heating_state(self, data: GwEntityData) -> None:
         """Helper-function for _get_measurement_data().
 

plugwise/util.py

@@ -203,12 +203,14 @@ def power_data_local_format(
 
 def remove_empty_platform_dicts(data: GwEntityData) -> None:
     """Helper-function for removing any empty platform dicts."""
-    if not data["binary_sensors"]:
+    if "binary_sensors" in data and not data["binary_sensors"]:
         data.pop("binary_sensors")
-    if not data["sensors"]:
+    if "sensors" in data and not data["sensors"]:
         data.pop("sensors")
-    if not data["switches"]:
+    if "switches" in data and not data["switches"]:
         data.pop("switches")
+    if "weather" in data and not data["weather"]:
+        data.pop("weather")
 
 
 def return_valid(value: etree | None, default: etree) -> etree: