p1-taskqueue 0.1.16__tar.gz → 0.1.19__tar.gz

{p1_taskqueue-0.1.16 → p1_taskqueue-0.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p1-taskqueue
-Version: 0.1.16
+Version: 0.1.19
 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.16 → p1_taskqueue-0.1.19}/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.16"
+version = "0.1.19"
 description = "A Task Queue Wrapper for Dekoruma Backend"
 authors = [
     {name = "Chalvin", email = "engineering@dekoruma.com"}

{p1_taskqueue-0.1.16 → p1_taskqueue-0.1.19}/src/p1_taskqueue.egg-info/PKG-INFO

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

@@ -53,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'])
 

{p1_taskqueue-0.1.16 → p1_taskqueue-0.1.19}/src/taskqueue/cmanager.py

@@ -171,7 +171,7 @@ class CManager:
                 enqueue_op_type, args, kwargs)
 
             use_legacy_executor = queue_options.pop(
-                'use_legacy_executor', True)
+                'use_legacy_executor', False)
 
             if use_legacy_executor:
                 task_name, task_args, task_kwargs = _build_dynamic_task_call(

{p1_taskqueue-0.1.16 → p1_taskqueue-0.1.19}/src/taskqueue/libs/helper_test.py

@@ -112,6 +112,7 @@ def celery_worker_burst(include_func_names: List[str], channel: str = "default")
 def get_queued_tasks(channel: str = "default"):
     app = current_app
     queued_tasks = []
+    messages = []
 
     try:
         with app.connection_for_read() as conn:
@@ -119,10 +120,11 @@ def get_queued_tasks(channel: str = "default"):
                 queue = app.amqp.queues[channel](chan)
 
                 while True:
-                    message = queue.get(no_ack=True)
+                    message = queue.get(no_ack=False)
                     if not message:
                         break
 
+                    messages.append(message)
                     task_name = message.headers.get("task")
 
                     try:
@@ -173,7 +175,10 @@ def get_queued_tasks(channel: str = "default"):
 
                     except Exception as e:
                         logger.warning(f"Failed to decode message: {e}")
-                        continue
+
+                for message in messages:
+                    if message and not message.acknowledged:
+                        message.reject(requeue=True)
 
     except Exception as e:
         logger.error(

{p1_taskqueue-0.1.16 → p1_taskqueue-0.1.19}/tests/test_cmanager.py

@@ -365,7 +365,7 @@ class TestCManager:
 
         mock_send_task.assert_called_once()
         call_args = mock_send_task.call_args
-        assert call_args[0][0] == "taskqueue.cmanager.dynamic_function_executor"
+        assert call_args[0][0] == "taskqueue.cmanager.callable_executor"
 
     @patch('taskqueue.cmanager.logger')
     @patch.object(CManager, '_send_task')
@@ -376,7 +376,7 @@ class TestCManager:
 
         mock_send_task.assert_called_once()
         call_args = mock_send_task.call_args
-        assert call_args[0][0] == "taskqueue.cmanager.dynamic_function_executor"
+        assert call_args[0][0] == "taskqueue.cmanager.callable_executor"
 
     @patch('taskqueue.cmanager.logger')
     @patch.object(CManager, '_send_task')
@@ -387,7 +387,7 @@ class TestCManager:
 
         mock_send_task.assert_called_once()
         call_args = mock_send_task.call_args
-        assert call_args[0][0] == "taskqueue.cmanager.dynamic_function_executor"
+        assert call_args[0][0] == "taskqueue.cmanager.callable_executor"
 
     def test_cmanager_enqueue_given_no_args_expect_raise_value_error(self):
         cm = CManager()
@@ -904,13 +904,13 @@ class TestBuildCallableTaskCall:
 
     @patch('taskqueue.cmanager.logger')
     @patch.object(CManager, '_send_task')
-    def test_cmanager_enqueue_given_no_use_legacy_executor_expect_default_to_true(self, mock_send_task: Any, mock_logger: Any) -> None:
+    def test_cmanager_enqueue_given_no_use_legacy_executor_expect_default_to_false(self, mock_send_task: Any, mock_logger: Any) -> None:
         cm = CManager()
         cm.enqueue(test_function, 1, 2)
 
         mock_send_task.assert_called_once()
         call_args = mock_send_task.call_args
-        assert call_args[0][0] == "taskqueue.cmanager.dynamic_function_executor"
+        assert call_args[0][0] == "taskqueue.cmanager.callable_executor"
 
     @patch('taskqueue.cmanager.logger')
     @patch.object(CManager, '_send_task')

{p1_taskqueue-0.1.16 → p1_taskqueue-0.1.19}/tests/test_helper_test_functions.py

@@ -220,6 +220,77 @@ class TestHelperTest:
         assert result[0]['args'] == []
         assert result[0]['kwargs']['callable_obj'] == bound_method
 
+    @patch('taskqueue.libs.helper_test.current_app')
+    @patch('taskqueue.libs.helper_test.loads')
+    def test_get_queued_tasks_expect_messages_are_nacked(self, mock_loads, mock_current_app):
+        mock_message1 = MagicMock()
+        mock_message1.headers = {
+            'task': 'taskqueue.cmanager.dynamic_function_executor'}
+        mock_message1.body = b'mock_body'
+        mock_message1.content_type = 'application/json'
+        mock_message1.content_encoding = 'utf-8'
+        mock_message1.acknowledged = False
+
+        mock_message2 = MagicMock()
+        mock_message2.headers = {
+            'task': 'taskqueue.cmanager.dynamic_function_executor'}
+        mock_message2.body = b'mock_body'
+        mock_message2.content_type = 'application/json'
+        mock_message2.content_encoding = 'utf-8'
+        mock_message2.acknowledged = False
+
+        mock_loads.return_value = [[], {
+            'module_path': 'my.module',
+            'function_name': 'my_function',
+            'args': [],
+            'kwargs': {}
+        }]
+
+        mock_queue = MagicMock()
+        mock_queue.get.side_effect = [mock_message1, mock_message2, None]
+        mock_current_app.amqp.queues = {
+            'default': MagicMock(return_value=mock_queue)}
+
+        mock_conn = MagicMock()
+        mock_chan = MagicMock()
+        mock_current_app.connection_for_read.return_value.__enter__.return_value = mock_conn
+        mock_conn.channel.return_value.__enter__.return_value = mock_chan
+
+        result = get_queued_tasks('default')
+
+        assert len(result) == 2
+        mock_message1.reject.assert_called_once_with(requeue=True)
+        mock_message2.reject.assert_called_once_with(requeue=True)
+        mock_queue.get.assert_called_with(no_ack=False)
+
+    @patch('taskqueue.libs.helper_test.current_app')
+    @patch('taskqueue.libs.helper_test.loads')
+    def test_get_queued_tasks_given_decode_failure_expect_nack_called(self, mock_loads, mock_current_app):
+        mock_message = MagicMock()
+        mock_message.headers = {
+            'task': 'taskqueue.cmanager.dynamic_function_executor'}
+        mock_message.body = b'mock_body'
+        mock_message.content_type = 'application/json'
+        mock_message.content_encoding = 'utf-8'
+        mock_message.acknowledged = False
+
+        mock_loads.side_effect = ValueError("Failed to decode")
+
+        mock_queue = MagicMock()
+        mock_queue.get.side_effect = [mock_message, None]
+        mock_current_app.amqp.queues = {
+            'default': MagicMock(return_value=mock_queue)}
+
+        mock_conn = MagicMock()
+        mock_chan = MagicMock()
+        mock_current_app.connection_for_read.return_value.__enter__.return_value = mock_conn
+        mock_conn.channel.return_value.__enter__.return_value = mock_chan
+
+        result = get_queued_tasks('default')
+
+        assert result == []
+        mock_message.reject.assert_called_once_with(requeue=True)
+
     @patch('taskqueue.libs.helper_test.get_queued_tasks')
     def test_is_task_in_queue_given_task_exists_expect_true(self, mock_get_queued_tasks):
         mock_get_queued_tasks.return_value = [