p1-taskqueue 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

{p1_taskqueue-0.1.14.dist-info → p1_taskqueue-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.14
+Version: 0.1.16
 Summary: A Task Queue Wrapper for Dekoruma Backend
 Author-email: Chalvin <engineering@dekoruma.com>
 Project-URL: Homepage, https://github.com/Dekoruma/p1-taskqueue

{p1_taskqueue-0.1.14.dist-info → p1_taskqueue-0.1.16.dist-info}/RECORD

@@ -1,10 +1,10 @@
 taskqueue/__init__.py,sha256=nNHXIyysNLom9f8of-d__pWJ-YF53Mbrbsb1frPzPPI,298
-taskqueue/celery_app.py,sha256=rLIYRBBgYaQiXEqz-zCntvS8xU4eFZ9YuhJBfIye9E0,3931
+taskqueue/celery_app.py,sha256=0FaotFOUCKkJf8YQ2RySmRMBBIhh_ZoFXFJVrxZad5w,5263
 taskqueue/cmanager.py,sha256=9jxcTsWOpzexV3SkRhlY-PkhrobEdMuQVm6tWVVzgTs,16260
 taskqueue/slack_notifier.py,sha256=ZvTbWa1XXHUiciYF14_SH5af0BvGoPCBQohPtxx4FgU,1419
 taskqueue/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/libs/helper_test.py,sha256=3f7RoYEDBIpLHG1YY3eQ_RqZvkm4Er3FDEvFJeoAc8o,9572
-p1_taskqueue-0.1.14.dist-info/METADATA,sha256=BsbOsaQJo1_JXzhgSuH5M3Z1NipXSlvAsHuHELdry0o,1597
-p1_taskqueue-0.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-p1_taskqueue-0.1.14.dist-info/top_level.txt,sha256=hA3SM1ik2K8iPqtlt_-_nJ4TAePwHPN3vsOc4EiynqU,10
-p1_taskqueue-0.1.14.dist-info/RECORD,,
+p1_taskqueue-0.1.16.dist-info/METADATA,sha256=NyP1LDXMON9P_hYIK1jPvHH9s8YMxXvWP9ah8pFZ3_k,1597
+p1_taskqueue-0.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+p1_taskqueue-0.1.16.dist-info/top_level.txt,sha256=hA3SM1ik2K8iPqtlt_-_nJ4TAePwHPN3vsOc4EiynqU,10
+p1_taskqueue-0.1.16.dist-info/RECORD,,

taskqueue/celery_app.py

@@ -4,6 +4,7 @@ Reads configuration from Django settings and auto-configures queues with DLQ.
 """
 import logging
 
+from amqp.exceptions import PreconditionFailed
 from celery import Celery
 from kombu import Exchange
 from kombu import Queue
@@ -52,7 +53,7 @@ def create_celery_app():
         'worker_max_tasks_per_child': 1000,
     }
 
-    setup_queues(app, settings, celery_config)
+    # setup_queues(app, settings, celery_config)
     app.conf.update(celery_config)
     app.autodiscover_tasks(['taskqueue'])
 
@@ -67,6 +68,9 @@ def setup_queues(app, settings, celery_config):
         queue_names = ['default', 'high', 'low']
     dlq_name_prefix = getattr(settings, 'TASKQUEUE_DLQ_NAME_PREFIX', 'dlq')
 
+    logger.info(
+        f"[TaskQueue] Configuring app: {app_name}, queues: {queue_names}")
+
     main_exchange = Exchange(app_name, type='direct')
     dlx_exchange = Exchange(f'{app_name}.dlx', type='direct')
 
@@ -74,22 +78,28 @@ def setup_queues(app, settings, celery_config):
 
     for queue_name in queue_names:
         dlq_name = f'{dlq_name_prefix}.{queue_name}'
+        dlx_name = f'{app_name}.dlx'
+
+        queue_args = {
+            'x-dead-letter-exchange': dlx_name,
+            'x-dead-letter-routing-key': dlq_name
+        }
 
         queue = Queue(
             queue_name,
             main_exchange,
             routing_key=queue_name,
-            queue_arguments={
-                'x-dead-letter-exchange': f'{app_name}.dlx',
-                'x-dead-letter-routing-key': dlq_name
-            }
+            queue_arguments=queue_args
         )
         queues.append(queue)
+        logger.info(
+            f"[TaskQueue] Queue '{queue_name}' configured with DLX: {dlx_name}, DLQ routing key: {dlq_name}")
 
     for queue_name in queue_names:
         dlq_name = f'{dlq_name_prefix}.{queue_name}'
         dlq = Queue(dlq_name, dlx_exchange, routing_key=dlq_name)
         queues.append(dlq)
+        logger.info(f"[TaskQueue] DLQ '{dlq_name}' configured")
 
     celery_config.update({
         'task_default_queue': 'default',
@@ -100,14 +110,36 @@ def setup_queues(app, settings, celery_config):
 
     try:
         with app.connection_or_acquire() as conn:
-            main_exchange.declare(channel=conn.default_channel)
-            dlx_exchange.declare(channel=conn.default_channel)
+            channel = conn.default_channel
+
+            try:
+                main_exchange.declare(channel=channel)
+                logger.info(f"[TaskQueue] Exchange declared: {app_name}")
+            except PreconditionFailed:
+                logger.info(f"[TaskQueue] Exchange already exists: {app_name}")
+
+            try:
+                dlx_exchange.declare(channel=channel)
+                logger.info(
+                    f"[TaskQueue] DLX Exchange declared: {app_name}.dlx")
+            except PreconditionFailed:
+                logger.info(
+                    f"[TaskQueue] DLX Exchange already exists: {app_name}.dlx")
 
             for queue in queues:
-                queue.declare(channel=conn.default_channel)
+                try:
+                    queue.declare(channel=channel)
+                    logger.info(f"[TaskQueue] Queue declared: {queue.name}")
+                except PreconditionFailed:
+                    logger.info(
+                        f"[TaskQueue] Queue already exists with different config: {queue.name}. Using existing queue.")
+                except Exception as e:
+                    logger.warning(
+                        f"[TaskQueue] Failed to declare queue {queue.name}: {e}")
+
     except Exception as e:
         logger.warning(
-            f"[TaskQueue] Failed to declare queues: {str(e.__class__.__name__)} {e}")
+            f"[TaskQueue] Failed to setup queues: {str(e.__class__.__name__)} {e}")
 
 
 celery_app = create_celery_app()