fixed @state_trigger when there is just a .old variable

Author: craigbarratt

custom_components/pyscript/trigger.py

@@ -97,10 +97,13 @@ def ident_values_changed(func_args, ident):
 
     for check_var in ident:
         var_pieces = check_var.split(".")
-        if len(var_pieces) == 2 and check_var == var_name:
+        if len(var_pieces) < 2 or len(var_pieces) > 3:
+            continue
+        var_root = f"{var_pieces[0]}.{var_pieces[1]}"
+        if var_root == var_name and (len(var_pieces) == 2 or var_pieces[2] == "old"):
             if value != old_value:
                 return True
-        elif len(var_pieces) == 3 and f"{var_pieces[0]}.{var_pieces[1]}" == var_name:
+        elif len(var_pieces) == 3 and var_root == var_name:
             if getattr(value, var_pieces[2], None) != getattr(old_value, var_pieces[2], None):
                 return True
 

docs/new_features.rst

@@ -51,10 +51,11 @@ Breaking changes since 1.2.1 include:
 
 Bug fixes since 1.2.1 include:
 
+- Fixed ``@state_trigger`` with only a ``.old`` variable, which previously never triggered; reported by stigvi.
+- Fixed subscripts when running python 3.9.x.
 - Timeouts that implement time triggers might infrequenctly occur a tiny time before the target time. A fix was added
   to do an additional short timeout when there is an early timeout, to make sure any time trigger occurs at or shortly
   after the target time (and never before).
-- Fixed subscripts when running python 3.9.x.
 - When exception text is created, ensure lineno is inside code_list[]; with lambda function or eval it might not be.
 - An exception is raised when a function is called with unexpected keyword parameters that don't have corresponding
   keyword arguments (however, the trigger parameter names are excluded from this check, since trigger functions

tests/test_function.py

@@ -264,6 +264,14 @@ def func2c(var_name=None, value=None):
     log.info(f"func2c var = {var_name}, value = {value}")
     pyscript.done = [seq_num, var_name, int(value)]
 
+@state_trigger("pyscript.f1var2.old == '15'")
+def func2d(var_name=None, value=None, old_value=None):
+    global seq_num
+
+    seq_num += 1
+    log.info(f"func2d var = {var_name}, value = {value}")
+    pyscript.done = [seq_num, var_name, int(value), int(old_value)]
+
 
 @event_trigger("fire_event")
 def fire_event(**kwargs):
@@ -402,6 +410,7 @@ def func9(var_name=None, value=None, old_value=None):
     # initialize the trigger and active variables
     seq_num = 0
     hass.states.async_set("pyscript.f1var1", 0)
+    hass.states.async_set("pyscript.f1var2", 0)
     hass.states.async_set("pyscript.f2var2", 0)
     hass.states.async_set("pyscript.f2var3", 0)
     hass.states.async_set("pyscript.f2var4", 0)
@@ -466,6 +475,20 @@ def func9(var_name=None, value=None, old_value=None):
             seq_num += 1
             assert literal_eval(await wait_until_done(notify_q)) == [seq_num, "pyscript.f1var1", num]
 
+    #
+    # check that just a .old variable triggers
+    #
+    seq_num += 1
+    hass.states.async_set("pyscript.f1var2", 10)
+    hass.states.async_set("pyscript.f1var2", 15)
+    hass.states.async_set("pyscript.f1var2", 10)
+    assert literal_eval(await wait_until_done(notify_q)) == [
+        seq_num,
+        "pyscript.f1var2",
+        10,
+        15,
+    ]
+
     seq_num += 1
     hass.states.async_set("pyscript.f2var4", 4)
     hass.states.async_set("pyscript.f2var2", 2)