Try 3

Author: bouwew

plugwise/__init__.py

@@ -8,6 +8,8 @@
 from typing import cast
 
 from plugwise.constants import (
+    ADAM,
+    ANNA,
     DEFAULT_LEGACY_TIMEOUT,
     DEFAULT_PORT,
     DEFAULT_TIMEOUT,
@@ -16,12 +18,16 @@
     LOGGER,
     MODULES,
     NONE,
+    SMILE_P1,
     SMILES,
     STATE_OFF,
     STATE_ON,
     STATUS,
     SYSTEM,
-    GwEntityData,
+    PlugwiseAdamData,
+    PlugwiseAnnaData,
+    PlugwiseP1Data,
+    PlugwiseStretchData,
     ThermoLoc,
 )
 from plugwise.exceptions import (
@@ -308,9 +314,17 @@ async def _smile_detect_legacy(
         self.smile.legacy = True
         return return_model
 
-    async def async_update(self) -> dict[str, GwEntityData]:
-        """Update the Plughwise Gateway entities and their data and states."""
-        data: dict[str, GwEntityData] = {}
+    async def async_update(self) -> dict[str, PlugwiseAnnaData | PlugwiseAdamData | PlugwiseP1Data | PlugwiseStretchData]:
+        """Update the Plugwise Gateway entities and their data and states."""
+        if self.smile.type == ANNA:
+            data: dict[str, PlugwiseAnnaData] = {}
+        if self.smile.type == ADAM:
+            data: dict[str, PlugwiseAdamData] = {}
+        if self.smile.type == SMILE_P1:
+            data: dict[str, PlugwiseP1Data] = {}
+        if self.smile.type == "Stretch":
+            data: dict[str, PlugwiseStretchData] = {}
+
         try:
             data = await self._smile_api.async_update()
         except (DataMissingError, KeyError) as err:

plugwise/constants.py

@@ -18,6 +18,7 @@
     SmartEnergyLegacySensors,
     SmartEnergyMeter,
     SmileP1Gateway,
+    SmileThermostatGateway,
     StretchGateway,
     ThermoZone,
 )
@@ -523,28 +524,54 @@ class ActuatorData(TypedDict, total=False):
 
 
 @dataclass
-class GwEntityData(
+class GwEntityData:
+    """The base Gateway Entity data class."""
+
+    # For temporary use
+    cooling_enabled: bool
+    domestic_hot_water_setpoint: float
+    elga_status_code: int
+    c_heating_state: bool
+    thermostat_supports_cooling: bool
+
+
+@dataclass
+class PlugwiseAnnaData(
+    AnnaData,
+    GwEntityData,
+    OnOffTherm,
+    OpenTherm,
+    SmileThermostatGateway,
+):
+    """The Plugwise Anna Data class."""
+
+
+@dataclass
+class PlugwiseAdamData(
     AdamGateway,
     AnnaAdamData,
-    AnnaData,
+    GwEntityData,
     JipLisaTomData,
     PlugData,
     OnOffTherm,
     OpenTherm,
+    ThermoZone,
+):
+    """The Plugwise Adam Data class."""
+
+
+@dataclass
+class PlugwiseP1Data(
     SmartEnergyLegacySensors,
     SmartEnergyMeter,
     SmileP1Gateway,
-    StretchGateway,
-    ThermoZone,
 ):
-    """The Gateway Entity data class.
+    """The Plugwise P1 Data class."""
 
-    Covering the collected output-data per device or location.
-    """
 
-    # For temporary use
-    cooling_enabled: bool
-    domestic_hot_water_setpoint: float
-    elga_status_code: int
-    c_heating_state: bool
-    thermostat_supports_cooling: bool
+@dataclass
+class PlugwiseStretchData(
+    PlugData,
+    StretchGateway,
+):
+    """The Plugwise Stretch Data class."""

plugwise/legacy/smile.py

@@ -20,7 +20,10 @@
     RULES,
     STATE_OFF,
     STATE_ON,
-    GwEntityData,
+    PlugwiseAdamData,
+    PlugwiseAnnaData,
+    PlugwiseP1Data,
+    PlugwiseStretchData,
     ThermoLoc,
 )
 from plugwise.exceptions import ConnectionFailedError, DataMissingError, PlugwiseError
@@ -87,7 +90,7 @@ def get_all_gateway_entities(self) -> None:
 
         self._all_entity_data()
 
-    async def async_update(self) -> dict[str, GwEntityData]:
+    async def async_update(self) -> dict[str, PlugwiseAnnaData | PlugwiseAdamData | PlugwiseP1Data | PlugwiseStretchData]:
         """Perform an full update update at day-change: re-collect all gateway entities and their data and states.
 
         Otherwise perform an incremental update: only collect the entities updated data and states.

plugwise/smile.py

@@ -24,7 +24,10 @@
     RULES,
     STATE_OFF,
     STATE_ON,
-    GwEntityData,
+    PlugwiseAdamData,
+    PlugwiseAnnaData,
+    PlugwiseP1Data,
+    PlugwiseStretchData,
     SwitchType,
     ThermoLoc,
 )
@@ -121,7 +124,7 @@ def get_all_gateway_entities(self) -> None:
 
         self._all_entity_data()
 
-    async def async_update(self) -> dict[str, GwEntityData]:
+    async def async_update(self) -> dict[str, PlugwiseAnnaData | PlugwiseAdamData | PlugwiseP1Data | PlugwiseStretchData]:
         """Perform an full update: re-collect all gateway entities and their data and states.
 
         Any change in the connected entities will be detected immediately.