dj-queue 0.6.2__tar.gz → 0.6.3__tar.gz

{dj_queue-0.6.2 → dj_queue-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dj-queue
-Version: 0.6.2
+Version: 0.6.3
 Summary: Database-backed task queue backend for Django’s Tasks framework.
 License-Expression: MIT
 License-File: LICENSE

{dj_queue-0.6.2 → dj_queue-0.6.3}/dj_queue/admin.py

@@ -28,7 +28,7 @@ from dj_queue.models import (
   RecurringTask,
   Semaphore,
 )
-from dj_queue.operations.jobs import enqueue_job_again
+from dj_queue.operations.jobs import dispatch_scheduled_job_now, enqueue_job_again
 
 
 class DjQueueFirstAdminSite(admin.AdminSite):
@@ -563,6 +563,16 @@ class JobAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
   def get_change_actions(self, request, obj):
     if obj is None:
       return ()
+    if obj.status == "scheduled":
+      return (
+        {"name": "run_now", "label": "Run now", "css_class": "djq-object-action-retry"},
+        {
+          "name": "enqueue_copy_now",
+          "label": "Enqueue copy now",
+          "css_class": "djq-object-action-retry",
+        },
+      )
+
     actions = [{"name": "enqueue", "label": "Enqueue job", "css_class": "djq-object-action-retry"}]
     if obj.status == "failed":
       actions.extend(
@@ -582,6 +592,39 @@ class JobAdmin(HiddenSidebarAdminMixin, admin.ModelAdmin):
     return tuple(actions)
 
   def handle_change_action(self, request, obj, action):
+    if action == "run_now":
+      try:
+        _job, dispatched_as = dispatch_scheduled_job_now(obj.pk, backend_alias=obj.backend_alias)
+      except (EnqueueError, ImportError, AttributeError) as exc:
+        self.message_user(request, f"Could not dispatch job now: {exc}", level=messages.ERROR)
+        return self._current_object_redirect(obj, backend_alias=obj.backend_alias)
+
+      message = "Dispatched scheduled job for immediate execution"
+      if dispatched_as == "blocked":
+        message = "Dispatched scheduled job immediately and it is now blocked"
+      if dispatched_as == "discarded":
+        message = "Dispatched scheduled job immediately and it was discarded"
+      self.message_user(request, message, level=messages.SUCCESS)
+      return self._current_object_redirect(obj, backend_alias=obj.backend_alias)
+
+    if action == "enqueue_copy_now":
+      try:
+        new_job = enqueue_job_again(obj.pk, backend_alias=obj.backend_alias, run_after=None)
+      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_alias)
+
+      self.message_user(
+        request,
+        format_html(
+          'Enqueued immediate copy <a href="{}">{}</a>.',
+          self._change_url(object_id=new_job.pk, backend_alias=new_job.backend_alias),
+          new_job.pk,
+        ),
+        level=messages.SUCCESS,
+      )
+      return self._current_object_redirect(obj, backend_alias=obj.backend_alias)
+
     if action == "enqueue":
       try:
         new_job = enqueue_job_again(obj.pk, backend_alias=obj.backend_alias)

{dj_queue-0.6.2 → dj_queue-0.6.3}/dj_queue/operations/jobs.py

@@ -351,6 +351,39 @@ def promote_scheduled_jobs(*, batch_size, backend_alias="default", use_skip_lock
     return jobs
 
 
+def dispatch_scheduled_job_now(job_id, *, backend_alias="default"):
+  alias = get_database_alias(backend_alias)
+  config = load_backend_config(backend_alias)
+
+  with transaction.atomic(using=alias):
+    scheduled = locked_queryset(
+      ScheduledExecution.objects.using(alias)
+      .select_related("job")
+      .filter(job_id=job_id, job__backend_alias=backend_alias),
+      use_skip_locked=config.use_skip_locked,
+    ).first()
+    if scheduled is None:
+      raise EnqueueError("job is not scheduled")
+
+    job = scheduled.job
+    scheduled.delete(using=alias)
+    job.scheduled_at = None
+    job.save(using=alias, update_fields=["scheduled_at", "updated_at"])
+    dispatched_as = _dispatch_existing_job(job)
+
+  if dispatched_as == "ready":
+    runtime_notify.notify_ready_queues((job.queue_name,), backend_alias=backend_alias)
+
+  log_event(
+    "job.dispatched_now",
+    job_id=str(job.id),
+    queue_name=job.queue_name,
+    priority=job.priority,
+    dispatched_as=dispatched_as,
+  )
+  return job, dispatched_as
+
+
 def retry_failed_job(job_id, *, backend_alias="default"):
   alias = get_database_alias(backend_alias)
 
@@ -370,15 +403,19 @@ def retry_failed_job(job_id, *, backend_alias="default"):
   return job
 
 
-def enqueue_job_again(job_id, *, backend_alias="default"):
+_KEEP_RUN_AFTER = object()
+
+
+def enqueue_job_again(job_id, *, backend_alias="default", run_after=_KEEP_RUN_AFTER):
   alias = get_database_alias(backend_alias)
   source_job = Job.objects.using(alias).get(pk=job_id)
   task = import_string(source_job.task_path)
+  source_run_after = source_job.scheduled_at if run_after is _KEEP_RUN_AFTER else run_after
   if hasattr(task, "using"):
     task = task.using(
       priority=source_job.priority,
       queue_name=source_job.queue_name,
-      run_after=source_job.scheduled_at,
+      run_after=source_run_after,
       backend=source_job.backend_alias,
     )
   args = list(source_job.payload.get("args", []))

{dj_queue-0.6.2 → dj_queue-0.6.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "dj-queue"
-version = "0.6.2"
+version = "0.6.3"
 description = "Database-backed task queue backend for Django’s Tasks framework."
 readme = "README.md"
 license = "MIT"