python-roborock 0.4.9__tar.gz → 0.4.11__tar.gz

{python_roborock-0.4.9 → python_roborock-0.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-roborock
-Version: 0.4.9
+Version: 0.4.11
 Summary: 
 License: GPL-3.0-only
 Author: humbertogontijo

{python_roborock-0.4.9 → python_roborock-0.4.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "0.4.9"
+version = "0.4.11"
 description = ""
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"

{python_roborock-0.4.9 → python_roborock-0.4.11}/roborock/api.py

@@ -35,14 +35,14 @@ from .containers import (
     HomeData,
     MultiMapsList,
     SmartWashParameters,
+    RoborockDeviceInfo,
 
 )
 from .roborock_queue import RoborockQueue
 from .typing import (
     RoborockDeviceProp,
     RoborockCommand,
-    RoborockDockSummary,
-    RoborockDeviceInfo,
+    RoborockDockSummary
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -147,7 +147,7 @@ class RoborockClient:
         }
 
     def _encode_msg(self, device_id, request_id, protocol, timestamp, payload, prefix=None) -> bytes:
-        local_key = self.devices_info[device_id].local_key
+        local_key = self.devices_info[device_id].device.local_key
         aes_key = md5bin(encode_timestamp(timestamp) + local_key + self._salt)
         cipher = AES.new(aes_key, AES.MODE_ECB)
         encrypted = cipher.encrypt(pad(payload, AES.block_size))
@@ -173,7 +173,7 @@ class RoborockClient:
 
     async def on_message(self, device_id, msg) -> bool:
         try:
-            data = self._decode_msg(msg, self.devices_info[device_id].local_key)
+            data = self._decode_msg(msg, self.devices_info[device_id].device.local_key)
             protocol = data.get("protocol")
             if protocol == 102 or protocol == 4:
                 payload = json.loads(data.get("payload").decode())
@@ -371,11 +371,14 @@ class RoborockClient:
             )
 
     async def get_multi_maps_list(self, device_id) -> MultiMapsList:
-        multi_maps_list = await self.send_command(
-            device_id, RoborockCommand.GET_MULTI_MAPS_LIST
-        )
-        if isinstance(multi_maps_list, dict):
-            return MultiMapsList(multi_maps_list)
+        try:
+            multi_maps_list = await self.send_command(
+                device_id, RoborockCommand.GET_MULTI_MAPS_LIST
+            )
+            if isinstance(multi_maps_list, dict):
+                return MultiMapsList(multi_maps_list)
+        except RoborockTimeout as e:
+            _LOGGER.error(e)
 
     async def get_map_v1(self, device_id):
         return await self.send_command(device_id, RoborockCommand.GET_MAP_V1)

{python_roborock-0.4.9 → python_roborock-0.4.11}/roborock/cli.py

@@ -8,7 +8,7 @@ import click
 from roborock import RoborockException
 from roborock.api import RoborockApiClient
 from roborock.cloud_api import RoborockMqttClient
-from roborock.containers import LoginData
+from roborock.containers import LoginData, RoborockDeviceInfo
 from roborock.util import run_sync
 
 _LOGGER = logging.getLogger(__name__)
@@ -116,9 +116,9 @@ async def command(ctx, cmd, params):
         await _discover(ctx)
         login_data = context.login_data()
     home_data = login_data.home_data
-    device_map: dict[str, str] = {}
+    device_map: dict[str, RoborockDeviceInfo] = {}
     for device in home_data.devices + home_data.received_devices:
-        device_map[device.duid] = device.local_key
+        device_map[device.duid] = RoborockDeviceInfo({"device": device})
     mqtt_client = RoborockMqttClient(login_data.user_data, device_map)
     await mqtt_client.send_command(home_data.devices[0].duid, cmd, params)
     mqtt_client.__del__()

{python_roborock-0.4.9 → python_roborock-0.4.11}/roborock/cloud_api.py

@@ -9,9 +9,9 @@ from typing import Any
 from urllib.parse import urlparse
 
 import paho.mqtt.client as mqtt
-from roborock.code_mappings import RoborockDockType
 
 from roborock.api import md5hex, md5bin, RoborockClient, SPECIAL_COMMANDS
+from roborock.code_mappings import RoborockDockType
 from roborock.exceptions import (
     RoborockException,
     CommandVacuumError,
@@ -19,10 +19,11 @@ from roborock.exceptions import (
 )
 from .containers import (
     UserData,
+    RoborockDeviceInfo,
 )
 from .roborock_queue import RoborockQueue
 from .typing import (
-    RoborockCommand, RoborockDeviceProp, RoborockDeviceInfo,
+    RoborockCommand, RoborockDeviceProp,
 )
 from .util import run_in_executor
 

{python_roborock-0.4.9 → python_roborock-0.4.11}/roborock/containers.py

@@ -237,6 +237,15 @@ class NetworkInfoField(str, Enum):
     RSSI = "rssi"
 
 
+class RoborockDeviceInfoField(str, Enum):
+    DEVICE = "device"
+    PRODUCT = "product"
+
+
+class RoborockLocalDeviceInfoField(str, Enum):
+    NETWORK_INFO = "network_info"
+
+
 class RoborockBase(dict):
     def __init__(self, data: dict[str, any]) -> None:
         super().__init__()
@@ -248,8 +257,6 @@ class RoborockBase(dict):
 
 
 class Reference(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def region(self) -> str:
@@ -269,8 +276,6 @@ class Reference(RoborockBase):
 
 
 class RRiot(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def user(self) -> str:
@@ -294,8 +299,6 @@ class RRiot(RoborockBase):
 
 
 class UserData(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def uid(self) -> int:
@@ -343,8 +346,6 @@ class UserData(RoborockBase):
 
 
 class LoginData(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def user_data(self) -> UserData:
@@ -364,8 +365,6 @@ class LoginData(RoborockBase):
 
 
 class HomeDataProductSchema(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self):
@@ -397,8 +396,6 @@ class HomeDataProductSchema(RoborockBase):
 
 
 class HomeDataProduct(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self) -> str:
@@ -438,8 +435,6 @@ class HomeDataProduct(RoborockBase):
 
 
 class HomeDataDeviceStatus(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self):
@@ -479,8 +474,6 @@ class HomeDataDeviceStatus(RoborockBase):
 
 
 class HomeDataDevice(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def duid(self) -> str:
@@ -584,8 +577,6 @@ class HomeDataDevice(RoborockBase):
 
 
 class HomeDataRoom(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self):
@@ -597,8 +588,6 @@ class HomeDataRoom(RoborockBase):
 
 
 class HomeData(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self) -> int:
@@ -638,8 +627,6 @@ class HomeData(RoborockBase):
 
 
 class Status(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def msg_ver(self) -> int:
@@ -839,8 +826,6 @@ class Status(RoborockBase):
 
 
 class DNDTimer(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def start_hour(self) -> int:
@@ -864,8 +849,6 @@ class DNDTimer(RoborockBase):
 
 
 class CleanSummary(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def clean_time(self) -> int:
@@ -889,8 +872,6 @@ class CleanSummary(RoborockBase):
 
 
 class CleanRecord(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def begin(self) -> int:
@@ -946,8 +927,6 @@ class CleanRecord(RoborockBase):
 
 
 class Consumable(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def main_brush_work_time(self) -> int:
@@ -983,8 +962,6 @@ class Consumable(RoborockBase):
 
 
 class MultiMapsListMapInfoBakMaps(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def mapflag(self):
@@ -996,8 +973,6 @@ class MultiMapsListMapInfoBakMaps(RoborockBase):
 
 
 class MultiMapsListMapInfo(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def mapflag(self):
@@ -1021,8 +996,6 @@ class MultiMapsListMapInfo(RoborockBase):
 
 
 class MultiMapsList(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def max_multi_map(self) -> int:
@@ -1042,8 +1015,6 @@ class MultiMapsList(RoborockBase):
 
 
 class SmartWashParameters(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def smart_wash(self) -> int:
@@ -1053,22 +1024,40 @@ class SmartWashParameters(RoborockBase):
     def wash_interval(self) -> int:
         return self.get(SmartWashField.WASH_INTERVAL)
 
-class NetworkInfo(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
+class NetworkInfo(RoborockBase):
     @property
     def ssid(self) -> str:
         return self.get(NetworkInfoField.SSID)
+
     @property
     def ip(self) -> str:
         return self.get(NetworkInfoField.IP)
+
     @property
     def mac(self) -> str:
         return self.get(NetworkInfoField.MAC)
+
     @property
     def bssid(self) -> str:
         return self.get(NetworkInfoField.BSSID)
+
     @property
     def rssi(self) -> int:
         return self.get(NetworkInfoField.RSSI)
+
+
+class RoborockDeviceInfo(RoborockBase):
+    @property
+    def device(self) -> HomeDataDevice:
+        return HomeDataDevice(self.get(RoborockDeviceInfoField.DEVICE))
+
+    @property
+    def product(self) -> HomeDataProduct:
+        return HomeDataProduct(self.get(RoborockDeviceInfoField.PRODUCT))
+
+
+class RoborockLocalDeviceInfo(RoborockDeviceInfo):
+    @property
+    def network_info(self) -> NetworkInfo:
+        return NetworkInfo(self.get(RoborockLocalDeviceInfoField.NETWORK_INFO))

{python_roborock-0.4.9 → python_roborock-0.4.11}/roborock/local_api.py

@@ -9,8 +9,9 @@ from typing import Callable, Coroutine, Any
 import async_timeout
 
 from roborock.api import RoborockClient, SPECIAL_COMMANDS
+from roborock.containers import RoborockLocalDeviceInfo
 from roborock.exceptions import RoborockTimeout, CommandVacuumError
-from roborock.typing import RoborockCommand, RoborockLocalDeviceInfo
+from roborock.typing import RoborockCommand
 from roborock.util import get_running_loop_or_create_one
 
 secured_prefix = 199
@@ -39,7 +40,7 @@ class RoborockLocalClient(RoborockClient):
         super().__init__("abc", devices_info)
         self.loop = get_running_loop_or_create_one()
         self.device_listener: dict[str, RoborockSocketListener] = {
-            device_id: RoborockSocketListener(device_info.ip, device_id, self.on_message)
+            device_id: RoborockSocketListener(device_info.network_info.ip, device_id, self.on_message)
             for device_id, device_info in devices_info.items()
         }
         self._mutex = Lock()
@@ -72,6 +73,7 @@ class RoborockLocalClient(RoborockClient):
             _LOGGER.debug(f"id={request_id} Response from {method}: {response}")
             return response
 
+
 class RoborockSocket(socket.socket):
     _closed = None
 
@@ -79,6 +81,7 @@ class RoborockSocket(socket.socket):
     def is_closed(self):
         return self._closed
 
+
 class RoborockSocketListener:
     roborock_port = 58867
 

python_roborock-0.4.11/roborock/offline/offline.py

@@ -0,0 +1,41 @@
+import asyncio
+import logging
+
+from roborock.containers import HomeDataDevice, HomeDataDeviceField, HomeDataProduct, HomeDataProductField, NetworkInfo, \
+    NetworkInfoField
+from roborock.containers import RoborockLocalDeviceInfo
+from roborock.local_api import RoborockLocalClient
+
+local_ip = "<local_ip>"
+local_key = "<local_key>"
+device_id = "<device_id>"
+
+
+async def main():
+    logging_config = {
+        "level": logging.DEBUG
+    }
+    logging.basicConfig(**logging_config)
+    localdevices_info = RoborockLocalDeviceInfo({
+        "device": HomeDataDevice({
+            HomeDataDeviceField.NAME: "test_name",
+            HomeDataDeviceField.DUID: device_id,
+            HomeDataDeviceField.FV: "1",
+            HomeDataDeviceField.LOCAL_KEY: local_key
+        }),
+        "product": HomeDataProduct({
+            HomeDataProductField.MODEL: "test_model"
+        }),
+        "network_info": NetworkInfo({
+            NetworkInfoField.IP: local_ip
+        })})
+    client = RoborockLocalClient({
+        device_id: localdevices_info
+    })
+    await client.async_connect()
+    props = await client.get_prop(device_id)
+    print(props)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

{python_roborock-0.4.9 → python_roborock-0.4.11}/roborock/typing.py

@@ -68,7 +68,7 @@ class RoborockCommand(str, Enum):
     GET_SERVER_TIMER = "get_server_timer"
     GET_CUSTOMIZE_CLEAN_MODE = "get_customize_clean_mode"
     GET_CLEAN_SEQUENCE = "get_clean_sequence"
-    SET_FDS_ENDPOINT = "set_fds_endpoint" # Seems to be logging server
+    SET_FDS_ENDPOINT = "set_fds_endpoint"  # Seems to be logging server
     ENABLE_LOG_UPLOAD = "enable_log_upload"
     APP_WAKEUP_ROBOT = "app_wakeup_robot"
     GET_LED_STATUS = "get_led_status"
@@ -82,21 +82,12 @@ class RoborockCommand(str, Enum):
     SET_CARPET_MODE = "set_carpet_mode"
     GET_CARPET_CLEAN_MODE = "get_carpet_clean_mode"
     SET_CARPET_CLEAN_MODE = "set_carpet_clean_mode"
-    UPD_SERVER_TIMER = "upd_server_timer" # Server timer seems to be with schedules
+    UPD_SERVER_TIMER = "upd_server_timer"  # Server timer seems to be with schedules
     SET_SERVER_TIMER = "set_server_timer"
     APP_GET_INIT_STATUS = "get_init_status"
     SET_APP_TIMEZONE = "set_app_timezone"
     GET_NETWORK_INFO = "get_network_info"
 
-class RoborockDeviceInfo:
-    def __init__(self, local_key: str, model: str):
-        self.local_key = local_key
-        self.model = model
-
-class RoborockLocalDeviceInfo(RoborockDeviceInfo):
-    def __init__(self, local_key: str, model: str, ip: str):
-        super().__init__(local_key, model)
-        self.ip = ip
 
 class RoborockDockSummary:
     def __init__(self, dust_collection_mode: RoborockDockDustCollectionType,

python_roborock-0.4.9/roborock/offline/offline.py

@@ -1,26 +0,0 @@
-import asyncio
-import logging
-
-from roborock.local_api import RoborockLocalClient
-from roborock.typing import RoborockLocalDeviceInfo
-
-local_ip = "<local_ip>"
-local_key = "<local_key>"
-device_id = "<device_id>"
-
-
-async def main():
-    logging_config = {
-        "level": logging.DEBUG
-    }
-    logging.basicConfig(**logging_config)
-    client = RoborockLocalClient({
-        device_id: RoborockLocalDeviceInfo(local_key, "model_test", local_ip)
-    })
-    await client.async_connect()
-    props = await client.get_prop(device_id)
-    print(props)
-
-
-if __name__ == "__main__":
-    asyncio.run(main())