dj-queue 0.2.3__tar.gz → 0.3.0__tar.gz

{dj_queue-0.2.3 → dj_queue-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dj-queue
-Version: 0.2.3
+Version: 0.3.0
 Summary: Database-backed task queue backend for Django's django.tasks framework
 License-Expression: MIT
 License-File: LICENSE
@@ -164,6 +164,8 @@ If Django admin is installed, `dj_queue` adds an operator dashboard at
 - queue, process, recurring-task, and semaphore overview
 - backend-aware dashboard and raw changelists
 - queue controls: pause, resume, clear ready
+- job detail action: enqueue a fresh copy of any stored job
+- pause detail action: resume the paused queue from the raw pause row
 - failed-job actions: retry and discard from list and detail views
 - queue drill-down pages for state-specific inspection
 
@@ -430,8 +432,9 @@ python manage.py dj_queue_prune --task-path myapp.tasks.cleanup
 When a task raises, `dj_queue` keeps the job and its failed execution row in the
 queue database, including the exception class, message, and traceback.
 
-You can retry and discard failed jobs through Django admin, or call the same
-operations directly through the operations layer:
+You can retry and discard failed jobs through Django admin, and any raw job
+detail page can enqueue a fresh copy of that stored job. The failed-job actions
+also stay available directly through the operations layer:
 
 ```python
 from dj_queue.operations.jobs import discard_failed_job, retry_failed_job

{dj_queue-0.2.3 → dj_queue-0.3.0}/README.md

@@ -138,6 +138,8 @@ If Django admin is installed, `dj_queue` adds an operator dashboard at
 - queue, process, recurring-task, and semaphore overview
 - backend-aware dashboard and raw changelists
 - queue controls: pause, resume, clear ready
+- job detail action: enqueue a fresh copy of any stored job
+- pause detail action: resume the paused queue from the raw pause row
 - failed-job actions: retry and discard from list and detail views
 - queue drill-down pages for state-specific inspection
 
@@ -404,8 +406,9 @@ python manage.py dj_queue_prune --task-path myapp.tasks.cleanup
 When a task raises, `dj_queue` keeps the job and its failed execution row in the
 queue database, including the exception class, message, and traceback.
 
-You can retry and discard failed jobs through Django admin, or call the same
-operations directly through the operations layer:
+You can retry and discard failed jobs through Django admin, and any raw job
+detail page can enqueue a fresh copy of that stored job. The failed-job actions
+also stay available directly through the operations layer:
 
 ```python
 from dj_queue.operations.jobs import discard_failed_job, retry_failed_job

{dj_queue-0.2.3 → dj_queue-0.3.0}/dj_queue/admin.py

@@ -15,7 +15,9 @@ from django.utils import timezone
 
 from dj_queue.config import load_backend_config
 from dj_queue import dashboard
+from dj_queue.api import QueueInfo
 from dj_queue.db import get_database_alias
+from dj_queue.exceptions import EnqueueError
 from dj_queue.models import (
   BlockedExecution,
   Dashboard,
@@ -26,6 +28,7 @@ from dj_queue.models import (
   RecurringTask,
   Semaphore,
 )
+from dj_queue.operations.jobs import enqueue_job_again
 
 
 class DjQueueFirstAdminSite(admin.AdminSite):
@@ -129,48 +132,44 @@ class DashboardAdmin(admin.ModelAdmin):
     return TemplateResponse(request, "admin/dj_queue/queue_jobs.html", context)
 
   def queue_action_view(self, request, queue_name):
-    if request.method != "POST":
-      return HttpResponseNotAllowed(["POST"])
-
     backend_alias = dashboard.resolve_backend_alias(request.POST.get("backend"))
-    action = request.POST.get("action")
-    try:
-      message = dashboard.apply_queue_action(
+    return self._post_action_response(
+      request,
+      operation=lambda: dashboard.apply_queue_action(
         backend_alias=backend_alias,
         queue_name=queue_name,
-        action=action,
-      )
-    except ValueError as exc:
-      self.message_user(request, str(exc), level=messages.ERROR)
-    else:
-      self.message_user(request, message, level=messages.SUCCESS)
-    return self._redirect(
-      request, self._queue_url(backend_alias=backend_alias, queue_name=queue_name)
+        action=request.POST.get("action"),
+      ),
+      fallback_url=self._queue_url(backend_alias=backend_alias, queue_name=queue_name),
     )
 
   def job_action_view(self, request, queue_name):
-    if request.method != "POST":
-      return HttpResponseNotAllowed(["POST"])
-
     backend_alias = dashboard.resolve_backend_alias(request.POST.get("backend"))
     state = request.POST.get("state", "ready")
-    job_ids = [job_id for job_id in request.POST.getlist("job_ids") if job_id]
-    try:
-      message = dashboard.apply_job_action(
+    return self._post_action_response(
+      request,
+      operation=lambda: dashboard.apply_job_action(
         backend_alias=backend_alias,
         queue_name=queue_name,
         state=state,
         action=request.POST.get("action"),
-        job_ids=job_ids,
-      )
+        job_ids=[job_id for job_id in request.POST.getlist("job_ids") if job_id],
+      ),
+      fallback_url=self._queue_url(
+        backend_alias=backend_alias, queue_name=queue_name, state=state
+      ),
+    )
+
+  def _post_action_response(self, request, operation, fallback_url):
+    if request.method != "POST":
+      return HttpResponseNotAllowed(["POST"])
+    try:
+      message = operation()
     except ValueError as exc:
       self.message_user(request, str(exc), level=messages.ERROR)
     else:
       self.message_user(request, message, level=messages.SUCCESS)
-    return self._redirect(
-      request,
-      self._queue_url(backend_alias=backend_alias, queue_name=queue_name, state=state),
-    )
+    return self._redirect(request, fallback_url)
 
   def _redirect(self, request, fallback_url):
     next_url = request.POST.get("next")
@@ -214,6 +213,7 @@ class HiddenSidebarAdminMixin:
     extra_context = {
       **(extra_context or {}),
       "dashboard_url": self._dashboard_url(request),
+      "changelist_url": self._changelist_url(backend_alias=self._backend_alias(request)),
       "change_actions": self.get_change_actions(request, obj),
     }
     return super().changeform_view(
@@ -292,6 +292,12 @@ class HiddenSidebarAdminMixin:
   def handle_change_action(self, request, obj, action):
     return HttpResponseRedirect(request.get_full_path())
 
+  def _change_redirect(self, *, object_id, backend_alias):
+    return HttpResponseRedirect(self._change_url(object_id=object_id, backend_alias=backend_alias))
+
+  def _current_object_redirect(self, obj, *, backend_alias):
+    return self._change_redirect(object_id=obj.pk, backend_alias=backend_alias)
+
   def _change_url(self, *, object_id, backend_alias):
     url = reverse(
       f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}_change",
@@ -474,37 +480,60 @@ class JobAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
     return format_html('<a href="{}">{}</a>', url, obj.queue_name)
 
   def get_change_actions(self, request, obj):
-    if obj is None or obj.status != "failed":
+    if obj is None:
       return ()
-    return (
-      {"name": "retry", "label": "Retry failed job", "css_class": "djq-object-action-retry"},
-      {
-        "name": "discard",
-        "label": "Discard failed job",
-        "css_class": "djq-object-action-discard",
-      },
-    )
+    actions = [{"name": "enqueue", "label": "Enqueue job", "css_class": "djq-object-action-retry"}]
+    if obj.status == "failed":
+      actions.extend(
+        (
+          {
+            "name": "retry",
+            "label": "Retry failed job",
+            "css_class": "djq-object-action-retry",
+          },
+          {
+            "name": "discard",
+            "label": "Discard failed job",
+            "css_class": "djq-object-action-discard",
+          },
+        )
+      )
+    return tuple(actions)
 
   def handle_change_action(self, request, obj, action):
+    if action == "enqueue":
+      try:
+        new_job = enqueue_job_again(obj.pk, backend_alias=obj.backend_name)
+      except (EnqueueError, ImportError, AttributeError) as exc:
+        self.message_user(request, f"Could not enqueue job: {exc}", level=messages.ERROR)
+        return self._current_object_redirect(obj, backend_alias=obj.backend_name)
+
+      self.message_user(
+        request,
+        format_html(
+          'Enqueued job <a href="{}">{}</a>.',
+          self._change_url(object_id=new_job.pk, backend_alias=new_job.backend_name),
+          new_job.pk,
+        ),
+        level=messages.SUCCESS,
+      )
+      return self._current_object_redirect(obj, backend_alias=obj.backend_name)
+
     if obj.status != "failed":
       self.message_user(request, "This job is not failed", level=messages.ERROR)
-      return HttpResponseRedirect(
-        self._change_url(object_id=obj.pk, backend_alias=obj.backend_name)
-      )
+      return self._current_object_redirect(obj, backend_alias=obj.backend_name)
 
     if action == "retry":
       obj.failed_execution.retry()
       self.message_user(request, "Retried failed job", level=messages.SUCCESS)
-      return HttpResponseRedirect(
-        self._change_url(object_id=obj.pk, backend_alias=obj.backend_name)
-      )
+      return self._current_object_redirect(obj, backend_alias=obj.backend_name)
 
     if action == "discard":
       obj.failed_execution.discard()
       self.message_user(request, "Discarded failed job", level=messages.SUCCESS)
       return HttpResponseRedirect(self._changelist_url(backend_alias=obj.backend_name))
 
-    return HttpResponseRedirect(self._change_url(object_id=obj.pk, backend_alias=obj.backend_name))
+    return self._current_object_redirect(obj, backend_alias=obj.backend_name)
 
 
 @admin.register(FailedExecution)
@@ -560,7 +589,7 @@ class FailedExecutionAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
       self.message_user(request, "Discarded failed job", level=messages.SUCCESS)
       return HttpResponseRedirect(self._changelist_url(backend_alias=backend_alias))
 
-    return HttpResponseRedirect(self._change_url(object_id=obj.pk, backend_alias=backend_alias))
+    return self._current_object_redirect(obj, backend_alias=backend_alias)
 
 
 @admin.register(Process)
@@ -633,6 +662,28 @@ class PauseAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
   readonly_fields = ("queue_name", "created_at")
   search_fields = ("queue_name",)
 
+  def get_change_actions(self, request, obj):
+    if obj is None:
+      return ()
+    return ({"name": "resume", "label": "Resume queue", "css_class": "djq-object-action-retry"},)
+
+  def handle_change_action(self, request, obj, action):
+    backend_alias = self._backend_alias(request)
+    if action == "resume":
+      QueueInfo(obj.queue_name, backend_alias=backend_alias).resume()
+      self.message_user(
+        request,
+        format_html(
+          'Resumed queue <a href="{}">{}</a>',
+          f"{reverse('admin:dj_queue_dashboard_queue', args=[obj.queue_name])}?{urlencode({'backend': backend_alias})}",
+          obj.queue_name,
+        ),
+        level=messages.SUCCESS,
+      )
+      return HttpResponseRedirect(self._changelist_url(backend_alias=backend_alias))
+
+    return self._current_object_redirect(obj, backend_alias=backend_alias)
+
 
 @admin.register(Semaphore)
 class SemaphoreAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):