added tests for #82 and fixed a couple of issues

Author: craigbarratt

custom_components/pyscript/__init__.py

@@ -188,18 +188,17 @@ def state_var_remove():
 
     async def state_changed(event):
         var_name = event.data["entity_id"]
-        # attr = event.data["new_state"].attributes
-        if "new_state" not in event.data or event.data["new_state"] is None:
+        if event.data.get("new_state", None):
+            new_val = StateVar(event.data["new_state"])
+        else:
             # state variable has been deleted
             new_val = None
-        else:
-            new_val = StateVar(event.data['new_state'])
 
-        if "old_state" not in event.data or event.data["old_state"] is None:
+        if event.data.get("old_state", None):
+            old_val = StateVar(event.data["old_state"])
+        else:
             # 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 = {

custom_components/pyscript/state.py

@@ -14,6 +14,7 @@
 
 STATE_VIRTUAL_ATTRS = {"last_changed", "last_updated"}
 
+
 class StateVar(str):
     """Class for representing the value and attributes of a state variable."""
 
@@ -127,14 +128,21 @@ async def update(cls, new_vars, func_args):
 
     @classmethod
     def notify_var_get(cls, var_names, new_vars):
-        """Return the most recent value of a state variable change."""
-        notify_vars = {}
+        """Add values of var_names to new_vars, or default to None."""
+        notify_vars = new_vars.copy()
         for var_name in var_names if var_names is not None else []:
+            if var_name in notify_vars:
+                continue
+            parts = var_name.split(".")
             if var_name in cls.notify_var_last:
                 notify_vars[var_name] = cls.notify_var_last[var_name]
-            elif var_name in new_vars:
-                notify_vars[var_name] = new_vars[var_name]
-            elif 1 <= var_name.count(".") <= 2 and not cls.exist(var_name):
+            elif len(parts) == 3 and f"{parts[0]}.{parts[1]}" in cls.notify_var_last:
+                notify_vars[var_name] = getattr(
+                    cls.notify_var_last[f"{parts[0]}.{parts[1]}"], parts[2], None
+                )
+            elif len(parts) == 4 and parts[2] == "old" and f"{parts[0]}.{parts[1]}.old" in notify_vars:
+                notify_vars[var_name] = getattr(notify_vars[f"{parts[0]}.{parts[1]}.old"], parts[3], None)
+            elif 1 <= var_name.count(".") <= 3 and not cls.exist(var_name):
                 notify_vars[var_name] = None
         return notify_vars
 
@@ -144,13 +152,14 @@ async def set(cls, var_name, value=None, new_attributes=None, **kwargs):
         if var_name.count(".") != 1:
             raise NameError(f"invalid name {var_name} (should be 'domain.entity')")
 
-        if isinstance(value, StateVar) and new_attributes is None:
-            #
-            # value is a StateVar, so extract the attributes and value
-            #
-            new_attributes = value.__dict__.copy()
-            for discard in STATE_VIRTUAL_ATTRS:
-                new_attributes.pop(discard, None)
+        if isinstance(value, StateVar):
+            if new_attributes is None:
+                #
+                # value is a StateVar, so extract the attributes and value
+                #
+                new_attributes = value.__dict__.copy()
+                for discard in STATE_VIRTUAL_ATTRS:
+                    new_attributes.pop(discard, None)
             value = str(value)
 
         state_value = None
@@ -176,10 +185,15 @@ async def set(cls, var_name, value=None, new_attributes=None, **kwargs):
         if kwargs:
             new_attributes = new_attributes.copy()
             new_attributes.update(kwargs)
-        _LOGGER.debug("setting %s = %s, attr = %s", var_name, value, new_attributes)
-        cls.notify_var_last[var_name] = str(value)
 
+        _LOGGER.debug("setting %s = %s, attr = %s", var_name, value, new_attributes)
         cls.hass.states.async_set(var_name, value, new_attributes, context=context)
+        if var_name in cls.notify_var_last or var_name in cls.notify:
+            #
+            # immediately update a variable we are monitoring since it could take a while
+            # for the state changed event to propagate
+            #
+            cls.notify_var_last[var_name] = StateVar(cls.hass.states.get(var_name))
 
     @classmethod
     async def setattr(cls, var_attr_name, value):

custom_components/pyscript/trigger.py

@@ -17,7 +17,7 @@
 from .eval import AstEval
 from .event import Event
 from .function import Function
-from .state import State, STATE_VIRTUAL_ATTRS
+from .state import STATE_VIRTUAL_ATTRS, State
 
 _LOGGER = logging.getLogger(LOGGER_PATH + ".trigger")
 
@@ -49,73 +49,58 @@ def parse_time_offset(offset_str):
 
 
 def ident_any_values_changed(func_args, ident):
-    """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')
+    """Check for any changes to state or attributes on ident vars."""
+    var_name = func_args.get("var_name", None)
 
     if var_name is None:
         return False
+    value = func_args["value"]
+    old_value = func_args["old_value"]
 
     for check_var in ident:
         if check_var == var_name and old_value != value:
             return True
 
         if check_var.startswith(f"{var_name}."):
-            var_pieces = check_var.split('.')
+            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()
+                    all_attrs = set()
                     if value is not None:
-                        all_attributes |= set(value.__dict__.keys())
+                        all_attrs |= set(value.__dict__.keys())
                     if old_value is not None:
-                        all_attributes |= set(old_value.__dict__.keys())
-                    all_attributes -= STATE_VIRTUAL_ATTRS
-                    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:
+                        all_attrs |= set(old_value.__dict__.keys())
+                    for attr in all_attrs - STATE_VIRTUAL_ATTRS:
+                        if getattr(value, attr, None) != getattr(old_value, attr, None):
                             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:
-                        return True
-    
+                elif getattr(value, var_pieces[2], None) != getattr(old_value, var_pieces[2], None):
+                    return True
+
     return False
 
+
 def ident_values_changed(func_args, ident):
-    """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')
+    """Check for changes to state or attributes on ident vars."""
+    var_name = func_args.get("var_name", None)
 
     if var_name is None:
         return False
+    value = func_args["value"]
+    old_value = func_args["old_value"]
 
     for check_var in 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('.')
+        var_pieces = check_var.split(".")
         if len(var_pieces) == 2 and check_var == var_name:
             if value != old_value:
                 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:
+            if getattr(value, var_pieces[2], None) != getattr(old_value, var_pieces[2], None):
                 return True
 
     return False
 
 
-
 class TrigTime:
     """Class for trigger time functions."""
 
@@ -222,7 +207,8 @@ async def wait_until(
                 #
                 # check straight away to see if the condition is met (to avoid race conditions)
                 #
-                state_trig_ok = await state_trig_eval.eval(State.notify_var_get(state_trig_ident, {}))
+                new_vars = State.notify_var_get(state_trig_ident, {})
+                state_trig_ok = await state_trig_eval.eval(new_vars)
                 exc = state_trig_eval.get_exception_obj()
                 if exc is not None:
                     raise exc
@@ -324,8 +310,8 @@ async def wait_until(
 
                 if not ident_any_values_changed(func_args, state_trig_ident_any):
                     # if var_name not in func_args we are state_check_now
-                    if "var_name" in func_args and not ident_values_changed(func_args, state_trig):
-                        state_trig_ok = False
+                    if "var_name" in func_args and not ident_values_changed(func_args, state_trig_ident):
+                        continue
 
                     if state_trig_eval:
                         state_trig_ok = await state_trig_eval.eval(new_vars)
@@ -813,7 +799,9 @@ async def trigger_watch(self):
 
                     if not ident_any_values_changed(func_args, self.state_trig_ident_any):
                         # if var_name not in func_args we are state_check_now
-                        if "var_name" in func_args and not ident_values_changed(func_args, self.state_trig_ident):
+                        if "var_name" in func_args and not ident_values_changed(
+                            func_args, self.state_trig_ident
+                        ):
                             continue
 
                         if self.state_trig_eval:
@@ -965,8 +953,9 @@ async def do_func_call(func, ast_ctx, task_unique, task_unique_func, hass_contex
         except asyncio.CancelledError:
             raise
 
-        except Exception:
+        except Exception as exc:
             # _LOGGER.error(f"{self.name}: " + traceback.format_exc(-1))
+            _LOGGER.error("%s: %s", self.name, exc)
             if self.state_trig_ident:
                 State.notify_del(self.state_trig_ident, self.notify_q)
             if self.event_trigger is not None: