Make ServerCallContext mandatory in RequestContext

Author: sokoliva

src/a2a/server/agent_execution/context.py

@@ -26,35 +26,35 @@ class RequestContext:
 
     def __init__(  # noqa: PLR0913
         self,
+        call_context: ServerCallContext,
         request: SendMessageRequest | None = None,
         task_id: str | None = None,
         context_id: str | None = None,
         task: Task | None = None,
         related_tasks: list[Task] | None = None,
-        call_context: ServerCallContext | None = None,
         task_id_generator: IDGenerator | None = None,
         context_id_generator: IDGenerator | None = None,
     ):
         """Initializes the RequestContext.
 
         Args:
+            call_context: The server call context associated with this request.
             request: The incoming `SendMessageRequest` request payload.
             task_id: The ID of the task explicitly provided in the request or path.
             context_id: The ID of the context explicitly provided in the request or path.
             task: The existing `Task` object retrieved from the store, if any.
             related_tasks: A list of other tasks related to the current request (e.g., for tool use).
-            call_context: The server call context associated with this request.
             task_id_generator: ID generator for new task IDs. Defaults to UUID generator.
             context_id_generator: ID generator for new context IDs. Defaults to UUID generator.
         """
         if related_tasks is None:
             related_tasks = []
+        self._call_context = call_context
         self._params = request
         self._task_id = task_id
         self._context_id = context_id
         self._current_task = task
         self._related_tasks = related_tasks
-        self._call_context = call_context
         self._task_id_generator = (
             task_id_generator if task_id_generator else UUIDGenerator()
         )

src/a2a/server/agent_execution/request_context_builder.py

@@ -11,10 +11,10 @@ class RequestContextBuilder(ABC):
     @abstractmethod
     async def build(
         self,
+        context: ServerCallContext,
         params: SendMessageRequest | None = None,
         task_id: str | None = None,
         context_id: str | None = None,
         task: Task | None = None,
-        context: ServerCallContext | None = None,
     ) -> RequestContext:
         pass

src/a2a/server/agent_execution/simple_request_context_builder.py

@@ -35,11 +35,11 @@ def __init__(
 
     async def build(
         self,
+        context: ServerCallContext,
         params: SendMessageRequest | None = None,
         task_id: str | None = None,
         context_id: str | None = None,
         task: Task | None = None,
-        context: ServerCallContext | None = None,
     ) -> RequestContext:
         """Builds the request context for an agent execution.
 
@@ -48,11 +48,11 @@ async def build(
         referenced in `params.message.reference_task_ids` from the `task_store`.
 
         Args:
+            context: The server call context, containing metadata about the call.
             params: The parameters of the incoming message send request.
             task_id: The ID of the task being executed.
             context_id: The ID of the current execution context.
             task: The primary task object associated with the request.
-            context: The server call context, containing metadata about the call.
 
         Returns:
             An instance of RequestContext populated with the provided information
@@ -77,12 +77,12 @@ async def build(
             related_tasks = [x for x in tasks if x is not None]
 
         return RequestContext(
+            call_context=context,
             request=params,
             task_id=task_id,
             context_id=context_id,
             task=task,
             related_tasks=related_tasks,
-            call_context=context,
             task_id_generator=self._task_id_generator,
             context_id_generator=self._context_id_generator,
         )

src/a2a/server/request_handlers/default_request_handler.py

@@ -195,7 +195,8 @@ async def on_cancel_task(
 
         await self.agent_executor.cancel(
             RequestContext(
-                None,
+                call_context=context,
+                request=None,
                 task_id=task.id,
                 context_id=task.context_id,
                 task=task,

tests/server/agent_execution/test_context.py

@@ -35,7 +35,7 @@ def mock_task(self) -> Mock:
 
     def test_init_without_params(self) -> None:
         """Test initialization without parameters."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         assert context.message is None
         assert context.task_id is None
         assert context.context_id is None
@@ -51,7 +51,7 @@ def test_init_with_params_no_ids(self, mock_params: Mock) -> None:
                 uuid.UUID('00000000-0000-0000-0000-000000000002'),
             ],
         ):
-            context = RequestContext(request=mock_params)
+            context = RequestContext(ServerCallContext(), request=mock_params)
 
         assert context.message == mock_params.message
         assert context.task_id == '00000000-0000-0000-0000-000000000001'
@@ -68,15 +68,19 @@ def test_init_with_params_no_ids(self, mock_params: Mock) -> None:
     def test_init_with_task_id(self, mock_params: Mock) -> None:
         """Test initialization with task ID provided."""
         task_id = 'task-123'
-        context = RequestContext(request=mock_params, task_id=task_id)
+        context = RequestContext(
+            ServerCallContext(), request=mock_params, task_id=task_id
+        )
 
         assert context.task_id == task_id
         assert mock_params.message.task_id == task_id
 
     def test_init_with_context_id(self, mock_params: Mock) -> None:
         """Test initialization with context ID provided."""
         context_id = 'context-456'
-        context = RequestContext(request=mock_params, context_id=context_id)
+        context = RequestContext(
+            ServerCallContext(), request=mock_params, context_id=context_id
+        )
 
         assert context.context_id == context_id
         assert mock_params.message.context_id == context_id
@@ -86,7 +90,10 @@ def test_init_with_both_ids(self, mock_params: Mock) -> None:
         task_id = 'task-123'
         context_id = 'context-456'
         context = RequestContext(
-            request=mock_params, task_id=task_id, context_id=context_id
+            ServerCallContext(),
+            request=mock_params,
+            task_id=task_id,
+            context_id=context_id,
         )
 
         assert context.task_id == task_id
@@ -96,18 +103,20 @@ def test_init_with_both_ids(self, mock_params: Mock) -> None:
 
     def test_init_with_task(self, mock_params: Mock, mock_task: Mock) -> None:
         """Test initialization with a task object."""
-        context = RequestContext(request=mock_params, task=mock_task)
+        context = RequestContext(
+            ServerCallContext(), request=mock_params, task=mock_task
+        )
 
         assert context.current_task == mock_task
 
     def test_get_user_input_no_params(self) -> None:
         """Test get_user_input with no params returns empty string."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         assert context.get_user_input() == ''
 
     def test_attach_related_task(self, mock_task: Mock) -> None:
         """Test attach_related_task adds a task to related_tasks."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         assert len(context.related_tasks) == 0
 
         context.attach_related_task(mock_task)
@@ -122,7 +131,7 @@ def test_attach_related_task(self, mock_task: Mock) -> None:
 
     def test_current_task_property(self, mock_task: Mock) -> None:
         """Test current_task getter and setter."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         assert context.current_task is None
 
         context.current_task = mock_task
@@ -135,7 +144,7 @@ def test_current_task_property(self, mock_task: Mock) -> None:
 
     def test_check_or_generate_task_id_no_params(self) -> None:
         """Test _check_or_generate_task_id with no params does nothing."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         context._check_or_generate_task_id()
         assert context.task_id is None
 
@@ -146,7 +155,7 @@ def test_check_or_generate_task_id_with_existing_task_id(
         existing_id = 'existing-task-id'
         mock_params.message.task_id = existing_id
 
-        context = RequestContext(request=mock_params)
+        context = RequestContext(ServerCallContext(), request=mock_params)
         # The method is called during initialization
 
         assert context.task_id == existing_id
@@ -160,15 +169,17 @@ def test_check_or_generate_task_id_with_custom_id_generator(
         id_generator.generate.return_value = 'custom-task-id'
 
         context = RequestContext(
-            request=mock_params, task_id_generator=id_generator
+            ServerCallContext(),
+            request=mock_params,
+            task_id_generator=id_generator,
         )
         # The method is called during initialization
 
         assert context.task_id == 'custom-task-id'
 
     def test_check_or_generate_context_id_no_params(self) -> None:
         """Test _check_or_generate_context_id with no params does nothing."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         context._check_or_generate_context_id()
         assert context.context_id is None
 
@@ -179,7 +190,7 @@ def test_check_or_generate_context_id_with_existing_context_id(
         existing_id = 'existing-context-id'
         mock_params.message.context_id = existing_id
 
-        context = RequestContext(request=mock_params)
+        context = RequestContext(ServerCallContext(), request=mock_params)
         # The method is called during initialization
 
         assert context.context_id == existing_id
@@ -193,7 +204,9 @@ def test_check_or_generate_context_id_with_custom_id_generator(
         id_generator.generate.return_value = 'custom-context-id'
 
         context = RequestContext(
-            request=mock_params, context_id_generator=id_generator
+            ServerCallContext(),
+            request=mock_params,
+            context_id_generator=id_generator,
         )
         # The method is called during initialization
 
@@ -205,7 +218,10 @@ def test_init_raises_error_on_task_id_mismatch(
         """Test that an error is raised if provided task_id mismatches task.id."""
         with pytest.raises(InvalidParamsError) as exc_info:
             RequestContext(
-                request=mock_params, task_id='wrong-task-id', task=mock_task
+                ServerCallContext(),
+                request=mock_params,
+                task_id='wrong-task-id',
+                task=mock_task,
             )
         assert 'bad task id' in exc_info.value.message
 
@@ -218,6 +234,7 @@ def test_init_raises_error_on_context_id_mismatch(
 
         with pytest.raises(InvalidParamsError) as exc_info:
             RequestContext(
+                ServerCallContext(),
                 request=mock_params,
                 task_id=mock_task.id,
                 context_id='wrong-context-id',
@@ -229,30 +246,32 @@ def test_init_raises_error_on_context_id_mismatch(
     def test_with_related_tasks_provided(self, mock_task: Mock) -> None:
         """Test initialization with related tasks provided."""
         related_tasks = [mock_task, Mock(spec=Task)]
-        context = RequestContext(related_tasks=related_tasks)  # type: ignore[arg-type]
+        context = RequestContext(
+            ServerCallContext(), related_tasks=related_tasks
+        )  # type: ignore[arg-type]
 
         assert context.related_tasks == related_tasks
         assert len(context.related_tasks) == 2
 
     def test_message_property_without_params(self) -> None:
         """Test message property returns None when no params are provided."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         assert context.message is None
 
     def test_message_property_with_params(self, mock_params: Mock) -> None:
         """Test message property returns the message from params."""
-        context = RequestContext(request=mock_params)
+        context = RequestContext(ServerCallContext(), request=mock_params)
         assert context.message == mock_params.message
 
     def test_metadata_property_without_content(self) -> None:
         """Test metadata property returns empty dict when no content are provided."""
-        context = RequestContext()
+        context = RequestContext(ServerCallContext())
         assert context.metadata == {}
 
     def test_metadata_property_with_content(self, mock_params: Mock) -> None:
         """Test metadata property returns the metadata from params."""
         mock_params.metadata = {'key': 'value'}
-        context = RequestContext(request=mock_params)
+        context = RequestContext(ServerCallContext(), request=mock_params)
         assert context.metadata == {'key': 'value'}
 
     def test_init_with_existing_ids_in_message(
@@ -262,7 +281,7 @@ def test_init_with_existing_ids_in_message(
         mock_message.task_id = 'existing-task-id'
         mock_message.context_id = 'existing-context-id'
 
-        context = RequestContext(request=mock_params)
+        context = RequestContext(ServerCallContext(), request=mock_params)
 
         assert context.task_id == 'existing-task-id'
         assert context.context_id == 'existing-context-id'
@@ -275,7 +294,10 @@ def test_init_with_task_id_and_existing_task_id_match(
         mock_params.message.task_id = mock_task.id
 
         context = RequestContext(
-            request=mock_params, task_id=mock_task.id, task=mock_task
+            ServerCallContext(),
+            request=mock_params,
+            task_id=mock_task.id,
+            task=mock_task,
         )
 
         assert context.task_id == mock_task.id
@@ -289,6 +311,7 @@ def test_init_with_context_id_and_existing_context_id_match(
         mock_params.message.context_id = mock_task.context_id
 
         context = RequestContext(
+            ServerCallContext(),
             request=mock_params,
             task_id=mock_task.id,
             context_id=mock_task.context_id,