diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3b2b36f0..a7a63120 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,6 +13,14 @@ Change Log Unreleased ~~~~~~~~~~ + +[3.4.3] - 2025-08-06 +~~~~~~~~~~~~~~~~~~~~ + +Fixed ++++++ +* Fix Celery protocol v2 header parameter name from ``task_id`` to ``id`` in ``extract_proto2_headers`` function + [3.4.2] - 2025-06-24 ~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/test_signals.py b/tests/test_signals.py index 9b0e5a0e..c0e9a3e5 100644 --- a/tests/test_signals.py +++ b/tests/test_signals.py @@ -202,7 +202,7 @@ def test_create_user_task_protocol_v2(self): {'callbacks': [], 'errbacks': [], 'task_chain': None, 'chord': None} ) headers = { - 'task_id': 'tid', 'retries': 0, 'eta': None, 'expires': None, + 'id': 'tid', 'retries': 0, 'eta': None, 'expires': None, 'group': None, 'timelimit': [None, None], 'task': 'test_signals.sample_task' } create_user_task(sender='test_signals.sample_task', body=body, headers=headers) @@ -565,7 +565,7 @@ class TestUtils: def test_extract_proto2_headers(self): headers = extract_proto2_headers( - task_id='abc123', retries=2, eta='2025-05-30T12:00:00', + id='abc123', retries=2, eta='2025-05-30T12:00:00', expires=None, group='group1', timelimit=[10, 20], task='my_task', extra='ignored') assert headers == { @@ -609,7 +609,7 @@ def test_proto2_to_proto1(self, monkeypatch): 'task_chain': ['a'], 'chord': 'ch'} ) headers = { - 'task_id': 'tid', 'retries': 1, 'eta': 'eta', 'expires': 'exp', + 'id': 'tid', 'retries': 1, 'eta': 'eta', 'expires': 'exp', 'group': 'grp', 'timelimit': [1, 2], 'task': 't', 'extra': 'ignored' } diff --git a/user_tasks/__init__.py b/user_tasks/__init__.py index 014d3cba..4615993b 100644 --- a/user_tasks/__init__.py +++ b/user_tasks/__init__.py @@ -4,7 +4,7 @@ from django.dispatch import Signal -__version__ = '3.4.2' +__version__ = '3.4.3' # This signal is emitted when a user task reaches any final state: diff --git a/user_tasks/utils.py b/user_tasks/utils.py index 4b553491..2359a597 100644 --- a/user_tasks/utils.py +++ b/user_tasks/utils.py @@ -23,12 +23,12 @@ def proto2_to_proto1(body, headers): return new_body -def extract_proto2_headers(task_id, retries, eta, expires, group, timelimit, task, **_): +def extract_proto2_headers(id, retries, eta, expires, group, timelimit, task, **_): # pylint: disable=redefined-builtin """ Extract relevant headers from protocol v2 format. """ return { - "id": task_id, + "id": id, "task": task, "retries": retries, "eta": eta,