task.executor raises an exception when called with a pyscript function.

Author: craigbarratt

custom_components/pyscript/function.py

@@ -1,7 +1,6 @@
 """Function call handling."""
 
 import asyncio
-import functools
 import logging
 import traceback
 
@@ -84,7 +83,6 @@ def init(cls, hass):
                 "event.fire": cls.event_fire,
                 "service.call": cls.service_call,
                 "service.has_service": cls.service_has_service,
-                "task.executor": cls.task_executor,
                 "task.cancel": cls.user_task_cancel,
                 "task.current_task": cls.user_task_current_task,
                 "task.remove_done_callback": cls.user_task_remove_done_callback,
@@ -253,13 +251,6 @@ async def task_unique(name, kill_me=False):
 
         return task_unique
 
-    @classmethod
-    async def task_executor(cls, func, *args, **kwargs):
-        """Implement task.executor()."""
-        if asyncio.iscoroutinefunction(func) or not callable(func):
-            raise TypeError("function is not callable by task.executor()")
-        return await cls.hass.async_add_executor_job(functools.partial(func, **kwargs), *args)
-
     @classmethod
     async def user_task_cancel(cls, task=None):
         """Implement task.cancel()."""

custom_components/pyscript/trigger.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import datetime as dt
+import functools
 import locale
 import logging
 import math
@@ -185,6 +186,7 @@ async def user_task_add_done_callback(task, callback, *args, **kwargs):
 
         funcs = {
             "task.add_done_callback": user_task_add_done_callback,
+            "task.executor": cls.user_task_executor,
         }
         Function.register(funcs)
 
@@ -513,6 +515,17 @@ async def wait_until(
             raise exc
         return ret
 
+    @classmethod
+    async def user_task_executor(cls, func, *args, **kwargs):
+        """Implement task.executor()."""
+        if asyncio.iscoroutinefunction(func) or not callable(func):
+            raise TypeError(f"function {func} is not callable by task.executor")
+        if isinstance(func, EvalFuncVar):
+            raise TypeError(
+                "pyscript functions can't be called from task.executor - must be a regular python function"
+            )
+        return await cls.hass.async_add_executor_job(functools.partial(func, **kwargs), *args)
+
     @classmethod
     def parse_date_time(cls, date_time_str, day_offset, now, startup_time):
         """Parse a date time string, returning datetime."""

tests/test_unit_eval.py

@@ -1229,7 +1229,11 @@ async def test_eval(hass):
     ["continue", "Exception in test line 1 column 0: continue statement outside loop"],
     ["raise", "Exception in test line 1 column 0: No active exception to reraise"],
     ["yield", "Exception in test line 1 column 0: test: not implemented ast ast_yield"],
-    ["task.executor(5)", "Exception in test line 1 column 14: function is not callable by task.executor()"],
+    ["task.executor(5)", "Exception in test line 1 column 14: function 5 is not callable by task.executor"],
+    [
+        "task.executor(task.sleep)",
+        "Exception in test line 1 column 14: function <bound method Function.async_sleep of <class 'custom_components.pyscript.function.Function'>> is not callable by task.executor",
+    ],
     ["task.name2id('notask')", "Exception in test line 1 column 13: task name 'notask' is unknown"],
     [
         "state.get('pyscript.xyz1.abc')",