plugwise 1.7.2__tar.gz → 1.7.3__tar.gz

{plugwise-1.7.2 → plugwise-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plugwise
-Version: 1.7.2
+Version: 1.7.3
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners
@@ -48,12 +48,13 @@ Requires-Dist: python-dateutil
 
 # Plugwise python module
 
-This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as co-code owners).
+This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as code owners).
 
-This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
+This module supports Hubs such as `Adam`, `Smile`s for Anna and P1 and `Stretch`, i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
 
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
+![Static Badge](https://img.shields.io/badge/Plugwise_Discord-Join_now-purple?style=social&logo=discord&link=https%3A%2F%2Fdiscord.gg%2FmFVhF8Ar6A)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
 [![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
 [![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)

{plugwise-1.7.2 → plugwise-1.7.3}/README.md

@@ -1,11 +1,12 @@
 # Plugwise python module
 
-This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as co-code owners).
+This module is the backend for the [`plugwise` component](https://github.com/home-assistant/core/tree/dev/homeassistant/components/plugwise) in Home Assistant Core (which we maintain as code owners).
 
-This module supports `Smile`s (and `Stretch`), i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
+This module supports Hubs such as `Adam`, `Smile`s for Anna and P1 and `Stretch`, i.e. the networked plugwise devices. For the USB (or Stick-standalone version) please refer to upcoming [`plugwise-usb` component](https://github.com/plugwise/plugwise_usb-beta).
 
 Our main usage for this module is supporting [Home Assistant](https://www.home-assistant.io) / [home-assistant](http://github.com/home-assistant/core/)
 
+![Static Badge](https://img.shields.io/badge/Plugwise_Discord-Join_now-purple?style=social&logo=discord&link=https%3A%2F%2Fdiscord.gg%2FmFVhF8Ar6A)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/plugwise)
 [![CodeRabbit.ai is Awesome](https://img.shields.io/badge/AI-orange?label=CodeRabbit&color=orange&link=https%3A%2F%2Fcoderabbit.ai)](https://coderabbit.ai)
 [![renovate maintained](https://img.shields.io/badge/maintained%20with-renovate-blue?logo=renovatebot)](https://github.com/plugwise/python-plugwise/issues/291)

{plugwise-1.7.2 → plugwise-1.7.3}/plugwise/__init__.py

@@ -18,7 +18,6 @@ from plugwise.constants import (
     STATUS,
     SYSTEM,
     GwEntityData,
-    SmileProps,
     ThermoLoc,
 )
 from plugwise.exceptions import (
@@ -69,7 +68,6 @@ class Smile(SmileComm):
         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
@@ -86,26 +84,22 @@ class Smile(SmileComm):
     @property
     def cooling_present(self) -> bool:
         """Return the cooling capability."""
-        if "cooling_present" in self._smile_props:
-            return self._smile_props["cooling_present"]
-        return False
+        return self._smile_api.cooling_present
 
     @property
     def gateway_id(self) -> str:
         """Return the gateway-id."""
-        return self._smile_props["gateway_id"]
+        return self._smile_api.gateway_id
 
     @property
     def heater_id(self) -> str:
         """Return the heater-id."""
-        if "heater_id" in self._smile_props:
-            return self._smile_props["heater_id"]
-        return NONE
+        return self._smile_api.heater_id
 
     @property
     def item_count(self) -> int:
         """Return the item-count."""
-        return self._smile_props["item_count"]
+        return self._smile_api.item_count
 
     @property
     def reboot(self) -> bool:
@@ -162,7 +156,6 @@ class Smile(SmileComm):
                 self._opentherm_device,
                 self._request,
                 self._schedule_old_states,
-                self._smile_props,
                 self.smile_hostname,
                 self.smile_hw_version,
                 self.smile_mac_address,
@@ -179,7 +172,6 @@ class Smile(SmileComm):
                 self._on_off_device,
                 self._opentherm_device,
                 self._request,
-                self._smile_props,
                 self._stretch_v2,
                 self._target_smile,
                 self.smile_hostname,
@@ -198,7 +190,9 @@ class Smile(SmileComm):
 
         return self.smile_version
 
-    async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
+    async def _smile_detect(
+        self, result: etree.Element, dsmrmain: etree.Element
+    ) -> None:
         """Helper-function for connect().
 
         Detect which type of Plugwise Gateway is being connected.
@@ -256,10 +250,8 @@ class Smile(SmileComm):
             # For Adam, Anna, determine the system capabilities:
             # Find the connected heating/cooling device (heater_central),
             # e.g. heat-pump or gas-fired heater
-            onoff_boiler: etree = result.find("./module/protocols/onoff_boiler")
-            open_therm_boiler: etree = result.find(
-                "./module/protocols/open_therm_boiler"
-            )
+            onoff_boiler = result.find("./module/protocols/onoff_boiler")
+            open_therm_boiler = result.find("./module/protocols/open_therm_boiler")
             self._on_off_device = onoff_boiler is not None
             self._opentherm_device = open_therm_boiler is not None
 
@@ -272,7 +264,7 @@ class Smile(SmileComm):
                 self._elga = True
 
     async def _smile_detect_legacy(
-        self, result: etree, dsmrmain: etree, model: str
+        self, result: etree.Element, dsmrmain: etree.Element, model: str
     ) -> str:
         """Helper-function for _smile_detect().
 
@@ -298,11 +290,12 @@ class Smile(SmileComm):
             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
-            # If wlan0 contains data it's active, so eth0 should be checked last
+            # 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
+
         # P1 legacy:
         elif dsmrmain is not None:
             status = await self._request(STATUS)

{plugwise-1.7.2 → plugwise-1.7.3}/plugwise/common.py

@@ -27,7 +27,9 @@ from defusedxml import ElementTree as etree
 from munch import Munch
 
 
-def get_zigbee_data(module: etree, module_data: ModuleData, legacy: bool) -> None:
+def get_zigbee_data(
+    module: etree.Element, module_data: ModuleData, legacy: bool
+) -> None:
     """Helper-function for _get_module_data()."""
     if legacy:
         # Stretches
@@ -49,13 +51,18 @@ class SmileCommon:
         """Init."""
         self._cooling_present: bool
         self._count: int
-        self._domain_objects: etree
+        self._domain_objects: etree.Element
         self._heater_id: str = NONE
         self._on_off_device: bool
         self.gw_entities: dict[str, GwEntityData] = {}
         self.smile_name: str
         self.smile_type: str
 
+    @property
+    def heater_id(self) -> str:
+        """Return the heater-id."""
+        return self._heater_id
+
     def smile(self, name: str) -> bool:
         """Helper-function checking the smile-name."""
         return self.smile_name == name
@@ -63,10 +70,10 @@ class SmileCommon:
     def _appl_heater_central_info(
         self,
         appl: Munch,
-        xml_1: etree,
+        xml_1: etree.Element,
         legacy: bool,
-        xml_2: etree = None,
-        xml_3: etree = None,
+        xml_2: etree.Element = None,
+        xml_3: etree.Element = None,
     ) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         # Find the valid heater_central
@@ -74,6 +81,9 @@ class SmileCommon:
         xml_2 = return_valid(xml_2, self._domain_objects)
         self._heater_id = check_heater_central(xml_2)
 
+        if self._heater_id == NONE:
+            return Munch()  # pragma: no cover
+
         #  Info for On-Off device
         if self._on_off_device:
             appl.name = "OnOff"  # pragma: no cover
@@ -101,7 +111,7 @@ class SmileCommon:
         return appl
 
     def _appl_thermostat_info(
-        self, appl: Munch, xml_1: etree, xml_2: etree = None
+        self, appl: Munch, xml_1: etree.Element, xml_2: etree.Element = None
     ) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         locator = "./logs/point_log[type='thermostat']/thermostat"
@@ -190,7 +200,7 @@ class SmileCommon:
         return switch_groups
 
     def _get_lock_state(
-        self, xml: etree, data: GwEntityData, stretch_v2: bool = False
+        self, xml: etree.Element, data: GwEntityData, stretch_v2: bool = False
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -209,9 +219,9 @@ class SmileCommon:
 
     def _get_module_data(
         self,
-        xml_1: etree,
+        xml_1: etree.Element,
         locator: str,
-        xml_2: etree = None,
+        xml_2: etree.Element = None,
         legacy: bool = False,
     ) -> ModuleData:
         """Helper-function for _energy_device_info_finder() and _appliance_info_finder().

{plugwise-1.7.2 → plugwise-1.7.3}/plugwise/constants.py

@@ -393,17 +393,6 @@ ZONE_THERMOSTATS: Final[tuple[str, ...]] = (
 )
 
 
-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-1.7.2 → plugwise-1.7.3}/plugwise/data.py

@@ -16,7 +16,6 @@ from plugwise.constants import (
     OFF,
     ActuatorData,
     GwEntityData,
-    SmileProps,
 )
 from plugwise.helper import SmileHelper
 from plugwise.util import remove_empty_platform_dicts
@@ -27,28 +26,19 @@ class SmileData(SmileHelper):
 
     def __init__(self) -> None:
         """Init."""
-        self._smile_props: SmileProps
+        super().__init__()
         self._zones: dict[str, GwEntityData] = {}
-        SmileHelper.__init__(self)
 
     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().
 
@@ -228,6 +218,7 @@ class SmileData(SmileHelper):
                 for msg in item.values():
                     if message in msg:
                         data["available"] = False
+                        break
 
     def _get_adam_data(self, entity: GwEntityData, data: GwEntityData) -> None:
         """Helper-function for _get_entity_data().
@@ -329,16 +320,14 @@ class SmileData(SmileHelper):
 
         Also, replace NONE by OFF when none of the schedules are active.
         """
-        loc_schedule_states: dict[str, str] = {}
-        for schedule in schedules:
-            loc_schedule_states[schedule] = "off"
-            if schedule == selected and data["climate_mode"] == "auto":
-                loc_schedule_states[schedule] = "on"
-        self._schedule_old_states[location] = loc_schedule_states
-
         all_off = True
-        for state in self._schedule_old_states[location].values():
-            if state == "on":
+        self._schedule_old_states[location] = {}
+        for schedule in schedules:
+            active: bool = schedule == selected and data["climate_mode"] == "auto"
+            self._schedule_old_states[location][schedule] = "off"
+            if active:
+                self._schedule_old_states[location][schedule] = "on"
                 all_off = False
+
         if all_off:
             data["select_schedule"] = OFF

{plugwise-1.7.2 → plugwise-1.7.3}/plugwise/helper.py

@@ -59,7 +59,9 @@ from munch import Munch
 from packaging import version
 
 
-def search_actuator_functionalities(appliance: etree, actuator: str) -> etree | None:
+def search_actuator_functionalities(
+    appliance: etree.Element, actuator: str
+) -> etree.Element | None:
     """Helper-function for finding the relevant actuator xml-structure."""
     locator = f"./actuator_functionalities/{actuator}"
     if (search := appliance.find(locator)) is not None:
@@ -73,6 +75,7 @@ class SmileHelper(SmileCommon):
 
     def __init__(self) -> None:
         """Set the constructor for this class."""
+        super().__init__()
         self._endpoint: str
         self._elga: bool
         self._is_thermostat: bool
@@ -87,7 +90,16 @@ class SmileHelper(SmileCommon):
         self.smile_model: str
         self.smile_model_id: str | None
         self.smile_version: version.Version
-        SmileCommon.__init__(self)
+
+    @property
+    def gateway_id(self) -> str:
+        """Return the gateway-id."""
+        return self._gateway_id
+
+    @property
+    def item_count(self) -> int:
+        """Return the item-count."""
+        return self._count
 
     def _all_appliances(self) -> None:
         """Collect all appliances with relevant info.
@@ -195,6 +207,7 @@ class SmileHelper(SmileCommon):
                     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."""
@@ -212,7 +225,7 @@ class SmileHelper(SmileCommon):
                 f"./location[@id='{loc.loc_id}']"
             )
 
-    def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
+    def _appliance_info_finder(self, appl: Munch, appliance: etree.Element) -> Munch:
         """Collect info for all appliances found."""
         match appl.pwclass:
             case "gateway":
@@ -230,7 +243,7 @@ class SmileHelper(SmileCommon):
                     appliance, "domestic_hot_water_mode_control_functionality"
                 )
                 # Skip orphaned heater_central (Core Issue #104433)
-                if appl.entity_id != self._heater_id:
+                if appl.entity_id != self.heater_id:
                     return Munch()
                 return appl
             case _ as s if s.endswith("_plug"):
@@ -250,9 +263,9 @@ class SmileHelper(SmileCommon):
                 appl.zigbee_mac = module_data["zigbee_mac_address"]
                 return appl
             case _:  # pragma: no cover
-                return appl
+                return Munch()
 
-    def _appl_gateway_info(self, appl: Munch, appliance: etree) -> Munch:
+    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)
@@ -285,7 +298,7 @@ class SmileHelper(SmileCommon):
         return appl
 
     def _get_appl_actuator_modes(
-        self, appliance: etree, actuator_type: str
+        self, appliance: etree.Element, actuator_type: str
     ) -> list[str]:
         """Get allowed modes for the given actuator type."""
         mode_list: list[str] = []
@@ -341,7 +354,7 @@ class SmileHelper(SmileCommon):
 
         # Get non-P1 data from APPLIANCES
         measurements = DEVICE_MEASUREMENTS
-        if self._is_thermostat and entity_id == self._heater_id:
+        if self._is_thermostat and entity_id == self.heater_id:
             measurements = HEATER_CENTRAL_MEASUREMENTS
             # Show the allowed dhw_modes (Loria only)
             if self._dhw_allowed_modes:
@@ -397,7 +410,7 @@ class SmileHelper(SmileCommon):
 
     def _appliance_measurements(
         self,
-        appliance: etree,
+        appliance: etree.Element,
         data: GwEntityData,
         measurements: dict[str, DATA | UOM],
     ) -> None:
@@ -429,7 +442,7 @@ class SmileHelper(SmileCommon):
         self._count = count_data_items(self._count, data)
 
     def _get_toggle_state(
-        self, xml: etree, toggle: str, name: ToggleNameType, data: GwEntityData
+        self, xml: etree.Element, toggle: str, name: ToggleNameType, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -458,7 +471,7 @@ class SmileHelper(SmileCommon):
                 )
 
     def _get_actuator_functionalities(
-        self, xml: etree, entity: GwEntityData, data: GwEntityData
+        self, xml: etree.Element, entity: GwEntityData, data: GwEntityData
     ) -> None:
         """Get and process the actuator_functionalities details for an entity.
 
@@ -520,7 +533,7 @@ class SmileHelper(SmileCommon):
                 data[act_item] = temp_dict
 
     def _get_actuator_mode(
-        self, appliance: etree, entity_id: str, key: str
+        self, appliance: etree.Element, entity_id: str, key: str
     ) -> str | None:
         """Helper-function for _get_regulation_mode and _get_gateway_mode.
 
@@ -535,7 +548,7 @@ class SmileHelper(SmileCommon):
         return None
 
     def _get_regulation_mode(
-        self, appliance: etree, entity_id: str, data: GwEntityData
+        self, appliance: etree.Element, entity_id: str, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -551,7 +564,7 @@ class SmileHelper(SmileCommon):
             self._cooling_enabled = mode == "cooling"
 
     def _get_gateway_mode(
-        self, appliance: etree, entity_id: str, data: GwEntityData
+        self, appliance: etree.Element, entity_id: str, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data().
 
@@ -616,7 +629,7 @@ class SmileHelper(SmileCommon):
 
         Support added for Techneco Elga and Thercon Loria/Thermastage.
         """
-        if entity_id != self._heater_id:
+        if entity_id != self.heater_id:
             return
 
         if "elga_status_code" in data:
@@ -837,9 +850,7 @@ class SmileHelper(SmileCommon):
                 return presets  # pragma: no cover
 
         for rule_id in rule_ids:
-            directives: etree = self._domain_objects.find(
-                f'rule[@id="{rule_id}"]/directives'
-            )
+            directives = self._domain_objects.find(f'rule[@id="{rule_id}"]/directives')
             for directive in directives:
                 preset = directive.find("then").attrib
                 presets[directive.attrib["preset"]] = [

{plugwise-1.7.2 → plugwise-1.7.3}/plugwise/legacy/data.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 # 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
 
@@ -15,22 +15,12 @@ from plugwise.util import remove_empty_platform_dicts
 class SmileLegacyData(SmileLegacyHelper):
     """The Plugwise Smile main class."""
 
-    def __init__(self) -> None:
-        """Init."""
-        self._smile_props: SmileProps
-        SmileLegacyHelper.__init__(self)
-
     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-1.7.2 → plugwise-1.7.3}/plugwise/legacy/helper.py

@@ -23,6 +23,7 @@ from plugwise.constants import (
     NONE,
     OFF,
     P1_LEGACY_MEASUREMENTS,
+    PRIORITY_DEVICE_CLASSES,
     TEMP_CELSIUS,
     THERMOSTAT_CLASSES,
     UOM,
@@ -49,7 +50,7 @@ from munch import Munch
 from packaging.version import Version
 
 
-def etree_to_dict(element: etree) -> dict[str, str]:
+def etree_to_dict(element: etree.Element) -> dict[str, str]:
     """Helper-function translating xml Element to dict."""
     node: dict[str, str] = {}
     if element is not None:
@@ -63,18 +64,29 @@ class SmileLegacyHelper(SmileCommon):
 
     def __init__(self) -> None:
         """Set the constructor for this class."""
-        self._appliances: etree
+        super().__init__()
+        self._appliances: etree.Element
+        self._gateway_id: str = NONE
         self._is_thermostat: bool
         self._loc_data: dict[str, ThermoLoc]
-        self._locations: etree
-        self._modules: etree
+        self._locations: etree.Element
+        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
-        SmileCommon.__init__(self)
+
+    @property
+    def gateway_id(self) -> str:
+        """Return the gateway-id."""
+        return self._gateway_id
+
+    @property
+    def item_count(self) -> int:
+        """Return the item-count."""
+        return self._count
 
     def _all_appliances(self) -> None:
         """Collect all appliances with relevant info."""
@@ -124,13 +136,13 @@ class SmileLegacyHelper(SmileCommon):
                 continue
 
             # Skip orphaned heater_central (Core Issue #104433)
-            if appl.pwclass == "heater_central" and appl.entity_id != self._heater_id:
+            if appl.pwclass == "heater_central" and appl.entity_id != self.heater_id:
                 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 ("heater_central", "gateway"):
+        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
@@ -138,6 +150,7 @@ class SmileLegacyHelper(SmileCommon):
                     cleared_dict = self.gw_entities
                     add_to_front = {entity_id: tmp_entity}
                     self.gw_entities = {**add_to_front, **cleared_dict}
+                    break
 
     def _all_locations(self) -> None:
         """Collect all locations."""
@@ -171,11 +184,11 @@ class SmileLegacyHelper(SmileCommon):
 
         Use the home_location or FAKE_APPL as entity id.
         """
-        self.gateway_id = self._home_loc_id
+        self._gateway_id = self._home_loc_id
         if self.smile_type == "power":
-            self.gateway_id = FAKE_APPL
+            self._gateway_id = FAKE_APPL
 
-        self.gw_entities[self.gateway_id] = {"dev_class": "gateway"}
+        self.gw_entities[self._gateway_id] = {"dev_class": "gateway"}
         self._count += 1
         for key, value in {
             "firmware": str(self.smile_version),
@@ -188,7 +201,7 @@ class SmileLegacyHelper(SmileCommon):
         }.items():
             if value is not None:
                 gw_key = cast(ApplianceType, key)
-                self.gw_entities[self.gateway_id][gw_key] = value
+                self.gw_entities[self._gateway_id][gw_key] = value
                 self._count += 1
 
     def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
@@ -266,7 +279,7 @@ class SmileLegacyHelper(SmileCommon):
             return data
 
         measurements = DEVICE_MEASUREMENTS
-        if self._is_thermostat and entity_id == self._heater_id:
+        if self._is_thermostat and entity_id == self.heater_id:
             measurements = HEATER_CENTRAL_MEASUREMENTS
 
         if (
@@ -280,7 +293,7 @@ class SmileLegacyHelper(SmileCommon):
 
         # Anna: the Smile outdoor_temperature is present in the Home location
         # For some Anna's LOCATIONS is empty, falling back to domain_objects!
-        if self._is_thermostat and entity_id == self.gateway_id:
+        if self._is_thermostat and entity_id == self._gateway_id:
             locator = f"./location[@id='{self._home_loc_id}']/logs/point_log[type='outdoor_temperature']/period/measurement"
             if (found := self._domain_objects.find(locator)) is not None:
                 value = format_measure(found.text, NONE)
@@ -316,7 +329,7 @@ class SmileLegacyHelper(SmileCommon):
 
     def _appliance_measurements(
         self,
-        appliance: etree,
+        appliance: etree.Element,
         data: GwEntityData,
         measurements: dict[str, DATA | UOM],
     ) -> None:
@@ -345,7 +358,7 @@ class SmileLegacyHelper(SmileCommon):
         self._count = count_data_items(self._count, data)
 
     def _get_actuator_functionalities(
-        self, xml: etree, entity: GwEntityData, data: GwEntityData
+        self, xml: etree.Element, entity: GwEntityData, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data()."""
         for item in ACTIVE_ACTUATORS: