Don't modify legacy_anna data

Author: bouwew

plugwise/__init__.py

@@ -143,6 +143,7 @@ async def connect(self) -> bool:
             self.smile_fw_version,
             self.smile_hostname,
             self.smile_hw_version,
+            self.smile_legacy,
             self.smile_mac_address,
             self.smile_model,
             self.smile_name,

plugwise/common.py

@@ -52,6 +52,7 @@ def _appl_heater_central_info(
         self,
         appl: Munch,
         xml_1: etree,
+        legacy: bool,
         xml_2: etree = None,
         xml_3: etree = None,
     ) -> Munch:
@@ -85,7 +86,7 @@ def _appl_heater_central_info(
             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_id = module_data["vendor_model"]
+        appl.model_id = module_data["vendor_model"] if not legacy else None
         appl.model = (
             "Generic heater/cooler"
             if self._cooling_present

plugwise/helper.py

@@ -252,6 +252,7 @@ def __init__(self) -> None:
         self.loc_data: dict[str, ThermoLoc]
         self.smile_fw_version: str | None
         self.smile_hw_version: str | None
+        self.smile_legacy: bool
         self.smile_mac_address: str | None
         self.smile_model: str
         self.smile_name: str
@@ -372,7 +373,7 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
                 return self._appl_thermostat_info(appl, appliance)
             case "heater_central":
                 # Collect heater_central device info
-                self._appl_heater_central_info(appl, appliance)
+                self._appl_heater_central_info(appl, appliance, self.smile_legacy)
                 self._appl_dhw_mode_info(appl, appliance)
                 return appl
             case _:

plugwise/legacy/helper.py

@@ -208,7 +208,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
                 return self._appl_thermostat_info(appl, appliance, self._modules)
         # Collect heater_central device info
             case "heater_central":
-                return self._appl_heater_central_info(appl, appliance, self._appliances, self._modules)
+                return self._appl_heater_central_info(appl, appliance, True, self._appliances, self._modules)
         # Collect info from Stretches
             case _:
                 return self._energy_device_info_finder(appliance, appl)

plugwise/smile.py

@@ -60,6 +60,7 @@ def __init__(
         smile_fw_version: str | None,
         smile_hostname: str | None,
         smile_hw_version: str | None,
+        smile_legacy: bool,
         smile_mac_address: str | None,
         smile_model: str,
         smile_name: str,
@@ -76,8 +77,6 @@ def __init__(
             port,
             timeout,
         )
-        SmileData.__init__(self)
-
         self._cooling_present = _cooling_present
         self._elga = _elga
         self._is_thermostat = _is_thermostat
@@ -91,10 +90,12 @@ def __init__(
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
+        self.smile_legacy = smile_legacy
         self.smile_mac_address = smile_mac_address
         self.smile_model = smile_model
         self.smile_name = smile_name
         self.smile_type = smile_type
+        SmileData.__init__(self)
 
         self._heater_id: str
         self._cooling_enabled = False

tests/data/anna/legacy_anna.json

@@ -35,7 +35,6 @@
     "dev_class": "heater_central",
     "location": "0000aaaa0000aaaa0000aaaa0000aa00",
     "model": "Generic heater",
-    "model_id": "4.21",
     "name": "OpenTherm",
     "vendor": "Bosch Thermotechniek B.V.",
     "maximum_boiler_temperature": {

tests/test_legacy_anna.py

@@ -30,7 +30,7 @@ async def test_connect_legacy_anna(self):
 
         await self.device_test(smile, "2020-03-22 00:00:01", testdata)
         assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
-        assert self.device_items == 42
+        assert self.device_items == 41
 
         result = await self.tinker_legacy_thermostat(smile, schedule_on=False)
         assert result