chore: merge

Author: Lash-L

roborock/devices/b01_channel.py

@@ -43,25 +43,26 @@ def find_response(response_message: RoborockMessage) -> None:
             _LOGGER.info("Failed to decode b01 message: %s: %s", response_message, ex)
             return
 
-        for _, dps_value in decoded_dps.items():
+        for dps_value in decoded_dps.values():
             # valid responses are JSON strings wrapped in the dps value
-            if isinstance(dps_value, str):
-                try:
-                    inner = json.loads(dps_value)
-                except (json.JSONDecodeError, TypeError):
-                    _LOGGER.debug("Received unexpected response: %s", dps_value)
-                    continue
+            if not isinstance(dps_value, str):
+                _LOGGER.debug("Received unexpected response: %s", dps_value)
+                continue
 
-                if isinstance(inner, dict) and inner.get("msgId") == msg_id:
-                    _LOGGER.debug("Received query response: %s", inner)
-                    data = inner.get("data")
-                    if not future.done():
-                        if isinstance(data, dict):
-                            future.set_result(data)
-                        else:
-                            future.set_exception(RoborockException(f"Unexpected data type for response: {data}"))
-            else:
+            try:
+                inner = json.loads(dps_value)
+            except (json.JSONDecodeError, TypeError):
                 _LOGGER.debug("Received unexpected response: %s", dps_value)
+                continue
+
+            if isinstance(inner, dict) and inner.get("msgId") == msg_id:
+                _LOGGER.debug("Received query response: %s", inner)
+                data = inner.get("data")
+                if not future.done():
+                    if isinstance(data, dict):
+                        future.set_result(data)
+                    else:
+                        future.set_exception(RoborockException(f"Unexpected data type for response: {data}"))
 
     unsub = await mqtt_channel.subscribe(find_response)
 

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

@@ -21,7 +21,7 @@ def __init__(self, channel: MqttChannel) -> None:
         self._channel = channel
 
     async def query_values(self, props: list[RoborockB01Props]) -> B01Props | None:
-        """Query the device for the values of the given Q7 protocols."""
+        """Query the device for the values of the given Q7 properties."""
         result = await send_decoded_command(
             self._channel, dps=10000, command=RoborockB01Q7Methods.GET_PROP, params={"property": props}
         )