Ensure async tasks can be called directly

Author: RealOrangeOne

django_tasks/task.py

@@ -1,8 +1,20 @@
 from copy import deepcopy
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, Any, Callable, Dict, Generic, Optional, TypeVar, Union
-
+from inspect import iscoroutinefunction
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Coroutine,
+    Dict,
+    Generic,
+    Optional,
+    TypeVar,
+    Union,
+)
+
+from asgiref.sync import async_to_sync, sync_to_async
 from django.db.models.enums import TextChoices
 from django.utils import timezone
 from typing_extensions import ParamSpec, Self
@@ -117,9 +129,21 @@ async def aget_result(self, result_id: str) -> "TaskResult[T]":
 
         return result
 
-    def __call__(self, *args: P.args, **kwargs: P.kwargs) -> T:
+    def __call__(
+        self, *args: P.args, **kwargs: P.kwargs
+    ) -> Union[T, Coroutine[T, None, None]]:
+        return self.func(*args, **kwargs)
+
+    def call(self, *args: P.args, **kwargs: P.kwargs) -> T:
+        if iscoroutinefunction(self.func):
+            return async_to_sync(self.func)(*args, **kwargs)  # type:ignore[no-any-return]
         return self.func(*args, **kwargs)
 
+    async def acall(self, *args: P.args, **kwargs: P.kwargs) -> T:
+        if iscoroutinefunction(self.func):
+            return await self.func(*args, **kwargs)  # type:ignore[no-any-return]
+        return await sync_to_async(self.func)(*args, **kwargs)
+
     def get_backend(self) -> "BaseTaskBackend":
         from . import tasks
 

tests/tasks.py

@@ -3,12 +3,12 @@
 
 @task()
 def noop_task(*args: tuple, **kwargs: dict) -> None:
-    pass
+    return None
 
 
 @task()
 async def noop_task_async(*args: tuple, **kwargs: dict) -> None:
-    pass
+    return None
 
 
 @task()

tests/tests/test_tasks.py

@@ -135,6 +135,17 @@ async def test_invalid_priority(self) -> None:
 
     def test_call_task(self) -> None:
         self.assertEqual(test_tasks.calculate_meaning_of_life(), 42)
+        self.assertEqual(test_tasks.calculate_meaning_of_life.call(), 42)
+
+    async def test_call_task_async(self) -> None:
+        self.assertEqual(await test_tasks.calculate_meaning_of_life.acall(), 42)
+
+    async def test_call_async_task(self) -> None:
+        self.assertIsNone(await test_tasks.noop_task_async())  # type:ignore[func-returns-value]
+        self.assertIsNone(await test_tasks.noop_task_async.acall())
+
+    def test_call_async_task_sync(self) -> None:
+        self.assertIsNone(test_tasks.noop_task_async.call())
 
     def test_get_result(self) -> None:
         result = default_task_backend.enqueue(test_tasks.noop_task, (), {})