Fix missing changes

Author: holtskinner

src/a2a/server/tasks/task_updater.py

@@ -112,7 +112,7 @@ async def add_artifact(  # noqa: PLR0913
                 task_id=self.task_id,
                 context_id=self.context_id,
                 artifact=Artifact(
-                    artifactId=artifact_id,
+                    artifact_id=artifact_id,
                     name=name,
                     parts=parts,
                     metadata=metadata,

src/a2a/utils/artifact.py

@@ -18,10 +18,10 @@ def new_artifact(
         description: An optional description of the artifact.
 
     Returns:
-        A new `Artifact` object with a generated artifactId.
+        A new `Artifact` object with a generated artifact_id.
     """
     return Artifact(
-        artifactId=str(uuid.uuid4()),
+        artifact_id=str(uuid.uuid4()),
         parts=parts,
         name=name,
         description=description,
@@ -41,7 +41,7 @@ def new_text_artifact(
         description: An optional description of the artifact.
 
     Returns:
-        A new `Artifact` object with a generated artifactId.
+        A new `Artifact` object with a generated artifact_id.
     """
     return new_artifact(
         [Part(root=TextPart(text=text))],
@@ -63,7 +63,7 @@ def new_data_artifact(
         description: An optional description of the artifact.
 
     Returns:
-        A new `Artifact` object with a generated artifactId.
+        A new `Artifact` object with a generated artifact_id.
     """
     return new_artifact(
         [Part(root=DataPart(data=data))],

src/a2a/utils/helpers.py

@@ -115,7 +115,7 @@ def build_text_artifact(text: str, artifact_id: str) -> Artifact:
     """
     text_part = TextPart(text=text)
     part = Part(root=text_part)
-    return Artifact(parts=[part], artifactId=artifact_id)
+    return Artifact(parts=[part], artifact_id=artifact_id)
 
 
 def validate(

src/a2a/utils/proto_utils.py

@@ -517,7 +517,7 @@ def task_state(cls, state: a2a_pb2.TaskState) -> types.TaskState:
     @classmethod
     def artifact(cls, artifact: a2a_pb2.Artifact) -> types.Artifact:
         return types.Artifact(
-            artifactId=artifact.artifact_id,
+            artifact_id=artifact.artifact_id,
             description=artifact.description,
             metadata=FromProto.metadata(artifact.metadata),
             name=artifact.name,
@@ -577,12 +577,12 @@ def message_send_configuration(
     ) -> types.MessageSendConfiguration:
         return types.MessageSendConfiguration(
             accepted_output_modes=list(config.accepted_output_modes),
-            pushNotificationConfig=FromProto.push_notification_config(
+            push_notification_config=FromProto.push_notification_config(
                 config.push_notification
             )
             if config.HasField('push_notification')
             else None,
-            historyLength=config.history_length,
+            history_length=config.history_length,
             blocking=config.blocking,
         )
 
@@ -638,7 +638,7 @@ def task_push_notification_config(
                 )
             )
         return types.TaskPushNotificationConfig(
-            pushNotificationConfig=cls.push_notification_config(
+            push_notification_config=cls.push_notification_config(
                 request.config.push_notification_config,
             ),
             task_id=m.group(1),
@@ -651,18 +651,18 @@ def agent_card(
     ) -> types.AgentCard:
         return types.AgentCard(
             capabilities=cls.capabilities(card.capabilities),
-            defaultInputModes=list(card.default_input_modes),
-            defaultOutputModes=list(card.default_output_modes),
+            default_input_modes=list(card.default_input_modes),
+            default_output_modes=list(card.default_output_modes),
             description=card.description,
-            documentationUrl=card.documentation_url,
+            documentation_url=card.documentation_url,
             name=card.name,
             provider=cls.provider(card.provider),
             security=cls.security(list(card.security)),
-            securitySchemes=cls.security_schemes(dict(card.security_schemes)),
+            security_schemes=cls.security_schemes(dict(card.security_schemes)),
             skills=[cls.skill(x) for x in card.skills] if card.skills else [],
             url=card.url,
             version=card.version,
-            supportsAuthenticatedExtendedCard=card.supports_authenticated_extended_card,
+            supports_authenticated_extended_card=card.supports_authenticated_extended_card,
         )
 
     @classmethod
@@ -678,7 +678,7 @@ def task_query_params(
                 )
             )
         return types.TaskQueryParams(
-            historyLength=request.history_length
+            history_length=request.history_length
             if request.history_length
             else None,
             id=m.group(1),
@@ -691,7 +691,7 @@ def capabilities(
     ) -> types.AgentCapabilities:
         return types.AgentCapabilities(
             streaming=capabilities.streaming,
-            pushNotifications=capabilities.push_notifications,
+            push_notifications=capabilities.push_notifications,
         )
 
     @classmethod
@@ -741,7 +741,7 @@ def security_scheme(
                 root=types.HTTPAuthSecurityScheme(
                     description=scheme.http_auth_security_scheme.description,
                     scheme=scheme.http_auth_security_scheme.scheme,
-                    bearerFormat=scheme.http_auth_security_scheme.bearer_format,
+                    bearer_format=scheme.http_auth_security_scheme.bearer_format,
                 )
             )
         if scheme.HasField('oauth2_security_scheme'):
@@ -754,42 +754,42 @@ def security_scheme(
         return types.SecurityScheme(
             root=types.OpenIdConnectSecurityScheme(
                 description=scheme.open_id_connect_security_scheme.description,
-                openIdConnectUrl=scheme.open_id_connect_security_scheme.open_id_connect_url,
+                open_id_connect_url=scheme.open_id_connect_security_scheme.open_id_connect_url,
             )
         )
 
     @classmethod
     def oauth2_flows(cls, flows: a2a_pb2.OAuthFlows) -> types.OAuthFlows:
         if flows.HasField('authorization_code'):
             return types.OAuthFlows(
-                authorizationCode=types.AuthorizationCodeOAuthFlow(
-                    authorizationUrl=flows.authorization_code.authorization_url,
-                    refreshUrl=flows.authorization_code.refresh_url,
+                authorization_code=types.AuthorizationCodeOAuthFlow(
+                    authorization_url=flows.authorization_code.authorization_url,
+                    refresh_url=flows.authorization_code.refresh_url,
                     scopes=dict(flows.authorization_code.scopes.items()),
-                    tokenUrl=flows.authorization_code.token_url,
+                    token_url=flows.authorization_code.token_url,
                 ),
             )
         if flows.HasField('client_credentials'):
             return types.OAuthFlows(
-                clientCredentials=types.ClientCredentialsOAuthFlow(
-                    refreshUrl=flows.client_credentials.refresh_url,
+                client_credentials=types.ClientCredentialsOAuthFlow(
+                    refresh_url=flows.client_credentials.refresh_url,
                     scopes=dict(flows.client_credentials.scopes.items()),
-                    tokenUrl=flows.client_credentials.token_url,
+                    token_url=flows.client_credentials.token_url,
                 ),
             )
         if flows.HasField('implicit'):
             return types.OAuthFlows(
                 implicit=types.ImplicitOAuthFlow(
-                    authorizationUrl=flows.implicit.authorization_url,
-                    refreshUrl=flows.implicit.refresh_url,
+                    authorization_url=flows.implicit.authorization_url,
+                    refresh_url=flows.implicit.refresh_url,
                     scopes=dict(flows.implicit.scopes.items()),
                 ),
             )
         return types.OAuthFlows(
             password=types.PasswordOAuthFlow(
-                refreshUrl=flows.password.refresh_url,
+                refresh_url=flows.password.refresh_url,
                 scopes=dict(flows.password.scopes.items()),
-                tokenUrl=flows.password.token_url,
+                token_url=flows.password.token_url,
             ),
         )
 

tests/client/test_grpc_client.py

@@ -43,9 +43,9 @@ def sample_agent_card() -> AgentCard:
         description='Agent for testing gRPC client',
         url='grpc://localhost:50051',
         version='1.0',
-        capabilities=AgentCapabilities(streaming=True, pushNotifications=True),
-        defaultInputModes=['text/plain'],
-        defaultOutputModes=['text/plain'],
+        capabilities=AgentCapabilities(streaming=True, push_notifications=True),
+        default_input_modes=['text/plain'],
+        default_output_modes=['text/plain'],
         skills=[],
     )
 

tests/server/apps/jsonrpc/test_serialization.py

@@ -38,10 +38,10 @@ def agent_card_with_api_key():
         url='http://example.com/apikey-agent',
         version='1.0.0',
         capabilities=AgentCapabilities(),
-        defaultInputModes=['text/plain'],
-        defaultOutputModes=['text/plain'],
+        default_input_modes=['text/plain'],
+        default_output_modes=['text/plain'],
         skills=[],
-        securitySchemes={'api_key_auth': SecurityScheme(root=api_key_scheme)},
+        security_schemes={'api_key_auth': SecurityScheme(root=api_key_scheme)},
         security=[{'api_key_auth': []}],
     )
     return agent_card

tests/server/events/test_event_consumer.py

@@ -131,7 +131,7 @@ async def test_consume_all_multiple_events(
             task_id='task_123',
             context_id='session-xyz',
             artifact=Artifact(
-                artifactId='11', parts=[Part(TextPart(text='text'))]
+                artifact_id='11', parts=[Part(TextPart(text='text'))]
             ),
         ),
         TaskStatusUpdateEvent(
@@ -173,7 +173,7 @@ async def test_consume_until_message(
             task_id='task_123',
             context_id='session-xyz',
             artifact=Artifact(
-                artifactId='11', parts=[Part(TextPart(text='text'))]
+                artifact_id='11', parts=[Part(TextPart(text='text'))]
             ),
         ),
         Message(**MESSAGE_PAYLOAD),

tests/server/events/test_event_queue.py

@@ -116,7 +116,9 @@ async def test_task_done(event_queue: EventQueue) -> None:
     event = TaskArtifactUpdateEvent(
         task_id='task_123',
         context_id='session-xyz',
-        artifact=Artifact(artifactId='11', parts=[Part(TextPart(text='text'))]),
+        artifact=Artifact(
+            artifact_id='11', parts=[Part(TextPart(text='text'))]
+        ),
     )
     await event_queue.enqueue_event(event)
     _ = await event_queue.dequeue_event()

tests/server/request_handlers/test_default_request_handler.py

@@ -343,7 +343,7 @@ async def test_on_message_send_with_push_notification():
 
     push_config = PushNotificationConfig(url='http://callback.com/push')
     message_config = MessageSendConfiguration(
-        pushNotificationConfig=push_config,
+        push_notification_config=push_config,
         accepted_output_modes=['text/plain'],  # Added required field
     )
     params = MessageSendParams(
@@ -431,7 +431,7 @@ async def test_on_message_send_with_push_notification_no_existing_Task():
 
     push_config = PushNotificationConfig(url='http://callback.com/push')
     message_config = MessageSendConfiguration(
-        pushNotificationConfig=push_config,
+        push_notification_config=push_config,
         accepted_output_modes=['text/plain'],  # Added required field
     )
     params = MessageSendParams(
@@ -685,7 +685,7 @@ async def test_on_message_send_stream_with_push_notification():
 
     push_config = PushNotificationConfig(url='http://callback.stream.com/push')
     message_config = MessageSendConfiguration(
-        pushNotificationConfig=push_config,
+        push_notification_config=push_config,
         accepted_output_modes=['text/plain'],  # Added required field
     )
     params = MessageSendParams(
@@ -1032,7 +1032,9 @@ async def test_set_task_push_notification_config_no_notifier():
     )
     params = TaskPushNotificationConfig(
         task_id='task1',
-        pushNotificationConfig=PushNotificationConfig(url='http://example.com'),
+        push_notification_config=PushNotificationConfig(
+            url='http://example.com'
+        ),
     )
     from a2a.utils.errors import ServerError  # Local import
 
@@ -1059,7 +1061,9 @@ async def test_set_task_push_notification_config_task_not_found():
     )
     params = TaskPushNotificationConfig(
         task_id='non_existent_task',
-        pushNotificationConfig=PushNotificationConfig(url='http://example.com'),
+        push_notification_config=PushNotificationConfig(
+            url='http://example.com'
+        ),
     )
     from a2a.utils.errors import ServerError  # Local import
 
@@ -1162,7 +1166,7 @@ async def test_get_task_push_notification_config_info_with_config():
 
     set_config_params = TaskPushNotificationConfig(
         task_id='task_1',
-        pushNotificationConfig=PushNotificationConfig(
+        push_notification_config=PushNotificationConfig(
             id='config_id', url='http://1.example.com'
         ),
     )
@@ -1171,7 +1175,7 @@ async def test_get_task_push_notification_config_info_with_config():
     )
 
     params = GetTaskPushNotificationConfigParams(
-        id='task_1', pushNotificationConfigId='config_id'
+        id='task_1', push_notification_config_id='config_id'
     )
 
     result: TaskPushNotificationConfig = (
@@ -1487,7 +1491,7 @@ async def test_delete_task_push_notification_config_no_store():
         push_config_store=None,  # Explicitly None
     )
     params = DeleteTaskPushNotificationConfigParams(
-        id='task1', pushNotificationConfigId='config1'
+        id='task1', push_notification_config_id='config1'
     )
     from a2a.utils.errors import ServerError  # Local import
 
@@ -1511,7 +1515,7 @@ async def test_delete_task_push_notification_config_task_not_found():
         push_config_store=mock_push_store,
     )
     params = DeleteTaskPushNotificationConfigParams(
-        id='non_existent_task', pushNotificationConfigId='config1'
+        id='non_existent_task', push_notification_config_id='config1'
     )
     from a2a.utils.errors import ServerError  # Local import
 
@@ -1545,7 +1549,7 @@ async def test_delete_no_task_push_notification_config_info():
         push_config_store=push_store,
     )
     params = DeleteTaskPushNotificationConfigParams(
-        id='task1', pushNotificationConfigId='config_non_existant'
+        id='task1', push_notification_config_id='config_non_existant'
     )
 
     result = await request_handler.on_delete_task_push_notification_config(
@@ -1554,7 +1558,7 @@ async def test_delete_no_task_push_notification_config_info():
     assert result == None
 
     params = DeleteTaskPushNotificationConfigParams(
-        id='task2', pushNotificationConfigId='config_non_existant'
+        id='task2', push_notification_config_id='config_non_existant'
     )
 
     result = await request_handler.on_delete_task_push_notification_config(
@@ -1589,7 +1593,7 @@ async def test_delete_task_push_notification_config_info_with_config():
         push_config_store=push_store,
     )
     params = DeleteTaskPushNotificationConfigParams(
-        id='task_1', pushNotificationConfigId='config_1'
+        id='task_1', push_notification_config_id='config_1'
     )
 
     result1 = await request_handler.on_delete_task_push_notification_config(
@@ -1629,7 +1633,7 @@ async def test_delete_task_push_notification_config_info_with_config_and_no_id()
         push_config_store=push_store,
     )
     params = DeleteTaskPushNotificationConfigParams(
-        id='task_1', pushNotificationConfigId='task_1'
+        id='task_1', push_notification_config_id='task_1'
     )
 
     result = await request_handler.on_delete_task_push_notification_config(

tests/server/request_handlers/test_grpc_handler.py

@@ -32,10 +32,10 @@ def sample_agent_card() -> types.AgentCard:
         url='http://localhost',
         version='1.0.0',
         capabilities=types.AgentCapabilities(
-            streaming=True, pushNotifications=True
+            streaming=True, push_notifications=True
         ),
-        defaultInputModes=['text/plain'],
-        defaultOutputModes=['text/plain'],
+        default_input_modes=['text/plain'],
+        default_output_modes=['text/plain'],
         skills=[],
     )