Use default inputs for actual

Author: bouwew

plugwise/common.py

@@ -17,6 +17,7 @@ class SmileCommon:
     def __init__(self) -> None:
         """Init."""
         self._appliances: etree
+        self._domain_objects: etree
         self._cooling_present: bool
         self._heater_id: str
         self._on_off_device: bool
@@ -27,11 +28,12 @@ def smile(self, name: str) -> bool:
         """Helper-function checking the smile-name."""
         return self.smile_name == name
 
-    def _appl_thermostat_info(self, xml_1: etree, xml_2: etree, appl: Munch) -> Munch:
+    def _appl_thermostat_info(self, appl: Munch, xml_1: etree, xml_2: etree = None) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         locator = "./logs/point_log[type='thermostat']/thermostat"
         mod_type = "thermostat"
-        module_data = self._get_module_data(xml_1, xml_2, locator, mod_type)
+        xml_2 = xml_2 or self._domain_objects
+        module_data = self._get_module_data(xml_1, locator, mod_type, xml_2)
         appl.vendor_name = module_data["vendor_name"]
         appl.model = check_model(module_data["vendor_model"], appl.vendor_name)
         appl.hardware = module_data["hardware_version"]
@@ -42,19 +44,19 @@ def _appl_thermostat_info(self, xml_1: etree, xml_2: etree, appl: Munch) -> Munc
 
     def _appl_heater_central_info(
         self,
+        appl: Munch,
         xml_1: etree,
-        xml_2: etree,
-        xml_3: etree,
-        appl: Munch
+        xml_2: etree = None,
+        xml_3: etree = None,
     ) -> Munch:
         """Helper-function for _appliance_info_finder()."""
         # Remove heater_central when no active device present
         if not self._opentherm_device and not self._on_off_device:
             return None
 
         # Find the valid heater_central
-        # xml_1: self._appliances for legacy, self._domain_objects for actual
-        self._heater_id = check_heater_central(xml_1)
+        # xml_2 self._appliances for legacy, self._domain_objects for actual
+        self._heater_id = check_heater_central(xml_2 or self._domain_objects)
 
         #  Info for On-Off device
         if self._on_off_device:
@@ -68,11 +70,12 @@ def _appl_heater_central_info(
         locator_1 = "./logs/point_log[type='flame_state']/boiler_state"
         locator_2 = "./services/boiler_state"
         mod_type = "boiler_state"
-        # xml_2: appliance
+        # xml_1: appliance
         # xml_3: self._modules for legacy, self._domain_objects for actual
-        module_data = self._get_module_data(xml_2, xml_3, locator_1, mod_type)
+        xml_3 = xml_3 or self._domain_objects
+        module_data = self._get_module_data(xml_1, locator_1, mod_type, xml_3)
         if not module_data["contents"]:
-            module_data = self._get_module_data(xml_2, xml_3, locator_2, mod_type)
+            module_data = self._get_module_data(xml_1, locator_2, mod_type, xml_3)
         appl.vendor_name = module_data["vendor_name"]
         appl.hardware = module_data["hardware_version"]
         appl.model = module_data["vendor_model"]
@@ -86,7 +89,12 @@ def _appl_heater_central_info(
         return appl
 
     def _get_module_data(
-        self, xml_1: etree, xml_2: etree, locator: str, mod_type: str, legacy:bool=False,
+        self,
+        xml_1: etree,
+        locator: str,
+        mod_type: str,
+        xml_2: etree = None,
+        legacy: bool = False,
     ) -> ModelData:
         """Helper-function for _energy_device_info_finder() and _appliance_info_finder().
 
@@ -109,7 +117,8 @@ def _get_module_data(
                 loc = f".//{mod_type}[@id='{link_id}']...."
             # Not possible to walrus for some reason...
             # xml_2: self._modules for legacy, self._domain_objects for actual
-            module = xml_2.find(loc)
+            search = xml_2 or self._domain_objects
+            module = search.find(loc)
             if module is not None:  # pylint: disable=consider-using-assignment-expr
                 model_data["contents"] = True
                 get_vendor_name(module, model_data)

plugwise/helper.py

@@ -268,7 +268,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
         if self.smile_type == "power":
             locator = "./logs/point_log/electricity_point_meter"
             mod_type = "electricity_point_meter"
-            module_data = self._get_module_data(appliance, self._domain_objects, locator, mod_type)
+            module_data = self._get_module_data(appliance, locator, mod_type)
             appl.hardware = module_data["hardware_version"]
             appl.model = module_data["vendor_model"]
             appl.vendor_name = module_data["vendor_name"]
@@ -279,7 +279,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
         if self.smile(ADAM):
             locator = "./logs/interval_log/electricity_interval_meter"
             mod_type = "electricity_interval_meter"
-            module_data = self._get_module_data(appliance, self._domain_objects, locator, mod_type)
+            module_data = self._get_module_data(appliance, locator, mod_type)
             # Filter appliance without zigbee_mac, it's an orphaned device
             appl.zigbee_mac = module_data["zigbee_mac_address"]
             if appl.zigbee_mac is None:
@@ -294,7 +294,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
 
         return appl  # pragma: no cover
 
-    def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
+    def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
         """Collect device info (Smile/Stretch, Thermostats, OpenTherm/On-Off): firmware, model and vendor name."""
         # Collect gateway device info
         if appl.pwclass == "gateway":
@@ -334,11 +334,11 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
 
         # Collect thermostat device info
         if appl.pwclass in THERMOSTAT_CLASSES:
-            return self._appl_thermostat_info(appliance, self._domain_objects, appl)
+            return self._appl_thermostat_info(appl, appliance)
 
         # Collect extra heater_central device info
         if appl.pwclass == "heater_central":
-            appl = self._appl_heater_central_info(self._domain_objects, appliance, self._domain_objects, appl)
+            appl = self._appl_heater_central_info(appl, appliance)
             # Anna + Loria: collect dhw control operation modes
             dhw_mode_list: list[str] = []
             locator = "./actuator_functionalities/domestic_hot_water_mode_control_functionality"
@@ -420,7 +420,7 @@ def _all_appliances(self) -> None:
 
             # Determine class for this appliance
             # Skip on heater_central when no active device present
-            if not (appl := self._appliance_info_finder(appliance, appl)):
+            if not (appl := self._appliance_info_finder(appl, appliance)):
                 continue
 
             # Skip orphaned heater_central (Core Issue #104433)
@@ -634,12 +634,12 @@ def _wireless_availability(self, appliance: etree, data: DeviceData) -> None:
             # Collect for Plugs
             locator = "./logs/interval_log/electricity_interval_meter"
             mod_type = "electricity_interval_meter"
-            module_data = self._get_module_data(appliance, self._domain_objects, locator, mod_type)
+            module_data = self._get_module_data(appliance, locator, mod_type)
             if module_data["reachable"] is None:
                 # Collect for wireless thermostats
                 locator = "./logs/point_log[type='thermostat']/thermostat"
                 mod_type = "thermostat"
-                module_data = self._get_module_data(appliance, self._domain_objects, locator, mod_type)
+                module_data = self._get_module_data(appliance, locator, mod_type)
 
             if module_data["reachable"] is not None:
                 data["available"] = module_data["reachable"]

plugwise/legacy/helper.py

@@ -136,7 +136,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch:
             locator = "./services/electricity_point_meter"
             mod_type = "electricity_point_meter"
 
-            module_data = self._get_module_data(appliance, self._modules, locator, mod_type, legacy=True)
+            module_data = self._get_module_data(appliance, locator, mod_type, 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":
@@ -158,11 +158,11 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
         """Collect device info (Smile/Stretch, Thermostats, OpenTherm/On-Off): firmware, model and vendor name."""
         # Collect thermostat device info
         if appl.pwclass in THERMOSTAT_CLASSES:
-            return self._appl_thermostat_info(appliance, self._modules, appl)
+            return self._appl_thermostat_info(appl, appliance, self._modules)
 
         # Collect heater_central device info
         if appl.pwclass == "heater_central":
-            return self._appl_heater_central_info(self._appliances, appliance, self._modules, appl)
+            return self._appl_heater_central_info(appl, appliance, self._appliances, self._modules)
 
         # Collect info from Stretches
         appl = self._energy_device_info_finder(appliance, appl)