Merge DeviceDataPoints into DeviceData class, adapt

Author: bouwew

plugwise/constants.py

@@ -751,10 +751,8 @@ class ActuatorData(TypedDict, total=False):
     upper_bound: float
 
 
-class DeviceDataPoints(
-    SmileBinarySensors, SmileSensors, SmileSwitches, TypedDict, total=False
-):
-    """The class covering all possible collected data points."""
+class DeviceData(ApplianceData, TypedDict, total=False):
+    """The Device Data class, covering the collected and ordere output-data per device."""
 
     # Loria
     dhw_mode: str
@@ -784,10 +782,6 @@ class DeviceDataPoints(
     # Device availability
     available: bool | None
 
-
-class DeviceData(ApplianceData, DeviceDataPoints, TypedDict, total=False):
-    """The Device Data class, covering the collected and ordere output-data per device."""
-
     binary_sensors: SmileBinarySensors
     domestic_hot_water_setpoint: ActuatorData | float
     maximum_boiler_temperature: ActuatorData | float

plugwise/helper.py

@@ -6,7 +6,6 @@
 
 import asyncio
 import datetime as dt
-from typing import cast
 
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from aiohttp import BasicAuth, ClientError, ClientResponse, ClientSession, ClientTimeout
@@ -52,7 +51,6 @@
     ActuatorData,
     ApplianceData,
     DeviceData,
-    DeviceDataPoints,
     GatewayData,
     ModelData,
     SmileBinarySensors,
@@ -77,7 +75,7 @@
 
 
 def update_helper(
-    data: DeviceDataPoints,
+    data: DeviceData,
     devices: dict[str, DeviceData],
     device_dict: DeviceData,
     device_id: str,
@@ -1481,7 +1479,7 @@ def _get_toggle_state(
     def _update_device_with_dicts(
         self,
         d_id: str,
-        data: DeviceDataPoints,
+        data: DeviceData,
         device_in: ApplianceData,
         bs_dict: SmileBinarySensors,
         s_dict: SmileSensors,
@@ -1519,7 +1517,6 @@ def _update_device_with_dicts(
             ):
                 bs_dict["plugwise_notification"] = False
 
-        data = cast(DeviceData, data)
         device_out.update(data)
         if bs_dict:
             device_out["binary_sensors"] = bs_dict

plugwise/smile.py

@@ -35,7 +35,6 @@
     ActuatorData,
     ApplianceData,
     DeviceData,
-    DeviceDataPoints,
     GatewayData,
     SmileBinarySensors,
     SmileSensors,
@@ -265,7 +264,7 @@ def _check_availability(
                     if "P1 does not seem to be connected to a smart meter" in msg:
                         device_data["available"] = False
 
-    def _get_device_data(self, dev_id: str) -> DeviceDataPoints:
+    def _get_device_data(self, dev_id: str) -> DeviceData:
         """
         Helper-function for _all_device_data() and async_update().