python-roborock 5.7.0__tar.gz → 5.8.0__tar.gz

{python_roborock-5.7.0 → python_roborock-5.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-roborock
-Version: 5.7.0
+Version: 5.8.0
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/python-roborock/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/
@@ -21,7 +21,7 @@ Requires-Dist: click-shell~=2.1
 Requires-Dist: click>=8
 Requires-Dist: construct<3,>=2.10.57
 Requires-Dist: paho-mqtt<3.0.0,>=1.6.1
-Requires-Dist: protobuf<7,>=6.31.1
+Requires-Dist: protobuf<8,>=6.31.1
 Requires-Dist: pycryptodomex~=3.18; sys_platform == 'darwin'
 Requires-Dist: pycryptodome~=3.18
 Requires-Dist: pyrate-limiter<5,>=4.0.0

{python_roborock-5.7.0 → python_roborock-5.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "5.7.0"
+version = "5.8.0"
 description = "A package to control Roborock vacuums."
 authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
 requires-python = ">=3.11, <4"
@@ -25,7 +25,7 @@ dependencies = [
     "pycryptodomex~=3.18 ; sys_platform == 'darwin'",
     "paho-mqtt>=1.6.1,<3.0.0",
     "construct>=2.10.57,<3",
-    "protobuf>=6.31.1,<7",
+    "protobuf>=6.31.1,<8",
     "vacuum-map-parser-roborock",
     "pyrate-limiter>=4.0.0,<5",
     "aiomqtt>=2.5.0,<3",

{python_roborock-5.7.0 → python_roborock-5.8.0}/roborock/data/v1/v1_containers.py

@@ -792,7 +792,7 @@ class AppInitStatusLocalInfo(RoborockBase):
 class AppInitStatus(RoborockBase):
     local_info: AppInitStatusLocalInfo
     feature_info: list[int]
-    new_feature_info: int
+    new_feature_info: int = 0
     new_feature_info_str: str = ""
     new_feature_info_2: int | None = None
     carriage_type: int | None = None

{python_roborock-5.7.0 → python_roborock-5.8.0}/roborock/devices/traits/v1/clean_summary.py

@@ -2,6 +2,7 @@ import logging
 
 from roborock.data import CleanRecord, CleanSummaryWithDetail, RoborockBase
 from roborock.devices.traits.v1 import common
+from roborock.exceptions import RoborockParsingException
 from roborock.roborock_typing import RoborockCommand
 from roborock.util import unpack_list
 
@@ -87,4 +88,12 @@ class CleanSummaryTrait(CleanSummaryWithDetail, common.V1TraitMixin):
     async def get_clean_record(self, record_id: int) -> CleanRecord:
         """Load a specific clean record by ID."""
         response = await self.rpc_channel.send_command(RoborockCommand.GET_CLEAN_RECORD, params=[record_id])
-        return self.clean_record_converter.convert(response)
+        try:
+            return self.clean_record_converter.convert(response)
+        except (TypeError, ValueError) as err:
+            raise RoborockParsingException(
+                trait_name=type(self).__name__,
+                command=RoborockCommand.GET_CLEAN_RECORD,
+                payload=response,
+                inner_error=err,
+            ) from err

{python_roborock-5.7.0 → python_roborock-5.8.0}/roborock/devices/traits/v1/common.py

@@ -9,6 +9,7 @@ from dataclasses import fields
 from typing import ClassVar
 
 from roborock.data import RoborockBase
+from roborock.exceptions import RoborockParsingException
 from roborock.protocols.v1_protocol import V1RpcChannel
 from roborock.roborock_typing import RoborockCommand
 
@@ -63,7 +64,7 @@ class V1TraitMixin(ABC):
 
     def __init__(self) -> None:
         """Initialize the V1TraitMixin."""
-        self._rpc_channel = None
+        self._rpc_channel: V1RpcChannel | None = None
 
     @property
     def rpc_channel(self) -> V1RpcChannel:
@@ -75,7 +76,15 @@ class V1TraitMixin(ABC):
     async def refresh(self) -> None:
         """Refresh the contents of this trait."""
         response = await self.rpc_channel.send_command(self.command)
-        new_data = self.converter.convert(response)
+        try:
+            new_data = self.converter.convert(response)
+        except (TypeError, ValueError) as err:
+            raise RoborockParsingException(
+                trait_name=type(self).__name__,
+                command=self.command,
+                payload=response,
+                inner_error=err,
+            ) from err
         merge_trait_values(self, new_data)  # type: ignore[arg-type]
 
 

{python_roborock-5.7.0 → python_roborock-5.8.0}/roborock/devices/traits/v1/rooms.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 
 from roborock.data import HomeData, HomeDataRoom, NamedRoomMapping, RoborockBase
 from roborock.devices.traits.v1 import common
+from roborock.exceptions import RoborockParsingException
 from roborock.roborock_typing import RoborockCommand
 from roborock.web_api import UserWebApiClient
 
@@ -94,7 +95,12 @@ class RoomsTrait(Rooms, common.V1TraitMixin):
         """Refresh room mappings and backfill unknown room names from the web API."""
         response = await self.rpc_channel.send_command(self.command)
         if not isinstance(response, list):
-            raise ValueError(f"Unexpected RoomsTrait response format: {response!r}")
+            raise RoborockParsingException(
+                trait_name=type(self).__name__,
+                command=self.command,
+                payload=response,
+                inner_error="Unexpected RoomsTrait response format",
+            )
 
         segment_map = RoomsConverter.extract_segment_map(response)
         # Track all iot ids seen before. Refresh the room list when new ids are found.
@@ -105,8 +111,16 @@ class RoomsTrait(Rooms, common.V1TraitMixin):
                 _LOGGER.debug("Updating rooms: %s", list(updated_rooms))
                 self._home_data.rooms = updated_rooms
             self._discovered_iot_ids.update(new_iot_ids)
+        try:
+            rooms = self.converter.convert(response)
+        except (TypeError, ValueError) as err:
+            raise RoborockParsingException(
+                trait_name=type(self).__name__,
+                command=self.command,
+                payload=response,
+                inner_error=err,
+            ) from err
 
-        rooms = self.converter.convert(response)
         rooms = rooms.with_room_names(self._home_data.rooms_name_map)
         common.merge_trait_values(self, rooms)
 

{python_roborock-5.7.0 → python_roborock-5.8.0}/roborock/exceptions.py

@@ -1,5 +1,8 @@
 """Roborock exceptions."""
 
+from enum import Enum
+from typing import Any
+
 
 class RoborockException(Exception):
     """Class for Roborock exceptions."""
@@ -91,3 +94,14 @@ class RoborockInvalidStatus(RoborockException):
 
 class RoborockUnsupportedFeature(RoborockException):
     """Class for Roborock unsupported feature exceptions."""
+
+
+class RoborockParsingException(RoborockException):
+    """Class for Roborock exceptions when parsing device responses."""
+
+    def __init__(self, trait_name: str, command: Enum | str, payload: Any, inner_error: Exception | str) -> None:
+        cmd_name = command.name if isinstance(command, Enum) else str(command)
+        self.message = (
+            f"Failed to parse {cmd_name} response for {trait_name}. Payload: {payload!r} Error: {inner_error!r}"
+        )
+        super().__init__(self.message)