From 77a3e652bd1cf089277d16d1da64c218e54c2ae4 Mon Sep 17 00:00:00 2001
From: Aaron Lane <aaron.lane@hashicorp.com>
Date: Thu, 8 Feb 2024 02:37:17 +0000
Subject: [PATCH] Upgrade to celery 5.1.2, flower 1.0.0

---
 Makefile                               |  2 +-
 Procfile                               |  2 +-
 app/worker/tasks/__init__.py           |  4 ++--
 app/worker/tasks/exporter.py           |  4 ++--
 app/worker/tasks/importers/__init__.py |  5 +++--
 reboot/__init__.py                     |  2 +-
 reboot/celery.py                       | 13 +++++++++----
 requirements.txt                       |  6 ++----
 8 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 9fd41dbb..e7a61aa5 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ migrate:
 
 .PHONY: celery
 celery:
-	celery worker -A reboot --without-heartbeat --without-gossip --without-mingle
+	CELERY_TRACE_APP=1 celery --app reboot worker --without-heartbeat --without-gossip --without-mingle
 
 .PHONY: clean
 clean:
diff --git a/Procfile b/Procfile
index 9ac1b955..47d3b424 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
-worker: celery worker -A reboot --without-heartbeat --without-gossip --without-mingle
+worker: celery --app worker --without-heartbeat --without-gossip --without-mingle
 web: gunicorn reboot.wsgi --log-level info
diff --git a/app/worker/tasks/__init__.py b/app/worker/tasks/__init__.py
index fb4770f6..0fca89f5 100644
--- a/app/worker/tasks/__init__.py
+++ b/app/worker/tasks/__init__.py
@@ -1,13 +1,13 @@
 '''
 Module for tasks to be sent on task queue
 '''
-from celery import task
+from celery import shared_task
 
 from app.worker.app_celery import AppTask
 from .create_receipt import Receiptor
 
 
-@task(bind=True, base=AppTask)
+@shared_task(bind=True, base=AppTask)
 def receiptor(self, queryset, total_count):
     receiptor = Receiptor(queryset, total_count)
     return receiptor()
diff --git a/app/worker/tasks/exporter.py b/app/worker/tasks/exporter.py
index 9419aec7..a02cf045 100644
--- a/app/worker/tasks/exporter.py
+++ b/app/worker/tasks/exporter.py
@@ -1,6 +1,6 @@
 import csv
 
-from celery import task
+from celery import shared_task
 from celery.utils.log import get_task_logger
 from django.core import serializers
 from django.db.models.query import QuerySet
@@ -10,7 +10,7 @@
 from app.worker.app_celery import AppTask, update_percent
 
 
-@task(bind=True, base=AppTask)
+@shared_task(bind=True, base=AppTask)
 def exporter(self, file_name, qs: QuerySet = None, total_count: int = 0):
     rows = serializers.deserialize('json', qs)
     csv_exporter = CsvExporter(file_name, rows, total_count)
diff --git a/app/worker/tasks/importers/__init__.py b/app/worker/tasks/importers/__init__.py
index cf650561..2a3e3b50 100644
--- a/app/worker/tasks/importers/__init__.py
+++ b/app/worker/tasks/importers/__init__.py
@@ -1,13 +1,14 @@
 """
 Module for csv file importers to be sent to queue
 """
-from celery import task
+from celery import shared_task
 
 from app.worker.app_celery import AppTask
+
 from .historical_data_importer import HistoricalDataImporter
 
 
-@task(bind=True, base=AppTask)
+@shared_task(bind=True, base=AppTask)
 def historical_data_importer(self, csvpath):
     importer = HistoricalDataImporter(csvpath)
     importer()
diff --git a/reboot/__init__.py b/reboot/__init__.py
index 1a6c551d..15d7c508 100644
--- a/reboot/__init__.py
+++ b/reboot/__init__.py
@@ -2,4 +2,4 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app
 
-__all__ = ['celery_app']
+__all__ = ('celery_app',)
diff --git a/reboot/celery.py b/reboot/celery.py
index 73853938..2e1aef5f 100644
--- a/reboot/celery.py
+++ b/reboot/celery.py
@@ -1,10 +1,15 @@
-from celery import Celery
-from django.conf import settings
 import os
 
+from celery import Celery
+
+# Set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'reboot.settings')
 
-app = Celery()
+app = Celery('reboot')
+
+# Using a string here means the worker doesn't have to serialize
+# the configuration object to child processes.
 app.config_from_object('reboot.celeryconfig')
 
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+# Load task modules from all registered Django apps.
+app.autodiscover_tasks()
diff --git a/requirements.txt b/requirements.txt
index b0c11aab..6833a87f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,7 @@
 # Commented requirements indicate the latest patches of the earliest releases that support Python 3.9.
 
 # https://pypi.org/project/celery/5.1.2/
-# celery[redis]==5.1.2
-celery[redis]==4.4.7
+celery[redis]==5.1.2
 # https://pypi.org/project/Django/2.2.28/
 Django==2.2.28
 # https://pypi.org/project/dj-database-url/1.0.0/
@@ -15,8 +14,7 @@ django-admin-rangefilter==0.8.8
 # https://pypi.org/project/django-modeladmin-reorder/0.3.1/
 django-modeladmin-reorder==0.3.1
 # https://pypi.org/project/flower/1.0.0/
-# flower==1.0.0
-flower==0.9.7
+flower==1.0.0
 # https://pypi.org/project/gunicorn/20.1.0/
 gunicorn==20.1.0
 # https://pypi.org/project/importlib-metadata/4.8.3/