exclude backed off tasks from retries, revert registry changes

Author: khvn26

src/task_processor/decorators.py

@@ -49,7 +49,7 @@ def __init__(
             f,
             task_name,
         )
-        task_registry.register_task(task_identifier, self)
+        task_registry.register_task(task_identifier, f)
 
     def __call__(
         self,

src/task_processor/models.py

@@ -74,7 +74,7 @@ def run(self) -> None:
     @property
     def callable(self) -> TaskCallable[typing.Any]:
         task = get_task(self.task_identifier)
-        return task.task_callable
+        return task.task_function
 
 
 class Task(AbstractBaseTask):

src/task_processor/processor.py

@@ -51,7 +51,7 @@ def run_tasks(database: str, num_tasks: int = 1) -> list[TaskRun]:
         if executed_tasks:
             Task.objects.using(database).bulk_update(
                 executed_tasks,
-                fields=["completed", "num_failures", "is_locked"],
+                fields=["completed", "num_failures", "is_locked", "scheduled_for"],
             )
 
         if task_runs:
@@ -165,18 +165,10 @@ def _run_task(
             )
             if typing.TYPE_CHECKING:
                 assert isinstance(task, Task)
-                assert registered_task.task_handler
             delay_until = e.delay_until or timezone.now() + timedelta(
                 seconds=settings.TASK_BACKOFF_DEFAULT_DELAY_SECONDS,
             )
-            assert registered_task.task_handler, (
-                "Attempt to back off a recurring task (currently not supported)"
-            )
-            registered_task.task_handler.delay(
-                delay_until=delay_until,
-                args=task.args,
-                kwargs=task.kwargs,
-            )
+            task.scheduled_for = delay_until
             logger.info(
                 "Backoff requested. Task '%s' set to retry at %s",
                 task_identifier,

src/task_processor/task_registry.py

@@ -6,9 +6,6 @@
 from task_processor.exceptions import TaskProcessingError
 from task_processor.types import TaskCallable
 
-if typing.TYPE_CHECKING:
-    from task_processor.decorators import TaskHandler  # noqa: F401
-
 logger = logging.getLogger(__name__)
 
 
@@ -20,9 +17,8 @@ class TaskType(enum.Enum):
 @dataclass
 class RegisteredTask:
     task_identifier: str
-    task_callable: TaskCallable[typing.Any]
+    task_function: TaskCallable[typing.Any]
     task_type: TaskType = TaskType.STANDARD
-    task_handler: "TaskHandler[typing.Any] | None" = None
     task_kwargs: dict[str, typing.Any] | None = None
 
 
@@ -60,21 +56,20 @@ def get_task(task_identifier: str) -> RegisteredTask:
 
 def register_task(
     task_identifier: str,
-    task_handler: "TaskHandler[typing.Any]",
+    callable_: TaskCallable[typing.Any],
 ) -> None:
     global registered_tasks
 
     registered_task = RegisteredTask(
         task_identifier=task_identifier,
-        task_handler=task_handler,
-        task_callable=task_handler.unwrapped,
+        task_function=callable_,
     )
     registered_tasks[task_identifier] = registered_task
 
 
 def register_recurring_task(
     task_identifier: str,
-    task_callable: TaskCallable[typing.Any],
+    callable_: TaskCallable[typing.Any],
     **task_kwargs: typing.Any,
 ) -> None:
     global registered_tasks
@@ -83,7 +78,7 @@ def register_recurring_task(
 
     registered_task = RegisteredTask(
         task_identifier=task_identifier,
-        task_callable=task_callable,
+        task_function=callable_,
         task_type=TaskType.RECURRING,
         task_kwargs=task_kwargs,
     )

tests/unit/task_processor/test_unit_task_processor_processor.py

@@ -684,11 +684,8 @@ def backoff_task() -> None:
     assert [
         record.message for record in caplog.records if record.levelno == logging.INFO
     ] == [expected_log_message]
-    assert Task.objects.using(current_database).count() == 2
-    assert (
-        Task.objects.using(current_database).latest("created_at").scheduled_for
-        == expected_scheduled_for
-    )
+    task.refresh_from_db(using=current_database)
+    assert task.scheduled_for == expected_scheduled_for
 
 
 @pytest.mark.multi_database