Develop-Python
diff --git a/‎procrastinate/app.py
Lines changed: 3 additions & 0 deletions b/‎procrastinate/app.py
Lines changed: 3 additions & 0 deletions
diff --git a/‎procrastinate/worker.py
Lines changed: 7 additions & 2 deletions b/‎procrastinate/worker.py
Lines changed: 7 additions & 2 deletions
diff --git a/‎tests/unit/test_worker.py
Lines changed: 44 additions & 8 deletions b/‎tests/unit/test_worker.py
Lines changed: 44 additions & 8 deletions
@@ -311,6 +311,9 @@ async def run_worker_async(self, **kwargs) -> None:
             If ``successful`` the worker will only delete successful jobs.
             If ``never``, the worker will keep the jobs in the database.
             (defaults to ``never``)
+        additional_context: ``Optional[Dict[str, Any]]``
+            If set extend the context received by the tasks when ``pass_context`` is set
+            to ``True`` in the task definition.
         """
         self.perform_import_paths()
         worker = self._worker(**kwargs)
 
@@ -3,7 +3,7 @@
 import logging
 import time
 from enum import Enum
-from typing import Dict, Iterable, Optional, Set, Union
+from typing import Any, Dict, Iterable, Optional, Set, Union
 
 from procrastinate import app, exceptions, job_context, jobs, signals, tasks, utils
 
@@ -36,6 +36,7 @@ def __init__(
         timeout: float = WORKER_TIMEOUT,
         listen_notify: bool = True,
         delete_jobs: str = DeleteJobCondition.NEVER.value,
+        additional_context: Optional[Dict[str, Any]] = None,
     ):
         self.app = app
         self.queues = queues
@@ -57,7 +58,10 @@ def __init__(
             self.logger = logger
 
         self.base_context: job_context.JobContext = job_context.JobContext(
-            app=app, worker_name=self.worker_name, worker_queues=self.queues
+            app=app,
+            worker_name=self.worker_name,
+            worker_queues=self.queues,
+            additional_context=additional_context.copy() if additional_context else {},
         )
         self.current_contexts: Dict[int, job_context.JobContext] = {}
         self.stop_requested = False
@@ -75,6 +79,7 @@ def context_for_worker(
         if reset or worker_id not in self.current_contexts:
             context = self.base_context
             kwargs["worker_id"] = worker_id
+            kwargs["additional_context"] = self.base_context.additional_context.copy()
         else:
             context = self.current_contexts[worker_id]
 
 
@@ -23,6 +23,11 @@ def _(job):
     return _
 
 
+def test_worker_additional_context(app):
+    worker_obj = worker.Worker(app=app, additional_context={"foo": "bar"})
+    assert worker_obj.base_context.additional_context == {"foo": "bar"}
+
+
 async def test_run(test_worker, mocker, caplog):
     caplog.set_level("INFO")
 
@@ -315,17 +320,15 @@ def task_func(test_context, a):
         task_name="job",
         queue="yay",
     )
-    test_worker = worker.Worker(app, queues=["yay"], name="my_worker")
-    context = job_context.JobContext(
-        worker_name="my_worker",
-        worker_id=3,
-        worker_queues=["yay"],
-        job=job,
-        task=task_func,
+    test_worker = worker.Worker(
+        app, queues=["yay"], name="my_worker", additional_context={"foo": "bar"}
     )
-    test_worker.current_contexts[3] = context
+    context = test_worker.context_for_worker(worker_id=3)
+
     await test_worker.run_job(job=job, worker_id=3)
 
+    context = context.evolve(task=task_func)
+
     assert result == [
         context,
         1,
@@ -519,3 +522,36 @@ def test_context_for_worker_reset(app):
     context = test_worker.context_for_worker(worker_id=3, reset=True)
 
     assert context == expected
+
+
+def test_worker_copy_additional_context(app):
+    additional_context = {"foo": "bar"}
+    test_worker = worker.Worker(
+        app=app,
+        name="worker",
+        additional_context=additional_context,
+    )
+
+    # mutate the additional_context object and test that we have the original
+    # value in the worker
+    additional_context["foo"] = "baz"
+    assert test_worker.base_context.additional_context == {"foo": "bar"}
+
+
+def test_context_for_worker_with_additional_context(app):
+    additional_context = {"foo": "bar"}
+    test_worker = worker.Worker(
+        app=app,
+        name="worker",
+        additional_context=additional_context,
+    )
+
+    context1 = test_worker.context_for_worker(worker_id=3)
+
+    # mutate the additional_context object for one worker and test that it
+    # hasn't changed for other workers
+    context1.additional_context["foo"] = "baz"
+
+    context2 = test_worker.context_for_worker(worker_id=4)
+
+    assert context2.additional_context == {"foo": "bar"}