p1-taskqueue 0.1.30__tar.gz → 0.1.31__tar.gz

{p1_taskqueue-0.1.30 → p1_taskqueue-0.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.30
+Version: 0.1.31
 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.30 → p1_taskqueue-0.1.31}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "p1-taskqueue"
 # DO NOT CHANGE THIS VERSION - it gets automatically replaced by CI/CD with the git tag version
-version = "0.1.30"
+version = "0.1.31"
 description = "A Task Queue Wrapper for Dekoruma Backend"
 authors = [
     {name = "Chalvin", email = "engineering@dekoruma.com"}

{p1_taskqueue-0.1.30 → p1_taskqueue-0.1.31}/src/p1_taskqueue.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.30
+Version: 0.1.31
 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.30 → p1_taskqueue-0.1.31}/src/taskqueue/celery_app.py

@@ -54,14 +54,13 @@ def create_celery_app():
         'broker_pool_limit': 2,
     }
 
-    setup_queues(app, settings, celery_config)
     app.conf.update(celery_config)
     app.autodiscover_tasks(['taskqueue'])
 
     return app
 
 
-def setup_queues(app, settings, celery_config):
+def setup_queues(app, settings):
     app_name = getattr(settings, 'TASKQUEUE_APP_NAME', 'taskqueue')
     queue_names = getattr(settings, 'TASKQUEUE_QUEUES',
                           ['default', 'high', 'low'])
@@ -102,7 +101,7 @@ def setup_queues(app, settings, celery_config):
         queues.append(dlq)
         logger.info(f"[TaskQueue] DLQ '{dlq_name}' configured")
 
-    celery_config.update({
+    app.conf.update({
         'task_default_queue': 'default',
         'task_default_exchange': app_name,
         'task_default_exchange_type': 'direct',

{p1_taskqueue-0.1.30 → p1_taskqueue-0.1.31}/tests/test_celery_app.py

@@ -91,29 +91,28 @@ class TestSetupQueues:
     def test_setup_queues_given_valid_settings_expect_queues_configured(self):
         """Test that setup_queues configures queues and DLQs correctly."""
         mock_app = MagicMock()
+        mock_app.conf = {}
         mock_settings = MagicMock()
         mock_settings.TASKQUEUE_APP_NAME = 'testapp'
         mock_settings.TASKQUEUE_QUEUES = ['default', 'high', 'low']
         mock_settings.TASKQUEUE_DLQ_NAME_PREFIX = 'dlq'
 
-        celery_config = {}
-
-        setup_queues(mock_app, mock_settings, celery_config)
+        setup_queues(mock_app, mock_settings)
 
         # Assertions
-        assert celery_config['task_default_queue'] == 'default'
-        assert celery_config['task_default_exchange'] == 'testapp'
-        assert celery_config['task_default_exchange_type'] == 'direct'
-        assert len(celery_config['task_queues']) == 6
+        assert mock_app.conf['task_default_queue'] == 'default'
+        assert mock_app.conf['task_default_exchange'] == 'testapp'
+        assert mock_app.conf['task_default_exchange_type'] == 'direct'
+        assert len(mock_app.conf['task_queues']) == 6
 
-        main_queues = [q for q in celery_config['task_queues']
+        main_queues = [q for q in mock_app.conf['task_queues']
                        if not q.name.startswith('dlq.')]
         assert len(main_queues) == 3
         assert any(q.name == 'default' for q in main_queues)
         assert any(q.name == 'high' for q in main_queues)
         assert any(q.name == 'low' for q in main_queues)
 
-        dlq_queues = [q for q in celery_config['task_queues']
+        dlq_queues = [q for q in mock_app.conf['task_queues']
                       if q.name.startswith('dlq.')]
         assert len(dlq_queues) == 3
         assert any(q.name == 'dlq.default' for q in dlq_queues)
@@ -122,40 +121,38 @@ class TestSetupQueues:
 
     def test_setup_queues_given_missing_settings_expect_defaults_used(self):
         mock_app = MagicMock()
+        mock_app.conf = {}
         mock_settings = MagicMock()
         del mock_settings.TASKQUEUE_APP_NAME
         del mock_settings.TASKQUEUE_QUEUES
         del mock_settings.TASKQUEUE_DLQ_NAME_PREFIX
 
-        celery_config = {}
-
-        setup_queues(mock_app, mock_settings, celery_config)
+        setup_queues(mock_app, mock_settings)
 
-        assert celery_config['task_default_queue'] == 'default'
-        assert celery_config['task_default_exchange'] == 'taskqueue'
-        assert celery_config['task_default_exchange_type'] == 'direct'
-        assert len(celery_config['task_queues']) == 6
+        assert mock_app.conf['task_default_queue'] == 'default'
+        assert mock_app.conf['task_default_exchange'] == 'taskqueue'
+        assert mock_app.conf['task_default_exchange_type'] == 'direct'
+        assert len(mock_app.conf['task_queues']) == 6
 
     def test_setup_queues_given_single_queue_expect_correct_configuration(self):
         mock_app = MagicMock()
+        mock_app.conf = {}
         mock_settings = MagicMock()
         mock_settings.TASKQUEUE_APP_NAME = 'singleapp'
         mock_settings.TASKQUEUE_QUEUES = ['single']
         mock_settings.TASKQUEUE_DLQ_NAME_PREFIX = 'dead'
 
-        celery_config = {}
-
-        setup_queues(mock_app, mock_settings, celery_config)
+        setup_queues(mock_app, mock_settings)
 
-        assert len(celery_config['task_queues']) == 2
+        assert len(mock_app.conf['task_queues']) == 2
 
         main_queue = next(
-            q for q in celery_config['task_queues'] if q.name == 'single')
+            q for q in mock_app.conf['task_queues'] if q.name == 'single')
         assert main_queue.queue_arguments['x-dead-letter-exchange'] == 'singleapp.dlx'
         assert main_queue.queue_arguments['x-dead-letter-routing-key'] == 'dead.single'
 
         dlq = next(
-            q for q in celery_config['task_queues'] if q.name == 'dead.single')
+            q for q in mock_app.conf['task_queues'] if q.name == 'dead.single')
         assert dlq.exchange.name == 'singleapp.dlx'