dj-queue 0.2.1__tar.gz → 0.2.2__tar.gz

{dj_queue-0.2.1 → dj_queue-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dj-queue
-Version: 0.2.1
+Version: 0.2.2
 Summary: Database-backed task queue backend for Django's django.tasks framework
 License-Expression: MIT
 License-File: LICENSE
@@ -28,6 +28,7 @@ Description-Content-Type: text/markdown
 
 [![CI](https://github.com/coriocactus/dj_queue/actions/workflows/ci.yml/badge.svg)](https://github.com/coriocactus/dj_queue/actions/workflows/ci.yml)
 ![PyPI](https://img.shields.io/pypi/v/dj-queue.svg)
+[![Latest on Django Packages](https://img.shields.io/badge/pypi/dj-queue-tags.svg)](https://djangopackages.org/packages/p/dj-queue/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/dj-queue.svg)
 ![PyPI - Status](https://img.shields.io/pypi/status/dj-queue.svg)
 ![PyPI - License](https://img.shields.io/pypi/l/dj-queue.svg)
@@ -414,8 +415,8 @@ pauses, and semaphores.
 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 failed jobs through Django admin, or retry and discard them
-through the operations layer:
+You can retry and discard failed jobs through Django admin, or call the same
+operations directly through the operations layer:
 
 ```python
 from dj_queue.operations.jobs import discard_failed_job, retry_failed_job

{dj_queue-0.2.1 → dj_queue-0.2.2}/README.md

@@ -2,6 +2,7 @@
 
 [![CI](https://github.com/coriocactus/dj_queue/actions/workflows/ci.yml/badge.svg)](https://github.com/coriocactus/dj_queue/actions/workflows/ci.yml)
 ![PyPI](https://img.shields.io/pypi/v/dj-queue.svg)
+[![Latest on Django Packages](https://img.shields.io/badge/pypi/dj-queue-tags.svg)](https://djangopackages.org/packages/p/dj-queue/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/dj-queue.svg)
 ![PyPI - Status](https://img.shields.io/pypi/status/dj-queue.svg)
 ![PyPI - License](https://img.shields.io/pypi/l/dj-queue.svg)
@@ -388,8 +389,8 @@ pauses, and semaphores.
 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 failed jobs through Django admin, or retry and discard them
-through the operations layer:
+You can retry and discard failed jobs through Django admin, or call the same
+operations directly through the operations layer:
 
 ```python
 from dj_queue.operations.jobs import discard_failed_job, retry_failed_job

{dj_queue-0.2.1 → dj_queue-0.2.2}/dj_queue/admin.py

@@ -79,6 +79,7 @@ class DashboardAdmin(admin.ModelAdmin):
     context = {
       **self.admin_site.each_context(request),
       **dashboard.dashboard_context(backend_alias=backend_alias, query_params=request.GET),
+      "title": "dj_queue",
     }
     if extra_context:
       context.update(extra_context)
@@ -111,16 +112,19 @@ class DashboardAdmin(admin.ModelAdmin):
     backend_alias = dashboard.resolve_backend_alias(request.GET.get("backend"))
     state = request.GET.get("state", "ready")
     page_number = request.GET.get("page", 1)
+    queue_context = dashboard.queue_page_context(
+      backend_alias=backend_alias,
+      queue_name=queue_name,
+      state=state,
+      page_number=page_number,
+      query_params=request.GET,
+    )
     context = {
       **self.admin_site.each_context(request),
-      **dashboard.queue_page_context(
-        backend_alias=backend_alias,
-        queue_name=queue_name,
-        state=state,
-        page_number=page_number,
-        query_params=request.GET,
-      ),
+      **queue_context,
       "job_actions": dashboard.job_actions_for_state(state),
+      "title": "dj_queue",
+      "subtitle": queue_name,
     }
     return TemplateResponse(request, "admin/dj_queue/queue_jobs.html", context)
 
@@ -201,7 +205,17 @@ class HiddenSidebarAdminMixin:
     return super().changelist_view(request, extra_context=extra_context)
 
   def changeform_view(self, request, object_id=None, form_url="", extra_context=None):
-    extra_context = {**(extra_context or {}), "dashboard_url": self._dashboard_url(request)}
+    obj = self.get_object(request, object_id) if object_id is not None else None
+    if request.method == "POST":
+      action = request.POST.get("_djq_object_action")
+      if action and obj is not None:
+        return self.handle_change_action(request, obj, action)
+
+    extra_context = {
+      **(extra_context or {}),
+      "dashboard_url": self._dashboard_url(request),
+      "change_actions": self.get_change_actions(request, obj),
+    }
     return super().changeform_view(
       request,
       object_id=object_id,
@@ -272,6 +286,23 @@ class HiddenSidebarAdminMixin:
   def _dashboard_url(self, request):
     return f"{reverse('admin:dj_queue_dashboard_changelist')}?{urlencode({'backend': self._backend_alias(request)})}"
 
+  def get_change_actions(self, request, obj):
+    return ()
+
+  def handle_change_action(self, request, obj, action):
+    return HttpResponseRedirect(request.get_full_path())
+
+  def _change_url(self, *, object_id, backend_alias):
+    url = reverse(
+      f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}_change",
+      args=[object_id],
+    )
+    return f"{url}?{urlencode({'backend': backend_alias})}"
+
+  def _changelist_url(self, *, backend_alias):
+    url = reverse(f"admin:{self.model._meta.app_label}_{self.model._meta.model_name}_changelist")
+    return f"{url}?{urlencode({'backend': backend_alias})}"
+
 
 class JobStatusListFilter(admin.SimpleListFilter):
   title = "status"
@@ -442,6 +473,39 @@ class JobAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
     url = f"{reverse('admin:dj_queue_dashboard_queue', args=[obj.queue_name])}?{urlencode(query)}"
     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":
+      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",
+      },
+    )
+
+  def handle_change_action(self, request, obj, action):
+    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)
+      )
+
+    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)
+      )
+
+    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))
+
 
 @admin.register(FailedExecution)
 class FailedExecutionAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
@@ -469,6 +533,35 @@ class FailedExecutionAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
       discarded += execution.discard()
     self.message_user(request, f"Discarded {discarded} failed jobs", level=messages.SUCCESS)
 
+  def get_change_actions(self, request, obj):
+    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",
+      },
+    )
+
+  def handle_change_action(self, request, obj, action):
+    backend_alias = obj.job.backend_name
+
+    if action == "retry":
+      job_id = obj.job_id
+      obj.retry()
+      self.message_user(request, "Retried failed job", level=messages.SUCCESS)
+      url = reverse("admin:dj_queue_job_change", args=[job_id])
+      return HttpResponseRedirect(f"{url}?{urlencode({'backend': backend_alias})}")
+
+    if action == "discard":
+      obj.discard()
+      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))
+
 
 @admin.register(Process)
 class ProcessAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):

{dj_queue-0.2.1 → dj_queue-0.2.2}/dj_queue/dashboard.py

@@ -550,7 +550,7 @@ def _summary_cards(*, backend_alias, queue_rows, process_rows, recurring_rows, s
       "detail": f"{live_processes} live, {stale_processes} stale",
     },
     {
-      "label": "control plane",
+      "label": "control-plane",
       "value": len(recurring_rows) + len(semaphore_rows),
       "detail": f"{len(recurring_rows)} recurring and {len(semaphore_rows)} semaphores",
     },

dj_queue-0.2.2/dj_queue/templates/admin/dj_queue/change_form.html

@@ -0,0 +1,69 @@
+{% extends "admin/change_form.html" %}
+
+{% load i18n admin_urls %}
+
+{% block extrastyle %}
+  {{ block.super }}
+  <style>
+    .submit-row form {
+      display: inline;
+    }
+
+    .submit-row .djq-object-action {
+      border: none;
+      border-radius: 4px;
+      min-height: 2.1875rem;
+      padding: 0.625rem 0.9375rem;
+      color: var(--button-fg);
+      font-size: 0.75rem;
+      line-height: 0.9375rem;
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+      cursor: pointer;
+    }
+
+    .submit-row .djq-object-action-retry {
+      background: var(--button-bg);
+    }
+
+    .submit-row .djq-object-action-retry:hover,
+    .submit-row .djq-object-action-retry:focus {
+      background: var(--button-hover-bg);
+    }
+
+    .submit-row .djq-object-action-discard {
+      background: var(--delete-button-bg);
+    }
+
+    .submit-row .djq-object-action-discard:hover,
+    .submit-row .djq-object-action-discard:focus {
+      background: var(--delete-button-hover-bg);
+    }
+  </style>
+{% endblock extrastyle %}
+
+{% block breadcrumbs %}
+  <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 add %}{% blocktranslate with name=opts.verbose_name %}Add {{ name }}{% endblocktranslate %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
+  </div>
+{% endblock breadcrumbs %}
+
+{% block object-tools %}{% endblock object-tools %}
+
+{% block submit_buttons_top %}{% endblock submit_buttons_top %}
+
+{% block submit_buttons_bottom %}
+  {% if change_actions %}
+    <div class="submit-row">
+      {% for action in change_actions %}
+        <form method="post" action="{{ request.get_full_path }}">
+          {% csrf_token %}
+          <button type="submit" name="_djq_object_action" value="{{ action.name }}" class="djq-object-action {{ action.css_class }}">{{ action.label }}</button>
+        </form>
+      {% endfor %}
+    </div>
+  {% endif %}
+{% endblock submit_buttons_bottom %}

{dj_queue-0.2.1 → dj_queue-0.2.2}/dj_queue/templates/admin/dj_queue/dashboard.html

@@ -810,9 +810,9 @@
             <p>Job-centric rows scoped to the selected backend where possible.</p>
           </div>
           <div class="djq-raw-links">
-            <a href="{% url 'admin:dj_queue_job_changelist' %}?backend={{ backend_alias }}">jobs</a>
-            <a href="{% url 'admin:dj_queue_failedexecution_changelist' %}?backend={{ backend_alias }}">failed executions</a>
-            <a href="{% url 'admin:dj_queue_pause_changelist' %}?backend={{ backend_alias }}">pause rows</a>
+            <a href="{% url 'admin:dj_queue_job_changelist' %}?backend={{ backend_alias }}">Jobs</a>
+            <a href="{% url 'admin:dj_queue_failedexecution_changelist' %}?backend={{ backend_alias }}">Failed executions</a>
+            <a href="{% url 'admin:dj_queue_pause_changelist' %}?backend={{ backend_alias }}">Pauses</a>
           </div>
         </div>
 
@@ -822,9 +822,9 @@
             <p>Control-plane rows scoped by the selected backend's queue database alias.</p>
           </div>
           <div class="djq-raw-links">
-            <a href="{% url 'admin:dj_queue_process_changelist' %}?backend={{ backend_alias }}">processes</a>
-            <a href="{% url 'admin:dj_queue_recurringtask_changelist' %}?backend={{ backend_alias }}">recurring tasks</a>
-            <a href="{% url 'admin:dj_queue_semaphore_changelist' %}?backend={{ backend_alias }}">semaphores</a>
+            <a href="{% url 'admin:dj_queue_process_changelist' %}?backend={{ backend_alias }}">Processes</a>
+            <a href="{% url 'admin:dj_queue_recurringtask_changelist' %}?backend={{ backend_alias }}">Recurring tasks</a>
+            <a href="{% url 'admin:dj_queue_semaphore_changelist' %}?backend={{ backend_alias }}">Semaphores</a>
           </div>
         </div>
       </div>

{dj_queue-0.2.1 → dj_queue-0.2.2}/dj_queue/templates/admin/dj_queue/queue_jobs.html

@@ -187,14 +187,21 @@
   <div class="breadcrumbs">
     <a href="{% url 'admin:index' %}">Home</a>
     › <a href="{% url 'admin:dj_queue_dashboard_changelist' %}?backend={{ backend_alias }}">dj_queue</a>
+    › <a href="{% url 'admin:dj_queue_dashboard_changelist' %}?backend={{ backend_alias }}#queue-summary">queues</a>
     › {{ queue_name }}
   </div>
 {% endblock breadcrumbs %}
 
 {% block content_title %}
-  <h1>{{ queue_name }} {{ state_label }} jobs</h1>
+  <h1>
+    <a href="{% url 'admin:dj_queue_dashboard_changelist' %}?backend={{ backend_alias }}">dj_queue</a>
+    › <a href="{% url 'admin:dj_queue_dashboard_changelist' %}?backend={{ backend_alias }}#queue-summary">queues</a>
+    › {{ queue_name }}
+  </h1>
 {% endblock content_title %}
 
+{% block content_subtitle %}{% endblock content_subtitle %}
+
 {% block content %}
   <div id="content-main">
     <div class="module" id="changelist">
@@ -300,7 +307,9 @@
                         {% if job_actions %}
                           <td class="action-checkbox"><input type="checkbox" class="action-select" name="job_ids" value="{{ job.id }}"></td>
                         {% endif %}
-                        <th scope="row"><code>{{ job.id }}</code></th>
+                        <th scope="row">
+                          <a href="{% url 'admin:dj_queue_job_change' job.id %}?backend={{ backend_alias }}"><code>{{ job.id }}</code></a>
+                        </th>
                         <td>{{ job.task_path }}</td>
                         <td>{{ job.priority }}</td>
                         <td>{{ job.created_at|date:"Y-m-d H:i:s" }}</td>

{dj_queue-0.2.1 → dj_queue-0.2.2}/pyproject.toml

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

dj_queue-0.2.1/dj_queue/templates/admin/dj_queue/change_form.html

@@ -1,12 +0,0 @@
-{% extends "admin/change_form.html" %}
-
-{% load i18n admin_urls %}
-
-{% block breadcrumbs %}
-  <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 add %}{% blocktranslate with name=opts.verbose_name %}Add {{ name }}{% endblocktranslate %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
-  </div>
-{% endblock breadcrumbs %}