Try 2

Author: bouwew

plugwise/__init__.py

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

plugwise/common.py

@@ -146,14 +146,12 @@ def _appl_thermostat_info(
 
     def _create_gw_entities(self, appl: Munch) -> None:
         """Helper-function for creating/updating gw_entities."""
-        appl.device = self.device_name(pw_class, model_id or name)
         self.gw_entities[appl.entity_id] = {"dev_class": appl.pwclass}
         self._count += 1
         for key, value in {
             "available": appl.available,
             "firmware": appl.firmware,
             "hardware": appl.hardware,
-            "id": appl.entity_id,
             "location": appl.location,
             "mac_address": appl.mac,
             "model": appl.model,
@@ -164,49 +162,9 @@ def _create_gw_entities(self, appl: Munch) -> None:
         }.items():
             if value is not None or key == "location":
                 appl_key = cast(ApplianceType, key)
-                self.gw_entities[appl.device][appl_key] = value
+                self.gw_entities[appl.entity_id][appl_key] = value
                 self._count += 1
 
-    def device_name(self, pw_type: str, model): None
-        """Returns device name/type based on pw_type and optionally model.."""
-        match pw_type:
-            case "smartmeter":
-                return "smartmeter"
-            case "thermostat":
-                match "143.1":
-                    return "anna_adam"
-                match: "Anna":
-                    return "anna"
-            case "zone_thermostat":
-                match "158-01":
-                    return "lisa"
-                match "170-01":
-                    return "emma"
-                match "106-03":
-                    return "tom_floor"
-            case "zone_thermometer":
-                match "168-01":
-                    return "jip"
-            case "heater_central"
-                match "Opentherm":
-                    return "opentherm"
-                match "OnOff":
-                    return "onoff"
-            case "gateway":
-                match model_id:
-                    case: "smile_open_therm":
-                        return "adam"
-                    case: "smile_thermo":
-                        if self.smile.anna_p1:
-                            return "smile_t_p1"
-                        return "smile_t"
-                    case: "smile":
-                        return "smile_p1"
-                    case: "stretch":
-                        return "stretch"
-            case s if s.endswith("_plug"):
-                return "plug"
-
     def _reorder_devices(self) -> None:
         """Place the gateway and optional heater_central devices as 1st and 2nd."""
         reordered = {}

plugwise/constants.py

@@ -3,26 +3,9 @@
 from __future__ import annotations
 
 from collections import namedtuple
-from dataclasses import dataclass
 import logging
 from typing import Final, Literal, TypedDict, get_args
 
-from plugwise.devices import (
-    AdamGateway,
-    AnnaAdam,
-    Anna,
-    EmmaJipLisaTom,
-    OnOff,
-    OpenTherm,
-    Plug,
-    SmartEnergyLegacySensors,
-    SmartEnergyMeter,
-    SmileP1Gateway,
-    SmileTGateway,
-    StretchGateway,
-    Zone,
-)
-
 LOGGER = logging.getLogger(__name__)
 
 # Copied homeassistant.consts
@@ -541,9 +524,24 @@ class ActuatorData(TypedDict, total=False):
     upper_bound: float
 
 
-@dataclass
-class GwEntityData:
-    """The base Gateway Entity data class."""
+class GwEntityData(TypedDict, total=False):
+    """The Gateway Entity data class.
+
+    Covering the collected output-data per device or location.
+    """
+
+    # Appliance base data
+    dev_class: str
+    firmware: str
+    hardware: str
+    location: str
+    mac_address: str
+    members: list[str]
+    model: str
+    model_id: str | None
+    name: str
+    vendor: str
+    zigbee_mac_address: str
 
     # For temporary use
     cooling_enabled: bool
@@ -552,44 +550,40 @@ class GwEntityData:
     c_heating_state: bool
     thermostat_supports_cooling: bool
 
+    # Device availability
+    available: bool | None
+
+    # Loria
+    select_dhw_mode: str
+    dhw_modes: list[str]
+
+    # Gateway
+    gateway_modes: list[str]
+    notifications: dict[str, dict[str, str]]
+    regulation_modes: list[str]
+    select_gateway_mode: str
+    select_regulation_mode: str
+
+    # Thermostat-related
+    select_zone_profile: str
+    thermostats: dict[str, list[str]]
+    zone_profiles: list[str]
+    # Presets:
+    active_preset: str | None
+    preset_modes: list[str] | None
+    # Schedules:
+    available_schedules: list[str]
+    select_schedule: str | None
+
+    climate_mode: str
+    # Extra for Adam Master Thermostats
+    control_state: str
 
-@dataclass
-class PlugwiseAnnaData(
-    Anna,
-    GwEntityData,
-    OnOff,
-    OpenTherm,
-    SmileTGateway,
-):
-    """The Plugwise Anna Data class."""
-
-
-@dataclass
-class PlugwiseAdamData(
-    AdamGateway,
-    AnnaAdam,
-    GwEntityData,
-    EmmaJipLisaTom,
-    Plug,
-    OnOff,
-    OpenTherm,
-    Zone,
-):
-    """The Plugwise Adam Data class."""
-
-
-@dataclass
-class PlugwiseP1Data(
-    SmartEnergyLegacySensors,
-    SmartEnergyMeter,
-    SmileP1Gateway,
-):
-    """The Plugwise P1 Data class."""
-
-
-@dataclass
-class PlugwiseStretchData(
-    Plug,
-    StretchGateway,
-):
-    """The Plugwise Stretch Data class."""
+    # Dict-types
+    binary_sensors: SmileBinarySensors
+    max_dhw_temperature: ActuatorData
+    maximum_boiler_temperature: ActuatorData
+    sensors: SmileSensors
+    switches: SmileSwitches
+    temperature_offset: ActuatorData
+    thermostat: ActuatorData