python-roborock 0.6.13__tar.gz → 0.6.15__tar.gz

{python_roborock-0.6.13 → python_roborock-0.6.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-roborock
-Version: 0.6.13
+Version: 0.6.15
 Summary: A package to control Roborock vacuums.
 Home-page: https://github.com/humbertogontijo/python-roborock
 License: GPL-3.0-only

{python_roborock-0.6.13 → python_roborock-0.6.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "0.6.13"
+version = "0.6.15"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"

{python_roborock-0.6.13 → python_roborock-0.6.15}/roborock/api.py

@@ -40,6 +40,7 @@ from .exceptions import RoborockException, RoborockTimeout, VacuumError
 from .roborock_future import RoborockFuture
 from .roborock_message import RoborockMessage
 from .typing import RoborockCommand, RoborockDeviceProp, RoborockDockSummary
+from .util import unpack_list
 
 _LOGGER = logging.getLogger(__name__)
 QUEUE_TIMEOUT = 4
@@ -190,6 +191,14 @@ class RoborockClient:
             clean_summary = await self.send_command(device_id, RoborockCommand.GET_CLEAN_SUMMARY)
             if isinstance(clean_summary, dict):
                 return CleanSummary.from_dict(clean_summary)
+            elif isinstance(clean_summary, list):
+                clean_time, clean_area, clean_count, records = unpack_list(clean_summary, 4)
+                return CleanSummary(
+                    clean_time=clean_time,
+                    clean_area=clean_area,
+                    clean_count=clean_count,
+                    records=records
+                )
             elif isinstance(clean_summary, int):
                 return CleanSummary(clean_time=clean_summary)
         except RoborockTimeout as e:
@@ -244,6 +253,7 @@ class RoborockClient:
     async def get_dock_summary(self, device_id: str, dock_type: RoborockEnum) -> RoborockDockSummary | None:
         """Gets the status summary from the dock with the methods available for a given dock.
 
+        :param device_id: Device id
         :param dock_type: RoborockDockTypeCode"""
         try:
             commands: list[
@@ -258,9 +268,7 @@ class RoborockClient:
                     self.get_wash_towel_mode(device_id),
                     self.get_smart_wash_params(device_id),
                 ]
-            [dust_collection_mode, wash_towel_mode, smart_wash_params] = (
-                list(await asyncio.gather(*commands)) + [None, None]
-            )[:3]
+            [dust_collection_mode, wash_towel_mode, smart_wash_params] = unpack_list(list(await asyncio.gather(*commands)), 3)
 
             return RoborockDockSummary(dust_collection_mode, wash_towel_mode, smart_wash_params)
         except RoborockTimeout as e:

{python_roborock-0.6.13 → python_roborock-0.6.15}/roborock/containers.py

@@ -25,6 +25,8 @@ from .code_mappings import (
 
 def camelize(s: str):
     first, *others = s.split("_")
+    if len(others) == 0:
+        return s
     return "".join([first.lower(), *map(str.title, others)])
 
 
@@ -32,19 +34,27 @@ def decamelize(s: str):
     return re.sub("([A-Z]+)", "_\\1", s).lower()
 
 
-def decamelize_obj(d: dict | list):
+def decamelize_obj(d: dict | list, ignore_keys: list[str]):
     if isinstance(d, list):
-        return [decamelize_obj(i) if isinstance(i, (dict, list)) else i for i in d]
-    return {decamelize(a): decamelize_obj(b) if isinstance(b, (dict, list)) else b for a, b in d.items()}
+        return [decamelize_obj(i, ignore_keys) if isinstance(i, (dict, list)) else i for i in d]
+    return {
+        (decamelize(a) if a not in ignore_keys else a): decamelize_obj(b, ignore_keys)
+        if isinstance(b, (dict, list))
+        else b
+        for a, b in d.items()
+    }
 
 
 @dataclass
 class RoborockBase:
+    _ignore_keys = []  # type: ignore
+
     @classmethod
     def from_dict(cls, data: dict[str, Any]):
-        return from_dict(cls, decamelize_obj(data), config=Config(cast=[Enum]))
+        ignore_keys = cls._ignore_keys
+        return from_dict(cls, decamelize_obj(data, ignore_keys), config=Config(cast=[Enum]))
 
-    def as_dict(self):
+    def as_dict(self) -> dict:
         return asdict(
             self,
             dict_factory=lambda _fields: {camelize(key): value for (key, value) in _fields if value is not None},
@@ -277,7 +287,9 @@ class MultiMapsListMapInfoBakMaps(RoborockBase):
 
 @dataclass
 class MultiMapsListMapInfo(RoborockBase):
-    mapflag: Optional[Any] = None
+    _ignore_keys = ["mapFlag"]
+
+    mapFlag: Optional[Any] = None
     add_time: Optional[Any] = None
     length: Optional[Any] = None
     name: Optional[Any] = None
@@ -286,6 +298,8 @@ class MultiMapsListMapInfo(RoborockBase):
 
 @dataclass
 class MultiMapsList(RoborockBase):
+    _ignore_keys = ["mapFlag"]
+
     max_multi_map: Optional[int] = None
     max_bak_map: Optional[int] = None
     multi_map_count: Optional[int] = None

{python_roborock-0.6.13 → python_roborock-0.6.15}/roborock/roborock_message.py

@@ -60,7 +60,7 @@ class RoborockMessage:
                     return data_point_response.get("method")
         return None
 
-    def get_params(self) -> list | None:
+    def get_params(self) -> list | dict | None:
         protocol = self.protocol
         if protocol in [4, 101, 102]:
             payload = json.loads(self.payload.decode())

{python_roborock-0.6.13 → python_roborock-0.6.15}/roborock/typing.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import typing
+from typing import Optional
 from dataclasses import dataclass
 from enum import Enum
 
@@ -117,6 +117,12 @@ class RoborockCommand(str, Enum):
     GET_ROOM_MAPPING = "get_room_mapping"
     NAME_SEGMENT = "name_segment"
     SET_TIMEZONE = "set_timezone"
+    GET_HOMESEC_CONNECT_STATUS = "get_homesec_connect_status"
+    START_CAMERA_PREVIEW = "start_camera_preview"
+    GET_TURN_SERVER = "get_turn_server"
+    GET_DEVICE_ICE = "get_device_ice"
+    START_VOICE_CHAT = "start_voice_chat"
+    SEND_SDP_TO_ROBOT = "send_sdp_to_robot"
 
 
 @dataclass
@@ -200,7 +206,11 @@ CommandInfoMap: dict[RoborockCommand, CommandInfo] = {
     RoborockCommand.SET_SERVER_TIMER: CommandInfo(prefix=b"\x00\x00\x00\xc7"),
     RoborockCommand.GET_ROOM_MAPPING: CommandInfo(prefix=b"\x00\x00\x00w"),
     RoborockCommand.NAME_SEGMENT: CommandInfo(prefix=b"\x00\x00\x027"),
-    RoborockCommand.SET_TIMEZONE: CommandInfo(prefix=b"\x00\x00\x00\x97")
+    RoborockCommand.SET_TIMEZONE: CommandInfo(prefix=b"\x00\x00\x00\x97"),
+    RoborockCommand.GET_HOMESEC_CONNECT_STATUS: CommandInfo(prefix=b"\x00\x00\x00\x87"),
+    RoborockCommand.START_CAMERA_PREVIEW: CommandInfo(prefix=b"\x00\x00\x00\x87"),
+    RoborockCommand.GET_TURN_SERVER: CommandInfo(prefix=b"\x00\x00\x00\x77"),
+    RoborockCommand.GET_DEVICE_ICE: CommandInfo(prefix=b"\x00\x00\x00\x77"),
     # TODO discover prefix for following commands
     # RoborockCommand.APP_GET_DRYER_SETTING: CommandInfo(prefix=b'\x00\x00\x00w'),
     # RoborockCommand.APP_SET_DRYER_SETTING: CommandInfo(prefix=b'\x00\x00\x00w'),
@@ -214,26 +224,21 @@ CommandInfoMap: dict[RoborockCommand, CommandInfo] = {
 }
 
 
+@dataclass
 class RoborockDockSummary:
-    def __init__(
-        self,
-        dust_collection_mode: DustCollectionMode,
-        wash_towel_mode: WashTowelMode,
-        smart_wash_params: SmartWashParams,
-    ) -> None:
-        self.dust_collection_mode = dust_collection_mode
-        self.wash_towel_mode = wash_towel_mode
-        self.smart_wash_params = smart_wash_params
+    dust_collection_mode: Optional[DustCollectionMode] = None
+    wash_towel_mode: Optional[WashTowelMode] = None
+    smart_wash_params: Optional[SmartWashParams] = None
 
 
 @dataclass
 class RoborockDeviceProp:
-    status: typing.Optional[Status] = None
-    dnd_timer: typing.Optional[DNDTimer] = None
-    clean_summary: typing.Optional[CleanSummary] = None
-    consumable: typing.Optional[Consumable] = None
-    last_clean_record: typing.Optional[CleanRecord] = None
-    dock_summary: typing.Optional[RoborockDockSummary] = None
+    status: Optional[Status] = None
+    dnd_timer: Optional[DNDTimer] = None
+    clean_summary: Optional[CleanSummary] = None
+    consumable: Optional[Consumable] = None
+    last_clean_record: Optional[CleanRecord] = None
+    dock_summary: Optional[RoborockDockSummary] = None
 
     def update(self, device_prop: "RoborockDeviceProp"):
         if device_prop.status:

{python_roborock-0.6.13 → python_roborock-0.6.15}/roborock/util.py

@@ -1,7 +1,14 @@
+from __future__ import annotations
+
 import asyncio
 import functools
 from asyncio import AbstractEventLoop
+from typing import TypeVar
+
+T = TypeVar("T")
 
+def unpack_list(value: list[T], size: int) -> list[T | None]:
+    return (value + [None] * size)[:size]
 
 def get_running_loop_or_create_one() -> AbstractEventLoop:
     try: