Change are param of CleanArea to list of int or float (#1449)

Author: edenhaus

deebot_client/capabilities.py

@@ -141,7 +141,7 @@ class CapabilityCleanAction:
     """Capabilities for clean action."""
 
     command: Callable[[CleanAction], Command]
-    area: Callable[[CleanMode, str, int], Command] | None = None
+    area: Callable[[CleanMode, list[int | float], int], Command] | None = None
 
 
 @dataclass(frozen=True, kw_only=True)

deebot_client/commands/json/clean.py

@@ -58,10 +58,12 @@ def _get_args(self, action: CleanAction) -> dict[str, Any]:
 class CleanArea(Clean):
     """Clean area command."""
 
-    def __init__(self, mode: CleanMode, area: str, cleanings: int = 1) -> None:
+    def __init__(
+        self, mode: CleanMode, area: list[int | float], cleanings: int = 1
+    ) -> None:
         self._additional_args = {
             "type": mode.value,
-            "content": area,
+            "content": ",".join(str(i) for i in area),
             "count": cleanings,
         }
         super().__init__(CleanAction.START)
@@ -92,8 +94,11 @@ def _get_args(self, action: CleanAction) -> dict[str, Any]:
 class CleanAreaV2(CleanV2):
     """Clean area command."""
 
-    def __init__(self, mode: CleanMode, area: str, _: int = 1) -> None:
-        self._additional_content = {"type": mode.value, "value": area}
+    def __init__(self, mode: CleanMode, area: list[int | float], _: int = 1) -> None:
+        self._additional_content = {
+            "type": mode.value,
+            "value": ",".join(str(i) for i in area),
+        }
         super().__init__(CleanAction.START)
 
     def _get_args(self, action: CleanAction) -> dict[str, Any]:

deebot_client/commands/xml/clean.py

@@ -49,14 +49,17 @@ class CleanArea(Clean):
     def __init__(
         self,
         mode: CleanMode,
-        area_or_coordinates: str,
+        area_or_coordinates: list[int | float],
         cleanings: int = 1,
     ) -> None:
         key = "mid" if mode == CleanMode.SPOT_AREA else "p"
         super().__init__(
             CleanAction.START,
             mode=mode,
-            additional_args={"deep": str(cleanings), key: area_or_coordinates},
+            additional_args={
+                "deep": str(cleanings),
+                key: ",".join(str(i) for i in area_or_coordinates),
+            },
         )
 
 

tests/commands/json/test_clean.py

@@ -110,15 +110,15 @@ async def test_Clean_act(
     ("command", "args"),
     [
         (
-            CleanArea(CleanMode.SPOT_AREA, "5,8"),
+            CleanArea(CleanMode.SPOT_AREA, [5, 8]),
             {"act": "start", "type": "spotArea", "content": "5,8", "count": 1},
         ),
         (
-            CleanAreaV2(CleanMode.SPOT_AREA, "5,8"),
+            CleanAreaV2(CleanMode.SPOT_AREA, [5, 8]),
             {"act": "start", "content": {"type": "spotArea", "value": "5,8"}},
         ),
         (
-            CleanArea(CleanMode.CUSTOM_AREA, "1580.0,-4087.0,3833.0,-7525.0"),
+            CleanArea(CleanMode.CUSTOM_AREA, [1580.0, -4087.0, 3833.0, -7525.0]),
             {
                 "act": "start",
                 "type": "customArea",
@@ -127,7 +127,7 @@ async def test_Clean_act(
             },
         ),
         (
-            CleanAreaV2(CleanMode.CUSTOM_AREA, "1580.0,-4087.0,3833.0,-7525.0"),
+            CleanAreaV2(CleanMode.CUSTOM_AREA, [1580.0, -4087.0, 3833.0, -7525.0]),
             {
                 "act": "start",
                 "content": {

tests/commands/xml/test_clean.py

@@ -32,8 +32,8 @@ async def test_Clean(command: Clean) -> None:
 @pytest.mark.parametrize(
     "command",
     [
-        CleanArea(CleanMode.SPOT_AREA, "4", 1),
-        CleanArea(CleanMode.CUSTOM_AREA, "1580.0,-4087.0,3833.0,-7525.0"),
+        CleanArea(CleanMode.SPOT_AREA, [4], 1),
+        CleanArea(CleanMode.CUSTOM_AREA, [1580.0, -4087.0, 3833.0, -7525.0]),
     ],
 )
 async def test_CleanArea(command: CleanArea) -> None: