Update types throughout

Author: holtskinner

src/a2a/server/models.py

@@ -123,7 +123,7 @@ class TaskMixin:
     """Mixin providing standard task columns with proper type handling."""
 
     id: Mapped[str] = mapped_column(String(36), primary_key=True, index=True)
-    contextId: Mapped[str] = mapped_column(String(36), nullable=False)  # noqa: N815
+    context_id: Mapped[str] = mapped_column(String(36), nullable=False)
     kind: Mapped[str] = mapped_column(
         String(16), nullable=False, default='task'
     )
@@ -148,12 +148,12 @@ def task_metadata(cls) -> Mapped[dict[str, Any] | None]:
     def __repr__(self) -> str:
         """Return a string representation of the task."""
         repr_template = (
-            '<{CLS}(id="{ID}", contextId="{CTX_ID}", status="{STATUS}")>'
+            '<{CLS}(id="{ID}", context_id="{CTX_ID}", status="{STATUS}")>'
         )
         return repr_template.format(
             CLS=self.__class__.__name__,
             ID=self.id,
-            CTX_ID=self.contextId,
+            CTX_ID=self.context_id,
             STATUS=self.status,
         )
 
@@ -188,11 +188,11 @@ class TaskModel(TaskMixin, base):
         @override
         def __repr__(self) -> str:
             """Return a string representation of the task."""
-            repr_template = '<TaskModel[{TABLE}](id="{ID}", contextId="{CTX_ID}", status="{STATUS}")>'
+            repr_template = '<TaskModel[{TABLE}](id="{ID}", context_id="{CTX_ID}", status="{STATUS}")>'
             return repr_template.format(
                 TABLE=table_name,
                 ID=self.id,
-                CTX_ID=self.contextId,
+                CTX_ID=self.context_id,
                 STATUS=self.status,
             )
 

src/a2a/server/request_handlers/default_request_handler.py

@@ -126,7 +126,7 @@ async def on_cancel_task(
 
         task_manager = TaskManager(
             task_id=task.id,
-            context_id=task.contextId,
+            context_id=task.context_id,
             task_store=self.task_store,
             initial_message=None,
         )
@@ -140,7 +140,7 @@ async def on_cancel_task(
             RequestContext(
                 None,
                 task_id=task.id,
-                context_id=task.contextId,
+                context_id=task.context_id,
                 task=task,
             ),
             queue,
@@ -185,7 +185,7 @@ async def _setup_message_execution(
         # Create task manager and validate existing task
         task_manager = TaskManager(
             task_id=params.message.taskId,
-            context_id=params.message.contextId,
+            context_id=params.message.context_id,
             task_store=self.task_store,
             initial_message=params.message,
         )
@@ -205,7 +205,7 @@ async def _setup_message_execution(
         request_context = await self._request_context_builder.build(
             params=params,
             task_id=task.id if task else None,
-            context_id=params.message.contextId,
+            context_id=params.message.context_id,
             task=task,
             context=context,
         )
@@ -430,7 +430,7 @@ async def on_resubscribe_to_task(
 
         task_manager = TaskManager(
             task_id=task.id,
-            context_id=task.contextId,
+            context_id=task.context_id,
             task_store=self.task_store,
             initial_message=None,
         )

src/a2a/server/tasks/database_task_store.py

@@ -95,7 +95,7 @@ def _to_orm(self, task: Task) -> TaskModel:
         """Maps a Pydantic Task to a SQLAlchemy TaskModel instance."""
         return self.task_model(
             id=task.id,
-            contextId=task.contextId,
+            context_id=task.context_id,
             kind=task.kind,
             status=task.status,
             artifacts=task.artifacts,
@@ -108,7 +108,7 @@ def _from_orm(self, task_model: TaskModel) -> Task:
         # Map database columns to Pydantic model fields
         task_data_from_db = {
             'id': task_model.id,
-            'contextId': task_model.contextId,
+            'context_id': task_model.context_id,
             'kind': task_model.kind,
             'status': task_model.status,
             'artifacts': task_model.artifacts,

src/a2a/server/tasks/task_manager.py

@@ -110,14 +110,14 @@ async def save_task_event(
             )
         if not self.task_id:
             self.task_id = task_id_from_event
-        if self.context_id and self.context_id != event.contextId:
+        if self.context_id and self.context_id != event.context_id:
             raise ServerError(
                 error=InvalidParamsError(
-                    message=f"Context in event doesn't match TaskManager {self.context_id} : {event.contextId}"
+                    message=f"Context in event doesn't match TaskManager {self.context_id} : {event.context_id}"
                 )
             )
         if not self.context_id:
-            self.context_id = event.contextId
+            self.context_id = event.context_id
 
         logger.debug(
             'Processing save of task event of type %s for task_id: %s',
@@ -173,11 +173,11 @@ async def ensure_task(
             logger.info(
                 'Task not found or task_id not set. Creating new task for event (task_id: %s, context_id: %s).',
                 event.taskId,
-                event.contextId,
+                event.context_id,
             )
             # streaming agent did not previously stream task object.
             # Create a task object with the available information and persist the event
-            task = self._init_task_obj(event.taskId, event.contextId)
+            task = self._init_task_obj(event.taskId, event.context_id)
             await self._save_task(task)
 
         return task
@@ -219,7 +219,7 @@ def _init_task_obj(self, task_id: str, context_id: str) -> Task:
         history = [self._initial_message] if self._initial_message else []
         return Task(
             id=task_id,
-            contextId=context_id,
+            context_id=context_id,
             status=TaskStatus(state=TaskState.submitted),
             history=history,
         )
@@ -236,7 +236,7 @@ async def _save_task(self, task: Task) -> None:
         if not self.task_id:
             logger.info('New task created with id: %s', task.id)
             self.task_id = task.id
-            self.context_id = task.contextId
+            self.context_id = task.context_id
 
     def update_with_message(self, message: Message, task: Task) -> Task:
         """Updates a task object in memory by adding a new message to its history.

src/a2a/server/tasks/task_updater.py

@@ -75,7 +75,7 @@ async def update_status(
             await self.event_queue.enqueue_event(
                 TaskStatusUpdateEvent(
                     taskId=self.task_id,
-                    contextId=self.context_id,
+                    context_id=self.context_id,
                     final=final,
                     status=TaskStatus(
                         state=state,
@@ -110,7 +110,7 @@ async def add_artifact(  # noqa: PLR0913
         await self.event_queue.enqueue_event(
             TaskArtifactUpdateEvent(
                 taskId=self.task_id,
-                contextId=self.context_id,
+                context_id=self.context_id,
                 artifact=Artifact(
                     artifactId=artifact_id,
                     name=name,
@@ -198,7 +198,7 @@ def new_agent_message(
         return Message(
             role=Role.agent,
             taskId=self.task_id,
-            contextId=self.context_id,
+            context_id=self.context_id,
             messageId=str(uuid.uuid4()),
             metadata=metadata,
             parts=parts,

src/a2a/utils/helpers.py

@@ -36,12 +36,12 @@ def create_task_obj(message_send_params: MessageSendParams) -> Task:
     Returns:
         A new `Task` object initialized with 'submitted' status and the input message in history.
     """
-    if not message_send_params.message.contextId:
-        message_send_params.message.contextId = str(uuid4())
+    if not message_send_params.message.context_id:
+        message_send_params.message.context_id = str(uuid4())
 
     return Task(
         id=str(uuid4()),
-        contextId=message_send_params.message.contextId,
+        context_id=message_send_params.message.context_id,
         status=TaskStatus(state=TaskState.submitted),
         history=[message_send_params.message],
     )

src/a2a/utils/message.py

@@ -36,7 +36,7 @@ def new_agent_text_message(
         parts=[Part(root=TextPart(text=text))],
         messageId=str(uuid.uuid4()),
         taskId=task_id,
-        contextId=context_id,
+        context_id=context_id,
     )
 
 
@@ -60,7 +60,7 @@ def new_agent_parts_message(
         parts=parts,
         messageId=str(uuid.uuid4()),
         taskId=task_id,
-        contextId=context_id,
+        context_id=context_id,
     )
 
 

src/a2a/utils/proto_utils.py

@@ -28,7 +28,7 @@ def message(cls, message: types.Message | None) -> a2a_pb2.Message | None:
         return a2a_pb2.Message(
             message_id=message.messageId,
             content=[ToProto.part(p) for p in message.parts],
-            context_id=message.contextId,
+            context_id=message.context_id,
             task_id=message.taskId,
             role=cls.role(message.role),
             metadata=ToProto.metadata(message.metadata),
@@ -81,7 +81,7 @@ def file(
     def task(cls, task: types.Task) -> a2a_pb2.Task:
         return a2a_pb2.Task(
             id=task.id,
-            context_id=task.contextId,
+            context_id=task.context_id,
             status=ToProto.task_status(task.status),
             artifacts=(
                 [ToProto.artifact(a) for a in task.artifacts]
@@ -161,7 +161,7 @@ def task_artifact_update_event(
     ) -> a2a_pb2.TaskArtifactUpdateEvent:
         return a2a_pb2.TaskArtifactUpdateEvent(
             task_id=event.taskId,
-            context_id=event.contextId,
+            context_id=event.context_id,
             artifact=ToProto.artifact(event.artifact),
             metadata=ToProto.metadata(event.metadata),
             append=event.append or False,
@@ -174,7 +174,7 @@ def task_status_update_event(
     ) -> a2a_pb2.TaskStatusUpdateEvent:
         return a2a_pb2.TaskStatusUpdateEvent(
             task_id=event.taskId,
-            context_id=event.contextId,
+            context_id=event.context_id,
             status=ToProto.task_status(event.status),
             metadata=ToProto.metadata(event.metadata),
             final=event.final,
@@ -438,7 +438,7 @@ def message(cls, message: a2a_pb2.Message) -> types.Message:
         return types.Message(
             messageId=message.message_id,
             parts=[FromProto.part(p) for p in message.content],
-            contextId=message.context_id,
+            context_id=message.context_id,
             taskId=message.task_id,
             role=FromProto.role(message.role),
             metadata=FromProto.metadata(message.metadata),
@@ -483,7 +483,7 @@ def file(
     def task(cls, task: a2a_pb2.Task) -> types.Task:
         return types.Task(
             id=task.id,
-            contextId=task.context_id,
+            context_id=task.context_id,
             status=FromProto.task_status(task.status),
             artifacts=[FromProto.artifact(a) for a in task.artifacts],
             history=[FromProto.message(h) for h in task.history],
@@ -530,7 +530,7 @@ def task_artifact_update_event(
     ) -> types.TaskArtifactUpdateEvent:
         return types.TaskArtifactUpdateEvent(
             taskId=event.task_id,
-            contextId=event.context_id,
+            context_id=event.context_id,
             artifact=FromProto.artifact(event.artifact),
             metadata=FromProto.metadata(event.metadata),
             append=event.append,
@@ -543,7 +543,7 @@ def task_status_update_event(
     ) -> types.TaskStatusUpdateEvent:
         return types.TaskStatusUpdateEvent(
             taskId=event.task_id,
-            contextId=event.context_id,
+            context_id=event.context_id,
             status=FromProto.task_status(event.status),
             metadata=FromProto.metadata(event.metadata),
             final=event.final,

src/a2a/utils/task.py

@@ -28,8 +28,8 @@ def new_task(request: Message) -> Task:
     return Task(
         status=TaskStatus(state=TaskState.submitted),
         id=(request.taskId if request.taskId else str(uuid.uuid4())),
-        contextId=(
-            request.contextId if request.contextId else str(uuid.uuid4())
+        context_id=(
+            request.context_id if request.context_id else str(uuid.uuid4())
         ),
         history=[request],
     )
@@ -65,7 +65,7 @@ def completed_task(
     return Task(
         status=TaskStatus(state=TaskState.completed),
         id=task_id,
-        contextId=context_id,
+        context_id=context_id,
         artifacts=artifacts,
         history=history,
     )

tests/client/test_auth_middleware.py

@@ -55,7 +55,7 @@ def build_success_response() -> dict:
         jsonrpc='2.0',
         result=Message(
             kind='message',
-            messageId='message-id',
+            message_id='message-id',
             role=Role.agent,
             parts=[],
         ),
@@ -68,7 +68,7 @@ def build_send_message_request() -> SendMessageRequest:
         id='1',
         params=MessageSendParams(
             message=Message(
-                messageId='msg1',
+                message_id='msg1',
                 role=Role.user,
                 parts=[],
             )
@@ -223,9 +223,9 @@ class AuthTestCase:
     security_scheme=OAuth2SecurityScheme(
         type='oauth2',
         flows=OAuthFlows(
-            authorizationCode=AuthorizationCodeOAuthFlow(
-                authorizationUrl='http://provider.com/auth',
-                tokenUrl='http://provider.com/token',
+            authorization_code=AuthorizationCodeOAuthFlow(
+                authorization_url='http://provider.com/auth',
+                token_url='http://provider.com/token',
                 scopes={'read': 'Read scope'},
             )
         ),
@@ -242,7 +242,7 @@ class AuthTestCase:
     credential='secret-oidc-id-token',
     security_scheme=OpenIdConnectSecurityScheme(
         type='openIdConnect',
-        openIdConnectUrl='http://provider.com/.well-known/openid-configuration',
+        open_id_connect_url='http://provider.com/.well-known/openid-configuration',
     ),
     expected_header_key='Authorization',
     expected_header_value_func=lambda c: f'Bearer {c}',
@@ -282,12 +282,12 @@ async def test_auth_interceptor_variants(test_case, store):
         name=f'{test_case.scheme_name}bot',
         description=f'A bot that uses {test_case.scheme_name}',
         version='1.0',
-        defaultInputModes=[],
-        defaultOutputModes=[],
+        default_input_modes=[],
+        default_output_modes=[],
         skills=[],
         capabilities=AgentCapabilities(),
         security=[{test_case.scheme_name: []}],
-        securitySchemes={
+        security_schemes={
             test_case.scheme_name: SecurityScheme(
                 root=test_case.security_scheme
             )
@@ -314,7 +314,7 @@ async def test_auth_interceptor_skips_when_scheme_not_in_security_schemes(
 ):
     """
     Tests that AuthInterceptor skips a scheme if it's listed in security requirements
-    but not defined in securitySchemes.
+    but not defined in security_schemes.
     """
     scheme_name = 'missing'
     session_id = 'session-id'
@@ -328,12 +328,12 @@ async def test_auth_interceptor_skips_when_scheme_not_in_security_schemes(
         name='missingbot',
         description='A bot that uses missing scheme definition',
         version='1.0',
-        defaultInputModes=[],
-        defaultOutputModes=[],
+        default_input_modes=[],
+        default_output_modes=[],
         skills=[],
         capabilities=AgentCapabilities(),
         security=[{scheme_name: []}],
-        securitySchemes={},
+        security_schemes={},
     )
 
     new_payload, new_kwargs = await auth_interceptor.intercept(