fix(deps): update Celery to 5.6.0+ to fix task_id None error

collectoss/application/cli/backend.py

@@ -339,6 +339,7 @@ def stop_processes(signal, logger, engine):
         cleanup_collection_status_and_rabbit(logger, engine)
 
 
+
 def assign_orphan_repos_to_default_user(session):
     query = s.sql.text("""
         SELECT repo_id FROM repo WHERE repo_id NOT IN (SELECT repo_id FROM operations.user_repos)

collectoss/application/service_manager.py

@@ -146,7 +146,10 @@
 
     logger.info("Clearing all messages from celery queue in rabbitmq")
     from collectoss.tasks.init.celery_app import celery_app
-    celery_app.control.purge()
+    try:
+        celery_app.control.purge()
+    except Exception as e:
+        logger.warning(f"Failed to purge celery queue (this is usually benign if the queue doesn't exist yet): {e}")
 
     clear_all_message_queues(connection_string)
     #rabbitmq_purge_command = f"sudo rabbitmqctl purge_queue celery -p {virtual_host_string}"
@@ -162,5 +165,8 @@
     parsed = urlparse(connection_string)
 
     for q in queues:
-        curl_cmd = f"curl -i -u {parsed.username}:{parsed.password} -XDELETE http://localhost:15672/api/queues/{virtual_host_string}/{q}"
-        subprocess.call(curl_cmd.split(" "),stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # Use the hostname from the connection string instead of localhost
+        # to ensure it works in both docker and non-docker environments
+        hostname = parsed.hostname or "localhost"
+        curl_cmd = f"curl -is -u {parsed.username}:{parsed.password} -XDELETE http://{hostname}:15672/api/queues/{virtual_host_string}/{q}"
+        subprocess.call(curl_cmd.split(" "), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

collectoss/tasks/init/celery_app.py

@@ -8,7 +8,6 @@
 import inspect
 import celery
 from celery import Celery
-from celery import current_app 
 from celery.signals import after_setup_logger
 
 
@@ -264,7 +263,7 @@ def setup_periodic_tasks(sender, **kwargs):
 def setup_loggers(*args,**kwargs):
     """Override Celery loggers with our own."""
 
-    all_celery_tasks = list(current_app.tasks.keys())
+    all_celery_tasks = list(celery_app.tasks.keys())
 
     tasks = [task for task in all_celery_tasks if 'celery.' not in task]
 

pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
     "Beaker==1.11.0",
     "boto3==1.17.57",
     "bs4==0.0.1",
-    "celery~=5.5",
+    "celery>=5.6.0",
     "click~=8.1",
     "coloredlogs==15.0",
     "emoji==1.2.0",
@@ -54,7 +54,7 @@ dependencies = [
     "python-crfsuite>=0.9.8",
     "python-dotenv>=1.2.1",
     "pyYaml",
-    "redis==4.3.3",
+    "redis>=4.5.3",
     "scikit-image==0.19.1",
     "scikit-learn==1.5.0",
     "requests~=2.32",