state_active now defaults undefined state variables to None, and

also uses current trigger variable if there is a state_trigger

Author: craigbarratt

custom_components/pyscript/trigger.py

@@ -454,6 +454,7 @@ def __init__(
         self.global_sym_table = trig_cfg.get("global_sym_table", {})
         self.notify_q = asyncio.Queue(0)
         self.active_expr = None
+        self.state_active_ident = None
         self.state_trig_expr = None
         self.state_trig_ident = None
         self.event_trig_expr = None
@@ -546,6 +547,9 @@ async def do_func_call(func, ast_ctx, task_unique, kwargs=None):
                 if len(self.state_trig_ident) > 0:
                     State.notify_add(self.state_trig_ident, self.notify_q)
 
+            if self.active_expr:
+                self.state_active_ident = await self.active_expr.get_names()
+
             if self.event_trigger is not None:
                 _LOGGER.debug("trigger %s adding event_trigger %s", self.name, self.event_trigger[0])
                 Event.notify_add(self.event_trigger[0], self.notify_q)
@@ -591,6 +595,7 @@ async def do_func_call(func, ast_ctx, task_unique, kwargs=None):
                 # check the trigger-specific expressions
                 #
                 trig_ok = True
+                new_vars = {}
                 if notify_type == "state":
                     new_vars, func_args = notify_info
 
@@ -613,7 +618,8 @@ async def do_func_call(func, ast_ctx, task_unique, kwargs=None):
                 # now check the state and time active expressions
                 #
                 if trig_ok and self.active_expr:
-                    trig_ok = await self.active_expr.eval()
+                    active_vars = State.notify_var_get(self.state_active_ident, new_vars)
+                    trig_ok = await self.active_expr.eval(active_vars)
                     exc = self.active_expr.get_exception_long()
                     if exc is not None:
                         self.active_expr.get_logger().error(exc)

tests/test_function.py

@@ -332,6 +332,7 @@ def func6(var_name=None, value=None):
     pyscript.done = [seq_num, var_name, pyscript.f6var1.attr1]
 
 @state_trigger("pyscript.f7var1 == '2' and pyscript.f7var1.old == '1'")
+@state_active("pyscript.f7var1 == '2' and pyscript.f7var1.old == '1' and pyscript.no_such_variable is None")
 def func7(var_name=None, value=None, old_value=None):
     global seq_num
 
@@ -340,6 +341,7 @@ def func7(var_name=None, value=None, old_value=None):
     pyscript.done = [seq_num, var_name, value, old_value]
 
 @state_trigger("pyscript.f8var1 == '2' and pyscript.f8var1.old == None")
+@state_active("pyscript.no_such_variable is None")
 def func8(var_name=None, value=None, old_value=None):
     global seq_num