Cleaning up SmileProps

Author: bouwew

plugwise/__init__.py

@@ -18,7 +18,6 @@
     STATUS,
     SYSTEM,
     GwEntityData,
-    SmileProps,
     ThermoLoc,
 )
 from plugwise.exceptions import (
@@ -69,7 +68,6 @@ def __init__(
         self._opentherm_device = False
         self._schedule_old_states: dict[str, dict[str, str]] = {}
         self._smile_api: SmileAPI | SmileLegacyAPI
-        self._smile_props: SmileProps = {}
         self._stretch_v2 = False
         self._target_smile: str = NONE
         self.smile_hostname: str = NONE
@@ -158,7 +156,6 @@ async def connect(self) -> Version:
                 self._opentherm_device,
                 self._request,
                 self._schedule_old_states,
-                self._smile_props,
                 self.smile_hostname,
                 self.smile_hw_version,
                 self.smile_mac_address,
@@ -175,7 +172,6 @@ async def connect(self) -> Version:
                 self._on_off_device,
                 self._opentherm_device,
                 self._request,
-                self._smile_props,
                 self._stretch_v2,
                 self._target_smile,
                 self.smile_hostname,

plugwise/constants.py

@@ -393,17 +393,6 @@
 )
 
 
-class SmileProps(TypedDict, total=False):
-    """The SmileProps Data class."""
-
-    cooling_present: bool
-    gateway_id: str
-    heater_id: str
-    item_count: int
-    reboot: bool
-    smile_name: str
-
-
 class ModuleData(TypedDict):
     """The Module data class."""
 

plugwise/data.py

@@ -16,7 +16,6 @@
     OFF,
     ActuatorData,
     GwEntityData,
-    SmileProps,
 )
 from plugwise.helper import SmileHelper
 from plugwise.util import remove_empty_platform_dicts
@@ -28,27 +27,18 @@ class SmileData(SmileHelper):
     def __init__(self) -> None:
         """Init."""
         super().__init__()
-        self._smile_props: SmileProps
         self._zones: dict[str, GwEntityData] = {}
 
     def _all_entity_data(self) -> None:
         """Helper-function for get_all_gateway_entities().
 
-        Collect data for each entity and add to self._smile_props and self.gw_entities.
+        Collect data for each entity and add to self.gw_entities.
         """
         self._update_gw_entities()
         if self.smile(ADAM):
             self._update_zones()
             self.gw_entities.update(self._zones)
 
-        self._smile_props["gateway_id"] = self._gateway_id
-        self._smile_props["item_count"] = self._count
-        self._smile_props["reboot"] = True
-        self._smile_props["smile_name"] = self.smile_name
-        if self._is_thermostat:
-            self._smile_props["heater_id"] = self._heater_id
-            self._smile_props["cooling_present"] = self._cooling_present
-
     def _update_zones(self) -> None:
         """Helper-function for _all_entity_data() and async_update().
 

plugwise/legacy/data.py

@@ -7,7 +7,7 @@
 
 # Dict as class
 # Version detection
-from plugwise.constants import NONE, OFF, GwEntityData, SmileProps
+from plugwise.constants import NONE, OFF, GwEntityData
 from plugwise.legacy.helper import SmileLegacyHelper
 from plugwise.util import remove_empty_platform_dicts
 
@@ -18,19 +18,13 @@ class SmileLegacyData(SmileLegacyHelper):
     def __init__(self) -> None:
         """Init."""
         super().__init__()
-        self._smile_props: SmileProps
 
     def _all_entity_data(self) -> None:
         """Helper-function for get_all_gateway_entities().
 
-        Collect data for each entity and add to self._smile_props and self.gw_entities.
+        Collect data for each entity and add to self.gw_entities.
         """
         self._update_gw_entities()
-        self._smile_props["gateway_id"] = self.gateway_id
-        self._smile_props["item_count"] = self._count
-        self._smile_props["smile_name"] = self.smile_name
-        if self._is_thermostat:
-            self._smile_props["heater_id"] = self._heater_id
 
     def _update_gw_entities(self) -> None:
         """Helper-function for _all_entity_data() and async_update().

plugwise/legacy/smile.py

@@ -19,7 +19,6 @@
     REQUIRE_APPLIANCES,
     RULES,
     GwEntityData,
-    SmileProps,
     ThermoLoc,
 )
 from plugwise.exceptions import ConnectionFailedError, DataMissingError, PlugwiseError
@@ -41,7 +40,6 @@ def __init__(
         _on_off_device: bool,
         _opentherm_device: bool,
         _request: Callable[..., Awaitable[Any]],
-        _smile_props: SmileProps,
         _stretch_v2: bool,
         _target_smile: str,
         smile_hostname: str,
@@ -61,7 +59,6 @@ def __init__(
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
         self._request = _request
-        self._smile_props = _smile_props
         self._stretch_v2 = _stretch_v2
         self._target_smile = _target_smile
         self.smile_hostname = smile_hostname

plugwise/smile.py

@@ -22,7 +22,6 @@
     OFF,
     RULES,
     GwEntityData,
-    SmileProps,
     ThermoLoc,
 )
 from plugwise.data import SmileData
@@ -51,7 +50,6 @@ def __init__(
         _opentherm_device: bool,
         _request: Callable[..., Awaitable[Any]],
         _schedule_old_states: dict[str, dict[str, str]],
-        _smile_props: SmileProps,
         smile_hostname: str | None,
         smile_hw_version: str | None,
         smile_mac_address: str | None,
@@ -72,7 +70,6 @@ def __init__(
         self._opentherm_device = _opentherm_device
         self._request = _request
         self._schedule_old_states = _schedule_old_states
-        self._smile_props = _smile_props
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address
@@ -126,8 +123,8 @@ async def async_update(self) -> dict[str, GwEntityData]:
             self.get_all_gateway_entities()
             # Set self._cooling_enabled - required for set_temperature(),
             # also, check for a failed data-retrieval
-            if "heater_id" in self._smile_props:
-                heat_cooler = self.gw_entities[self._smile_props["heater_id"]]
+            if self.heater_id != NONE:
+                heat_cooler = self.gw_entities[self.heater_id]
                 if (
                     "binary_sensors" in heat_cooler
                     and "cooling_enabled" in heat_cooler["binary_sensors"]
@@ -136,7 +133,7 @@ async def async_update(self) -> dict[str, GwEntityData]:
                         "cooling_enabled"
                     ]
             else:  # cover failed data-retrieval for P1
-                _ = self.gw_entities[self._smile_props["gateway_id"]]["location"]
+                _ = self.gw_entities[self.gateway_id]["location"]
         except KeyError as err:
             raise DataMissingError("No Plugwise actual data received") from err
 
@@ -278,7 +275,7 @@ async def set_gateway_mode(self, mode: str) -> None:
             f"{valid}"
             "</gateway_mode_control_functionality>"
         )
-        uri = f"{APPLIANCES};id={self._smile_props['gateway_id']}/gateway_mode_control"
+        uri = f"{APPLIANCES};id={self.gateway_id}/gateway_mode_control"
         await self.call_request(uri, method="put", data=data)
 
     async def set_regulation_mode(self, mode: str) -> None: