RemoteRF 0.0.6.7__tar.gz → 0.0.6.9__tar.gz

{remoterf-0.0.6.7/src/remoteRF.egg-info → remoterf-0.0.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remoteRF
-Version: 0.0.6.7
+Version: 0.0.6.9
 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.7 → remoterf-0.0.6.9}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="remoteRF",
-    version="0.0.6.7",
+    version="0.0.6.9",
     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.7 → remoterf-0.0.6.9}/src/remoteRF/drivers/adalm_pluto/pluto_remote.py

@@ -30,7 +30,7 @@ class Pluto(metaclass=WrapperMeta): # client
         
     def try_get(self, *, function_name):
         try:
-            return rpc_client(function_name=f"Pluto:{function_name}:GET", args={'a':map_arg(self.token)}).results[function_name]
+            return unmap_arg(rpc_client(function_name=f"Pluto:{function_name}:GET", args={'a':map_arg(self.token)}).results[function_name])
         except Exception as e:
             input(f"Error: {e}\nHit enter to continue...")
             return None
@@ -152,10 +152,8 @@ class Pluto(metaclass=WrapperMeta): # client
     
     #region rx_def
     
-    @property
     def rx(self):
-        pass
-        # return unmap_arg(self.try_get(function_name="rx"))
+        return unmap_arg(self.try_get(function_name="rx"))
     
     @property
     def rx_buffer_size(self):

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

@@ -0,0 +1,67 @@
+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 method(self, *args, **kwargs)
+    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):
+        new_dct = {}
+        for attr_name, attr_value in dct.items():
+            if attr_name.startswith('__') and attr_name.endswith('__'):
+                # Skip dunder methods
+                new_dct[attr_name] = attr_value
+                continue
+            if callable(attr_value):
+                # Wrap methods
+                new_dct[attr_name] = method_wrapper(attr_value)
+            elif isinstance(attr_value, property):
+                # Wrap properties
+                new_dct[attr_name] = property_wrapper(attr_value)
+            else:
+                new_dct[attr_name] = attr_value
+        return super().__new__(cls, name, bases, new_dct)

{remoterf-0.0.6.7 → remoterf-0.0.6.9/src/remoteRF.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: remoteRF
-Version: 0.0.6.7
+Version: 0.0.6.9
 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.7/src/remoteRF/drivers/adalm_pluto/pluto_wrapper.py

@@ -1,73 +0,0 @@
-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