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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dj-queue
-Version: 0.2.3
+Version: 0.2.4
 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.2.4}/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.2.4}/dj_queue/admin.py

@@ -15,6 +15,7 @@ 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.models import (
   BlockedExecution,
@@ -26,6 +27,7 @@ from dj_queue.models import (
   RecurringTask,
   Semaphore,
 )
+from dj_queue.operations.jobs import enqueue_job_again
 
 
 class DjQueueFirstAdminSite(admin.AdminSite):
@@ -214,6 +216,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(
@@ -474,18 +477,49 @@ 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 Exception as exc:
+        self.message_user(request, f"Could not enqueue job: {exc}", level=messages.ERROR)
+        return HttpResponseRedirect(
+          self._change_url(object_id=obj.pk, 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 HttpResponseRedirect(
+        self._change_url(object_id=obj.pk, backend_alias=obj.backend_name)
+      )
+
     if obj.status != "failed":
       self.message_user(request, "This job is not failed", level=messages.ERROR)
       return HttpResponseRedirect(
@@ -633,6 +667,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 HttpResponseRedirect(self._change_url(object_id=obj.pk, backend_alias=backend_alias))
+
 
 @admin.register(Semaphore)
 class SemaphoreAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):

{dj_queue-0.2.3 → dj_queue-0.2.4}/dj_queue/dashboard.py

@@ -385,7 +385,14 @@ def queue_page_context(*, backend_alias, queue_name, state, page_number, query_p
   paginator = Paginator(jobs, PAGE_SIZE)
   page_obj = paginator.get_page(query_params.get("page", page_number))
   queue_info = QueueInfo(queue_name, backend_alias=backend_alias)
+  queue_paused = queue_info.paused
+  queue_latency_seconds = None if queue_paused else queue_info.latency
   state_counts = _queue_state_counts(backend_alias=backend_alias, queue_name=queue_name)
+  live_workers = [
+    process
+    for process in Process.objects.using(alias).filter(kind="Worker")
+    if process.last_heartbeat_at >= process_cutoff
+  ]
   state_tabs = [
     {
       "name": state_name,
@@ -425,7 +432,13 @@ def queue_page_context(*, backend_alias, queue_name, state, page_number, query_p
     "queue_database_alias": alias,
     "queue_name": queue_name,
     "queue_info": queue_info,
-    "queue_paused": queue_info.paused,
+    "queue_paused": queue_paused,
+    "queue_latency_seconds": queue_latency_seconds,
+    "queue_worker_count": sum(
+      1
+      for worker in live_workers
+      if _queue_matches_selectors(queue_name, worker.metadata.get("queues", []))
+    ),
     "state": state,
     "state_label": QUEUE_STATE_LABELS[state],
     "state_tabs": state_tabs,
@@ -1224,9 +1237,10 @@ def _queue_rows(*, backend_alias, now, process_cutoff):
 
   rows = []
   for queue_name in sorted(queue_names):
+    paused = queue_name in paused_queues
     oldest_ready_at = oldest_ready.get(queue_name)
     latency_seconds = None
-    if oldest_ready_at is not None:
+    if oldest_ready_at is not None and paused is False:
       latency_seconds = max((now - oldest_ready_at).total_seconds(), 0.0)
 
     ready_count = ready_counts.get(queue_name, 0)
@@ -1236,7 +1250,7 @@ def _queue_rows(*, backend_alias, now, process_cutoff):
     failed_count = failed_counts.get(queue_name, 0)
     finished_count = finished_counts.get(queue_name, 0)
     shared_sources = []
-    if queue_name in paused_queues:
+    if paused:
       shared_sources.append("pause")
     if queue_name in recurring_queues:
       shared_sources.append("recurring task")
@@ -1250,7 +1264,7 @@ def _queue_rows(*, backend_alias, now, process_cutoff):
         "blocked_count": blocked_count,
         "failed_count": failed_count,
         "finished_count": finished_count,
-        "paused": queue_name in paused_queues,
+        "paused": paused,
         "latency_seconds": latency_seconds,
         "oldest_scheduled_at": oldest_scheduled.get(queue_name),
         "oldest_blocked_at": oldest_blocked.get(queue_name),

{dj_queue-0.2.3 → dj_queue-0.2.4}/dj_queue/operations/jobs.py

@@ -354,6 +354,23 @@ def retry_failed_job(job_id, *, backend_alias="default"):
   return job
 
 
+def enqueue_job_again(job_id, *, backend_alias="default"):
+  alias = get_database_alias(backend_alias)
+  source_job = Job.objects.using(alias).get(pk=job_id)
+  task = import_string(source_job.task_path)
+  if hasattr(task, "using"):
+    task = task.using(
+      priority=source_job.priority,
+      queue_name=source_job.queue_name,
+      run_after=source_job.scheduled_at,
+      backend=source_job.backend_name,
+    )
+  args = list(source_job.payload.get("args", []))
+  kwargs = dict(source_job.payload.get("kwargs", {}))
+  job, _ = enqueue_job_with_dispatch(task, args, kwargs, backend_alias=source_job.backend_name)
+  return job
+
+
 def discard_failed_job(job_id, *, backend_alias="default"):
   alias = get_database_alias(backend_alias)
   queryset = Job.objects.using(alias).filter(pk=job_id, failed_execution__isnull=False)

{dj_queue-0.2.3 → dj_queue-0.2.4}/dj_queue/templates/admin/dj_queue/change_form.html

@@ -46,7 +46,7 @@
   <div class="breadcrumbs">
     <a href='{% url "admin:index" %}'>{% translate "Home" %}</a>
     › <a href="{{ dashboard_url }}">dj_queue</a>
-    › {% if has_view_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}
+    › {% if has_view_permission %}<a href="{{ changelist_url }}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}
     › {% if add %}{% blocktranslate with name=opts.verbose_name %}Add {{ name }}{% endblocktranslate %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
   </div>
 {% endblock breadcrumbs %}

{dj_queue-0.2.3 → dj_queue-0.2.4}/dj_queue/templates/admin/dj_queue/queue_jobs.html

@@ -216,6 +216,8 @@
               <div class="queue-toolbar-meta">
                 <span><strong>Backend:</strong> {{ backend_alias }}</span>
                 <span><strong>Database:</strong> {{ queue_database_alias }}</span>
+                <span><strong>Workers:</strong> {{ queue_worker_count }}</span>
+                <span><strong>Latency:</strong> {% if queue_latency_seconds != None %}{{ queue_latency_seconds|floatformat:1 }}s{% else %}-{% endif %}</span>
                 <span><strong>Paused:</strong> {{ queue_paused|yesno:"yes,no" }}</span>
               </div>
               <div class="queue-toolbar-actions">

{dj_queue-0.2.3 → dj_queue-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "dj-queue"
-version = "0.2.3"
+version = "0.2.4"
 description = "Database-backed task queue backend for Django's django.tasks framework"
 readme = "README.md"
 license = "MIT"