RemoteRF 2.0.1__tar.gz → 2.0.2__tar.gz

{remoterf-2.0.1/src/remoteRF.egg-info → remoterf-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.0.1
+Version: 2.0.2
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author: Ethan Ge
 Author-email: ethoGalaxy@gmail.com

{remoterf-2.0.1 → remoterf-2.0.2}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="remoterf",
-    version="2.0.1",
+    version="2.0.2",
     author="Ethan Ge",
     author_email="ethoGalaxy@gmail.com",
     description="A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.",

{remoterf-2.0.1 → remoterf-2.0.2}/src/remoteRF/common/grpc/grpc_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: grpc.proto
-# Protobuf Python Version: 5.29.0
+# Protobuf Python Version: 5.27.1
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -12,8 +12,8 @@ from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
     5,
-    29,
-    0,
+    27,
+    1,
     '',
     'grpc.proto'
 )
@@ -24,7 +24,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\ngrpc.proto\x12\tremote_rf\"\xa2\x01\n\x11GenericRPCRequest\x12\x15\n\rfunction_name\x18\x01 \x01(\t\x12\x34\n\x04\x61rgs\x18\x02 \x03(\x0b\x32&.remote_rf.GenericRPCRequest.ArgsEntry\x1a@\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.remote_rf.Argument:\x02\x38\x01\"\x96\x01\n\x12GenericRPCResponse\x12;\n\x07results\x18\x01 \x03(\x0b\x32*.remote_rf.GenericRPCResponse.ResultsEntry\x1a\x43\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.remote_rf.Argument:\x02\x38\x01\"\x19\n\nArrayShape\x12\x0b\n\x03\x64im\x18\x01 \x03(\x05\"+\n\rComplexNumber\x12\x0c\n\x04real\x18\x01 \x01(\x02\x12\x0c\n\x04imag\x18\x02 \x01(\x02\"a\n\x11\x43omplexNumpyArray\x12$\n\x05shape\x18\x01 \x01(\x0b\x32\x15.remote_rf.ArrayShape\x12&\n\x04\x64\x61ta\x18\x02 \x03(\x0b\x32\x18.remote_rf.ComplexNumber\"D\n\x0eRealNumpyArray\x12$\n\x05shape\x18\x01 \x01(\x0b\x32\x15.remote_rf.ArrayShape\x12\x0c\n\x04\x64\x61ta\x18\x02 \x03(\x02\"\xd7\x01\n\x08\x41rgument\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x15\n\x0bint64_value\x18\x02 \x01(\x03H\x00\x12\x15\n\x0b\x66loat_value\x18\x03 \x01(\x02H\x00\x12\x14\n\nbool_value\x18\x04 \x01(\x08H\x00\x12\x35\n\rcomplex_array\x18\x05 \x01(\x0b\x32\x1c.remote_rf.ComplexNumpyArrayH\x00\x12/\n\nreal_array\x18\x06 \x01(\x0b\x32\x19.remote_rf.RealNumpyArrayH\x00\x42\x07\n\x05value2Q\n\nGenericRPC\x12\x43\n\x04\x43\x61ll\x12\x1c.remote_rf.GenericRPCRequest\x1a\x1d.remote_rf.GenericRPCResponseB\x1e\n\x10\x63om.example.demoB\nDemoProtosb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\ngrpc.proto\x12\tremote_rf\"\xa2\x01\n\x11GenericRPCRequest\x12\x15\n\rfunction_name\x18\x01 \x01(\t\x12\x34\n\x04\x61rgs\x18\x02 \x03(\x0b\x32&.remote_rf.GenericRPCRequest.ArgsEntry\x1a@\n\tArgsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.remote_rf.Argument:\x02\x38\x01\"\x96\x01\n\x12GenericRPCResponse\x12;\n\x07results\x18\x01 \x03(\x0b\x32*.remote_rf.GenericRPCResponse.ResultsEntry\x1a\x43\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\"\n\x05value\x18\x02 \x01(\x0b\x32\x13.remote_rf.Argument:\x02\x38\x01\"\x19\n\nArrayShape\x12\x0b\n\x03\x64im\x18\x01 \x03(\x05\"+\n\rComplexNumber\x12\x0c\n\x04real\x18\x01 \x01(\x02\x12\x0c\n\x04imag\x18\x02 \x01(\x02\"a\n\x11\x43omplexNumpyArray\x12$\n\x05shape\x18\x01 \x01(\x0b\x32\x15.remote_rf.ArrayShape\x12&\n\x04\x64\x61ta\x18\x02 \x03(\x0b\x32\x18.remote_rf.ComplexNumber\"D\n\x0eRealNumpyArray\x12$\n\x05shape\x18\x01 \x01(\x0b\x32\x15.remote_rf.ArrayShape\x12\x0c\n\x04\x64\x61ta\x18\x02 \x03(\x02\"\xed\x01\n\x08\x41rgument\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x15\n\x0bint64_value\x18\x02 \x01(\x03H\x00\x12\x15\n\x0b\x66loat_value\x18\x03 \x01(\x02H\x00\x12\x14\n\nbool_value\x18\x04 \x01(\x08H\x00\x12\x35\n\rcomplex_array\x18\x05 \x01(\x0b\x32\x1c.remote_rf.ComplexNumpyArrayH\x00\x12/\n\nreal_array\x18\x06 \x01(\x0b\x32\x19.remote_rf.RealNumpyArrayH\x00\x12\x14\n\njson_value\x18\x07 \x01(\tH\x00\x42\x07\n\x05value2Q\n\nGenericRPC\x12\x43\n\x04\x43\x61ll\x12\x1c.remote_rf.GenericRPCRequest\x1a\x1d.remote_rf.GenericRPCResponseB\x1e\n\x10\x63om.example.demoB\nDemoProtosb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -53,7 +53,7 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_REALNUMPYARRAY']._serialized_start=514
   _globals['_REALNUMPYARRAY']._serialized_end=582
   _globals['_ARGUMENT']._serialized_start=585
-  _globals['_ARGUMENT']._serialized_end=800
-  _globals['_GENERICRPC']._serialized_start=802
-  _globals['_GENERICRPC']._serialized_end=883
+  _globals['_ARGUMENT']._serialized_end=822
+  _globals['_GENERICRPC']._serialized_start=824
+  _globals['_GENERICRPC']._serialized_end=905
 # @@protoc_insertion_point(module_scope)

remoterf-2.0.2/src/remoteRF/common/utils/process_arg.py

@@ -0,0 +1,153 @@
+from ..grpc import grpc_pb2, grpc_pb2_grpc
+import json
+import numpy as np
+
+_JSON_TYPE_KEY = "__remoterf_json_type__"
+
+def _json_safe(value):
+    if isinstance(value, np.ndarray):
+        if value.dtype == object:
+            raise ValueError(f"Cannot JSON-map object-dtype array: {value!r}")
+        array = np.asarray(value)
+        if np.iscomplexobj(array):
+            data = [[float(num.real), float(num.imag)] for num in array.ravel()]
+            return {
+                _JSON_TYPE_KEY: "ndarray",
+                "dtype": str(array.dtype),
+                "shape": list(array.shape),
+                "complex": True,
+                "data": data,
+            }
+        return {
+            _JSON_TYPE_KEY: "ndarray",
+            "dtype": str(array.dtype),
+            "shape": list(array.shape),
+            "complex": False,
+            "data": array.tolist(),
+        }
+    if isinstance(value, (np.bool_,)):
+        return bool(value)
+    if isinstance(value, (np.integer,)):
+        return int(value)
+    if isinstance(value, (np.floating,)):
+        return float(value)
+    if isinstance(value, complex):
+        return {_JSON_TYPE_KEY: "complex", "real": float(value.real), "imag": float(value.imag)}
+    if isinstance(value, dict):
+        return {str(key): _json_safe(item) for key, item in value.items()}
+    if isinstance(value, (list, tuple)):
+        return [_json_safe(item) for item in value]
+    return value
+
+def _json_restore(value):
+    if isinstance(value, dict):
+        kind = value.get(_JSON_TYPE_KEY)
+        if kind == "ndarray":
+            shape = tuple(value.get("shape", ()))
+            dtype = value.get("dtype")
+            if value.get("complex"):
+                data = [complex(real, imag) for real, imag in value.get("data", [])]
+                return np.array(data, dtype=dtype or np.complex64).reshape(shape)
+            return np.array(value.get("data", []), dtype=dtype).reshape(shape)
+        if kind == "complex":
+            return complex(value.get("real", 0.0), value.get("imag", 0.0))
+        return {key: _json_restore(item) for key, item in value.items()}
+    if isinstance(value, list):
+        return [_json_restore(item) for item in value]
+    return value
+
+def unmap_arg(arg):
+    if arg.HasField('int64_value'):
+        return arg.int64_value
+    elif arg.HasField('float_value'):
+        return arg.float_value
+    elif arg.HasField('string_value'):
+        return arg.string_value
+    elif arg.HasField('bool_value'):
+        return arg.bool_value
+    elif arg.HasField('real_array'):
+        shape = tuple(arg.real_array.shape.dim)
+        return np.array(arg.real_array.data, dtype=np.float64).reshape(shape)
+    elif arg.HasField('complex_array'):
+        shape = tuple(arg.complex_array.shape.dim)
+        data = [complex(c.real, c.imag) for c in arg.complex_array.data]
+        return np.array(data, dtype=np.complex64).reshape(shape)
+    elif arg.HasField('json_value'):
+        return _json_restore(json.loads(arg.json_value))
+    else:
+        raise ValueError(f"Unknown argument type during unmapping: {arg}")
+    
+def map_arg(value):
+    arg = grpc_pb2.Argument()
+    
+    if isinstance(value, (bool, np.bool_)):
+        arg.bool_value = bool(value)
+    elif value is None or isinstance(value, dict):
+        arg.json_value = json.dumps(_json_safe(value), separators=(",", ":"))
+    elif isinstance(value, (int, np.integer)):
+        arg.int64_value = int(value)
+    elif isinstance(value, (float, np.floating)):
+        arg.float_value = float(value)
+    elif isinstance(value, str):
+        arg.string_value = value
+    elif isinstance(value, (list, tuple)):
+        try:
+            array = np.asarray(value)
+        except Exception:
+            arg.json_value = json.dumps(_json_safe(value), separators=(",", ":"))
+            return arg
+        if array.dtype == object:
+            try:
+                array = np.stack(value)
+            except Exception:
+                arg.json_value = json.dumps(_json_safe(value), separators=(",", ":"))
+                return arg
+        return map_arg(array)
+    elif isinstance(value, np.ndarray):
+        if value.dtype == object:
+            raise ValueError(f"Cannot map object-dtype array: {value!r}")
+        if np.iscomplexobj(value):
+            complex_array = arg.complex_array
+            complex_array.shape.dim.extend(value.shape)
+            for num in value.ravel():
+                complex_num = complex_array.data.add()
+                complex_num.real = float(num.real)
+                complex_num.imag = float(num.imag)
+        else:
+            float_array = arg.real_array
+            float_array.shape.dim.extend(value.shape)
+            float_array.data.extend(np.asarray(value, dtype=np.float32).ravel())
+    else:
+        raise ValueError(f"Unknown argument type during mapping: {value}")
+    return arg
+        
+def map_array_proto(np_array):
+    arg = grpc_pb2.Argument()
+    
+    # Check if the array is complex
+    if np.iscomplexobj(np_array):
+        complex_array = grpc_pb2.ComplexArray()
+        for num in np_array.flat:
+            complex_number = complex_array.data.add()
+            complex_number.real = num.real
+            complex_number.imag = num.imag
+        arg.complex_array.CopyFrom(complex_array)
+    else:
+        # Handle as a regular float array
+        float_array = grpc_pb2.FloatArray()
+        float_array.data.extend(np_array.flat)
+        arg.float_array.CopyFrom(float_array)
+
+    return arg
+
+def unmap_array_proto(arg):
+    # Check which type of array is available and convert appropriately
+    if arg.HasField('complex_array'):
+        # Convert ComplexArray to a numpy array of complex numbers
+        data = [complex(cn.real, cn.imag) for cn in arg.complex_array.data]
+        return np.array(data, dtype=np.complex64)
+    elif arg.HasField('float_array'):
+        # Convert FloatArray to a numpy array of floats
+        return np.array(arg.float_array.data, dtype=np.float32)
+    else:
+        raise ValueError("Argument does not contain a recognizable array.")

{remoterf-2.0.1 → remoterf-2.0.2}/src/remoteRF/core/app.py

@@ -17,6 +17,7 @@ session = PromptSession()
 DEFAULT_TIMEZONE_NOTE = "All times are in Pacific Time (Los Angeles)"
 DEFAULT_TOS_URL = "https://remoterf.net/tos"
 SERVER_TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+BANNER_CREDIT = "Created at UCLA by E. Ge and I. Roberts."
 
 
 def _banner_note() -> str:
@@ -28,6 +29,10 @@ def _banner_note() -> str:
     return text or DEFAULT_TIMEZONE_NOTE
 
 
+def _banner_details() -> str:
+    return f"\n{BANNER_CREDIT}\nCurrent version: {print_my_version()}\n{_banner_note()}"
+
+
 def _tos_notice_text() -> str:
     notice_path = Path(__file__).resolve().parents[1] / "common" / "tos_notice.txt"
     try:
@@ -66,7 +71,7 @@ def _format_reservation_range(start_time: datetime.datetime, end_time: datetime.
     return f"{start} - {end}"
 
 def welcome():
-    printf(f"Welcome to the RemoteRF Platform", (Sty.BOLD, Sty.BLUE), f"\nCurrent version: {print_my_version()} \n{_banner_note()}", (Sty.GRAY))
+    printf(f"Welcome to the RemoteRF Platform", (Sty.BOLD, Sty.BLUE), _banner_details(), (Sty.GRAY))
     try:
         inpu = session.prompt(stylize("Please ", Sty.DEFAULT, "login", Sty.GREEN, " or ", Sty.DEFAULT, "register", Sty.RED, " to continue. (", Sty.DEFAULT, 'l', Sty.GREEN, "/", Sty.DEFAULT, 'r', Sty.RED, "): ", Sty.DEFAULT))
         if inpu == 'r':
@@ -103,7 +108,7 @@ def welcome():
         exit()
 
 def title():
-    printf(f"Welcome to the RemoteRF Platform", (Sty.BOLD, Sty.BLUE), f"\nCurrent version: {print_my_version()} \n{_banner_note()}", (Sty.GRAY))
+    printf(f"Welcome to the RemoteRF Platform", (Sty.BOLD, Sty.BLUE), _banner_details(), (Sty.GRAY))
     printf("Terms of Service: ", Sty.BOLD, _tos_url(), Sty.DEFAULT)
     # printf(f"Logged in as: ", Sty.DEFAULT, f'{account.username}', Sty.MAGENTA)
     printf(f"Input ", Sty.DEFAULT, "'help' ", Sty.BRIGHT_GREEN, "for a list of avaliable commands.", Sty.DEFAULT)  

{remoterf-2.0.1 → remoterf-2.0.2}/src/remoteRF/drivers/dynamic_device.py

@@ -115,6 +115,20 @@ def _try_call(prop, token, arg=_NO_ARG):
         )
     result = resp.results.get(prop)
     return unmap_arg(result) if result is not None else None
+
+
+def _try_calln(prop, token, kwargs):
+    payload = {'a': map_arg(token)}
+    for key, value in dict(kwargs).items():
+        if value is _NO_ARG:
+            continue
+        payload[str(key)] = map_arg(value)
+    resp = rpc_client(
+        function_name=f"{_PREFIX}:{prop}:CALLN",
+        args=payload,
+    )
+    result = resp.results.get(prop)
+    return unmap_arg(result) if result is not None else None
 '''
 
 
@@ -188,10 +202,49 @@ def _codegen(schema: dict) -> str:
     # ── Call methods ──────────────────────────────────────────────────
     for method, info in sorted(call_map.items()):
         doc = info.get("doc", "")
-        lines.append(f"    def {method}(self, _v=_NO_ARG):")
+        args_meta = info.get("args")
+
+        if args_meta is None:
+            lines.append(f"    def {method}(self, _v=_NO_ARG):")
+            if doc:
+                lines.append(f'        """{doc}"""')
+            lines.append(f'        return _try_call("{method}", self.token, _v)')
+            lines.append("")
+            continue
+
+        params = []
+        inserted_keyword_marker = False
+        for arg in args_meta:
+            name = str(arg.get("name", "")).strip()
+            if not name:
+                continue
+            if arg.get("kind") == "keyword_only" and not inserted_keyword_marker:
+                params.append("*")
+                inserted_keyword_marker = True
+            if arg.get("required", True):
+                params.append(name)
+            else:
+                params.append(f"{name}=_NO_ARG")
+
+        signature = ", ".join(["self", *params])
+        lines.append(f"    def {method}({signature}):")
         if doc:
             lines.append(f'        """{doc}"""')
-        lines.append(f'        return _try_call("{method}", self.token, _v)')
+
+        arg_names = [
+            str(arg.get("name", "")).strip()
+            for arg in args_meta
+            if str(arg.get("name", "")).strip()
+        ]
+        if len(arg_names) == 0:
+            lines.append(f'        return _try_call("{method}", self.token)')
+        elif len(arg_names) == 1 and args_meta[0].get("required", True):
+            lines.append(f'        return _try_call("{method}", self.token, {arg_names[0]})')
+        else:
+            lines.append(f'        return _try_calln("{method}", self.token, {{')
+            for arg_name in arg_names:
+                lines.append(f'            "{arg_name}": {arg_name},')
+            lines.append("        })")
         lines.append("")
 
     return "\n".join(lines)

{remoterf-2.0.1 → remoterf-2.0.2/src/remoteRF.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.0.1
+Version: 2.0.2
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author: Ethan Ge
 Author-email: ethoGalaxy@gmail.com

{remoterf-2.0.1 → remoterf-2.0.2}/src/remoteRF.egg-info/SOURCES.txt

@@ -39,4 +39,6 @@ src/remoterf.egg-info/SOURCES.txt
 src/remoterf.egg-info/dependency_links.txt
 src/remoterf.egg-info/entry_points.txt
 src/remoterf.egg-info/requires.txt
-src/remoterf.egg-info/top_level.txt
+src/remoterf.egg-info/top_level.txt
+tests/test_dynamic_device_codegen.py
+tests/test_process_arg.py

remoterf-2.0.2/tests/test_dynamic_device_codegen.py

@@ -0,0 +1,69 @@
+import unittest
+import sys
+import types
+
+fake_grpc_client = types.ModuleType("remoteRF.core.grpc_client")
+fake_grpc_client.rpc_client = lambda *args, **kwargs: None
+sys.modules.setdefault("remoteRF.core.grpc_client", fake_grpc_client)
+from remoteRF.drivers.dynamic_device import _codegen
+
+
+class DynamicDeviceCodegenTests(unittest.TestCase):
+    def test_codegen_emits_calln_for_named_optional_or_multi_arg_methods(self):
+        code = _codegen({
+            "device_type": "fake_device",
+            "client_class": "FakeDevice",
+            "driver_version": "0.0.0",
+            "schema_hash": "sha256:test",
+            "getters": {},
+            "setters": {},
+            "calls": {
+                "call_configure": {
+                    "doc": "Configure",
+                    "args": [
+                        {"name": "freq", "required": True, "type": "float"},
+                        {"name": "gain", "required": False, "type": "int", "default": 0},
+                        {"name": "options", "required": False, "type": "dict", "default": None},
+                    ],
+                },
+                "call_rx": {"args": []},
+                "call_tx": {"args": [{"name": "samples", "required": True, "type": "any"}]},
+                "call_legacy": {},
+                "call_keyword": {
+                    "args": [
+                        {"name": "first", "required": False, "kind": "positional_or_keyword"},
+                        {"name": "required", "required": True, "kind": "keyword_only"},
+                    ],
+                },
+            },
+        })
+
+        compile(code, "<generated>", "exec")
+        self.assertIn("def configure(self, freq, gain=_NO_ARG, options=_NO_ARG):", code)
+        self.assertIn('return _try_calln("configure", self.token, {', code)
+        self.assertIn('"options": options,', code)
+        self.assertIn("def rx(self):", code)
+        self.assertIn('return _try_call("rx", self.token)', code)
+        self.assertIn("def tx(self, samples):", code)
+        self.assertIn('return _try_call("tx", self.token, samples)', code)
+        self.assertIn("def legacy(self, _v=_NO_ARG):", code)
+        self.assertIn("def keyword(self, first=_NO_ARG, *, required):", code)
+
+    def test_generated_helpers_include_calln_and_omit_no_arg_sentinel(self):
+        code = _codegen({
+            "device_type": "fake_device",
+            "client_class": "FakeDevice",
+            "driver_version": "0.0.0",
+            "schema_hash": "sha256:test",
+            "getters": {},
+            "setters": {},
+            "calls": {},
+        })
+
+        self.assertIn("def _try_calln(prop, token, kwargs):", code)
+        self.assertIn("if value is _NO_ARG:", code)
+        self.assertIn('function_name=f"{_PREFIX}:{prop}:CALLN"', code)
+
+
+if __name__ == "__main__":
+    unittest.main()

remoterf-2.0.2/tests/test_process_arg.py

@@ -0,0 +1,44 @@
+import unittest
+
+import numpy as np
+
+from remoteRF.common.utils.process_arg import map_arg, unmap_arg
+
+
+class ProcessArgTests(unittest.TestCase):
+    def test_json_values_round_trip_dict_and_none(self):
+        value = {"nested": {"x": 1}, "flag": True, "nothing": None}
+
+        self.assertEqual(unmap_arg(map_arg(value)), value)
+        self.assertIsNone(unmap_arg(map_arg(None)))
+
+    def test_existing_scalar_values_still_round_trip(self):
+        self.assertIs(unmap_arg(map_arg(True)), True)
+        self.assertEqual(unmap_arg(map_arg(12)), 12)
+        self.assertAlmostEqual(unmap_arg(map_arg(1.5)), 1.5)
+        self.assertEqual(unmap_arg(map_arg("abc")), "abc")
+
+    def test_arrays_and_list_values_still_round_trip_as_arrays(self):
+        real = np.array([[1.0, 2.0], [3.0, 4.0]], dtype=np.float32)
+        complex_value = np.array([1 + 2j, 3 + 4j], dtype=np.complex64)
+
+        np.testing.assert_allclose(unmap_arg(map_arg(real)), real)
+        np.testing.assert_allclose(unmap_arg(map_arg([1, 2, 3])), np.array([1, 2, 3]))
+        np.testing.assert_allclose(unmap_arg(map_arg(complex_value)), complex_value)
+
+    def test_json_values_can_contain_arrays_and_mixed_return_tuples(self):
+        samples = np.array([[1 + 2j, 3 + 4j]], dtype=np.complex64)
+        value = (2, samples, {"error_code": "none"})
+
+        count, restored_samples, metadata = unmap_arg(map_arg(value))
+
+        self.assertEqual(count, 2)
+        np.testing.assert_allclose(restored_samples, samples)
+        self.assertEqual(metadata, {"error_code": "none"})
+
+        nested = unmap_arg(map_arg({"samples": samples}))
+        np.testing.assert_allclose(nested["samples"], samples)
+
+
+if __name__ == "__main__":
+    unittest.main()

remoterf-2.0.1/src/remoteRF/common/utils/process_arg.py

@@ -1,82 +0,0 @@
-from ..grpc import grpc_pb2, grpc_pb2_grpc
-import numpy as np
-
-def unmap_arg(arg):
-    if arg.HasField('int64_value'):
-        return arg.int64_value
-    elif arg.HasField('float_value'):
-        return arg.float_value
-    elif arg.HasField('string_value'):
-        return arg.string_value
-    elif arg.HasField('bool_value'):
-        return arg.bool_value
-    elif arg.HasField('real_array'):
-        shape = tuple(arg.real_array.shape.dim)
-        return np.array(arg.real_array.data, dtype=np.float64).reshape(shape)
-    elif arg.HasField('complex_array'):
-        shape = tuple(arg.complex_array.shape.dim)
-        data = [complex(c.real, c.imag) for c in arg.complex_array.data]
-        return np.array(data, dtype=np.complex64).reshape(shape)
-    else:
-        raise ValueError(f"Unknown argument type during unmapping: {arg}")
-    
-def map_arg(value):
-    arg = grpc_pb2.Argument()
-    
-    if isinstance(value, int):
-        arg.int64_value = value
-    elif isinstance(value, float):
-        arg.float_value = value
-    elif isinstance(value, str):
-        arg.string_value = value
-    elif isinstance(value, bool):
-        arg.bool_value = value
-    elif isinstance(value, (list, tuple)):
-        return map_arg(np.array(value))
-    elif isinstance(value, np.ndarray):
-        if np.iscomplexobj(value):
-            complex_array = arg.complex_array
-            complex_array.shape.dim.extend(value.shape)
-            for num in value.ravel():
-                complex_num = complex_array.data.add()
-                complex_num.real = num.real
-                complex_num.imag = num.imag
-        else:
-            float_array = arg.real_array
-            float_array.shape.dim.extend(value.shape)
-            float_array.data.extend(value.ravel())
-    else:
-        raise ValueError(f"Unknown argument type during mapping: {value}")
-    return arg
-        
-def map_array_proto(np_array):
-    arg = grpc_pb2.Argument()
-    
-    # Check if the array is complex
-    if np.iscomplexobj(np_array):
-        complex_array = grpc_pb2.ComplexArray()
-        for num in np_array.flat:
-            complex_number = complex_array.data.add()
-            complex_number.real = num.real
-            complex_number.imag = num.imag
-        arg.complex_array.CopyFrom(complex_array)
-    else:
-        # Handle as a regular float array
-        float_array = grpc_pb2.FloatArray()
-        float_array.data.extend(np_array.flat)
-        arg.float_array.CopyFrom(float_array)
-
-    return arg
-
-def unmap_array_proto(arg):
-    # Check which type of array is available and convert appropriately
-    if arg.HasField('complex_array'):
-        # Convert ComplexArray to a numpy array of complex numbers
-        data = [complex(cn.real, cn.imag) for cn in arg.complex_array.data]
-        return np.array(data, dtype=np.complex64)
-    elif arg.HasField('float_array'):
-        # Convert FloatArray to a numpy array of floats
-        return np.array(arg.float_array.data, dtype=np.float32)
-    else:
-        raise ValueError("Argument does not contain a recognizable array.")
-