Merge upstream/main into add-qrevo-s5v-dock-type

Author: justprox

CHANGELOG.md

@@ -2,6 +2,39 @@
 
 <!-- version list -->
 
+## v5.11.0 (2026-05-12)
+
+### Features
+
+- Add null option to ZeoMode and ZeoProgram enums
+  ([#823](https://github.com/Python-roborock/python-roborock/pull/823),
+  [`905f916`](https://github.com/Python-roborock/python-roborock/commit/905f91686cea233ff914a607dcd21e8f7489d108))
+
+- Add Saros 20 dock type code (27) to RoborockDockTypeCode
+  ([#830](https://github.com/Python-roborock/python-roborock/pull/830),
+  [`6c6c396`](https://github.com/Python-roborock/python-roborock/commit/6c6c39658300139b13af9d47c77f953fc433ab42))
+
+- Add saros20 ([#830](https://github.com/Python-roborock/python-roborock/pull/830),
+  [`6c6c396`](https://github.com/Python-roborock/python-roborock/commit/6c6c39658300139b13af9d47c77f953fc433ab42))
+
+- Add some new Zeo code mappings
+  ([#823](https://github.com/Python-roborock/python-roborock/pull/823),
+  [`905f916`](https://github.com/Python-roborock/python-roborock/commit/905f91686cea233ff914a607dcd21e8f7489d108))
+
+
+## v5.10.1 (2026-05-12)
+
+### Bug Fixes
+
+- Handle Web API unauthorized errors
+  ([#825](https://github.com/Python-roborock/python-roborock/pull/825),
+  [`ad8d8f0`](https://github.com/Python-roborock/python-roborock/commit/ad8d8f095a260ee720c3e0193bcba5bd691c9f96))
+
+- Mark non vacuum v1 devices as not supported
+  ([#828](https://github.com/Python-roborock/python-roborock/pull/828),
+  [`2e9a848`](https://github.com/Python-roborock/python-roborock/commit/2e9a84807f5d0c2cffb5b0b6592b9baa6ee14c64))
+
+
 ## v5.10.0 (2026-05-03)
 
 ### Features

device_info.yaml

@@ -1196,3 +1196,155 @@ roborock.vacuum.sc05:
       mode: rw
       type: RAW
       property: 'null'
+roborock.vacuum.a288:
+  protocol_version: '1.0'
+  product_nickname: PEARLPLUS
+  new_feature_info: 4499197267967999
+  new_feature_info_str: 0000000000099518CCFF7EFDA8E93EDDDBFF8F7F7EFEFFFF
+  feature_info:
+  - 111
+  - 112
+  - 113
+  - 114
+  - 115
+  - 116
+  - 117
+  - 118
+  - 119
+  - 120
+  - 121
+  - 122
+  - 123
+  - 124
+  - 125
+  product:
+    id: 3eizObJLFvPAxXvdW96ftd
+    name: Saros 20
+    model: roborock.vacuum.a288
+    category: robot.vacuum.cleaner
+    capability: 0
+    schema:
+    - id: 101
+      name: rpc_request
+      code: rpc_request
+      mode: rw
+      type: RAW
+    - id: 102
+      name: rpc_response
+      code: rpc_response
+      mode: rw
+      type: RAW
+    - id: 120
+      name: "\u9519\u8BEF\u4EE3\u7801"
+      code: error_code
+      mode: ro
+      type: ENUM
+      property: '{"range": [""]}'
+    - id: 121
+      name: "\u8BBE\u5907\u72B6\u6001"
+      code: state
+      mode: ro
+      type: ENUM
+      property: '{"range": [""]}'
+    - id: 122
+      name: "\u8BBE\u5907\u7535\u91CF"
+      code: battery
+      mode: ro
+      type: ENUM
+      property: '{"range": [""]}'
+    - id: 123
+      name: "\u6E05\u626B\u6A21\u5F0F"
+      code: fan_power
+      mode: rw
+      type: ENUM
+      property: '{"range": [""]}'
+    - id: 124
+      name: "\u62D6\u5730\u6A21\u5F0F"
+      code: water_box_mode
+      mode: rw
+      type: ENUM
+      property: '{"range": [""]}'
+    - id: 125
+      name: "\u4E3B\u5237\u5BFF\u547D"
+      code: main_brush_life
+      mode: rw
+      type: VALUE
+      property: '{"max": 100, "min": 0, "step": 1, "unit": "null", "scale": 1}'
+    - id: 126
+      name: "\u8FB9\u5237\u5BFF\u547D"
+      code: side_brush_life
+      mode: rw
+      type: VALUE
+      property: '{"max": 100, "min": 0, "step": 1, "unit": "null", "scale": 1}'
+    - id: 127
+      name: "\u6EE4\u7F51\u5BFF\u547D"
+      code: filter_life
+      mode: rw
+      type: VALUE
+      property: '{"max": 100, "min": 0, "step": 1, "unit": "null", "scale": 1}'
+    - id: 128
+      name: "\u989D\u5916\u72B6\u6001"
+      code: additional_props
+      mode: ro
+      type: RAW
+    - id: 130
+      name: "\u5B8C\u6210\u4E8B\u4EF6"
+      code: task_complete
+      mode: ro
+      type: RAW
+    - id: 131
+      name: "\u7535\u91CF\u4E0D\u8DB3\u4EFB\u52A1\u53D6\u6D88"
+      code: task_cancel_low_power
+      mode: ro
+      type: RAW
+    - id: 132
+      name: "\u8FD0\u52A8\u4E2D\u4EFB\u52A1\u53D6\u6D88"
+      code: task_cancel_in_motion
+      mode: ro
+      type: RAW
+    - id: 133
+      name: "\u5145\u7535\u72B6\u6001"
+      code: charge_status
+      mode: ro
+      type: RAW
+    - id: 134
+      name: "\u70D8\u5E72\u72B6\u6001"
+      code: drying_status
+      mode: ro
+      type: RAW
+    - id: 135
+      name: "\u79BB\u7EBF\u539F\u56E0\u7EC6\u5206"
+      code: offline_status
+      mode: ro
+      type: RAW
+    - id: 138
+      name: "\u5DE5\u4F5C\u4EFB\u52A1\u7C7B\u578B"
+      code: clean_task_type
+      mode: ro
+      type: ENUM
+      property: "{\"range\": [\"0 \u7A7A\u95F2\", \"1 \u5168\u5C4B\u6E05\u6D01\",\
+        \ \"2 \u9009\u533A\u6E05\u6D01\", \"3 \u5212\u533A\u6E05\u6D01\", \"4 \u5EFA\
+        \u56FE\", \"5 \u5C40\u90E8\u6E05\u6D01\", \"6 \u9065\u63A7\u6A21\u5F0F\",\
+        \ \"7 \u5DE1\u822A\", \"8 \u5BFB\u5BA0\", \"9 \u6574\u7406\"]}"
+    - id: 139
+      name: "\u56DE\u57FA\u7AD9\u76EE\u7684"
+      code: back_type
+      mode: ro
+      type: RAW
+    - id: 141
+      name: "\u6E05\u6D01\u8FDB\u5EA6"
+      code: cleaning_progress
+      mode: ro
+      type: VALUE
+      property: "{\"max\": 100, \"min\": 0, \"step\": 1, \"unit\": \"\u767E\u5206\u6BD4\
+        \", \"scale\": 1}"
+    - id: 142
+      name: publish_dsp
+      code: publish_dsp
+      mode: ro
+      type: RAW
+    - id: 143
+      name: "\u5730\u56FE\u53D8\u5316\u6570\u636E"
+      code: map_diff
+      mode: ro
+      type: RAW

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "5.10.0"
+version = "5.11.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"

roborock/data/v1/v1_code_mappings.py

@@ -665,6 +665,7 @@ class RoborockDockTypeCode(RoborockEnum):
     qrevo_curv_dock = 17
     saros_10_dock = 18
     qrevo_s5v_dock = 22
+    saros_20_dock = 27
 
 
 class RoborockDockDustCollectionModeCode(RoborockEnum):

roborock/data/zeo/zeo_code_mappings.py

@@ -2,6 +2,7 @@
 
 
 class ZeoMode(RoborockEnum):
+    null = 0
     wash = 1
     wash_and_dry = 2
     dry = 3
@@ -23,6 +24,7 @@ class ZeoState(RoborockEnum):
 
 
 class ZeoProgram(RoborockEnum):
+    null = 0
     standard = 1
     quick = 2
     sanitize = 3
@@ -75,6 +77,7 @@ class ZeoTemperature(RoborockEnum):
     high = 4
     max = 5
     twenty_c = 6
+    ninety_c = 7
 
 
 class ZeoRinse(RoborockEnum):
@@ -87,6 +90,7 @@ class ZeoRinse(RoborockEnum):
 
 
 class ZeoSpin(RoborockEnum):
+    null = 0
     none = 1
     very_low = 2
     low = 3

roborock/device_features.py

@@ -654,6 +654,7 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.saros_r10_dock,
     RoborockDockTypeCode.qrevo_curv_dock,
     RoborockDockTypeCode.qrevo_s5v_dock,
+    RoborockDockTypeCode.saros_20_dock,
 ]
 
 

roborock/devices/device_manager.py

@@ -13,6 +13,7 @@
     HomeData,
     HomeDataDevice,
     HomeDataProduct,
+    RoborockCategory,
     UserData,
 )
 from roborock.devices.device import DeviceReadyCallback, RoborockDevice
@@ -173,14 +174,15 @@ def create_web_api_wrapper(
     *,
     cache: Cache | None = None,
     session: aiohttp.ClientSession | None = None,
+    unauthorized_hook: SessionUnauthorizedHook | None = None,
 ) -> UserWebApiClient:
     """Create a home data API wrapper from an existing API client."""
 
     # Note: This will auto discover the API base URL. This can be improved
     # by caching this next to `UserData` if needed to avoid unnecessary API calls.
     client = RoborockApiClient(username=user_params.username, base_url=user_params.base_url, session=session)
 
-    return UserWebApiClient(client, user_params.user_data)
+    return UserWebApiClient(client, user_params.user_data, unauthorized_hook=unauthorized_hook)
 
 
 async def create_device_manager(
@@ -212,7 +214,9 @@ async def create_device_manager(
     if cache is None:
         cache = NoCache()
 
-    web_api = create_web_api_wrapper(user_params, session=session, cache=cache)
+    web_api = create_web_api_wrapper(
+        user_params, session=session, cache=cache, unauthorized_hook=mqtt_session_unauthorized_hook
+    )
     user_data = user_params.user_data
 
     diagnostics = Diagnostics()
@@ -228,6 +232,10 @@ def device_creator(home_data: HomeData, device: HomeDataDevice, product: HomeDat
         device_cache: DeviceCache = DeviceCache(device.duid, cache)
         match device.pv:
             case DeviceVersion.V1:
+                if product.category != RoborockCategory.VACUUM:
+                    raise UnsupportedDeviceError(
+                        f"Device {device.name} has unsupported V1 category {product.category}: {product.model}"
+                    )
                 channel = create_v1_channel(user_data, mqtt_params, mqtt_session, device, device_cache)
                 trait = v1.create(
                     device.duid,
@@ -265,6 +273,12 @@ def device_creator(home_data: HomeData, device: HomeDataDevice, product: HomeDat
             dev.add_ready_callback(ready_callback)
         return dev
 
-    manager = DeviceManager(web_api, device_creator, mqtt_session=mqtt_session, cache=cache, diagnostics=diagnostics)
+    manager = DeviceManager(
+        web_api,
+        device_creator,
+        mqtt_session=mqtt_session,
+        cache=cache,
+        diagnostics=diagnostics,
+    )
     await manager.discover_devices(prefer_cache)
     return manager

roborock/web_api.py

@@ -6,6 +6,7 @@
 import secrets
 import string
 import time
+from collections.abc import Callable
 from dataclasses import dataclass
 
 import aiohttp
@@ -737,23 +738,46 @@ class UserWebApiClient:
     to avoid needing to pass UserData around and mock out the web API.
     """
 
-    def __init__(self, web_api: RoborockApiClient, user_data: UserData) -> None:
+    def __init__(
+        self, web_api: RoborockApiClient, user_data: UserData, unauthorized_hook: Callable[[], None] | None = None
+    ) -> None:
         """Initialize the wrapper with the API client and user data."""
         self._web_api = web_api
         self._user_data = user_data
+        self._unauthorized_hook = unauthorized_hook
 
     async def get_home_data(self) -> HomeData:
         """Fetch home data using the API client."""
-        return await self._web_api.get_home_data_v3(self._user_data)
+        try:
+            return await self._web_api.get_home_data_v3(self._user_data)
+        except RoborockInvalidCredentials:
+            if self._unauthorized_hook:
+                self._unauthorized_hook()
+            raise
 
     async def get_routines(self, device_id: str) -> list[HomeDataScene]:
         """Fetch routines (scenes) for a specific device."""
-        return await self._web_api.get_scenes(self._user_data, device_id)
+        try:
+            return await self._web_api.get_scenes(self._user_data, device_id)
+        except RoborockInvalidCredentials:
+            if self._unauthorized_hook:
+                self._unauthorized_hook()
+            raise
 
     async def get_rooms(self) -> list[HomeDataRoom]:
         """Fetch rooms using the API client."""
-        return await self._web_api.get_rooms(self._user_data)
+        try:
+            return await self._web_api.get_rooms(self._user_data)
+        except RoborockInvalidCredentials:
+            if self._unauthorized_hook:
+                self._unauthorized_hook()
+            raise
 
     async def execute_routine(self, scene_id: int) -> None:
         """Execute a specific routine (scene) by its ID."""
-        await self._web_api.execute_scene(self._user_data, scene_id)
+        try:
+            await self._web_api.execute_scene(self._user_data, scene_id)
+        except RoborockInvalidCredentials:
+            if self._unauthorized_hook:
+                self._unauthorized_hook()
+            raise