RemoteRF 0.0.6.4__tar.gz → 0.0.6.6__tar.gz

{remoterf-0.0.6.4/src/remoteRF.egg-info → remoterf-0.0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remoteRF
-Version: 0.0.6.4
+Version: 0.0.6.6
 Summary: A python API to remotely access signal centric hardware. Client-side only!
 Author: Ethan Ge
 Author-email: ethoGalaxy@gmail.com

{remoterf-0.0.6.4 → remoterf-0.0.6.6}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="remoteRF",
-    version="0.0.6.4",
+    version="0.0.6.6",
     author="Ethan Ge",
     author_email="ethoGalaxy@gmail.com",
     description="A python API to remotely access signal centric hardware. Client-side only!",

{remoterf-0.0.6.4 → remoterf-0.0.6.6}/src/remoteRF/drivers/adalm_pluto/pluto_remote.py

@@ -2,20 +2,21 @@ from ...core.grpc_client import rpc_client
 from ...common.utils import *
 from ...common.grpc import grpc_pb2
 from ...core.grpc_client import get_tcp_calls
+from .pluto_wrapper import WrapperMeta
 
-class rx_def:
-    pass
+# class rx_def:
+#     pass
 
-class tx_def:
-    pass
+# class tx_def:
+#     pass
 
-class rx_tx_def(rx_def, tx_def):
-    pass
+# class rx_tx_def(rx_def, tx_def):
+#     pass
 
-class ad9364(rx_tx_def):
-    pass
+# class ad9364(rx_tx_def):
+#     pass
 
-class Pluto: # client
+class Pluto(metaclass=WrapperMeta): # client
     
     def __init__(self, token='', debug=False):
         self.token = token
@@ -48,99 +49,123 @@ class Pluto: # client
 
     @property
     def filter(self):
-        return self.try_get(function_name="filter")
+        pass
+        # return self.try_get(function_name="filter")
     
     @filter.setter
     def filter(self, value):
-        self.try_set(function_name="filter", value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="filter", value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def loopback(self):
-        return self.try_get(function_name="loopback")
+        pass
+        # return self.try_get(function_name="loopback")
     
     @loopback.setter
     def loopback(self, value):
-        self.try_set(function_name="loopback",  value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="loopback",  value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def gain_control_mode_chan0(self):
-        return self.try_get(function_name="gain_control_mode_chan0")
+        pass
+        # return self.try_get(function_name="gain_control_mode_chan0")
     
     @gain_control_mode_chan0.setter
     def gain_control_mode_chan0(self, value):
-        self.try_set(function_name="gain_control_mode_chan0",  value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="gain_control_mode_chan0",  value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def rx_hardwaregain_chan0(self):
-        return self.try_get(function_name="rx_hardwaregain_chan0")
+        pass
+        # return self.try_get(function_name="rx_hardwaregain_chan0")
     
     @rx_hardwaregain_chan0.setter
     def rx_hardwaregain_chan0(self, value):
-        self.try_set(function_name="rx_hardwaregain_chan0",  value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="rx_hardwaregain_chan0",  value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def tx_hardwaregain_chan0(self):
-        return self.try_get(function_name="tx_hardwaregain_chan0")
+        pass
+        # return self.try_get(function_name="tx_hardwaregain_chan0")
     
     @tx_hardwaregain_chan0.setter
     def tx_hardwaregain_chan0(self, value):
-        self.try_set(function_name="tx_hardwaregain_chan0", value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="tx_hardwaregain_chan0", value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def rx_rf_bandwidth(self):
-        return unmap_arg(self.try_get(function_name="rx_rf_bandwidth"))
+        pass
+        # return unmap_arg(self.try_get(function_name="rx_rf_bandwidth"))
     
     @rx_rf_bandwidth.setter
     def rx_rf_bandwidth(self, value):
-        print("Setting RX RF Bandwidth")
-        self.try_set(function_name="rx_rf_bandwidth",  value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # print("Setting RX RF Bandwidth")
+        # self.try_set(function_name="rx_rf_bandwidth",  value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def tx_rf_bandwidth(self):
-        return self.try_get(function_name="tx_rf_bandwidth")
+        pass
+        # return self.try_get(function_name="tx_rf_bandwidth")
     
     @tx_rf_bandwidth.setter
     def tx_rf_bandwidth(self, value):
-        self.try_set(function_name="tx_rf_bandwidth",  value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="tx_rf_bandwidth",  value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def sample_rate(self):
-        return self.try_get(function_name="sample_rate")
+        pass
+        # return self.try_get(function_name="sample_rate")
     
     @sample_rate.setter
     def sample_rate(self, value):
-        self.try_set(function_name="sample_rate",  value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="sample_rate",  value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def rx_lo(self):
-        return self.try_get(function_name="rx_lo").int64_value
+        pass
+        # return self.try_get(function_name="rx_lo").int64_value
     
     @rx_lo.setter
     def rx_lo(self, value):
-        self.try_set(function_name="rx_lo", value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="rx_lo", value=grpc_pb2.Argument(int64_value=value))
         
     @property
     def tx_lo(self):
-        return self.try_get(function_name="tx_lo").int64_value
+        pass
+        # return self.try_get(function_name="tx_lo").int64_value
     
     @tx_lo.setter
     def tx_lo(self, value):
-        self.try_set(function_name="tx_lo", value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="tx_lo", value=grpc_pb2.Argument(int64_value=value))
         
     #endregion
     
     #region rx_def
     
+    @property
     def rx(self):
-        return unmap_arg(self.try_get(function_name="rx"))
+        pass
+        # return unmap_arg(self.try_get(function_name="rx"))
     
     @property
     def rx_buffer_size(self):
-        return self.try_get(function_name="rx_buffer_size").int64_value
+        pass
+        # return self.try_get(function_name="rx_buffer_size").int64_value
     
     @rx_buffer_size.setter
     def rx_buffer_size(self, value):
-        self.try_set(function_name="rx_buffer_size", value=grpc_pb2.Argument(int64_value=value))
+        pass
+        # self.try_set(function_name="rx_buffer_size", value=grpc_pb2.Argument(int64_value=value))
     
     #endregion
     

remoterf-0.0.6.6/src/remoteRF/drivers/adalm_pluto/pluto_wrapper.py

@@ -0,0 +1,73 @@
+from ...core import rpc_client
+from ...common.utils.process_arg import map_arg
+
+import inspect
+from functools import wraps
+
+# def method_wrapper(method):
+#     @wraps(method)
+#     def wrapped(self, *args, **kwargs): # No methods are present in Pluto Script
+#         # Access instance attributes like self.token
+#         # print(f"Method called: {method.__name__} with self.token: {self.token}")
+#         # Modify behavior as needed
+#         # For example, redirect the call
+#         # return self.try_get(function_name=method.__name__)
+#         return
+#     return wrapped
+
+def property_wrapper(prop):
+    # Wrap the getter
+    if prop.fget:
+        @wraps(prop.fget)
+        def getter(self):
+            print(f"Getting property: {prop.fget.__name__} with self.token: {self.token}")
+            # Redirect or modify behavior here
+            return self.try_get(function_name=prop.fget.__name__)
+    else:
+        getter = None
+
+    # Wrap the setter
+    if prop.fset:
+        @wraps(prop.fset)
+        def setter(self, value):
+            print(f"Setting property: {prop.fset.__name__} to {value} with self.token: {self.token}")
+            # Redirect or modify behavior here
+            self.try_set(function_name=prop.fset.__name__, value=value)
+    else:
+        setter = None
+
+    # Wrap the deleter
+    if prop.fdel:
+        @wraps(prop.fdel)
+        def deleter(self):
+            print(f"Deleting property: {prop.fdel.__name__}")
+            # Redirect or modify behavior here
+            prop.fdel(self)
+    else:
+        deleter = None
+
+    return property(getter, setter, deleter)
+
+class WrapperMeta(type):
+    def __new__(cls, name, bases, dct):
+        # Create the class object first
+        cls_obj = super().__new__(cls, name, bases, dct)
+        wrapped_methods = set()
+
+        # Iterate over the MRO to include inherited methods and properties
+        for base in cls_obj.__mro__:
+            for attr_name, attr_value in base.__dict__.items():
+                if attr_name in wrapped_methods or attr_name.startswith('__') and attr_name.endswith('__'):
+                    continue
+
+                # if callable(attr_value):
+                #     # Wrap methods
+                #     setattr(cls_obj, attr_name, method_wrapper(attr_value))
+                #     wrapped_methods.add(attr_name)
+                
+                if isinstance(attr_value, property):
+                    # Wrap properties
+                    setattr(cls_obj, attr_name, property_wrapper(attr_value))
+                    wrapped_methods.add(attr_name)
+
+        return cls_obj

{remoterf-0.0.6.4 → remoterf-0.0.6.6/src/remoteRF.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remoteRF
-Version: 0.0.6.4
+Version: 0.0.6.6
 Summary: A python API to remotely access signal centric hardware. Client-side only!
 Author: Ethan Ge
 Author-email: ethoGalaxy@gmail.com

{remoterf-0.0.6.4 → remoterf-0.0.6.6}/src/remoteRF.egg-info/SOURCES.txt

@@ -32,4 +32,5 @@ src/remoteRF/core/certs/server.crt
 src/remoteRF/core/certs/server.key
 src/remoteRF/drivers/__init__.py
 src/remoteRF/drivers/adalm_pluto/__init__.py
-src/remoteRF/drivers/adalm_pluto/pluto_remote.py
+src/remoteRF/drivers/adalm_pluto/pluto_remote.py
+src/remoteRF/drivers/adalm_pluto/pluto_wrapper.py