Extend internal-use selfs

Author: bouwew

plugwise/__init__.py

@@ -69,14 +69,14 @@ def __init__(
         self._elga = False
         self._is_thermostat = False
         self._last_active: dict[str, str | None] = {}
+        self._loc_data: dict[str, ThermoLoc] = {}
         self._on_off_device = False
         self._opentherm_device = False
         self._schedule_old_states: dict[str, dict[str, str]] = {}
         self._smile_api: SmileAPI | SmileLegacyAPI
         self._stretch_v2 = False
         self._target_smile: str = NONE
         self.gateway_id: str = NONE
-        self.loc_data: dict[str, ThermoLoc] = {}
         self.smile_fw_version: Version | None = None
         self.smile_hostname: str = NONE
         self.smile_hw_version: str | None = None
@@ -134,11 +134,11 @@ async def connect(self) -> Version | None:
             self._elga,
             self._is_thermostat,
             self._last_active,
+            self._loc_data,
             self._on_off_device,
             self._opentherm_device,
             self._schedule_old_states,
             self.gateway_id,
-            self.loc_data,
             self.smile_fw_version,
             self.smile_hostname,
             self.smile_hw_version,
@@ -155,11 +155,11 @@ async def connect(self) -> Version | None:
             self._request,
             self._websession,
             self._is_thermostat,
+            self._loc_data,
             self._on_off_device,
             self._opentherm_device,
             self._stretch_v2,
             self._target_smile,
-            self.loc_data,
             self.smile_fw_version,
             self.smile_hostname,
             self.smile_hw_version,

plugwise/data.py

@@ -36,7 +36,7 @@ def _all_entity_data(self) -> None:
         self._update_gw_entities()
         if self.smile(ADAM):
             self._update_zones()
-            self.gw_entities.update(self.zones)
+            self.gw_entities.update(self._zones)
 
         self.gw_data.update(
             {
@@ -55,9 +55,9 @@ def _all_entity_data(self) -> None:
     def _update_zones(self) -> None:
         """Helper-function for _all_entity_data() and async_update().
 
-        Collect data for each zone/location and add to self.zones.
+        Collect data for each zone/location and add to self._zones.
         """
-        for location_id, zone in self.zones.items():
+        for location_id, zone in self._zones.items():
             data = self._get_location_data(location_id)
             zone.update(data)
 
@@ -158,7 +158,7 @@ def _get_location_data(self, loc_id: str) -> GwEntityData:
 
         Provide entity-data, based on Location ID (= loc_id).
         """
-        zone = self.zones[loc_id]
+        zone = self._zones[loc_id]
         data = self._get_zone_data(loc_id)
         if ctrl_state := self._control_state(loc_id):
             data["control_state"] = ctrl_state

plugwise/helper.py

@@ -224,6 +224,7 @@ def __init__(self) -> None:
         self._is_thermostat: bool
         self._last_active: dict[str, str | None]
         self._last_modified: dict[str, str] = {}
+        self._loc_data: dict[str, ThermoLoc]
         self._notifications: dict[str, dict[str, str]] = {}
         self._on_off_device: bool
         self._opentherm_device: bool
@@ -251,7 +252,6 @@ def __init__(self) -> None:
         self.gateway_id: str
         self.gw_data: GatewayData = {}
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.loc_data: dict[str, ThermoLoc]
         self.smile_fw_version: Version | None
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
@@ -261,7 +261,7 @@ def __init__(self) -> None:
         self.smile_type: str
         self.smile_zigbee_mac_address: str | None
         self.therms_with_offset_func: list[str] = []
-        self.zones: dict[str, GwEntityData] = {}
+        self._zones: dict[str, GwEntityData] = {}
         SmileCommon.__init__(self)
 
     def _all_appliances(self) -> None:
@@ -354,11 +354,11 @@ def _all_locations(self) -> None:
             if loc.name == "Home":
                 self._home_location = loc.loc_id
 
-            self.loc_data[loc.loc_id] = {"name": loc.name}
+            self._loc_data[loc.loc_id] = {"name": loc.name}
 
     def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
         """Collect P1 DSMR SmartMeter info."""
-        loc_id = next(iter(self.loc_data.keys()))
+        loc_id = next(iter(self._loc_data.keys()))
         location = self._domain_objects.find(f'./location[@id="{loc_id}"]')
         locator = MODULE_LOCATOR
         module_data = self._get_module_data(location, locator)
@@ -488,7 +488,7 @@ def _get_zone_data(self, loc_id: str) -> GwEntityData:
         Collect the location-data based on location id.
         """
         data: GwEntityData = {"sensors": {}}
-        zone = self.zones[loc_id]
+        zone = self._zones[loc_id]
         measurements = ZONE_MEASUREMENTS
         if (
             location := self._domain_objects.find(f'./location[@id="{loc_id}"]')
@@ -861,7 +861,7 @@ def _scan_thermostats(self) -> None:
 
         for loc_id, loc_data in list(self._thermo_locs.items()):
             if loc_data["primary_prio"] != 0:
-                self.zones[loc_id] = {
+                self._zones[loc_id] = {
                     "dev_class": "climate",
                     "name": loc_data["name"],
                     "thermostats": {"primary": loc_data["primary"], "secondary": loc_data["secondary"]}
@@ -874,7 +874,7 @@ def _match_locations(self) -> dict[str, ThermoLoc]:
         Match appliances with locations.
         """
         matched_locations: dict[str, ThermoLoc] = {}
-        for location_id, location_details in self.loc_data.items():
+        for location_id, location_details in self._loc_data.items():
             for appliance_details in self.gw_entities.values():
                 if appliance_details["location"] == location_id:
                     location_details.update(

plugwise/legacy/helper.py

@@ -68,6 +68,7 @@ def __init__(self) -> None:
         self._home_location: str
         self._is_thermostat: bool
         self._last_modified: dict[str, str] = {}
+        self._loc_data: dict[str, ThermoLoc]
         self._locations: etree
         self._modules: etree
         self._notifications: dict[str, dict[str, str]] = {}
@@ -81,7 +82,6 @@ def __init__(self) -> None:
         self.gateway_id: str
         self.gw_data: GatewayData = {}
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.loc_data: dict[str, ThermoLoc]
         self.smile_fw_version: Version | None
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
@@ -161,7 +161,7 @@ def _all_locations(self) -> None:
         # Legacy Anna without outdoor_temp and Stretches have no locations, create fake location-data
         if not (locations := self._locations.findall("./location")):
             self._home_location = FAKE_LOC
-            self.loc_data[FAKE_LOC] = {"name": "Home"}
+            self._loc_data[FAKE_LOC] = {"name": "Home"}
             return
 
         for location in locations:
@@ -182,7 +182,7 @@ def _all_locations(self) -> None:
                 loc.name = "Home"
                 self._home_location = loc.loc_id
 
-            self.loc_data[loc.loc_id] = {"name": loc.name}
+            self._loc_data[loc.loc_id] = {"name": loc.name}
 
     def _create_legacy_gateway(self) -> None:
         """Create the (missing) gateway entities for legacy Anna, P1 and Stretch.
@@ -251,7 +251,7 @@ def _energy_entity_info_finder(self, appliance: etree, appl: Munch) -> Munch:
 
     def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
         """Collect P1 DSMR Smartmeter info."""
-        loc_id = next(iter(self.loc_data.keys()))
+        loc_id = next(iter(self._loc_data.keys()))
         appl.available = None
         appl.entity_id = loc_id
         appl.location = loc_id

plugwise/legacy/smile.py

@@ -44,11 +44,11 @@ def __init__(
         request: Callable[..., Awaitable[Any]],
         websession: aiohttp.ClientSession,
         _is_thermostat: bool,
+        _loc_data: dict[str, ThermoLoc],
         _on_off_device: bool,
         _opentherm_device: bool,
         _stretch_v2: bool,
         _target_smile: str,
-        loc_data: dict[str, ThermoLoc],
         smile_fw_version: Version | None,
         smile_hostname: str,
         smile_hw_version: str | None,
@@ -65,11 +65,11 @@ def __init__(
 
         self._cooling_present = False
         self._is_thermostat = _is_thermostat
+        self._loc_data = _loc_data
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
         self._stretch_v2 = _stretch_v2
         self._target_smile = _target_smile
-        self.loc_data = loc_data
         self.request = request
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname

plugwise/smile.py

@@ -53,11 +53,11 @@ def __init__(
         _elga: bool,
         _is_thermostat: bool,
         _last_active: dict[str, str | None],
+        _loc_data: dict[str, ThermoLoc],
         _on_off_device: bool,
         _opentherm_device: bool,
         _schedule_old_states: dict[str, dict[str, str]],
         gateway_id: str,
-        loc_data: dict[str, ThermoLoc],
         smile_fw_version: Version | None,
         smile_hostname: str | None,
         smile_hw_version: str | None,
@@ -76,11 +76,11 @@ def __init__(
         self._elga = _elga
         self._is_thermostat = _is_thermostat
         self._last_active = _last_active
+        self._loc_data = _loc_data
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
         self._schedule_old_states = _schedule_old_states
         self.gateway_id = gateway_id
-        self.loc_data = loc_data
         self.request = request
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
@@ -126,7 +126,7 @@ async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
         self.gw_data: GatewayData = {}
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.zones: dict[str, GwEntityData] = {}
+        self._zones: dict[str, GwEntityData] = {}
         try:
             await self.full_xml_update()
             self.get_all_gateway_entities()

tests/test_init.py

@@ -642,7 +642,7 @@ def test_and_assert(test_dict, data, header):
             return  # pragma: no cover
 
         self.entity_list = list(data.entities.keys())
-        location_list = smile.loc_data
+        location_list = smile._loc_data
 
         _LOGGER.info("Gateway id = %s", data.gateway["gateway_id"])
         _LOGGER.info("Hostname = %s", smile.smile_hostname)