Merge branch 'a2aproject:1.0-dev' into 1.0-dev

Author: gaborfeher

buf.gen.yaml

@@ -2,7 +2,7 @@
 version: v2
 inputs:
   - git_repo: https://github.com/a2aproject/A2A.git
-    ref: 1997c9d63058ca0b89361a7d6e508f4641a6f68b
+    ref: main
     subdir: specification
 managed:
   enabled: true

src/a2a/client/base_client.py

@@ -12,7 +12,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -98,10 +97,10 @@ def _apply_client_config(self, request: SendMessageRequest) -> None:
         if not request.configuration.blocking and self._config.polling:
             request.configuration.blocking = not self._config.polling
         if (
-            not request.configuration.HasField('push_notification_config')
+            not request.configuration.HasField('task_push_notification_config')
             and self._config.push_notification_configs
         ):
-            request.configuration.push_notification_config.CopyFrom(
+            request.configuration.task_push_notification_config.CopyFrom(
                 self._config.push_notification_configs[0]
             )
         if (
@@ -178,7 +177,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
     ) -> TaskPushNotificationConfig:
@@ -304,8 +303,10 @@ async def get_extended_agent_card(
         card = await self._transport.get_extended_agent_card(
             request,
             context=context,
-            signature_verifier=signature_verifier,
         )
+        if signature_verifier:
+            signature_verifier(card)
+
         self._card = card
         return card
 

src/a2a/client/client.py

@@ -15,7 +15,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -24,7 +23,6 @@
     ListTaskPushNotificationConfigsResponse,
     ListTasksRequest,
     ListTasksResponse,
-    PushNotificationConfig,
     SendMessageRequest,
     StreamResponse,
     SubscribeToTaskRequest,
@@ -71,8 +69,8 @@ class ClientConfig:
     accepted_output_modes: list[str] = dataclasses.field(default_factory=list)
     """The set of accepted output modes for the client."""
 
-    push_notification_configs: list[PushNotificationConfig] = dataclasses.field(
-        default_factory=list
+    push_notification_configs: list[TaskPushNotificationConfig] = (
+        dataclasses.field(default_factory=list)
     )
     """Push notification configurations to use for every request."""
 
@@ -171,7 +169,7 @@ async def cancel_task(
     @abstractmethod
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
     ) -> TaskPushNotificationConfig:

src/a2a/client/transports/base.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from collections.abc import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator
 from types import TracebackType
 
 from typing_extensions import Self
@@ -8,7 +8,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -92,7 +91,7 @@ async def cancel_task(
     @abstractmethod
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
     ) -> TaskPushNotificationConfig:
@@ -142,7 +141,6 @@ async def get_extended_agent_card(
         request: GetExtendedAgentCardRequest,
         *,
         context: ClientCallContext | None = None,
-        signature_verifier: Callable[[AgentCard], None] | None = None,
     ) -> AgentCard:
         """Retrieves the Extended AgentCard."""
 

src/a2a/client/transports/grpc.py

@@ -27,7 +27,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -106,9 +105,6 @@ def __init__(
         self.agent_card = agent_card
         self.channel = channel
         self.stub = a2a_pb2_grpc.A2AServiceStub(channel)
-        self._needs_extended_card = (
-            agent_card.capabilities.extended_agent_card if agent_card else True
-        )
 
     @classmethod
     def create(
@@ -212,7 +208,7 @@ async def cancel_task(
     @_handle_grpc_exception
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
     ) -> TaskPushNotificationConfig:
@@ -271,22 +267,18 @@ async def get_extended_agent_card(
         request: GetExtendedAgentCardRequest,
         *,
         context: ClientCallContext | None = None,
-        signature_verifier: Callable[[AgentCard], None] | None = None,
     ) -> AgentCard:
         """Retrieves the agent's card."""
-        card = await self._call_grpc(
+        card = self.agent_card
+        if card and not card.capabilities.extended_agent_card:
+            return card
+
+        return await self._call_grpc(
             self.stub.GetExtendedAgentCard,
             request,
             context,
         )
 
-        if signature_verifier:
-            signature_verifier(card)
-
-        self.agent_card = card
-        self._needs_extended_card = False
-        return card
-
     async def close(self) -> None:
         """Closes the gRPC channel."""
         await self.channel.close()

src/a2a/client/transports/jsonrpc.py

@@ -1,6 +1,6 @@
 import logging
 
-from collections.abc import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator
 from typing import Any
 from uuid import uuid4
 
@@ -20,7 +20,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -63,7 +62,6 @@ def __init__(
         self.httpx_client = httpx_client
         self.agent_card = agent_card
         self.interceptors = interceptors or []
-        self._needs_extended_card = agent_card.capabilities.extended_agent_card
 
     async def send_message(
         self,
@@ -173,7 +171,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
     ) -> TaskPushNotificationConfig:
@@ -285,11 +283,9 @@ async def get_extended_agent_card(
         request: GetExtendedAgentCardRequest,
         *,
         context: ClientCallContext | None = None,
-        signature_verifier: Callable[[AgentCard], None] | None = None,
     ) -> AgentCard:
         """Retrieves the agent's card."""
         card = self.agent_card
-
         if not card.capabilities.extended_agent_card:
             return card
 
@@ -313,11 +309,7 @@ async def get_extended_agent_card(
         response: AgentCard = json_format.ParseDict(
             json_rpc_response.result, AgentCard()
         )
-        if signature_verifier:
-            signature_verifier(response)
 
-        self.agent_card = response
-        self._needs_extended_card = False
         return response
 
     async def close(self) -> None:

src/a2a/client/transports/rest.py

@@ -1,7 +1,7 @@
 import json
 import logging
 
-from collections.abc import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator
 from typing import Any, NoReturn
 
 import httpx
@@ -19,7 +19,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -62,7 +61,6 @@ def __init__(
         self.httpx_client = httpx_client
         self.agent_card = agent_card
         self.interceptors = interceptors or []
-        self._needs_extended_card = agent_card.capabilities.extended_agent_card
 
     async def send_message(
         self,
@@ -160,7 +158,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
     ) -> TaskPushNotificationConfig:
@@ -266,26 +264,17 @@ async def get_extended_agent_card(
         request: GetExtendedAgentCardRequest,
         *,
         context: ClientCallContext | None = None,
-        signature_verifier: Callable[[AgentCard], None] | None = None,
     ) -> AgentCard:
         """Retrieves the Extended AgentCard."""
         card = self.agent_card
-
         if not card.capabilities.extended_agent_card:
             return card
 
         response_data = await self._execute_request(
             'GET', '/extendedAgentCard', request.tenant, context=context
         )
-        response: AgentCard = ParseDict(response_data, AgentCard())
-
-        if signature_verifier:
-            signature_verifier(response)
 
-        # Update the transport's agent_card
-        self.agent_card = response
-        self._needs_extended_card = False
-        return response
+        return ParseDict(response_data, AgentCard())
 
     async def close(self) -> None:
         """Closes the httpx client."""

src/a2a/client/transports/tenant_decorator.py

@@ -1,11 +1,10 @@
-from collections.abc import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator
 
 from a2a.client.middleware import ClientCallContext
 from a2a.client.transports.base import ClientTransport
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -93,7 +92,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
     ) -> TaskPushNotificationConfig:
@@ -155,14 +154,12 @@ async def get_extended_agent_card(
         request: GetExtendedAgentCardRequest,
         *,
         context: ClientCallContext | None = None,
-        signature_verifier: Callable[[AgentCard], None] | None = None,
     ) -> AgentCard:
         """Retrieves the Extended AgentCard."""
         request.tenant = self._resolve_tenant(request.tenant)
         return await self._base.get_extended_agent_card(
             request,
             context=context,
-            signature_verifier=signature_verifier,
         )
 
     async def close(self) -> None: