Move preset input-checking to __init__.py, use constants

Author: bouwew

plugwise/__init__.py

@@ -359,6 +359,10 @@ async def set_schedule_state(
 
     async def set_preset(self, loc_id: str, preset: str) -> None:
         """Set the given Preset on the relevant Thermostat."""
+        if (presets := self._presets(loc_id)) is None:
+            raise PlugwiseError("Plugwise: no presets available.")  # pragma: no cover
+        if preset not in list(presets):
+            raise PlugwiseError("Plugwise: invalid preset.")
         try:
             await self._smile_api.set_preset(loc_id, preset)
         except ConnectionFailedError as exc:

plugwise/legacy/smile.py

@@ -18,6 +18,7 @@
     OFF,
     REQUIRE_APPLIANCES,
     RULES,
+    STATE_OFF,
     STATE_ON,
     GwEntityData,
     ThermoLoc,
@@ -168,11 +169,6 @@ 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:
-            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).attrib["id"]
         data = f"<rules><rule id='{rule_id}'><active>true</active></rule></rules>"
@@ -196,7 +192,7 @@ async def set_schedule_state(
         Determined from - DOMAIN_OBJECTS.
         Used in HA Core to set the hvac_mode: in practice switch between schedule on - off.
         """
-        if state not in ("on", "off"):
+        if state not in (STATE_OFF, STATE_ON):
             raise PlugwiseError("Plugwise: invalid schedule state.")
 
         # Handle no schedule-name / Off-schedule provided
@@ -215,7 +211,7 @@ async def set_schedule_state(
             )  # pragma: no cover
 
         new_state = "false"
-        if state == "on":
+        if state == STATE_ON:
             new_state = "true"
 
         locator = f'.//*[@id="{schedule_rule_id}"]/template'

plugwise/smile.py

@@ -22,6 +22,7 @@
     NOTIFICATIONS,
     OFF,
     RULES,
+    STATE_OFF,
     STATE_ON,
     GwEntityData,
     SwitchType,
@@ -201,11 +202,6 @@ async def set_offset(self, dev_id: str, offset: float) -> None:
 
     async def set_preset(self, loc_id: str, preset: str) -> None:
         """Set the given Preset on the relevant Thermostat - from LOCATIONS."""
-        if (presets := self._presets(loc_id)) is None:
-            raise PlugwiseError("Plugwise: no presets available.")  # pragma: no cover
-        if preset not in list(presets):
-            raise PlugwiseError("Plugwise: invalid preset.")
-
         current_location = self._domain_objects.find(f'location[@id="{loc_id}"]')
         location_name = current_location.find("name").text
         location_type = current_location.find("type").text
@@ -311,12 +307,12 @@ async def set_schedule_state(
         Used in HA Core to set the hvac_mode: in practice switch between schedule on - off.
         """
         # Input checking
-        if new_state not in ("on", "off"):
+        if new_state not in (STATE_OFF, STATE_ON):
             raise PlugwiseError("Plugwise: invalid schedule state.")
 
         # Translate selection of Off-schedule-option to disabling the active schedule
         if name == OFF:
-            new_state = "off"
+            new_state = STATE_OFF
 
         # Handle no schedule-name / Off-schedule provided
         if name is None or name == OFF:
@@ -369,10 +365,10 @@ def determine_contexts(
             subject = f'<context><zone><location id="{loc_id}" /></zone></context>'
             subject = etree.fromstring(subject)
 
-        if state == "off":
+        if state == STATE_OFF:
             self._last_active[loc_id] = name
             contexts.remove(subject)
-        if state == "on":
+        if state == STATE_ON:
             contexts.append(subject)
 
         return str(etree.tostring(contexts, encoding="unicode").rstrip())