tools: rpc_cloud: optional command json handling

Enable RPC wrappers to handle json responses from the cloud directly.
This allows nicer output than dumping the dictionary to the console.

Signed-off-by: Jordan Yates <jordan@embeint.com>

Author: JordanYates

src/infuse_iot/commands.py

@@ -111,3 +111,8 @@ def data_progress_cb(self, offset: int) -> None:
     def handle_response(self, return_code: int, response: ctypes.LittleEndianStructure | None) -> None:
         """Handle RPC_RSP"""
         raise NotImplementedError
+
+    @classmethod
+    def handle_json_response(cls, response: dict) -> None:
+        """Handle json response from cloud"""
+        raise NotImplementedError

src/infuse_iot/tools/rpc_cloud.py

@@ -19,7 +19,7 @@
 from infuse_iot.api_client.api.rpc import get_rpc_by_id, send_rpc
 from infuse_iot.api_client.models import Error, NewRPCMessage, NewRPCReq, RPCParams, RPCReqDataHeader, RpcRsp
 from infuse_iot.api_client.models.downlink_message_status import DownlinkMessageStatus
-from infuse_iot.commands import InfuseCommand, InfuseRpcCommand
+from infuse_iot.commands import InfuseCommand, InfuseRpcCommand, wrapper_from_command_id
 from infuse_iot.credentials import get_api_key
 from infuse_iot.definitions.rpc import id_type_mapping
 from infuse_iot.zephyr.errno import errno
@@ -111,6 +111,11 @@ def query(self, client: Client):
             command_name = id_type_mapping[rpc_req.command_id].NAME
         except KeyError:
             command_name = "Unknown"
+        try:
+            command_wrapper = wrapper_from_command_id(rpc_req.command_id)
+        except Exception:
+            command_wrapper = None
+
         print(f"   RPC ID: {rpc_req.command_id} ({command_name})")
         print(f"       To: {rsp.device.device_id}")
         # Manually detect downlink expiry, as the API doesn't do it
@@ -133,6 +138,12 @@ def query(self, client: Client):
             extra = f" ({errno(-rpc_rsp.return_code).name})" if rpc_rsp.return_code < 0 else ""
             print(f"   Result: {rpc_rsp.return_code}{extra}")
             if rpc_rsp.params:
+                try:
+                    if command_wrapper:
+                        command_wrapper.handle_json_response(rpc_rsp.params.additional_properties)
+                        return
+                except NotImplementedError:
+                    pass
                 print(json.dumps(rpc_rsp.params.additional_properties, indent=4))
             elif rpc_rsp.params_encoded:
                 raw_rsp = base64.b64decode(rpc_rsp.params_encoded)