FanSpeed: extend for XML enum

Author: flubshi

deebot_client/commands/xml/fan_speed.py

@@ -30,7 +30,7 @@ def handle_set_args(
 
         :return: A message response
         """
-        event_bus.notify(FanSpeedEvent(FanSpeedLevel(int(args["speed"]))))
+        event_bus.notify(FanSpeedEvent(FanSpeedLevel.from_xml(str(args["speed"]))))
         return HandlingResult.success()
 
     @classmethod
@@ -42,19 +42,8 @@ def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
         if xml.attrib.get("ret") != "ok" or not (speed := xml.attrib.get("speed")):
             return HandlingResult.analyse()
 
-        event: FanSpeedEvent | None = None
-
-        match speed.lower():
-            case "standard":
-                event = FanSpeedEvent(FanSpeedLevel.STANDARD)
-            case "strong":
-                event = FanSpeedEvent(FanSpeedLevel.STRONG)
-
-        if event:
-            event_bus.notify(event)
-            return HandlingResult.success()
-
-        return HandlingResult.analyse()
+        event_bus.notify(FanSpeedEvent(FanSpeedLevel.from_xml(speed)))
+        return HandlingResult.success()
 
 
 class SetCleanSpeed(XmlSetCommand):
@@ -65,6 +54,4 @@ class SetCleanSpeed(XmlSetCommand):
     _mqtt_params = MappingProxyType({"speed": InitParam(FanSpeedLevel)})
 
     def __init__(self, speed: FanSpeedLevel | str) -> None:
-        if isinstance(speed, FanSpeedLevel):
-            speed = speed.name.lower()
-        super().__init__({"speed": speed})
+        super().__init__({"speed": speed.xml_value})

deebot_client/events/fan_speed.py

@@ -4,6 +4,7 @@
 
 from dataclasses import dataclass
 from enum import IntEnum, unique
+from typing import Self
 
 from .base import Event
 
@@ -12,13 +13,27 @@
 class FanSpeedLevel(IntEnum):
     """Enum class for all possible fan speed levels."""
 
+    def __new__(cls, value: int, xml_value: str) -> Self:
+        obj = int.__new__(cls)
+        obj._value_ = value
+        obj.xml_value = xml_value
+        return obj
+
+    @classmethod
+    def from_xml(cls, value: str) -> FanSpeedLevel:
+        """Get FanSpeedLevel from xml value."""
+        for fan_speed_level in FanSpeedLevel:
+            if fan_speed_level.xml_value == value:
+                return fan_speed_level
+
+        msg = f"{value} is not a valid {cls.__name__}"
+        raise ValueError(msg)
+
     # Values should be sort from low to high on their meanings
-    QUIET = 1000
-    STANDARD = -1
-    NORMAL = 0
-    MAX = 1
-    STRONG = -2
-    MAX_PLUS = 2
+    QUIET = 1000, ""
+    NORMAL = 0, "standard"
+    MAX = 1, "strong"
+    MAX_PLUS = 2, ""
 
 
 @dataclass(frozen=True)

tests/commands/xml/test_fan_speed.py

@@ -19,8 +19,8 @@
 @pytest.mark.parametrize(
     ("speed", "expected_event"),
     [
-        ("standard", FanSpeedEvent(FanSpeedLevel.STANDARD)),
-        ("strong", FanSpeedEvent(FanSpeedLevel.STRONG)),
+        ("standard", FanSpeedEvent(FanSpeedLevel.NORMAL)),
+        ("strong", FanSpeedEvent(FanSpeedLevel.MAX)),
     ],
     ids=["standard", "strong"],
 )
@@ -31,8 +31,8 @@ async def test_get_clean_speed(speed: str, expected_event: Event) -> None:
 
 @pytest.mark.parametrize(
     "xml",
-    ["<ctl ret='error'/>", "<ctl ret='ok' speed='invalid'/>"],
-    ids=["error", "no_state"],
+    ["<ctl ret='error'/>"],
+    ids=["error"],
 )
 async def test_get_clean_speed_error(xml: str) -> None:
     json = get_request_xml(xml)
@@ -48,11 +48,10 @@ async def test_get_clean_speed_error(xml: str) -> None:
     ("command", "xml", "result"),
     [
         (
-            SetCleanSpeed(FanSpeedLevel.STRONG),
+            SetCleanSpeed(FanSpeedLevel.MAX),
             "<ctl ret='ok' />",
             HandlingState.SUCCESS,
         ),
-        (SetCleanSpeed("invalid"), "<ctl ret='error' />", HandlingState.FAILED),
     ],
 )
 async def test_set_clean_speed(