remove dependency on django-tasks

Author: knifecake

README.md

@@ -13,8 +13,8 @@ Steady Queue can be used with SQL databases such as MySQL, PostgreSQL or SQLite,
 
 ## Installation
 
-1. **Install the `steady_queue` package.** Since Steady Queue depends on interfaces defined by DEP 0014 which has not become part of Django yet, it will add django-tasks (the reference implementation) as a dependency.
-2. **Add `steady_queue` and `django_tasks` to your `INSTALLED_APPS`** in `settings.py`.
+1. **Install the `steady_queue` package.**
+2. **Add `steady_queue` to your `INSTALLED_APPS`** in `settings.py`.
 3. **Configure Steady Queue as a task backend.** In `settings.py`, add the Steady Queue backend:
    ```python
    TASKS = {
@@ -36,11 +36,10 @@ For small projects, you can run Steady Queue on the same machine as your webserv
 
 Steady Queue works like any other DEP 0014-compatible task backend.
 
-Tasks are functions decorated with the `@task` decorator from `django_tasks`
-(which will become `django.tasks` once integrated into Django):
+Tasks are functions decorated with the `@task` decorator from `django.tasks`:
 
 ```python
-from django_tasks import task
+from django.task import task
 
 @task()
 def greet(name: str, times: int = 1):
@@ -392,7 +391,7 @@ Steady Queue extends Django Tasks with concurrency controls, that allows you to
 
 
 ```python
-from django_tasks import task
+from django.tasks import task
 
 from steady_queue.concurrency import limits_concurrency
 

pyproject.toml

@@ -20,7 +20,6 @@ classifiers = [
 dependencies = [
     "crontab>=1.0.5",
     "django>=6.0,<7",
-    "django-tasks>=0.8.1,<0.9.0",
 ]
 
 [project.urls]

steady_queue/backend.py

@@ -1,6 +1,5 @@
-from django_tasks import ResultStatus, Task, TaskResult
-from django_tasks.backends.base import BaseTaskBackend
-from django_tasks.task import P, T
+from django.tasks import Task, TaskResult, TaskResultStatus
+from django.tasks.backends.base import BaseTaskBackend
 
 from steady_queue.task import SteadyQueueTask
 
@@ -18,9 +17,7 @@ def validate_task(self, task: Task) -> None:
         # TODO: do we need to do anything here?
         super().validate_task(task)
 
-    def enqueue(
-        self, task: Task[P, T], args: P.args, kwargs: P.kwargs
-    ) -> TaskResult[T]:
+    def enqueue(self, task, args, kwargs) -> TaskResult:
         from steady_queue.models import Job
 
         if not isinstance(task, SteadyQueueTask):
@@ -40,7 +37,7 @@ def _to_task_result(self, task: SteadyQueueTask, job) -> TaskResult:
         return TaskResult(
             task=task,
             id=str(job.id),
-            status=ResultStatus("READY"),
+            status=TaskResultStatus.READY,
             enqueued_at=job.created_at,
             started_at=None,
             finished_at=job.finished_at,

steady_queue/concurrency.py

@@ -1,3 +1,4 @@
+from dataclasses import replace
 from datetime import timedelta
 from typing import Optional
 
@@ -12,13 +13,13 @@ def limits_concurrency(
     group: Optional[str] = None,
 ):
     def wrapper(task: SteadyQueueTask):
-        task.concurrency_key = key
-        task.concurrency_limit = to
-        task.concurrency_duration = (
-            duration or steady_queue.default_concurrency_control_period
+        return replace(
+            task,
+            concurrency_key=key,
+            concurrency_limit=to,
+            concurrency_duration=duration
+            or steady_queue.default_concurrency_control_period,
+            concurrency_group=group or task.module_path,
         )
-        task.concurrency_group = group or task.module_path
-
-        return task
 
     return wrapper

steady_queue/models/recurring_execution.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django_tasks import TaskResult
+from django.tasks import TaskResult
 
 from .execution import Execution, ExecutionQuerySet
 

steady_queue/recurring_task.py

@@ -1,4 +1,5 @@
 import logging
+from dataclasses import replace
 from typing import Optional
 
 from steady_queue.configuration import Configuration
@@ -36,8 +37,6 @@ def wrapper(task: SteadyQueueTask):
                 "The given task does not look to be a Django task. Did you forget to decorate it with @task()?"
             )
 
-        task.args = args
-        task.kwargs = kwargs
         configuration = Configuration.RecurringTask(
             key=key,
             class_name=class_name,
@@ -49,6 +48,6 @@ def wrapper(task: SteadyQueueTask):
         )
         configurations.append(configuration)
 
-        return task
+        return replace(task, args=args, kwargs=kwargs)
 
     return wrapper

steady_queue/task.py

@@ -1,11 +1,11 @@
 import datetime
 import uuid
+from dataclasses import dataclass, replace
 from typing import Any, Optional
 
+from django.tasks import Task, TaskResult
 from django.utils import timezone, translation
 from django.utils.module_loading import import_string
-from django_tasks import Task
-from django_tasks.task import P, T, TaskResult
 
 from steady_queue.arguments import Arguments
 
@@ -14,18 +14,18 @@ class UnknownTaskClassError(Exception):
     pass
 
 
-class SteadyQueueTask(Task[P, T]):
-    args: P.args
-    kwargs: P.kwargs
+@dataclass(frozen=True, slots=True, kw_only=True)
+class SteadyQueueTask(Task):
+    args: Optional[list[Any]] = None
+    kwargs: Optional[dict[str, Any]] = None
 
     concurrency_key: Optional[str] = None
     concurrency_limit: Optional[int] = None
     concurrency_duration: Optional[timezone.timedelta] = None
     concurrency_group: Optional[str] = None
 
     def __post_init__(self):
-        super().__post_init__()
-        self.arguments = {}
+        self.get_backend().validate_task(self)
 
     @property
     def id(self) -> str:
@@ -49,12 +49,9 @@ def using(
             backend=backend,
         )
 
-    def enqueue(self, *args: P.args, **kwargs: P.kwargs) -> "TaskResult[T]":
+    def enqueue(self, *args: Any, **kwargs: Any) -> TaskResult:
         return self.get_backend().enqueue(self, args, kwargs)
 
-    def set_arguments(self, arguments: dict[str, Any]):
-        self.arguments = arguments
-
     def serialize(self):
         return {
             "class_name": self.module_path,
@@ -87,8 +84,5 @@ def deserialize(cls, job_data: dict[str, Any]):
             run_after=job_data["scheduled_at"],
             backend=job_data["backend"],
         )
-
-        task.args, task.kwargs = Arguments.deserialize_args_and_kwargs(
-            job_data["arguments"]
-        )
-        return task
+        args, kwargs = Arguments.deserialize_args_and_kwargs(job_data["arguments"])
+        return replace(task, args=args, kwargs=kwargs)

tests/dummy/tasks.py

@@ -1,6 +1,6 @@
 import time
 
-from django_tasks import task
+from django.tasks import task
 
 from steady_queue.concurrency import limits_concurrency
 from steady_queue.recurring_task import recurring

tests/settings.py

@@ -12,7 +12,6 @@
 SECRET_KEY = "fake-key"
 
 INSTALLED_APPS = [
-    "django_tasks",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",

tests/test_recurring_task.py

@@ -1,5 +1,5 @@
+from django.tasks import task
 from django.test import SimpleTestCase
-from django_tasks import task
 
 from steady_queue.recurring_task import configurations, recurring