changes per craig

Author: dlashua

custom_components/pyscript/eval.py

@@ -41,6 +41,17 @@
     "print",
 }
 
+TRIG_DECORATORS = {
+    "time_trigger",
+    "state_trigger",
+    "event_trigger",
+    "mqtt_trigger",
+    "state_active",
+    "time_active",
+    "task_unique",
+}
+
+ALL_DECORATORS = TRIG_DECORATORS.union({"service"})
 
 def ast_eval_exec_factory(ast_ctx, mode):
     """Generate a function that executes eval() or exec() with given ast_ctx."""
@@ -255,7 +266,6 @@ def __init__(self, func_def, code_list, code_str, global_ctx):
         self.trigger = None
         self.trigger_service = False
         self.has_closure = False
-        self.perform_call = None
 
     def get_name(self):
         """Return the function name."""
@@ -281,15 +291,6 @@ async def trigger_init(self):
             "event_trigger",
             "mqtt_trigger",
         }
-        trig_decorators = {
-            "time_trigger",
-            "state_trigger",
-            "event_trigger",
-            "mqtt_trigger",
-            "state_active",
-            "time_active",
-            "task_unique",
-        }
         decorator_used = set()
         for dec in self.decorators:
             dec_name, dec_args, dec_kwargs = dec[0], dec[1], dec[2]
@@ -304,7 +305,7 @@ async def trigger_init(self):
             decorator_used.add(dec_name)
             if dec_name in trig_decorators_reqd:
                 got_reqd_dec = True
-            if dec_name in trig_decorators:
+            if dec_name in TRIG_DECORATORS:
                 if dec_name not in trig_args:
                     trig_args[dec_name] = {}
                     trig_args[dec_name]["args"] = []
@@ -384,7 +385,7 @@ async def do_service_call(func, ast_ctx, data):
                     dec_name,
                 )
 
-        for dec_name in trig_decorators:
+        for dec_name in TRIG_DECORATORS:
             if dec_name in trig_args and len(trig_args[dec_name]["args"]) == 0:
                 trig_args[dec_name]["args"] = None
 
@@ -520,85 +521,21 @@ async def eval_decorators(self, ast_ctx):
         code_str, code_list = ast_ctx.code_str, ast_ctx.code_list
         ast_ctx.code_str, ast_ctx.code_list = self.code_str, self.code_list
 
-        decorator_chain_funcs = []
-
+        dec_funcs = []
         for dec in self.func_def.decorator_list:
-            # this should eventually handle:
-            # SomeClass('a','b').some_method('x','y')
-            if isinstance(dec, ast.Call) and isinstance(dec.func, ast.Attribute):
-                _LOGGER.info(
-                    "Attribute as decorator (ignoring for now) %s %s %s",
-                    dec.func,
-                    dec.func.attr,
-                    dec.func.value    
-                )
-
-            elif isinstance(dec, ast.Call) and isinstance(dec.func, ast.Name):
-                args = []
-                kwargs = {}
-                for arg in dec.args:
-                    args.append(await ast_ctx.aeval(arg))
-                for keyw in dec.keywords:
-                    kwargs[keyw.arg] = await ast_ctx.aeval(keyw.value)
+            if isinstance(dec, ast.Call) and isinstance(dec.func, ast.Name) and dec.func.id in ALL_DECORATORS:
+                args = [await ast_ctx.aeval(arg) for arg in dec.args]
+                kwargs = {keyw.arg: await ast_ctx.aeval(keyw.value) for keyw in dec.keywords}
                 if len(kwargs) == 0:
                     kwargs = None
-
-                if dec.func.id in ast_ctx.global_sym_table:
-                    _LOGGER.info(
-                        "added %s to decorator_chain_funcs",
-                        dec.func.id,
-                    )
-                    decorator_chain_funcs.append(dec)
-                else:
-                    self.decorators.append([dec.func.id, args, kwargs])
-            elif isinstance(dec, ast.Name):
-                if dec.id in ast_ctx.global_sym_table:
-                    decorator_chain_funcs.append(dec)
-                else:
-                    self.decorators.append([dec.id, None, None])
+                self.decorators.append([dec.func.id, args, kwargs])
+            elif isinstance(dec, ast.Name) and dec.id in ALL_DECORATORS:
+                self.decorators.append([dec.id, None, None])
             else:
-                _LOGGER.error("function %s has unexpected decorator type %s", self.name, dec)
-
-        actual_call = self.real_call
-
-        try:
-            for dec in reversed(decorator_chain_funcs):
-                if isinstance(dec, ast.Call) and isinstance(dec.func, ast.Name):
-                    args = []
-                    kwargs = {}
-                    for arg in dec.args:
-                        args.append(await ast_ctx.aeval(arg))
-                    for keyw in dec.keywords:
-                        kwargs[keyw.arg] = await ast_ctx.aeval(keyw.value)
-                    if len(kwargs) == 0:
-                        kwargs = {}
-                    func_def = ast_ctx.global_sym_table[dec.func.id]
-
-                    wrapper = await func_def.call(ast_ctx, *args, **kwargs)
-                    def make_actual_call_inner(actual_call):
-                        async def actual_call_inner(*args_tuple, **kwargs):
-                            args = list(args_tuple)
-                            if len(args) > 0 and isinstance(args[0], AstEval):
-                                _LOGGER.info('AstEval seen')
-                                args.pop(0)
-                            _LOGGER.info(actual_call)
-                            return await actual_call(ast_ctx, *args, **kwargs)
-                        return actual_call_inner
-                    actual_call = await wrapper(make_actual_call_inner(actual_call))
-    
-                elif isinstance(dec, ast.Name):
-                    func_def = ast_ctx.global_sym_table[dec.id]
-                    actual_call = await func_def.call(ast_ctx, actual_call)
+                dec_funcs.append(await ast_ctx.aeval(dec))
 
-                else:
-                    _LOGGER.error("function %s has unexpected global_sym_table decorator type %s", self.name, dec)
-        except Exception as e:
-            _LOGGER.error(
-                "Something went wrong %s",
-                e
-            )
-
-        self.perform_call = actual_call
+        for func in reversed(dec_funcs):
+            self.call = await ast_ctx.call_func(func, None, self.call)
 
         ast_ctx.code_str, ast_ctx.code_list = code_str, code_list
 
@@ -680,13 +617,9 @@ async def try_aeval(self, ast_ctx, arg):
                 ast_ctx.exception_long = ast_ctx.format_exc(err, arg.lineno, arg.col_offset)
 
     async def call(self, ast_ctx, *args, **kwargs):
-        """Call the function with decorators"""
-        return await self.perform_call(ast_ctx, *args, **kwargs)
-
-    async def real_call(self, ast_ctx, *args, **kwargs):
         """Call the function with the given context and arguments."""
         _LOGGER.info(
-            'in real_call of %s',
+            'in call of %s',
             self.name    
         )
         sym_table = {}