Add definition for 2pv572

Author: nanomad

deebot_client/capabilities.py

@@ -175,9 +175,9 @@ class CapabilityMap:
     clear: CapabilityExecute[[]] | None = None
     major: CapabilityEvent[MajorMapEvent]
     minor: CapabilityExecute[[str, int]]
-    multi_state: CapabilitySetEnable[MultimapStateEvent]
+    multi_state: CapabilitySetEnable[MultimapStateEvent] | None = None
     position: CapabilityEvent[PositionsEvent]
-    relocation: CapabilityExecute[[]]
+    relocation: CapabilityExecute[[]] | None = None
     rooms: CapabilityEvent[RoomsEvent]
     trace: CapabilityEvent[MapTraceEvent]
 
@@ -213,7 +213,7 @@ class CapabilitySettings:
     sweep_mode: CapabilitySetEnable[SweepModeEvent] | None = None
     true_detect: CapabilitySetEnable[TrueDetectEvent] | None = None
     voice_assistant: CapabilitySetEnable[VoiceAssistantStateEvent] | None = None
-    volume: CapabilitySet[VolumeEvent, [int]]
+    volume: CapabilitySet[VolumeEvent, [int]] | None = None
 
 
 @dataclass(frozen=True, kw_only=True)

deebot_client/commands/xml/map.py

@@ -239,7 +239,12 @@ class PullMP(XmlCommandWithMessageHandling):
 
     NAME = "PullMP"
 
-    def __init__(self, *, piece_index: int) -> None:
+    def __init__(
+        self,
+        map_id: str,  # pylint: disable=unused-argument # noqa: ARG002
+        piece_index: int,
+    ) -> None:
+        """Declare the map_id argument not to break compatibility with CapabilityMap."""
         self._piece_index = piece_index
         super().__init__({"pid": str(piece_index)})
 

deebot_client/hardware/deebot/2pv572.py

@@ -0,0 +1,126 @@
+"""2pv572 Capabilities."""
+
+from __future__ import annotations
+
+from deebot_client.capabilities import (
+    Capabilities,
+    CapabilityClean,
+    CapabilityCleanAction,
+    CapabilityCustomCommand,
+    CapabilityEvent,
+    CapabilityExecute,
+    CapabilityLifeSpan,
+    CapabilityMap,
+    CapabilitySettings,
+    CapabilitySetTypes,
+    CapabilityStats,
+    DeviceType,
+)
+from deebot_client.commands.json import GetNetInfoLegacy
+from deebot_client.commands.json.custom import CustomCommand
+from deebot_client.commands.xml import (
+    Charge,
+    Clean,
+    CleanArea,
+    GetBatteryInfo,
+    GetChargerPos,
+    GetCleanLogs,
+    GetCleanSpeed,
+    GetCleanState,
+    GetError,
+    GetLifeSpan,
+    GetMapM,
+    GetMapSt,
+    GetPos,
+    GetTrM,
+    PlaySound,
+    PullMP,
+    ResetLifeSpan,
+    SetCleanSpeed,
+)
+from deebot_client.commands.xml.charge_state import GetChargeState
+from deebot_client.commands.xml.stats import GetCleanSum
+from deebot_client.const import DataType
+from deebot_client.events import (
+    AvailabilityEvent,
+    BatteryEvent,
+    CleanLogEvent,
+    CustomCommandEvent,
+    ErrorEvent,
+    FanSpeedEvent,
+    FanSpeedLevel,
+    LifeSpan,
+    LifeSpanEvent,
+    NetworkInfoEvent,
+    ReportStatsEvent,
+    RoomsEvent,
+    StateEvent,
+    StatsEvent,
+    TotalStatsEvent,
+)
+from deebot_client.events.map import (
+    CachedMapInfoEvent,
+    MajorMapEvent,
+    MapChangedEvent,
+    MapTraceEvent,
+    PositionsEvent,
+)
+from deebot_client.models import StaticDeviceInfo
+from deebot_client.util import short_name
+
+from . import DEVICES
+
+DEVICES[short_name(__name__)] = StaticDeviceInfo(
+    DataType.XML,
+    Capabilities(
+        availability=CapabilityEvent(AvailabilityEvent, []),
+        battery=CapabilityEvent(BatteryEvent, [GetBatteryInfo()]),
+        charge=CapabilityExecute(Charge),
+        clean=CapabilityClean(
+            action=CapabilityCleanAction(command=Clean, area=CleanArea),
+            log=CapabilityEvent(CleanLogEvent, [GetCleanLogs()]),
+        ),
+        custom=CapabilityCustomCommand(
+            event=CustomCommandEvent, get=[], set=CustomCommand
+        ),
+        device_type=DeviceType.VACUUM,
+        error=CapabilityEvent(ErrorEvent, [GetError()]),
+        fan_speed=CapabilitySetTypes(
+            event=FanSpeedEvent,
+            get=[GetCleanSpeed()],
+            set=SetCleanSpeed,
+            types=(
+                FanSpeedLevel.NORMAL,
+                FanSpeedLevel.MAX,
+            ),
+        ),
+        life_span=CapabilityLifeSpan(
+            types=(LifeSpan.BRUSH, LifeSpan.SIDE_BRUSH, LifeSpan.DUST_CASE_HEAP),
+            event=LifeSpanEvent,
+            get=[
+                GetLifeSpan(LifeSpan.BRUSH),
+                GetLifeSpan(LifeSpan.SIDE_BRUSH),
+                GetLifeSpan(LifeSpan.DUST_CASE_HEAP),
+            ],
+            reset=ResetLifeSpan,
+        ),
+        map=CapabilityMap(
+            cached_info=CapabilityEvent(CachedMapInfoEvent, [GetMapSt()]),
+            changed=CapabilityEvent(MapChangedEvent, []),
+            major=CapabilityEvent(MajorMapEvent, [GetMapM()]),
+            minor=CapabilityExecute(PullMP),
+            position=CapabilityEvent(PositionsEvent, [GetPos(), GetChargerPos()]),
+            rooms=CapabilityEvent(RoomsEvent, [GetMapSt()]),
+            trace=CapabilityEvent(MapTraceEvent, [GetTrM()]),
+        ),
+        network=CapabilityEvent(NetworkInfoEvent, [GetNetInfoLegacy()]),
+        play_sound=CapabilityExecute(PlaySound),
+        state=CapabilityEvent(StateEvent, [GetChargeState(), GetCleanState()]),
+        stats=CapabilityStats(
+            clean=CapabilityEvent(StatsEvent, []),
+            report=CapabilityEvent(ReportStatsEvent, []),
+            total=CapabilityEvent(TotalStatsEvent, [GetCleanSum()]),
+        ),
+        settings=CapabilitySettings(),
+    ),
+)

tests/commands/xml/test_map.py

@@ -219,7 +219,7 @@ async def test_PullM_error(xml: str) -> None:
 async def test_PullMP(xml: str, expected_event: MinorMapEvent) -> None:
     json = get_request_xml(xml)
     await assert_command(
-        PullMP(piece_index=1),
+        PullMP(map_id="unused", piece_index=1),
         json,
         expected_event,
         command_result=CommandResult(
@@ -239,7 +239,7 @@ async def test_PullMP(xml: str, expected_event: MinorMapEvent) -> None:
 async def test_PullMP_error(xml: str) -> None:
     json = get_request_xml(xml)
     await assert_command(
-        PullMP(piece_index=1),
+        PullMP(map_id="unused", piece_index=1),
         json,
         None,
         command_result=CommandResult(HandlingState.ANALYSE_LOGGED),