chore: move extract api

Author: Lash-L

roborock/devices/traits/v1/common.py

@@ -9,6 +9,7 @@
 from typing import ClassVar, Self
 
 from roborock.data import RoborockBase
+from roborock.exceptions import RoborockException
 from roborock.protocols.v1_protocol import V1RpcChannel
 from roborock.roborock_typing import RoborockCommand
 
@@ -17,6 +18,20 @@
 V1ResponseData = dict | list | int | str
 
 
+def extract_v1_api_error_code(err: RoborockException) -> int | None:
+    """Extract a V1 RPC API error code from a RoborockException, if present.
+
+    V1 RPC error responses typically look like: {"code": -10007, "message": "..."}.
+    """
+    if not err.args:
+        return None
+    payload = err.args[0]
+    if isinstance(payload, dict):
+        code = payload.get("code")
+        return code if isinstance(code, int) else None
+    return None
+
+
 @dataclass
 class V1TraitMixin(ABC):
     """Base model that supports v1 traits.

roborock/devices/traits/v1/home.py

@@ -37,20 +37,6 @@
 MAP_SLEEP = 3
 
 
-def _extract_api_error_code(err: RoborockException) -> int | None:
-    """Extract an API error code from a RoborockException, if present.
-
-    V1 RPC error responses typically look like: {"code": -10007, "message": "..."}.
-    """
-    if not err.args:
-        return None
-    payload = err.args[0]
-    if isinstance(payload, dict):
-        code = payload.get("code")
-        return code if isinstance(code, int) else None
-    return None
-
-
 class HomeTrait(RoborockBase, common.V1TraitMixin):
     """Trait that represents a full view of the home layout."""
 
@@ -170,7 +156,7 @@ async def _build_home_map_info(self) -> tuple[dict[int, CombinedMapInfo], dict[i
                     # Some firmware revisions return -10007 ("invalid status"/action locked) when attempting
                     # to switch maps while the device is in a state that forbids it. Treat this as a
                     # "busy" condition so callers can fall back to refreshing the current map only.
-                    if _extract_api_error_code(ex) == -10007:
+                    if common.extract_v1_api_error_code(ex) == -10007:
                         raise RoborockDeviceBusy("Cannot switch maps right now (device action locked)") from ex
                     raise
                 await asyncio.sleep(MAP_SLEEP)

roborock/protocols/v1_protocol.py

@@ -165,6 +165,7 @@ def decode_rpc_response(message: RoborockMessage) -> ResponseMessage:
             api_error = RoborockException(
                 f"Invalid V1 message format: missing 'result' in data point for {message.payload!r}"
             )
+        result = {}
     else:
         _LOGGER.debug("Decoded V1 message result: %s", result)
         if isinstance(result, str):