"startup" is now a valid @time_trigger time_spec, and @task_unique is

a new decorator with the same arguments as task.unique().  Refactored
some time trigger.py code.

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -217,11 +217,16 @@ async def eval_decorators(self, ast_ctx):
         for dec in self.func_def.decorator_list:
             if isinstance(dec, ast.Call) and isinstance(dec.func, ast.Name):
                 args = []
+                kwargs = {}
                 for arg in dec.args:
                     args.append(await ast_ctx.aeval(arg))
-                self.decorators.append([dec.func.id, args])
+                for keyword in dec.keywords:
+                    kwargs[keyword.arg] = await ast_ctx.aeval(keyword.value)
+                if len(kwargs) == 0:
+                    kwargs = None
+                self.decorators.append([dec.func.id, args, kwargs])
             elif isinstance(dec, ast.Name):
-                self.decorators.append([dec.id, None])
+                self.decorators.append([dec.id, None, None])
             else:
                 _LOGGER.error(
                     "function %s has unexpected decorator type %s", self.name, dec

custom_components/pyscript/global_ctx.py

@@ -58,13 +58,14 @@ async def trigger_init(self, func):
             "event_trigger",
             "state_active",
             "time_active",
+            "task_unique",
         }
         decorator_used = set()
         for dec in func.get_decorators():
-            dec_name, dec_args = dec[0], dec[1]
+            dec_name, dec_args, dec_kwargs = dec[0], dec[1], dec[2]
             if dec_name in decorator_used:
                 self.logger.error(
-                    "%s defined in %s: decorator %s repeated; ignored",
+                    "%s defined in %s: decorator %s repeated; ignoring decorator",
                     func_name,
                     self.name,
                     dec_name,
@@ -75,13 +76,16 @@ async def trigger_init(self, func):
                 got_reqd_dec = True
             if dec_name in trig_decorators:
                 if dec_name not in trig_args:
-                    trig_args[dec_name] = []
+                    trig_args[dec_name] = {}
+                    trig_args[dec_name]["args"] = []
                 if dec_args is not None:
-                    trig_args[dec_name] += dec_args
+                    trig_args[dec_name]["args"] += dec_args
+                if dec_kwargs is not None:
+                    trig_args[dec_name]["kwargs"] = dec_kwargs
             elif dec_name == "service":
                 if dec_args is not None:
                     self.logger.error(
-                        "%s defined in %s: decorator @service takes no arguments; ignored",
+                        "%s defined in %s: decorator @service takes no arguments; ignoring decorator",
                         func_name,
                         self.name,
                     )
@@ -167,30 +171,71 @@ async def do_service_call(func, ast_ctx, data):
             self.services.discard(func_name)
 
         for dec_name in trig_decorators:
-            if dec_name in trig_args and len(trig_args[dec_name]) == 0:
-                trig_args[dec_name] = None
+            if dec_name in trig_args and len(trig_args[dec_name]["args"]) == 0:
+                trig_args[dec_name]["args"] = None
 
+        #
+        # check that we have the right number of arguments, and that they are
+        # strings
+        #
         arg_check = {
-            "state_trigger": {1},
-            "state_active": {1},
             "event_trigger": {1, 2},
+            "state_active": {1},
+            "state_trigger": {1},
+            "task_unique": {1},
+            "time_active": {"*"},
+            "time_trigger": {"*"},
         }
         for dec_name, arg_cnt in arg_check.items():
-            if dec_name not in trig_args or trig_args[dec_name] is None:
+            if dec_name not in trig_args or trig_args[dec_name]["args"] is None:
                 continue
-            if len(trig_args[dec_name]) not in arg_cnt:
+            if "*" not in arg_cnt and len(trig_args[dec_name]["args"]) not in arg_cnt:
                 self.logger.error(
-                    "%s defined in %s: decorator @%s got %d argument%s, expected %s; ignored",
+                    "%s defined in %s: decorator @%s got %d argument%s, expected %s; ignoring decorator",
                     func_name,
                     self.name,
                     dec_name,
-                    len(trig_args[dec_name]),
-                    "s" if len(trig_args[dec_name]) > 1 else "",
+                    len(trig_args[dec_name]["args"]),
+                    "s" if len(trig_args[dec_name]["args"]) > 1 else "",
                     " or ".join([str(cnt) for cnt in sorted(arg_cnt)]),
                 )
                 del trig_args[dec_name]
-            if arg_cnt == 1:
-                trig_args[dec_name] = trig_args[dec_name][0]
+                break
+            for arg_num, arg in enumerate(trig_args[dec_name]["args"]):
+                if not isinstance(arg, str):
+                    self.logger.error(
+                        "%s defined in %s: decorator @%s argument %d should be a string; ignoring decorator",
+                        func_name,
+                        self.name,
+                        dec_name,
+                        arg_num + 1
+                    )
+                    del trig_args[dec_name]
+                    break
+            if arg_cnt == {1}:
+                trig_args[dec_name]["args"] = trig_args[dec_name]["args"][0]
+
+        kwarg_check = {
+            "task_unique": {"kill_me"},
+        }
+        for dec_name in trig_args.keys():
+            if dec_name not in kwarg_check and "kwargs" in trig_args[dec_name]:
+                self.logger.error(
+                    "%s defined in %s: decorator @%s doesn't take keyword arguments; ignored",
+                    func_name,
+                    self.name,
+                    dec_name,
+                )
+            if dec_name in kwarg_check and "kwargs" in trig_args[dec_name]:
+                used_kw = set(trig_args[dec_name]["kwargs"].keys())
+                if not used_kw.issubset(kwarg_check[dec_name]):
+                    self.logger.error(
+                        "%s defined in %s: decorator @%s valid keyword arguments are: %s; others ignored",
+                        func_name,
+                        self.name,
+                        dec_name,
+                        ", ".join(sorted(kwarg_check[dec_name])),
+                    )
 
         if not got_reqd_dec and len(trig_args) > 0:
             self.logger.error(

custom_components/pyscript/handler.py

@@ -93,6 +93,10 @@ async def cancel_self():
             self.unique_name2task[name] = task
             self.unique_task2name[task] = name
 
+    def unique_name_used(self, name):
+        """Return whether the current unique name is in use."""
+        return name in self.unique_name2task
+
     def service_has_service(self, domain, name):
         """Implement service.has_service()."""
         return self.hass.services.has_service(domain, name)