state_trigger only triggers on value changes (using StateVar)

custom_components/pyscript/__init__.py

@@ -36,7 +36,7 @@
 from .global_ctx import GlobalContext, GlobalContextMgr
 from .jupyter_kernel import Kernel
 from .requirements import install_requirements
-from .state import State
+from .state import State, StateVar
 from .trigger import TrigTime
 
 _LOGGER = logging.getLogger(LOGGER_PATH)
@@ -193,8 +193,14 @@ async def state_changed(event):
             # state variable has been deleted
             new_val = None
         else:
-            new_val = event.data["new_state"].state
-        old_val = event.data["old_state"].state if event.data["old_state"] else None
+            new_val = StateVar(event.data['new_state'])
+
+        if "old_state" not in event.data or event.data["old_state"] is None:
+            # no previous state
+            old_val = None
+        else:
+            old_val = StateVar(event.data['old_state'])
+
         new_vars = {var_name: new_val, f"{var_name}.old": old_val}
         func_args = {
             "trigger_type": "state",

custom_components/pyscript/trigger.py

@@ -22,7 +22,7 @@
 _LOGGER = logging.getLogger(LOGGER_PATH + ".trigger")
 
 
-STATE_RE = re.compile(r"[a-zA-Z]\w*\.[a-zA-Z]\w*$")
+STATE_RE = re.compile(r"[a-zA-Z]\w*\.[a-zA-Z]\w*(\.[a-zA-Z\*]?[a-zA-Z]*)?$")
 
 
 def dt_now():
@@ -644,6 +644,112 @@ def start(self):
             self.task = Function.create_task(self.trigger_watch())
             _LOGGER.debug("trigger %s is active", self.name)
 
+    def ident_any_values_changed(self, func_args):
+        """Check for changes to state or attributes on ident any vars"""
+        value = func_args.get('value')
+        old_value = func_args.get('old_value')
+        var_name = func_args.get('var_name')
+
+        if var_name is None:
+            _LOGGER.debug(
+                "%s ident_any change not detected because no var_name",
+                self.name,
+            )
+            return False
+
+        for check_var in self.state_trig_ident_any:
+            if check_var == var_name and old_value != value:
+                _LOGGER.debug(
+                    "%s ident_any change detected at state",
+                    self.name,
+                )
+                return True
+
+            if check_var.startswith(f"{var_name}."):
+                var_pieces = check_var.split('.')
+                if len(var_pieces) == 3 and f"{var_pieces[0]}.{var_pieces[1]}" == var_name:
+                    if var_pieces[2] == "*":
+                        # catch all has been requested, check all attributes for change
+                        all_attributes = set()
+                        if value is not None:
+                            all_attributes |= set(value.__dict__.keys())
+                        if old_value is not None:
+                            all_attributes |= set(old_value.__dict__.keys())
+                        all_attributes -= {"last_updated", "last_changed"}
+                        for attribute in all_attributes:
+                            attrib_val = getattr(value, attribute, None)
+                            attrib_old_val = getattr(old_value, attribute, None)
+                            if attrib_old_val != attrib_val:
+                                _LOGGER.debug(
+                                    "%s ident_any change detected in * at %s",
+                                    self.name,
+                                    attribute,
+                                )
+                                return True
+                    else:
+                        attrib_val = getattr(value, var_pieces[2], None)
+                        attrib_old_val = getattr(old_value, var_pieces[2], None)
+                        if attrib_old_val != attrib_val:
+                            _LOGGER.debug(
+                                "%s ident_any change detected at %s",
+                                self.name,
+                                var_pieces[2],
+                            )
+                            return True
+
+        _LOGGER.debug(
+            "%s no ident_any change detected",
+            self.name,
+        )
+        return False
+
+    def ident_values_changed(self, func_args):
+        """Check for changes to state or attributes on ident vars"""
+        value = func_args.get('value')
+        old_value = func_args.get('old_value')
+        var_name = func_args.get('var_name')
+
+        if var_name is None:
+            _LOGGER.debug(
+                "%s ident changes not detected because no var_name",
+                self.name,
+            )
+            return False
+
+        for check_var in self.state_trig_ident:
+            if check_var in self.state_trig_ident_any:
+                _LOGGER.debug(
+                    "%s ident change skipping %s because also ident_any",
+                    self.name,
+                    check_var,
+                )
+                continue
+            var_pieces = check_var.split('.')
+            if len(var_pieces) == 2 and check_var == var_name:
+                if value != old_value:
+                    _LOGGER.debug(
+                        "%s ident change detected at state",
+                        self.name
+                    )
+                    return True
+            elif len(var_pieces) == 3 and f"{var_pieces[0]}.{var_pieces[1]}" == var_name:
+                attrib_val = getattr(value, var_pieces[2], None)
+                attrib_old_val = getattr(old_value, var_pieces[2], None)
+                if  attrib_old_val != attrib_val:
+                    _LOGGER.debug(
+                        "%s ident change detected at attribute %s",
+                        self.name,
+                        var_pieces[2]
+                    )
+                    return True
+
+        _LOGGER.debug(
+            "%s no ident change detected",
+            self.name,
+        )
+
+        return False
+
     async def trigger_watch(self):
         """Task that runs for each trigger, waiting for the next trigger and calling the function."""
 
@@ -739,7 +845,11 @@ async def trigger_watch(self):
                 elif notify_type == "state":
                     new_vars, func_args = notify_info
 
-                    if "var_name" not in func_args or func_args["var_name"] not in self.state_trig_ident_any:
+                    if not self.ident_any_values_changed(func_args):
+                        # if var_name not in func_args we are state_check_now
+                        if "var_name" in func_args and not self.ident_values_changed(func_args):
+                            continue
+
                         if self.state_trig_eval:
                             trig_ok = await self.state_trig_eval.eval(new_vars)
                             exc = self.state_trig_eval.get_exception_long()
@@ -748,6 +858,7 @@ async def trigger_watch(self):
                                 trig_ok = False
                         else:
                             trig_ok = False
+
                     if self.state_hold_dur is not None:
                         if trig_ok:
                             if not state_trig_waiting:

tests/test_decorator_errors.py

@@ -194,15 +194,7 @@ def func_wrapup():
         """Exception in <file.hello.func6 @state_active()> line 1:
     1 / pyscript.var1
         ^
-TypeError: unsupported operand type(s) for /: 'int' and 'str'"""
-        in caplog.text
-    )
-
-    assert (
-        """Exception in <file.hello.func6 @state_active()> line 1:
-    1 / pyscript.var1
-        ^
-TypeError: unsupported operand type(s) for /: 'int' and 'str'"""
+TypeError: unsupported operand type(s) for /: 'int' and 'StateVar'"""
         in caplog.text
     )