hacky method to handle pyscript decs in dec funcs

Author: dlashua

custom_components/pyscript/eval.py

@@ -561,49 +561,42 @@ async def eval_decorators(self, ast_ctx):
 
         actual_call = self.real_call
 
-        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:
+        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]
 
-                func_def = ast_ctx.global_sym_table[dec.func.id]
-                _LOGGER.info(
-                    "got Call calling %s with call %s %s",
-                    func_def,
-                    args,
-                    kwargs
-                )
-                if isinstance(func_def, EvalFuncVar):
-                    _LOGGER.info(
-                        "%s is EvalFuncVar",
-                        self.name
-                    )
                     wrapper = await func_def.call(ast_ctx, *args, **kwargs)
-                    actual_call = await wrapper(actual_call)
-                else:
-                    _LOGGER.info(
-                        "%s is NOT EvalFuncVar",
-                        self.name
-                    )
-                    wrapper = await func_def.call(*args, **kwargs)
-                    actual_call = await wrapper(actual_call)
- 
-            elif isinstance(dec, ast.Name):
-                func_def = ast_ctx.global_sym_table[dec.id]
-                _LOGGER.info(
-                    "got Name calling %s with call",
-                    func_def
-                )
-                actual_call = await func_def.call(ast_ctx, actual_call)
+                    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)
 
-            else:
-                _LOGGER.error("function %s has unexpected global_sym_table decorator type %s", self.name, 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