Recreate queue action 🙅🏽‍♀️

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Changelog
 
-## 1.11.2 : 2023-03-04
+## 1.12.0 : 2023-03-04
 
+- **Added**: `Recreate queue` in the administration
+- **Changed**: Use `enqueue_many` in `Evaluation`
 - **Fixed**: Evaluation reports compatible with new
 
 ## 1.11.1 : 2024-02-25

apps/core/admin.py

@@ -1,8 +1,14 @@
+import django_rq
+from admin_extra_buttons.decorators import button
+from admin_extra_buttons.mixins import ExtraButtonsMixin
+from admin_extra_buttons.utils import HttpResponseRedirectToReferrer
 from django.contrib import admin
 from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.translation import gettext as _
+from rq import Queue
 
+from apps.core.jobs import basic_job
 from apps.core.models import Assignment, Scenario, Task, TaskRecord, Evaluation
 
 
@@ -49,7 +55,7 @@ class TaskRecordAdmin(RelatedFieldAdmin):
     show_facets = admin.ShowFacets.ALWAYS
 
 
-class EvaluationAdmin(RelatedFieldAdmin):
+class EvaluationAdmin(ExtraButtonsMixin, RelatedFieldAdmin):
     list_display = ("id", "created_at", "assignment", "status", "protocol")
     readonly_fields = ("created_at", "tasks", "id")
     exclude = ("creator",)
@@ -86,6 +92,19 @@ def protocol(self, obj):
         else:
             return ""
 
+    @button(html_attrs={'style': 'background-color:#88FF88;color:black'})
+    def recreate_queue(self, request):
+        django_rq.get_queue("default").empty()
+        jobs = []
+
+        for task in Task.objects.filter(status=Task.Status.PENDING):
+            jobs.append(Queue.prepare_data(basic_job, (task.pk, False, )))
+
+        django_rq.get_queue("default").enqueue_many(jobs)
+
+        self.message_user(request, 'Pending tasks were added back to queue')
+        return HttpResponseRedirectToReferrer(request)
+
 
 class AssignmentAdmin(admin.ModelAdmin):
     show_facets = admin.ShowFacets.ALWAYS

apps/core/models/evaluation.py

@@ -6,6 +6,7 @@
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from rq import Queue
 
 from apps.core.jobs import basic_job
 from apps.core.models.assignment import Assignment
@@ -37,6 +38,7 @@ def __str__(self) -> str:
 @receiver(post_save, sender=Evaluation)
 def execute_tasks(sender, instance: Evaluation, created: bool, **kwargs):
     if created:
+        jobs = []
         with open(instance.links.path, "r", newline="") as csvfile:
             reader = csv.DictReader(csvfile, delimiter=",")
             for row in reader:
@@ -48,7 +50,10 @@ def execute_tasks(sender, instance: Evaluation, created: bool, **kwargs):
                     additional_information=row,
                 )
                 instance.tasks.add(task)
-                django_rq.enqueue(basic_job, task_id=task.pk, public_only=False)
+                jobs.append(
+                    Queue.prepare_data(basic_job, (task.pk, False, ))
+                )
+        django_rq.get_queue("default").enqueue_many(jobs)
 
 
 __all__ = ["Evaluation"]

dbs_tester/settings/base.py

@@ -68,6 +68,7 @@
     "django.forms",
     "django_rq",
     "django_bootstrap5",
+    "admin_extra_buttons",
     "apps.core",
     "apps.web",
     "apps.api",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dbs_tester"
-version = "1.11.2"
+version = "1.12.0"
 description = "DBS tester application"
 authors = [
     "Jakub Dubec <[email protected]>"
@@ -25,6 +25,7 @@ docker = "^7.0"
 python-crontab = "^3.0"
 porcupine-python = "^0.5.0"
 django-api-forms = "1.0.0rc9"
+django-admin-extra-buttons = "^1.5.7"
 
 [tool.poetry.dev-dependencies]
 black = "^24.0"