each trigger action now executed in its own ast context

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -457,8 +457,6 @@ async def do_service_call(func, ast_ctx, data):
             return
 
         trig_args["action"] = self
-        trig_args["action_ast_ctx"] = AstEval(f"{self.global_ctx_name}.{self.name}", self.global_ctx)
-        Function.install_ast_funcs(trig_args["action_ast_ctx"])
         trig_args["global_sym_table"] = self.global_ctx.global_sym_table
 
         self.trigger = self.global_ctx.get_trig_info(f"{self.global_ctx_name}.{self.name}", trig_args)

custom_components/pyscript/trigger.py

@@ -448,7 +448,6 @@ def __init__(
         self.time_active = trig_cfg.get("time_active", {}).get("args", None)
         self.task_unique = trig_cfg.get("task_unique", {}).get("args", None)
         self.task_unique_kwargs = trig_cfg.get("task_unique", {}).get("kwargs", None)
-        self.task_unique_func = None
         self.action = trig_cfg.get("action")
         self.action_ast_ctx = trig_cfg.get("action_ast_ctx")
         self.global_sym_table = trig_cfg.get("global_sym_table", {})
@@ -507,9 +506,6 @@ def __init__(
                     return
             self.have_trigger = True
 
-        if self.task_unique:
-            self.task_unique_func = Function.task_unique_factory(self.action_ast_ctx)
-
         self.setup_ok = True
 
     def stop(self):
@@ -534,13 +530,6 @@ async def trigger_watch(self):
 
         try:
 
-            async def do_func_call(func, ast_ctx, task_unique, **kwargs):
-                if task_unique and self.task_unique_func:
-                    await self.task_unique_func(task_unique)
-                await func.call(ast_ctx, **kwargs)
-                if ast_ctx.get_exception_obj():
-                    ast_ctx.get_logger().error(ast_ctx.get_exception_long())
-
             if self.state_trigger is not None:
                 self.state_trig_ident = await self.state_trig_expr.get_names()
                 _LOGGER.debug("trigger %s: watching vars %s", self.name, self.state_trig_ident)
@@ -655,8 +644,26 @@ async def do_func_call(func, ast_ctx, task_unique, **kwargs):
                     notify_type,
                     func_args,
                 )
+
+                async def do_func_call(func, ast_ctx, task_unique, task_unique_func, **kwargs):
+                    if task_unique and task_unique_func:
+                        await task_unique_func(task_unique)
+                    await func.call(ast_ctx, **kwargs)
+                    if ast_ctx.get_exception_obj():
+                        ast_ctx.get_logger().error(ast_ctx.get_exception_long())
+
+                action_ast_ctx = AstEval(
+                    f"{self.action.global_ctx_name}.{self.action.name}", self.action.global_ctx
+                )
+                Function.install_ast_funcs(action_ast_ctx)
+                task_unique_func = None
+                if self.task_unique:
+                    task_unique_func = Function.task_unique_factory(action_ast_ctx)
+
                 Function.create_task(
-                    do_func_call(self.action, self.action_ast_ctx, self.task_unique, **func_args)
+                    do_func_call(
+                        self.action, action_ast_ctx, self.task_unique, task_unique_func, **func_args
+                    )
                 )
 
         except asyncio.CancelledError: