Improve error-handling as suggested

Author: bouwew

plugwise/legacy/helper.py

@@ -393,7 +393,11 @@ def _presets(self) -> dict[str, list[float]]:
         """Helper-function for presets() - collect Presets for a legacy Anna."""
         presets: dict[str, list[float]] = {}
         for directive in self._domain_objects.findall("rule/directives/when/then"):
-            if directive is not None and directive.get("icon") is not None:
+            if (
+                directive is not None
+                and directive.get("icon") is not None
+                and directive.get("temperature") is not None
+            ):
                 # Ensure list of heating_setpoint, cooling_setpoint
                 presets[directive.get("icon")] = [
                     float(directive.get("temperature")),

plugwise/legacy/smile.py

@@ -152,13 +152,15 @@ async def set_offset(self, dev_id: str, offset: float) -> None:
 
     async def set_preset(self, _: str, preset: str) -> None:
         """Set the given Preset on the relevant Thermostat - from DOMAIN_OBJECTS."""
-        if (presets := self._presets()) is None:
+        if not (presets := self._presets()):
             raise PlugwiseError("Plugwise: no presets available.")  # pragma: no cover
         if preset not in list(presets):
             raise PlugwiseError("Plugwise: invalid preset.")
 
         locator = f'rule/directives/when/then[@icon="{preset}"].../.../...'
-        rule_id = self._domain_objects.find(locator).get("id")
+        if (rule_id := self._domain_objects.find(locator).get("id")) is None:
+            raise PlugwiseError("Plugwise: no preset id found.")  # pragma: no cover
+
         data = f"<rules><rule id='{rule_id}'><active>true</active></rule></rules>"
         await self.call_request(RULES, method="put", data=data)
 

plugwise/util.py

@@ -82,30 +82,36 @@ def check_heater_central(xml: etree.Element) -> str:
     for a system that has two heater_central appliances.
     """
     locator = "./appliance[type='heater_central']"
-    hc_count = 0
-    hc_list: list[dict[str, bool]] = []
+    heater_central_count = 0
+    heater_central_list: list[dict[str, bool]] = []
     for heater_central in xml.findall(locator):
-        hc_count += 1
-        hc_id: str = heater_central.get("id")
-        has_actuators: bool = (
-            heater_central.find("actuator_functionalities/") is not None
-        )
+        if not heater_central:
+            continue  # pragma: no cover
+
+        heater_central_count += 1
+        if (heater_central_id := heater_central.get("id")) is None:
+            continue  # pragma: no cover
+
+        has_actuators = heater_central.find("actuator_functionalities/") is not None
         # Filter for Plug/Circle/Stealth heater_central -- Pw-Beta Issue #739
-        if heater_central.find("name").text == "Central heating boiler":
-            hc_list.append({hc_id: has_actuators})
+        if (heater_central_name := heater_central.find("name")) is None:
+            continue  # pragma: no cover
+
+        if heater_central_name.text == "Central heating boiler":
+            heater_central_list.append({heater_central_id: has_actuators})
 
-    if not hc_list:
+    if not heater_central_list:
         return NONE  # pragma: no cover
 
-    heater_central_id = list(hc_list[0].keys())[0]
-    if hc_count > 1:
-        for item in hc_list:
-            hc_id, has_actuators = next(iter(item.items()))
+    heater_id = list(heater_central_list[0].keys())[0]
+    if heater_central_count > 1:
+        for item in heater_central_list:
+            heater_central_id, has_actuators = next(iter(item.items()))
             if has_actuators:
-                heater_central_id = hc_id
+                heater_id = heater_central_id
                 break
 
-    return heater_central_id
+    return heater_id
 
 
 def check_model(name: str | None, vendor_name: str | None) -> str | None: