plugwise 1.7.5__tar.gz → 1.7.7__tar.gz

{plugwise-1.7.5 → plugwise-1.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugwise
-Version: 1.7.5
+Version: 1.7.7
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Author: Plugwise device owners
 Maintainer: bouwew, CoMPaTech
@@ -16,6 +16,7 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: defusedxml
 Requires-Dist: munch

{plugwise-1.7.5 → plugwise-1.7.7}/plugwise/__init__.py

@@ -5,6 +5,8 @@ Plugwise backend module for Home Assistant Core.
 
 from __future__ import annotations
 
+from typing import cast
+
 from plugwise.constants import (
     DEFAULT_LEGACY_TIMEOUT,
     DEFAULT_PORT,
@@ -15,6 +17,8 @@ from plugwise.constants import (
     MODULES,
     NONE,
     SMILES,
+    STATE_OFF,
+    STATE_ON,
     STATUS,
     SYSTEM,
     GwEntityData,
@@ -34,6 +38,7 @@ from plugwise.smilecomm import SmileComm
 
 import aiohttp
 from defusedxml import ElementTree as etree
+from munch import Munch
 from packaging.version import Version, parse
 
 
@@ -70,16 +75,17 @@ class Smile(SmileComm):
         self._smile_api: SmileAPI | SmileLegacyAPI
         self._stretch_v2 = False
         self._target_smile: str = NONE
-        self.smile_hostname: str = NONE
-        self.smile_hw_version: str | None = None
-        self.smile_legacy = False
-        self.smile_mac_address: str | None = None
-        self.smile_model: str = NONE
-        self.smile_model_id: str | None = None
-        self.smile_name: str = NONE
-        self.smile_type: str = NONE
-        self.smile_version: Version = Version("0.0.0")
-        self.smile_zigbee_mac_address: str | None = None
+        self.smile: Munch = Munch()
+        self.smile.hostname = NONE
+        self.smile.hw_version = None
+        self.smile.legacy = False
+        self.smile.mac_address = None
+        self.smile.model = NONE
+        self.smile.model_id = None
+        self.smile.name = NONE
+        self.smile.type = NONE
+        self.smile.version = Version("0.0.0")
+        self.smile.zigbee_mac_address = None
 
     @property
     def cooling_present(self) -> bool:
@@ -107,7 +113,7 @@ class Smile(SmileComm):
 
         All non-legacy devices support gateway-rebooting.
         """
-        return not self.smile_legacy
+        return not self.smile.legacy
 
     async def connect(self) -> Version:
         """Connect to the Plugwise Gateway and determine its name, type, version, and other data."""
@@ -156,16 +162,9 @@ class Smile(SmileComm):
                 self._opentherm_device,
                 self._request,
                 self._schedule_old_states,
-                self.smile_hostname,
-                self.smile_hw_version,
-                self.smile_mac_address,
-                self.smile_model,
-                self.smile_model_id,
-                self.smile_name,
-                self.smile_type,
-                self.smile_version,
+                self.smile,
             )
-            if not self.smile_legacy
+            if not self.smile.legacy
             else SmileLegacyAPI(
                 self._is_thermostat,
                 self._loc_data,
@@ -174,21 +173,14 @@ class Smile(SmileComm):
                 self._request,
                 self._stretch_v2,
                 self._target_smile,
-                self.smile_hostname,
-                self.smile_hw_version,
-                self.smile_mac_address,
-                self.smile_model,
-                self.smile_name,
-                self.smile_type,
-                self.smile_version,
-                self.smile_zigbee_mac_address,
+                self.smile,
             )
         )
 
         # Update all endpoints on first connect
         await self._smile_api.full_xml_update()
 
-        return self.smile_version
+        return cast(Version, self.smile.version)
 
     async def _smile_detect(
         self, result: etree.Element, dsmrmain: etree.Element
@@ -201,15 +193,17 @@ class Smile(SmileComm):
         if (gateway := result.find("./gateway")) is not None:
             if (v_model := gateway.find("vendor_model")) is not None:
                 model = v_model.text
-            self.smile_version = parse(gateway.find("firmware_version").text)
-            self.smile_hw_version = gateway.find("hardware_version").text
-            self.smile_hostname = gateway.find("hostname").text
-            self.smile_mac_address = gateway.find("mac_address").text
-            self.smile_model_id = gateway.find("vendor_model").text
+            self.smile.version = parse(gateway.find("firmware_version").text)
+            self.smile.hw_version = gateway.find("hardware_version").text
+            self.smile.hostname = gateway.find("hostname").text
+            self.smile.mac_address = gateway.find("mac_address").text
+            self.smile.model_id = gateway.find("vendor_model").text
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 
-        if model == "Unknown" or self.smile_version is None:  # pragma: no cover
+        if model == "Unknown" or self.smile.version == Version(
+            "0.0.0"
+        ):  # pragma: no cover
             # Corner case check
             LOGGER.error(
                 "Unable to find model or version information, please create"
@@ -217,7 +211,7 @@ class Smile(SmileComm):
             )
             raise UnsupportedDeviceError
 
-        version_major = str(self.smile_version.major)
+        version_major = str(self.smile.version.major)
         self._target_smile = f"{model}_v{version_major}"
         LOGGER.debug("Plugwise identified as %s", self._target_smile)
         if self._target_smile not in SMILES:
@@ -228,7 +222,7 @@ class Smile(SmileComm):
             )
             raise UnsupportedDeviceError
 
-        if not self.smile_legacy:
+        if not self.smile.legacy:
             self._timeout = DEFAULT_TIMEOUT
 
         if self._target_smile in ("smile_open_therm_v2", "smile_thermo_v3"):
@@ -238,14 +232,14 @@ class Smile(SmileComm):
             )  # pragma: no cover
             raise UnsupportedDeviceError  # pragma: no cover
 
-        self.smile_model = "Gateway"
-        self.smile_name = SMILES[self._target_smile].smile_name
-        self.smile_type = SMILES[self._target_smile].smile_type
+        self.smile.model = "Gateway"
+        self.smile.name = SMILES[self._target_smile].smile_name
+        self.smile.type = SMILES[self._target_smile].smile_type
 
-        if self.smile_type == "stretch":
+        if self.smile.type == "stretch":
             self._stretch_v2 = int(version_major) == 2
 
-        if self.smile_type == "thermostat":
+        if self.smile.type == "thermostat":
             self._is_thermostat = True
             # For Adam, Anna, determine the system capabilities:
             # Find the connected heating/cooling device (heater_central),
@@ -273,13 +267,13 @@ class Smile(SmileComm):
         return_model = model
         # Stretch: find the MAC of the zigbee master_controller (= Stick)
         if (network := result.find("./module/protocols/master_controller")) is not None:
-            self.smile_zigbee_mac_address = network.find("mac_address").text
+            self.smile.zigbee_mac_address = network.find("mac_address").text
         # Find the active MAC in case there is an orphaned Stick
         if zb_networks := result.findall("./network"):
             for zb_network in zb_networks:
                 if zb_network.find("./nodes/network_router") is not None:
                     network = zb_network.find("./master_controller")
-                    self.smile_zigbee_mac_address = network.find("mac_address").text
+                    self.smile.zigbee_mac_address = network.find("mac_address").text
 
         # Legacy Anna or Stretch:
         if (
@@ -287,22 +281,22 @@ class Smile(SmileComm):
             or network is not None
         ):
             system = await self._request(SYSTEM)
-            self.smile_version = parse(system.find("./gateway/firmware").text)
+            self.smile.version = parse(system.find("./gateway/firmware").text)
             return_model = str(system.find("./gateway/product").text)
-            self.smile_hostname = system.find("./gateway/hostname").text
+            self.smile.hostname = system.find("./gateway/hostname").text
             # If wlan0 contains data it's active, eth0 should be checked last as is preferred
             for network in ("wlan0", "eth0"):
                 locator = f"./{network}/mac"
                 if (net_locator := system.find(locator)) is not None:
-                    self.smile_mac_address = net_locator.text
+                    self.smile.mac_address = net_locator.text
 
         # P1 legacy:
         elif dsmrmain is not None:
             status = await self._request(STATUS)
-            self.smile_version = parse(status.find("./system/version").text)
+            self.smile.version = parse(status.find("./system/version").text)
             return_model = str(status.find("./system/product").text)
-            self.smile_hostname = status.find("./network/hostname").text
-            self.smile_mac_address = status.find("./network/mac_address").text
+            self.smile.hostname = status.find("./network/hostname").text
+            self.smile.mac_address = status.find("./network/mac_address").text
         else:  # pragma: no cover
             # No cornercase, just end of the line
             LOGGER.error(
@@ -311,7 +305,7 @@ class Smile(SmileComm):
             )
             raise ResponseError
 
-        self.smile_legacy = True
+        self.smile.legacy = True
         return return_model
 
     async def async_update(self) -> dict[str, GwEntityData]:
@@ -398,10 +392,21 @@ class Smile(SmileComm):
 
     async def set_switch_state(
         self, appl_id: str, members: list[str] | None, model: str, state: str
-    ) -> None:
-        """Set the given State of the relevant Switch."""
+    ) -> bool:
+        """Set the given State of the relevant Switch.
+
+        Return the result:
+          - True when switched to state on,
+          - False when switched to state off,
+          - the unchanged state when the switch is for instance locked.
+        """
+        if state not in (STATE_OFF, STATE_ON):
+            raise PlugwiseError("Invalid state supplied to set_switch_state")
+
         try:
-            await self._smile_api.set_switch_state(appl_id, members, model, state)
+            return await self._smile_api.set_switch_state(
+                appl_id, members, model, state
+            )
         except ConnectionFailedError as exc:
             raise ConnectionFailedError(
                 f"Failed to set switch state: {str(exc)}"

{plugwise-1.7.5 → plugwise-1.7.7}/plugwise/common.py

@@ -10,6 +10,7 @@ from typing import cast
 from plugwise.constants import (
     ANNA,
     NONE,
+    PRIORITY_DEVICE_CLASSES,
     SPECIAL_PLUG_TYPES,
     SWITCH_GROUP_TYPES,
     ApplianceType,
@@ -55,17 +56,16 @@ class SmileCommon:
         self._heater_id: str = NONE
         self._on_off_device: bool
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.smile_name: str
-        self.smile_type: str
+        self.smile: Munch
 
     @property
     def heater_id(self) -> str:
         """Return the heater-id."""
         return self._heater_id
 
-    def smile(self, name: str) -> bool:
+    def check_name(self, name: str) -> bool:
         """Helper-function checking the smile-name."""
-        return self.smile_name == name
+        return bool(self.smile.name == name)
 
     def _appl_heater_central_info(
         self,
@@ -153,6 +153,16 @@ class SmileCommon:
                 self.gw_entities[appl.entity_id][appl_key] = value
                 self._count += 1
 
+    def _reorder_devices(self) -> None:
+        """Place the gateway and optional heater_central devices as 1st and 2nd."""
+        reordered = {}
+        for dev_class in PRIORITY_DEVICE_CLASSES:
+            for entity_id, entity in dict(self.gw_entities).items():
+                if entity["dev_class"] == dev_class:
+                    reordered[entity_id] = self.gw_entities.pop(entity_id)
+                    break
+        self.gw_entities = {**reordered, **self.gw_entities}
+
     def _entity_switching_group(self, entity: GwEntityData, data: GwEntityData) -> None:
         """Helper-function for _get_device_zone_data().
 
@@ -173,7 +183,7 @@ class SmileCommon:
         """
         switch_groups: dict[str, GwEntityData] = {}
         # P1 and Anna don't have switchgroups
-        if self.smile_type == "power" or self.smile(ANNA):
+        if self.smile.type == "power" or self.check_name(ANNA):
             return switch_groups
 
         for group in self._domain_objects.findall("./group"):

{plugwise-1.7.5 → plugwise-1.7.7}/plugwise/constants.py

@@ -23,6 +23,8 @@ POWER_WATT: Final = "W"
 PRESET_AWAY: Final = "away"
 PRESSURE_BAR: Final = "bar"
 SIGNAL_STRENGTH_DECIBELS_MILLIWATT: Final = "dBm"
+STATE_OFF: Final = "off"
+STATE_ON: Final = "on"
 TEMP_CELSIUS: Final = "°C"
 TEMP_KELVIN: Final = "°K"
 TIME_MILLISECONDS: Final = "ms"
@@ -84,7 +86,7 @@ MIN_SETPOINT: Final[float] = 4.0
 MODULE_LOCATOR: Final = "./logs/point_log/*[@id]"
 NONE: Final = "None"
 OFF: Final = "off"
-PRIORITY_DEVICE_CLASSES = ("heater_central", "gateway")
+PRIORITY_DEVICE_CLASSES = ("gateway", "heater_central")
 
 # XML data paths
 APPLIANCES: Final = "/core/appliances"

{plugwise-1.7.5 → plugwise-1.7.7}/plugwise/data.py

@@ -35,7 +35,7 @@ class SmileData(SmileHelper):
         Collect data for each entity and add to self.gw_entities.
         """
         self._update_gw_entities()
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             self._update_zones()
             self.gw_entities.update(self._zones)
 
@@ -86,7 +86,7 @@ class SmileData(SmileHelper):
         mac_pattern = re.compile(r"(?:[0-9A-F]{2}){8}")
         matches = ["Battery", "below"]
         if self._notifications:
-            for msg_id, notification in list(self._notifications.items()):
+            for msg_id, notification in self._notifications.copy().items():
                 mac_address: str | None = None
                 message: str | None = notification.get("message")
                 warning: str | None = notification.get("warning")
@@ -111,7 +111,7 @@ class SmileData(SmileHelper):
         """Helper-function adding or updating the Plugwise notifications."""
         if (
             entity_id == self._gateway_id
-            and (self._is_thermostat or self.smile_type == "power")
+            and (self._is_thermostat or self.smile.type == "power")
         ) or (
             "binary_sensors" in entity
             and "plugwise_notification" in entity["binary_sensors"]
@@ -124,7 +124,7 @@ class SmileData(SmileHelper):
         """Helper-function for adding/updating various cooling-related values."""
         # For Anna and heating + cooling, replace setpoint with setpoint_high/_low
         if (
-            self.smile(ANNA)
+            self.check_name(ANNA)
             and self._cooling_present
             and entity["dev_class"] == "thermostat"
         ):
@@ -194,11 +194,11 @@ class SmileData(SmileHelper):
         # Switching groups data
         self._entity_switching_group(entity, data)
         # Adam data
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             self._get_adam_data(entity, data)
 
         # Thermostat data for Anna (presets, temperatures etc)
-        if self.smile(ANNA) and entity["dev_class"] == "thermostat":
+        if self.check_name(ANNA) and entity["dev_class"] == "thermostat":
             self._climate_data(entity_id, entity, data)
             self._get_anna_control_state(data)
 
@@ -232,12 +232,12 @@ class SmileData(SmileHelper):
             if self._on_off_device and isinstance(self._heating_valves(), int):
                 data["binary_sensors"]["heating_state"] = self._heating_valves() != 0
             # Add cooling_enabled binary_sensor
-            if "binary_sensors" in data:
-                if (
-                    "cooling_enabled" not in data["binary_sensors"]
-                    and self._cooling_present
-                ):
-                    data["binary_sensors"]["cooling_enabled"] = self._cooling_enabled
+            if (
+                "binary_sensors" in data
+                and "cooling_enabled" not in data["binary_sensors"]
+                and self._cooling_present
+            ):
+                data["binary_sensors"]["cooling_enabled"] = self._cooling_enabled
 
         # Show the allowed regulation_modes and gateway_modes
         if entity["dev_class"] == "gateway":

{plugwise-1.7.5 → plugwise-1.7.7}/plugwise/helper.py

@@ -28,7 +28,6 @@ from plugwise.constants import (
     NONE,
     OFF,
     P1_MEASUREMENTS,
-    PRIORITY_DEVICE_CLASSES,
     TEMP_CELSIUS,
     THERMOSTAT_CLASSES,
     TOGGLES,
@@ -85,11 +84,7 @@ class SmileHelper(SmileCommon):
         self._gateway_id: str = NONE
         self._zones: dict[str, GwEntityData]
         self.gw_entities: dict[str, GwEntityData]
-        self.smile_hw_version: str | None
-        self.smile_mac_address: str | None
-        self.smile_model: str
-        self.smile_model_id: str | None
-        self.smile_version: version.Version
+        self.smile: Munch = Munch()
 
     @property
     def gateway_id(self) -> str:
@@ -160,11 +155,11 @@ class SmileHelper(SmileCommon):
 
             self._create_gw_entities(appl)
 
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             self._get_p1_smartmeter_info()
 
         # Sort the gw_entities
-        self._sort_gw_entities()
+        self._reorder_devices()
 
     def _get_p1_smartmeter_info(self) -> None:
         """For P1 collect the connected SmartMeter info from the Home/building location.
@@ -197,18 +192,6 @@ class SmileHelper(SmileCommon):
 
         self._create_gw_entities(appl)
 
-    def _sort_gw_entities(self) -> None:
-        """Place the gateway and optional heater_central entities as 1st and 2nd."""
-        for dev_class in PRIORITY_DEVICE_CLASSES:
-            for entity_id, entity in dict(self.gw_entities).items():
-                if entity["dev_class"] == dev_class:
-                    priority_entity = entity
-                    self.gw_entities.pop(entity_id)
-                    other_entities = self.gw_entities
-                    priority_entities = {entity_id: priority_entity}
-                    self.gw_entities = {**priority_entities, **other_entities}
-                    break
-
     def _all_locations(self) -> None:
         """Collect all locations."""
         loc = Munch()
@@ -268,16 +251,16 @@ class SmileHelper(SmileCommon):
     def _appl_gateway_info(self, appl: Munch, appliance: etree.Element) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         self._gateway_id = appliance.attrib["id"]
-        appl.firmware = str(self.smile_version)
-        appl.hardware = self.smile_hw_version
-        appl.mac = self.smile_mac_address
-        appl.model = self.smile_model
-        appl.model_id = self.smile_model_id
-        appl.name = self.smile_name
+        appl.firmware = str(self.smile.version)
+        appl.hardware = self.smile.hw_version
+        appl.mac = self.smile.mac_address
+        appl.model = self.smile.model
+        appl.model_id = self.smile.model_id
+        appl.name = self.smile.name
         appl.vendor_name = "Plugwise"
 
         # Adam: collect the ZigBee MAC address of the Smile
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             if (
                 found := self._domain_objects.find(".//protocols/zig_bee_coordinator")
             ) is not None:
@@ -346,7 +329,7 @@ class SmileHelper(SmileCommon):
         # Get P1 smartmeter data from LOCATIONS
         entity = self.gw_entities[entity_id]
         # !! DON'T CHANGE below two if-lines, will break stuff !!
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             if entity["dev_class"] == "smartmeter":
                 data.update(self._power_data_from_location())
 
@@ -383,7 +366,7 @@ class SmileHelper(SmileCommon):
             data.pop("c_heating_state")
             self._count -= 1
 
-        if self._is_thermostat and self.smile(ANNA):
+        if self._is_thermostat and self.check_name(ANNA):
             self._update_anna_cooling(entity_id, data)
 
         self._cleanup_data(data)
@@ -484,7 +467,7 @@ class SmileHelper(SmileCommon):
                 item == "thermostat"
                 and (
                     entity["dev_class"] != "climate"
-                    if self.smile(ADAM)
+                    if self.check_name(ADAM)
                     else entity["dev_class"] != "thermostat"
                 )
             ):
@@ -539,7 +522,7 @@ class SmileHelper(SmileCommon):
 
         Collect the requested gateway mode.
         """
-        if not (self.smile(ADAM) and entity_id == self._gateway_id):
+        if not (self.check_name(ADAM) and entity_id == self._gateway_id):
             return None
 
         if (search := search_actuator_functionalities(appliance, key)) is not None:
@@ -605,10 +588,10 @@ class SmileHelper(SmileCommon):
 
         Solution for Core issue #81839.
         """
-        if self.smile(ANNA):
+        if self.check_name(ANNA):
             data["binary_sensors"]["heating_state"] = data["c_heating_state"]
 
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             # First count when not present, then create and init to False.
             # When present init to False
             if "heating_state" not in data["binary_sensors"]:
@@ -723,7 +706,7 @@ class SmileHelper(SmileCommon):
             for entity_id, entity in self.gw_entities.items():
                 self._rank_thermostat(thermo_matching, loc_id, entity_id, entity)
 
-        for loc_id, loc_data in list(self._thermo_locs.items()):
+        for loc_id, loc_data in self._thermo_locs.items():
             if loc_data["primary_prio"] != 0:
                 self._zones[loc_id] = {
                     "dev_class": "climate",
@@ -799,8 +782,8 @@ class SmileHelper(SmileCommon):
 
         # Handle missing control_state in regulation_mode off for firmware >= 3.2.0 (issue #776)
         # In newer firmware versions, default to "off" when control_state is not present
-        if self.smile_version != version.Version("0.0.0"):
-            if self.smile_version >= version.parse("3.2.0"):
+        if self.smile.version != version.Version("0.0.0"):
+            if self.smile.version >= version.parse("3.2.0"):
                 return "off"
 
             # Older Adam firmware does not have the control_state xml-key

{plugwise-1.7.5 → plugwise-1.7.7}/plugwise/legacy/helper.py

@@ -23,7 +23,6 @@ from plugwise.constants import (
     NONE,
     OFF,
     P1_LEGACY_MEASUREMENTS,
-    PRIORITY_DEVICE_CLASSES,
     TEMP_CELSIUS,
     THERMOSTAT_CLASSES,
     UOM,
@@ -47,7 +46,6 @@ from plugwise.util import (
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from defusedxml import ElementTree as etree
 from munch import Munch
-from packaging.version import Version
 
 
 def etree_to_dict(element: etree.Element) -> dict[str, str]:
@@ -73,10 +71,7 @@ class SmileLegacyHelper(SmileCommon):
         self._modules: etree.Element
         self._stretch_v2: bool
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.smile_mac_address: str | None
-        self.smile_model: str
-        self.smile_version: Version
-        self.smile_zigbee_mac_address: str | None
+        self.smile: Munch = Munch()
 
     @property
     def gateway_id(self) -> str:
@@ -95,7 +90,7 @@ class SmileLegacyHelper(SmileCommon):
 
         self._create_legacy_gateway()
         # For legacy P1 collect the connected SmartMeter info
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             appl = Munch()
             self._p1_smartmeter_info_finder(appl)
             # Legacy P1 has no more devices
@@ -140,17 +135,7 @@ class SmileLegacyHelper(SmileCommon):
                 continue  # pragma: no cover
 
             self._create_gw_entities(appl)
-
-        # Place the gateway and optional heater_central devices as 1st and 2nd
-        for dev_class in PRIORITY_DEVICE_CLASSES:
-            for entity_id, entity in dict(self.gw_entities).items():
-                if entity["dev_class"] == dev_class:
-                    tmp_entity = entity
-                    self.gw_entities.pop(entity_id)
-                    cleared_dict = self.gw_entities
-                    add_to_front = {entity_id: tmp_entity}
-                    self.gw_entities = {**add_to_front, **cleared_dict}
-                    break
+            self._reorder_devices()
 
     def _all_locations(self) -> None:
         """Collect all locations."""
@@ -167,13 +152,13 @@ class SmileLegacyHelper(SmileCommon):
             loc.loc_id = location.attrib["id"]
             # Filter the valid single location for P1 legacy: services not empty
             locator = "./services"
-            if self.smile_type == "power" and len(location.find(locator)) == 0:
+            if self.smile.type == "power" and len(location.find(locator)) == 0:
                 continue
 
             if loc.name == "Home":
                 self._home_loc_id = loc.loc_id
             # Replace location-name for P1 legacy, can contain privacy-related info
-            if self.smile_type == "power":
+            if self.smile.type == "power":
                 loc.name = "Home"
                 self._home_loc_id = loc.loc_id
 
@@ -185,18 +170,18 @@ class SmileLegacyHelper(SmileCommon):
         Use the home_location or FAKE_APPL as entity id.
         """
         self._gateway_id = self._home_loc_id
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             self._gateway_id = FAKE_APPL
 
         self.gw_entities[self._gateway_id] = {"dev_class": "gateway"}
         self._count += 1
         for key, value in {
-            "firmware": str(self.smile_version),
+            "firmware": str(self.smile.version),
             "location": self._home_loc_id,
-            "mac_address": self.smile_mac_address,
-            "model": self.smile_model,
-            "name": self.smile_name,
-            "zigbee_mac_address": self.smile_zigbee_mac_address,
+            "mac_address": self.smile.mac_address,
+            "model": self.smile.model,
+            "name": self.smile.name,
+            "zigbee_mac_address": self.smile.zigbee_mac_address,
             "vendor": "Plugwise",
         }.items():
             if value is not None:
@@ -224,14 +209,14 @@ class SmileLegacyHelper(SmileCommon):
 
         Collect energy entity info (Smartmeter, Circle, Stealth, etc.): firmware, model and vendor name.
         """
-        if self.smile_type in ("power", "stretch"):
+        if self.smile.type in ("power", "stretch"):
             locator = "./services/electricity_point_meter"
             module_data = self._get_module_data(
                 appliance, locator, self._modules, legacy=True
             )
             appl.zigbee_mac = module_data["zigbee_mac_address"]
             # Filter appliance without zigbee_mac, it's an orphaned device
-            if appl.zigbee_mac is None and self.smile_type != "power":
+            if appl.zigbee_mac is None and self.smile.type != "power":
                 return None
 
             appl.hardware = module_data["hardware_version"]
@@ -253,7 +238,7 @@ class SmileLegacyHelper(SmileCommon):
         appl.entity_id = loc_id
         appl.location = loc_id
         appl.mac = None
-        appl.model = self.smile_model
+        appl.model = self.smile.model
         appl.model_id = None
         appl.name = "P1"
         appl.pwclass = "smartmeter"
@@ -272,7 +257,7 @@ class SmileLegacyHelper(SmileCommon):
         # Get P1 smartmeter data from MODULES
         entity = self.gw_entities[entity_id]
         # !! DON'T CHANGE below two if-lines, will break stuff !!
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             if entity["dev_class"] == "smartmeter":
                 data.update(self._power_data_from_modules())