assignment of StateVar to a state variable assigns value and attrs

Author: craigbarratt

custom_components/pyscript/state.py

@@ -12,6 +12,8 @@
 
 _LOGGER = logging.getLogger(LOGGER_PATH + ".state")
 
+STATE_VIRTUAL_ATTRS = {"last_changed", "last_updated"}
+
 
 class StateVar(str):
     """Class for representing the value and attributes of a state variable."""
@@ -143,6 +145,15 @@ 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)
+            value = str(value)
+
         state_value = None
         if value is None or new_attributes is None:
             state_value = cls.hass.states.get(var_name)
@@ -218,7 +229,7 @@ def exist(cls, var_name):
             len(parts) == 2
             or (parts[0] in cls.service2args and parts[2] in cls.service2args[parts[0]])
             or parts[2] in value.attributes
-            or parts[2] in {"last_changed", "last_updated"}
+            or parts[2] in STATE_VIRTUAL_ATTRS
         ):
             return True
         return False
@@ -302,7 +313,7 @@ def completions(cls, root):
             value = cls.hass.states.get(name)
             if value:
                 attr_root = root[last_period + 1 :]
-                attrs = set(value.attributes.keys()).union({"last_changed", "last_updated"})
+                attrs = set(value.attributes.keys()).union(STATE_VIRTUAL_ATTRS)
                 if parts[0] in cls.service2args:
                     attrs.update(set(cls.service2args[parts[0]].keys()))
                 for attr_name in attrs:

tests/test_unit_eval.py

@@ -141,7 +141,7 @@
 state.set("pyscript.var1", 100, attr1=1, attr2=3.5)
 chk = [[pyscript.var1.attr1, pyscript.var1.attr2]]
 pyscript.var1 += "xyz"
-chk.append([pyscript.var1.attr1, pyscript.var1.attr2])
+chk.append([pyscript.var1, pyscript.var1.attr1, pyscript.var1.attr2])
 state.set("pyscript.var1", 200, attr3 = 'abc')
 chk.append([pyscript.var1.attr1, pyscript.var1.attr2, pyscript.var1.attr3])
 chk.append(state.getattr("pyscript.var1"))
@@ -163,7 +163,7 @@
 """,
         [
             [1, 3.5],
-            [1, 3.5],
+            ["100xyz", 1, 3.5],
             [1, 3.5, "abc"],
             {"attr1": 1, "attr2": 3.5, "attr3": "abc"},
             {},
@@ -175,6 +175,22 @@
             "200",
         ],
     ],
+    [
+        """
+state.set("pyscript.var1", 100, attr1=1, attr2=3.5)
+s = pyscript.var1
+chk = [[s, s.attr1, s.attr2]]
+s.attr2 += 6.5
+chk.append([s, s.attr1, s.attr2])
+s.attr3 = 100
+chk.append([s, s.attr1, s.attr2, s.attr3])
+pyscript.var1 = 0
+pyscript.var1 = s
+chk.append([pyscript.var1, pyscript.var1.attr1, pyscript.var1.attr2, pyscript.var1.attr3])
+chk
+""",
+        [["100", 1, 3.5], ["100", 1, 10], ["100", 1, 10, 100], ["100", 1, 10, 100]],
+    ],
     ["eval('1+2')", 3],
     ["x = 5; eval('2 * x')", 10],
     ["x = 5; exec('x = 2 * x'); x", 10],