Re-enable show_setup()

Author: bouwew

plugwise/__init__.py

@@ -15,6 +15,7 @@
     STATUS,
     SYSTEM,
     PlugwiseData,
+    ThermoLoc,
 )
 from plugwise.exceptions import (
     InvalidSetupError,
@@ -76,6 +77,7 @@ def __init__(
         self._stretch_v2 = False
         self._stretch_v3 = False
         self._target_smile: str
+        self.loc_data: dict[str, ThermoLoc] = {}
         self.smile_fw_version: str | None
         self.smile_hostname: str
         self.smile_hw_version: str | None = None
@@ -133,6 +135,7 @@ async def connect(self) -> bool:
             self._opentherm_device,
             self._schedule_old_states,
             self._target_smile,
+            self.loc_data,
             self.smile_fw_version,
             self.smile_hostname,
             self.smile_hw_version,
@@ -158,6 +161,7 @@ async def connect(self) -> bool:
                 self._stretch_v2,
                 self._stretch_v3,
                 self._target_smile,
+                self.loc_data,
                 self.smile_fw_version,
                 self.smile_hostname,
                 self.smile_hw_version,

plugwise/helper.py

@@ -231,7 +231,6 @@ def __init__(self) -> None:
         self._is_thermostat = False
         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 = False
         self._opentherm_device = False
@@ -263,6 +262,7 @@ def __init__(self) -> None:
         self.gateway_id: str
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
+        self.loc_data: dict[str, ThermoLoc]
         self.smile_fw_version: str | None = None
         self.smile_hw_version: str | None = None
         self.smile_mac_address: str | None = None
@@ -286,7 +286,7 @@ 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 _get_module_data(
         self, appliance: etree, locator: str, mod_type: str
@@ -491,7 +491,7 @@ def _check_heater_central(self) -> str:
 
     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.dev_id = self.gateway_id
         appl.location = loc_id
         appl.mac = None
@@ -1039,7 +1039,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_devices.values():
                 if appliance_details["location"] == location_id:
                     location_details.update(

plugwise/legacy/helper.py

@@ -93,7 +93,6 @@ def __init__(self) -> None:
         self._last_active: dict[str, str | None] = {}
         self._last_modified: dict[str, str] = {}
         self._locations: etree
-        self._loc_data: dict[str, ThermoLoc] = {}
         self._modules: etree
         self._notifications: dict[str, dict[str, str]] = {}
         self._on_off_device = False
@@ -109,6 +108,7 @@ def __init__(self) -> None:
         self.gateway_id: str
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
+        self.loc_data: dict[str, ThermoLoc]
         self.smile_fw_version: str | None = None
         self.smile_hw_version: str | None = None
         self.smile_legacy = False
@@ -130,7 +130,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:
@@ -151,7 +151,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 _get_module_data(
         self, appliance: etree, locator: str, mod_type: str
@@ -300,7 +300,7 @@ def _check_heater_central(self) -> str:
 
     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.dev_id = loc_id
         appl.location = loc_id
         appl.mac = None

plugwise/legacy/smile.py

@@ -21,6 +21,7 @@
     DeviceData,
     GatewayData,
     PlugwiseData,
+    ThermoLoc,
 )
 from plugwise.exceptions import PlugwiseError
 from plugwise.helper import SmileComm
@@ -47,6 +48,7 @@ def __init__(
         _stretch_v2: bool,
         _stretch_v3: bool,
         _target_smile: str,
+        loc_data: dict[str, ThermoLoc],
         smile_fw_version: str | None,
         smile_hostname: str,
         smile_hw_version: str | None,
@@ -79,6 +81,7 @@ def __init__(
         self._stretch_v2 = _stretch_v2
         self._stretch_v3 = _stretch_v3
         self._target_smile = _target_smile
+        self.loc_data = loc_data
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version

plugwise/smile.py

@@ -23,6 +23,7 @@
     DeviceData,
     GatewayData,
     PlugwiseData,
+    ThermoLoc,
 )
 from plugwise.data import SmileData
 from plugwise.exceptions import PlugwiseError
@@ -54,6 +55,7 @@ def __init__(
         _opentherm_device: bool,
         _schedule_old_states: dict[str, dict[str, str]],
         _target_smile: str | None,
+        loc_data: dict[str, ThermoLoc],
         smile_fw_version: str | None,
         smile_hostname: str | None,
         smile_hw_version: str | None,
@@ -87,6 +89,7 @@ def __init__(
         self._opentherm_device = _opentherm_device
         self._schedule_old_states = _schedule_old_states
         self._target_smile = _target_smile
+        self.loc_data = loc_data
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version

tests/test_init.py

@@ -535,7 +535,6 @@ def show_setup(location_list, device_list):
                     )
             if device_count == 0:  # pragma: no cover
                 _LOGGER.info("      ! no devices found in this location")
-                assert False
 
     @pytest.mark.asyncio
     async def device_test(
@@ -590,14 +589,13 @@ async def device_test(
             return  # pragma: no cover
 
         self.device_list = list(data.devices.keys())
-        # _temp_list = [d["location"] for d in self.device_list if "location" in d]
-        # location_list = list(dict.fromkeys(_temp_list))
+        location_list = smile.loc_data
 
         _LOGGER.info("Gateway id = %s", data.gateway["gateway_id"])
         _LOGGER.info("Hostname = %s", smile.smile_hostname)
         _LOGGER.info("Gateway data = %s", data.gateway)
         _LOGGER.info("Device list = %s", data.devices)
-        # self.show_setup(location_list, data.devices)
+        self.show_setup(location_list, data.devices)
 
         # Perform tests and asserts
         tests = 0