Merge branch 'main' into pr/zeo-core-api-v2

Author: NOisi-x

CHANGELOG.md

@@ -2,6 +2,50 @@
 
 <!-- version list -->
 
+## v6.0.0 (2026-07-27)
+
+### Features
+
+- Audit and complete Zeo protocol DP and enum mappings
+  ([#892](https://github.com/Python-roborock/python-roborock/pull/892),
+  [`dba564d`](https://github.com/Python-roborock/python-roborock/commit/dba564d10b88afcd6195298b90c6d49844e334f5))
+
+- Full Zeo protocol definition — 67 DPs, complete enum mappings, all 56 devices covered
+  ([#892](https://github.com/Python-roborock/python-roborock/pull/892),
+  [`dba564d`](https://github.com/Python-roborock/python-roborock/commit/dba564d10b88afcd6195298b90c6d49844e334f5))
+
+### Refactoring
+
+- **zeo**: Replace raw integer fields with enum types
+  ([#892](https://github.com/Python-roborock/python-roborock/pull/892),
+  [`dba564d`](https://github.com/Python-roborock/python-roborock/commit/dba564d10b88afcd6195298b90c6d49844e334f5))
+
+
+## v5.37.1 (2026-07-25)
+
+### Bug Fixes
+
+- Add missing dock ids
+  ([`f431c5d`](https://github.com/Python-roborock/python-roborock/commit/f431c5dbab2730df73fdaf5b6c42319a0a77a07d))
+
+
+## v5.37.0 (2026-07-25)
+
+### Chores
+
+- Clean up security location ([#880](https://github.com/Python-roborock/python-roborock/pull/880),
+  [`f0579b8`](https://github.com/Python-roborock/python-roborock/commit/f0579b8dcee5be26da0c572d686f3a831d3867a9))
+
+- Mild clean ups ([#880](https://github.com/Python-roborock/python-roborock/pull/880),
+  [`f0579b8`](https://github.com/Python-roborock/python-roborock/commit/f0579b8dcee5be26da0c572d686f3a831d3867a9))
+
+### Features
+
+- Add photo for obstacle avoidance
+  ([#880](https://github.com/Python-roborock/python-roborock/pull/880),
+  [`f0579b8`](https://github.com/Python-roborock/python-roborock/commit/f0579b8dcee5be26da0c572d686f3a831d3867a9))
+
+
 ## v5.36.0 (2026-07-21)
 
 ### Features

pyproject.toml

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

@@ -365,10 +365,27 @@ class RoborockDockTypeCode(RoborockEnum):
     shell_e_dock = 21
     shell_2e_dock = 22
     shell_3c_dock = 23
+    hera_dock = 24
+    k1s_pro_dock = 26
     type_27_dock = 27
     k1c_lite_dock = 28
+    k1r_dock = 29
     shell_2e_lite_dock = 30
+    shell_4rc_dock = 31
+    shell_4r_dock = 32
+    shell_4p_dock = 33
+    shell_4s_dock = 34
+    o7_dock = 35
+    k1d_dock = 37
+    shell_3p_dock = 38
+    shell_4d_dock = 39
     shell_2e_heat_dock = 40
+    f1_dock = 41
+    f1r_dock = 42
+    f2r_dock = 43
+    f1s_dock = 44
+    o7h_dock = 45
+    f1c_dock = 46
 
 
 class RoborockDockDustCollectionModeCode(RoborockEnum):

roborock/device_features.py

@@ -539,6 +539,12 @@ class DeviceFeatures(RoborockBase):
             ]
         }
     )
+    is_ai_recognition_setting_supported: bool = field(
+        metadata={"product_features": [ProductFeatures.AIRECOGNITION_SETTING]}
+    )
+    is_ai_recognition_obstacle_supported: bool = field(
+        metadata={"product_features": [ProductFeatures.AIRECOGNITION_OBSTACLE]}
+    )
     is_pure_clean_mop_supported: bool = field(metadata={"product_features": [ProductFeatures.CLEANMODE_PURECLEANMOP]})
     is_new_remote_view_supported: bool = field(metadata={"product_features": [ProductFeatures.REMOTE_BACK]})
     is_max_plus_mode_supported: bool = field(metadata={"product_features": [ProductFeatures.CLEANMODE_MAXPLUS]})
@@ -670,6 +676,8 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.o4_dock,
     RoborockDockTypeCode.o5_dock,
     RoborockDockTypeCode.o6_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.o7h_dock,
 }
 
 _CLEAN_FLUID_AUTO_DELIVERY_DOCK_TYPES = {
@@ -679,6 +687,10 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_3s_dock,
     RoborockDockTypeCode.o6_dock,
     RoborockDockTypeCode.couple_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.o7h_dock,
 }
 
 _CLEAN_FLUID_AUTO_DELIVERY_AM_DOCK_TYPES = {
@@ -690,6 +702,7 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_e_dock,
     RoborockDockTypeCode.shell_2e_dock,
     RoborockDockTypeCode.shell_3c_dock,
+    RoborockDockTypeCode.k1c_dock,
 }
 
 _AUTO_STERILIZE_DOCK_TYPES = {
@@ -719,6 +732,18 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_3s_dock,
     RoborockDockTypeCode.k1s_dock,
     RoborockDockTypeCode.shell_3c_dock,
+    RoborockDockTypeCode.k1s_pro_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.k1r_dock,
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_4p_dock,
+    RoborockDockTypeCode.shell_4s_dock,
+    RoborockDockTypeCode.k1d_dock,
+    RoborockDockTypeCode.shell_3p_dock,
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.f1c_dock,
 }
 
 _WATER_UPDOWN_DRAIN_DOCK_TYPES = {
@@ -739,6 +764,19 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_e_dock,
     RoborockDockTypeCode.shell_2e_dock,
     RoborockDockTypeCode.shell_3c_dock,
+    RoborockDockTypeCode.k1c_dock,
+    RoborockDockTypeCode.hera_dock,
+    RoborockDockTypeCode.k1s_pro_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_4r_dock,
+    RoborockDockTypeCode.shell_4p_dock,
+    RoborockDockTypeCode.shell_4s_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.shell_4d_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.o7h_dock,
 }
 
 _HATCH_DOOR_DOCK_COOL_FAN_DOCK_TYPES = {
@@ -749,6 +787,56 @@ def get_supported_features(self) -> list[str]:
     RoborockDockTypeCode.shell_2e_lite_dock,
 }
 
+_HIGH_TMP_WATER_DOCK_TYPES = {
+    RoborockDockTypeCode.k1r_dock,
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_2e_heat_dock,
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1c_dock,
+}
+
+_DOUBLE_SERIAL_COMMUNICATION_DOCK_TYPES = {
+    RoborockDockTypeCode.k1s_pro_dock,
+    RoborockDockTypeCode.type_27_dock,
+    RoborockDockTypeCode.k1r_dock,
+    RoborockDockTypeCode.shell_4r_dock,
+    RoborockDockTypeCode.shell_4p_dock,
+    RoborockDockTypeCode.shell_4s_dock,
+    RoborockDockTypeCode.o7_dock,
+    RoborockDockTypeCode.k1d_dock,
+    RoborockDockTypeCode.shell_3p_dock,
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1s_dock,
+    RoborockDockTypeCode.o7h_dock,
+    RoborockDockTypeCode.f1c_dock,
+}
+
+_DOUBLE_SERIAL_COMMUNICATION_AM_DOCK_TYPES = {
+    RoborockDockTypeCode.shell_4rc_dock,
+    RoborockDockTypeCode.shell_4d_dock,
+}
+
+_NO_WATER_FLOW_CAROUSEL_DOCK_TYPES = {
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1s_dock,
+}
+
+_SIMPLE_WASH_MODE_DOCK_TYPES = {
+    RoborockDockTypeCode.f1_dock,
+    RoborockDockTypeCode.f1r_dock,
+    RoborockDockTypeCode.f2r_dock,
+    RoborockDockTypeCode.f1c_dock,
+}
+
+_STEAM_WASH_DOCK_TYPES = {
+    RoborockDockTypeCode.o7h_dock,
+}
+
 
 @dataclass(frozen=True)
 class RoborockDockFeatures:
@@ -849,6 +937,28 @@ def is_hatch_door_dock_cool_fan_supported(self) -> bool:
     def is_special_support_wash_temp(self) -> bool:
         return self.dock_type in _SPECIAL_WASH_TEMP_DOCK_TYPES
 
+    @property
+    def is_high_tmp_water_supported(self) -> bool:
+        return self.dock_type in _HIGH_TMP_WATER_DOCK_TYPES
+
+    @property
+    def is_double_serial_communication_supported(self) -> bool:
+        return self.dock_type in _DOUBLE_SERIAL_COMMUNICATION_DOCK_TYPES or self._matches_am_variant(
+            _DOUBLE_SERIAL_COMMUNICATION_AM_DOCK_TYPES
+        )
+
+    @property
+    def is_no_water_flow_carousel(self) -> bool:
+        return self.dock_type in _NO_WATER_FLOW_CAROUSEL_DOCK_TYPES
+
+    @property
+    def is_simple_wash_mode_supported(self) -> bool:
+        return self.dock_type in _SIMPLE_WASH_MODE_DOCK_TYPES
+
+    @property
+    def is_steam_wash_supported(self) -> bool:
+        return self.dock_type in _STEAM_WASH_DOCK_TYPES
+
 
 WASH_N_FILL_DOCK_TYPES = [
     dock_type for dock_type in RoborockDockTypeCode if RoborockDockFeatures.from_dock_type(dock_type).is_washable

roborock/devices/device_manager.py

@@ -246,6 +246,7 @@ def device_creator(home_data: HomeData, device: HomeDataDevice, product: HomeDat
                     channel.rpc_channel,
                     channel.mqtt_rpc_channel,
                     channel.map_rpc_channel,
+                    channel.blob_rpc_channel,
                     channel.add_dps_listener,
                     web_api,
                     device_cache=device_cache,

roborock/devices/rpc/v1_channel.py

@@ -29,6 +29,7 @@
     ResponseMessage,
     SecurityData,
     V1RpcChannel,
+    create_blob_response_decoder,
     create_map_response_decoder,
     create_security_data,
     decode_data_protocol_message,
@@ -161,6 +162,50 @@ def find_response(response_message: RoborockMessage) -> None:
         return result
 
 
+class BlobRpcChannel(V1RpcChannel):
+    """RPC channel that adds the security envelope required for blob requests."""
+
+    def __init__(
+        self,
+        rpc_channel: V1RpcChannel,
+        raw_blob_rpc_channel: V1RpcChannel,
+        security_data: SecurityData,
+    ) -> None:
+        """Initialize the blob RPC channel."""
+        self._rpc_channel = rpc_channel
+        self._raw_blob_rpc_channel = raw_blob_rpc_channel
+        self._security_data = security_data
+
+    async def send_command(
+        self,
+        method: CommandType,
+        *,
+        response_type: type[_T] | None = None,
+        params: ParamsType = None,
+    ) -> _T | Any:
+        """Send a blob command after adding the device security parameters."""
+        public_key = await self._rpc_channel.send_command(RoborockCommand.GET_RANDOM_PKEY)
+        if not isinstance(public_key, dict) or not isinstance(public_key.get("pub_key"), dict):
+            raise RoborockException("get_random_pkey response did not contain a public key")
+        security = self._security_data.to_dict()["security"]
+        blob_params = {
+            "security": {
+                "pub_key": public_key["pub_key"],
+                "cipher_suite": 0,
+            },
+            "endpoint": security["endpoint"],
+            "nonce": security["nonce"],
+            "data_filter": params,
+        }
+        if response_type is not None:
+            return await self._raw_blob_rpc_channel.send_command(
+                method,
+                response_type=response_type,
+                params=blob_params,
+            )
+        return await self._raw_blob_rpc_channel.send_command(method, params=blob_params)
+
+
 class V1Channel(Channel):
     """Unified V1 protocol channel with automatic MQTT/local connection handling.
 
@@ -245,6 +290,13 @@ def map_rpc_channel(self) -> V1RpcChannel:
         decoder = create_map_response_decoder(security_data=self._security_data)
         return RpcChannel(lambda: [self._create_mqtt_rpc_strategy(decoder)], self._logger)
 
+    @property
+    def blob_rpc_channel(self) -> V1RpcChannel:
+        """Return the blob RPC channel used for fetching binary content."""
+        decoder = create_blob_response_decoder()
+        raw_blob_rpc_channel = RpcChannel(lambda: [self._create_mqtt_rpc_strategy(decoder)], self._logger)
+        return BlobRpcChannel(self.rpc_channel, raw_blob_rpc_channel, self._security_data)
+
     def _create_local_rpc_strategy(self) -> RpcStrategy | None:
         """Create the RPC strategy for local transport."""
         if self._local_channel is None or not self.is_local_connected: