added @devicegroup.code and @devicegroup.code_follow decorators

Author: Carglglz

changelog.md

@@ -10,8 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix data feeding pipe missing blank lines in follow callback for BleDevice
 - deprecate self-signed certs in favor of ROOT CA signed certs for WebSocketDevices using SSL/TLS
 ### Added
-- @code decorator for Device classes to declare and call functions in devices
-- @code decorator examples
+- @device.code decorator for Device classes to declare and call functions in devices
+- @device.code_follow for Device classes to declare and call functions in devices whose output need to be followed.
+- @devicegroup.code for DeviceGroup class to declare and call functions in group of devices
+– @devicegroup.code_follow for Device classes to declare and call functions in a group of devices whose output need to be followed.
+- decorator examples
 ## [0.3.6] - 2022-03-25
 ### Fix
 - fixed missing dependencies in `setup.py` (@BradenM)

examples/decorators/test_dec.py

@@ -16,7 +16,7 @@ def led_toggle(led):
 
 
 print('Toggling led..')
-for i in range(1,5):
+for i in range(1, 5):
     led_toggle(i)
 
 
@@ -30,7 +30,7 @@ def dothis():
 
 dothis()
 
-#espd = Device('espdev.local', "oXQdh0wQ", init=True)
+# espd = Device('espdev.local', "oXQdh0wQ", init=True)
 
 # @espd.code
 # def esp_led_toggle():
@@ -62,5 +62,5 @@ def dothis():
 #
 #
 # doit()
-#res2 = espd.wr_cmd('esp_led_toggle()', rtn=True, rtn_resp=True)
-#print(res1 + 1)
+# res2 = espd.wr_cmd('esp_led_toggle()', rtn=True, rtn_resp=True)
+# print(res1 + 1)

upydevice/devgroup.py

@@ -23,6 +23,8 @@
 
 import time
 import multiprocessing
+from .decorators import getsource
+import functools
 
 # DEV GROUP
 
@@ -107,3 +109,57 @@ def reset(self, group_silent=False, silent_dev=True, ignore=[], include=[]):
             if not group_silent:
                 print('Rebooting {}'.format(dev))
             self.devs[dev].reset(silent=silent_dev)
+
+
+class DeviceGroup(DEVGROUP):
+
+    def __init__(self, *args, **kargs):
+        super().__init__(*args, **kargs)
+
+    def code(self, func):
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
+        for dev in self.devs.keys():
+            self.devs[dev].paste_buff(str_func)
+            self.devs[dev].cmd('\x04', silent=True)
+
+        @functools.wraps(func)
+        def wrapper_cmd(*args, **kwargs):
+            flags = ['>', '<', 'object', 'at', '0x']
+            args_repr = [repr(a) for a in args if any(
+                f not in repr(a) for f in flags)]
+            kwargs_repr = [f"{k}={v!r}" if not callable(
+                v) else f"{k}={v.__name__}" for k, v in kwargs.items()]
+            signature = ", ".join(args_repr + kwargs_repr)
+            cmd_ = f"{func.__name__}({signature})"
+            self.output = {}
+            for dev in self.devs.keys():
+                self.devs[dev].wr_cmd(cmd_, rtn=True)
+                if self.devs[dev].output:
+                    self.output[dev] = self.devs[dev].output
+            if self.output:
+                return self.output
+        return wrapper_cmd
+
+    def code_follow(self, func):
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
+        for dev in self.devs.keys():
+            self.devs[dev].paste_buff(str_func)
+            self.devs[dev].cmd('\x04', silent=True)
+
+        @functools.wraps(func)
+        def wrapper_cmd(*args, **kwargs):
+            flags = ['>', '<', 'object', 'at', '0x']
+            args_repr = [repr(a) for a in args if any(
+                f not in repr(a) for f in flags)]
+            kwargs_repr = [f"{k}={v!r}" if not callable(
+                v) else f"{k}={v.__name__}" for k, v in kwargs.items()]
+            signature = ", ".join(args_repr + kwargs_repr)
+            cmd_ = f"{func.__name__}({signature})"
+            self.output = {}
+            for dev in self.devs.keys():
+                self.devs[dev].wr_cmd(cmd_, rtn=True, follow=True)
+                if self.devs[dev].output:
+                    self.output[dev] = self.devs[dev].output
+            if self.output:
+                return self.output
+        return wrapper_cmd