🦎 q7: restore command ack compatibility

Author: arduano

roborock/devices/rpc/b01_q7_channel.py

@@ -61,11 +61,11 @@ def on_message(response_message: RoborockMessage) -> None:
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     request_message: Q7RequestMessage,
-) -> dict[str, Any]:
+) -> Any:
     """Send a command on the MQTT channel and get a decoded response."""
     _LOGGER.debug("Sending B01 MQTT command: %s", request_message)
 
-    def find_response(response_message: RoborockMessage) -> dict[str, Any] | None:
+    def find_response(response_message: RoborockMessage) -> Any | None:
         """Handle incoming messages and resolve the future."""
         try:
             decoded_dps = decode_rpc_response(response_message)
@@ -97,7 +97,7 @@ def find_response(response_message: RoborockMessage) -> dict[str, Any] | None:
                     _LOGGER.debug("B01 error response: %s", error_msg)
                     raise RoborockException(error_msg)
                 data = inner.get("data")
-                if not isinstance(data, dict):
+                if request_message.command == "prop.get" and not isinstance(data, dict):
                     raise RoborockException(f"Unexpected data type for response {data} ({request_message})")
                 return data
         return None

roborock/devices/traits/b01/q7/__init__.py

@@ -31,6 +31,7 @@
     "Q7MapListEntry",
 ]
 
+
 class Q7PropertiesApi(Trait):
     """API for interacting with B01 devices."""
 

tests/devices/traits/b01/q7/test_init.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any
+from typing import Any, cast
 
 import pytest
 from Crypto.Cipher import AES
@@ -111,6 +111,19 @@ async def test_send_decoded_command_error_code(fake_channel: FakeChannel, messag
         await send_decoded_command(fake_channel, Q7RequestMessage(dps=10000, command="prop.get", params=[]))  # type: ignore[arg-type]
 
 
+async def test_send_decoded_command_allows_ok_string_ack(fake_channel: FakeChannel, message_builder: B01MessageBuilder):
+    """Command ACKs may return plain string payloads like ``ok``."""
+    message = message_builder.build("ok")
+    fake_channel.response_queue.append(message)
+
+    result = await send_decoded_command(
+        cast(Any, fake_channel),
+        Q7RequestMessage(dps=10000, command="service.set_room_clean", params=[]),  # type: ignore[arg-type]
+    )
+
+    assert result == "ok"
+
+
 async def test_q7_api_set_fan_speed(
     q7_api: Q7PropertiesApi, fake_channel: FakeChannel, message_builder: B01MessageBuilder
 ):