Simplify setting of attributes

Support omitting the value for `state.set('domain.value', some_attr='abc')`
and support setting attributes like `domain.value.some_attr = 'abc'`

Author: swazrgb

custom_components/pyscript/eval.py

@@ -1167,9 +1167,15 @@ async def recurse_assign(self, lhs, val):
                 return
             if not isinstance(var_name, str):
                 raise NotImplementedError(f"unknown lhs type {lhs} (got {var_name}) in assign")
-            if var_name.find(".") >= 0:
+            dot_count = var_name.count(".")
+            if dot_count == 1:
                 State.set(var_name, val)
                 return
+            if dot_count == 2:
+                State.set_attr(var_name, val)
+                return
+            if dot_count > 0:
+                raise NotImplementedError("variable names may contain at most 2 dots")
             if self.curr_func and var_name in self.curr_func.global_names:
                 self.global_sym_table[var_name] = val
                 return

custom_components/pyscript/state.py

@@ -98,12 +98,19 @@ def notify_var_get(cls, var_names, new_vars):
         return notify_vars
 
     @classmethod
-    def set(cls, var_name, value, new_attributes=None, **kwargs):
+    def set(cls, var_name, value=None, new_attributes=None, **kwargs):
         """Set a state variable and optional attributes in hass."""
         if var_name.count(".") != 1:
             raise NameError(f"invalid name {var_name} (should be 'domain.entity')")
-        if new_attributes is None:
+
+        state_value = None
+        if value is None or new_attributes is None:
             state_value = cls.hass.states.get(var_name)
+
+        if value is None and state_value:
+            value = state_value.state
+
+        if new_attributes is None:
             if state_value:
                 new_attributes = state_value.attributes
             else:
@@ -115,6 +122,18 @@ def set(cls, var_name, value, new_attributes=None, **kwargs):
         cls.notify_var_last[var_name] = str(value)
         cls.hass.states.async_set(var_name, value, new_attributes)
 
+    @classmethod
+    def set_attr(cls, var_attr_name, value):
+        """Set a state variable's attribute in hass."""
+        parts = var_attr_name.split(".")
+        if len(parts) != 3:
+            raise NameError(f"invalid name {var_attr_name} (should be 'domain.entity.attr')")
+
+        state_var_name = f"{parts[0]}.{parts[1]}"
+        attr_name = parts[2]
+
+        cls.set(state_var_name, **{attr_name: value})
+
     @classmethod
     def exist(cls, var_name):
         """Check if a state variable value or attribute exists in hass."""