Merge branch '1.0-dev' into tenant

Author: sokoliva

.github/actions/spelling/allow.txt

@@ -86,6 +86,7 @@ notif
 npx
 oauthoidc
 oidc
+Oneof
 OpenAPI
 openapiv
 openapiv2

buf.compat.gen.yaml

@@ -0,0 +1,12 @@
+# Protobuf generation for legacy v0.3 A2A protocol buffer modules.
+---
+version: v2
+managed:
+  enabled: true
+plugins:
+  - remote: buf.build/protocolbuffers/python:v29.3
+    out: src/a2a/compat/v0_3
+  - remote: buf.build/grpc/python
+    out: src/a2a/compat/v0_3
+  - remote: buf.build/protocolbuffers/pyi
+    out: src/a2a/compat/v0_3

pyproject.toml

@@ -162,6 +162,8 @@ exclude = [
   "**/venv",
   "**/.venv",
   "src/a2a/types",
+  "src/a2a/compat/v0_3/*_pb2*.py",
+  "src/a2a/compat/v0_3/proto_utils.py",
 ]
 venvPath = "."
 venv = ".venv"

scripts/gen_proto.sh

@@ -19,3 +19,16 @@ fi
 # Fix imports in generated grpc file
 echo "Fixing imports in src/a2a/types/a2a_pb2_grpc.py"
 sed 's/import a2a_pb2 as a2a__pb2/from . import a2a_pb2 as a2a__pb2/g' src/a2a/types/a2a_pb2_grpc.py > src/a2a/types/a2a_pb2_grpc.py.tmp && mv src/a2a/types/a2a_pb2_grpc.py.tmp src/a2a/types/a2a_pb2_grpc.py
+
+# Download legacy v0.3 compatibility protobuf code
+echo "Downloading legacy v0.3 proto file..."
+# Commit hash was selected as a2a.proto version from 0.3 branch with latests fixes.
+curl -o src/a2a/compat/v0_3/a2a_v0_3.proto https://raw.githubusercontent.com/a2aproject/A2A/b3b266d127dde3d1000ec103b252d1de81289e83/specification/grpc/a2a.proto 
+
+# Generate legacy v0.3 compatibility protobuf code
+echo "Generating legacy v0.3 compatibility protobuf code"
+npx --yes @bufbuild/buf generate src/a2a/compat/v0_3 --template buf.compat.gen.yaml
+
+# Fix imports in legacy generated grpc file
+echo "Fixing imports in src/a2a/compat/v0_3/a2a_v0_3_pb2_grpc.py"
+sed 's/import a2a_v0_3_pb2 as a2a__v0__3__pb2/from . import a2a_v0_3_pb2 as a2a__v0__3__pb2/g' src/a2a/compat/v0_3/a2a_v0_3_pb2_grpc.py > src/a2a/compat/v0_3/a2a_v0_3_pb2_grpc.py.tmp && mv src/a2a/compat/v0_3/a2a_v0_3_pb2_grpc.py.tmp src/a2a/compat/v0_3/a2a_v0_3_pb2_grpc.py

src/a2a/client/base_client.py

@@ -1,9 +1,6 @@
 from collections.abc import AsyncGenerator, AsyncIterator, Callable
-from types import TracebackType
 from typing import Any
 
-from typing_extensions import Self
-
 from a2a.client.client import (
     Client,
     ClientCallContext,
@@ -51,19 +48,6 @@ def __init__(
         self._config = config
         self._transport = transport
 
-    async def __aenter__(self) -> Self:
-        """Enters the async context manager, returning the client itself."""
-        return self
-
-    async def __aexit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_val: BaseException | None,
-        exc_tb: TracebackType | None,
-    ) -> None:
-        """Exits the async context manager, ensuring close() is called."""
-        await self.close()
-
     async def send_message(
         self,
         request: Message,
@@ -208,7 +192,7 @@ async def cancel_task(
             request, context=context, extensions=extensions
         )
 
-    async def set_task_callback(
+    async def create_task_push_notification_config(
         self,
         request: CreateTaskPushNotificationConfigRequest,
         *,
@@ -225,11 +209,11 @@ async def set_task_callback(
         Returns:
             The created or updated `TaskPushNotificationConfig` object.
         """
-        return await self._transport.set_task_callback(
+        return await self._transport.create_task_push_notification_config(
             request, context=context, extensions=extensions
         )
 
-    async def get_task_callback(
+    async def get_task_push_notification_config(
         self,
         request: GetTaskPushNotificationConfigRequest,
         *,
@@ -246,11 +230,11 @@ async def get_task_callback(
         Returns:
             A `TaskPushNotificationConfig` object containing the configuration.
         """
-        return await self._transport.get_task_callback(
+        return await self._transport.get_task_push_notification_config(
             request, context=context, extensions=extensions
         )
 
-    async def list_task_callback(
+    async def list_task_push_notification_configs(
         self,
         request: ListTaskPushNotificationConfigsRequest,
         *,
@@ -267,11 +251,11 @@ async def list_task_callback(
         Returns:
             A `ListTaskPushNotificationConfigsResponse` object.
         """
-        return await self._transport.list_task_callback(
+        return await self._transport.list_task_push_notification_configs(
             request, context=context, extensions=extensions
         )
 
-    async def delete_task_callback(
+    async def delete_task_push_notification_config(
         self,
         request: DeleteTaskPushNotificationConfigRequest,
         *,
@@ -285,7 +269,7 @@ async def delete_task_callback(
             context: The client call context.
             extensions: List of extensions to be activated.
         """
-        await self._transport.delete_task_callback(
+        await self._transport.delete_task_push_notification_config(
             request, context=context, extensions=extensions
         )
 

src/a2a/client/client.py

@@ -3,10 +3,13 @@
 
 from abc import ABC, abstractmethod
 from collections.abc import AsyncIterator, Callable, Coroutine
+from types import TracebackType
 from typing import Any
 
 import httpx
 
+from typing_extensions import Self
+
 from a2a.client.middleware import ClientCallContext, ClientCallInterceptor
 from a2a.client.optionals import Channel
 from a2a.types.a2a_pb2 import (
@@ -71,7 +74,7 @@ class ClientConfig:
     push_notification_configs: list[PushNotificationConfig] = dataclasses.field(
         default_factory=list
     )
-    """Push notification callbacks to use for every request."""
+    """Push notification configurations to use for every request."""
 
     extensions: list[str] = dataclasses.field(default_factory=list)
     """A list of extension URIs the client supports."""
@@ -110,6 +113,19 @@ def __init__(
         self._consumers = consumers
         self._middleware = middleware
 
+    async def __aenter__(self) -> Self:
+        """Enters the async context manager."""
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
+    ) -> None:
+        """Exits the async context manager and closes the client."""
+        await self.close()
+
     @abstractmethod
     async def send_message(
         self,
@@ -161,7 +177,7 @@ async def cancel_task(
         """Requests the agent to cancel a specific task."""
 
     @abstractmethod
-    async def set_task_callback(
+    async def create_task_push_notification_config(
         self,
         request: CreateTaskPushNotificationConfigRequest,
         *,
@@ -171,7 +187,7 @@ async def set_task_callback(
         """Sets or updates the push notification configuration for a specific task."""
 
     @abstractmethod
-    async def get_task_callback(
+    async def get_task_push_notification_config(
         self,
         request: GetTaskPushNotificationConfigRequest,
         *,
@@ -181,7 +197,7 @@ async def get_task_callback(
         """Retrieves the push notification configuration for a specific task."""
 
     @abstractmethod
-    async def list_task_callback(
+    async def list_task_push_notification_configs(
         self,
         request: ListTaskPushNotificationConfigsRequest,
         *,
@@ -191,7 +207,7 @@ async def list_task_callback(
         """Lists push notification configurations for a specific task."""
 
     @abstractmethod
-    async def delete_task_callback(
+    async def delete_task_push_notification_config(
         self,
         request: DeleteTaskPushNotificationConfigRequest,
         *,
@@ -242,3 +258,7 @@ async def consume(
             return
         for c in self._consumers:
             await c(event, card)
+
+    @abstractmethod
+    async def close(self) -> None:
+        """Closes the client and releases any underlying resources."""

src/a2a/client/transports/base.py

@@ -95,7 +95,7 @@ async def cancel_task(
         """Requests the agent to cancel a specific task."""
 
     @abstractmethod
-    async def set_task_callback(
+    async def create_task_push_notification_config(
         self,
         request: CreateTaskPushNotificationConfigRequest,
         *,
@@ -105,7 +105,7 @@ async def set_task_callback(
         """Sets or updates the push notification configuration for a specific task."""
 
     @abstractmethod
-    async def get_task_callback(
+    async def get_task_push_notification_config(
         self,
         request: GetTaskPushNotificationConfigRequest,
         *,
@@ -115,7 +115,7 @@ async def get_task_callback(
         """Retrieves the push notification configuration for a specific task."""
 
     @abstractmethod
-    async def list_task_callback(
+    async def list_task_push_notification_configs(
         self,
         request: ListTaskPushNotificationConfigsRequest,
         *,
@@ -125,7 +125,7 @@ async def list_task_callback(
         """Lists push notification configurations for a specific task."""
 
     @abstractmethod
-    async def delete_task_callback(
+    async def delete_task_push_notification_config(
         self,
         request: DeleteTaskPushNotificationConfigRequest,
         *,

src/a2a/client/transports/grpc.py

@@ -175,7 +175,7 @@ async def cancel_task(
             metadata=self._get_grpc_metadata(extensions),
         )
 
-    async def set_task_callback(
+    async def create_task_push_notification_config(
         self,
         request: CreateTaskPushNotificationConfigRequest,
         *,
@@ -188,7 +188,7 @@ async def set_task_callback(
             metadata=self._get_grpc_metadata(extensions),
         )
 
-    async def get_task_callback(
+    async def get_task_push_notification_config(
         self,
         request: GetTaskPushNotificationConfigRequest,
         *,
@@ -201,7 +201,7 @@ async def get_task_callback(
             metadata=self._get_grpc_metadata(extensions),
         )
 
-    async def list_task_callback(
+    async def list_task_push_notification_configs(
         self,
         request: ListTaskPushNotificationConfigsRequest,
         *,
@@ -214,7 +214,7 @@ async def list_task_callback(
             metadata=self._get_grpc_metadata(extensions),
         )
 
-    async def delete_task_callback(
+    async def delete_task_push_notification_config(
         self,
         request: DeleteTaskPushNotificationConfigRequest,
         *,

src/a2a/client/transports/jsonrpc.py

@@ -303,7 +303,7 @@ async def cancel_task(
         response: Task = json_format.ParseDict(json_rpc_response.result, Task())
         return response
 
-    async def set_task_callback(
+    async def create_task_push_notification_config(
         self,
         request: CreateTaskPushNotificationConfigRequest,
         *,
@@ -335,7 +335,7 @@ async def set_task_callback(
         )
         return response
 
-    async def get_task_callback(
+    async def get_task_push_notification_config(
         self,
         request: GetTaskPushNotificationConfigRequest,
         *,
@@ -367,7 +367,7 @@ async def get_task_callback(
         )
         return response
 
-    async def list_task_callback(
+    async def list_task_push_notification_configs(
         self,
         request: ListTaskPushNotificationConfigsRequest,
         *,
@@ -402,7 +402,7 @@ async def list_task_callback(
         )
         return response
 
-    async def delete_task_callback(
+    async def delete_task_push_notification_config(
         self,
         request: DeleteTaskPushNotificationConfigRequest,
         *,

src/a2a/client/transports/rest.py

@@ -321,7 +321,7 @@ async def cancel_task(
         response: Task = ParseDict(response_data, Task())
         return response
 
-    async def set_task_callback(
+    async def create_task_push_notification_config(
         self,
         request: CreateTaskPushNotificationConfigRequest,
         *,
@@ -353,7 +353,7 @@ async def set_task_callback(
         )
         return response
 
-    async def get_task_callback(
+    async def get_task_push_notification_config(
         self,
         request: GetTaskPushNotificationConfigRequest,
         *,
@@ -392,7 +392,7 @@ async def get_task_callback(
         )
         return response
 
-    async def list_task_callback(
+    async def list_task_push_notification_configs(
         self,
         request: ListTaskPushNotificationConfigsRequest,
         *,
@@ -428,7 +428,7 @@ async def list_task_callback(
         )
         return response
 
-    async def delete_task_callback(
+    async def delete_task_push_notification_config(
         self,
         request: DeleteTaskPushNotificationConfigRequest,
         *,