fix: incorporate latest 1.0 proto changes

Mainly a2aproject/A2A#1500 which required many changes.

Generated from a2aproject/A2A@aca981c.

`buf.gen.yaml` is updated to `main` again.

Author: ishymko

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

@@ -14,7 +14,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -77,7 +76,7 @@ async def send_message(
         config = SendMessageConfiguration(
             accepted_output_modes=self._config.accepted_output_modes,
             blocking=not self._config.polling,
-            push_notification_config=(
+            task_push_notification_config=(
                 self._config.push_notification_configs[0]
                 if self._config.push_notification_configs
                 else None
@@ -195,7 +194,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,

src/a2a/client/client.py

@@ -15,7 +15,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -25,7 +24,6 @@
     ListTasksRequest,
     ListTasksResponse,
     Message,
-    PushNotificationConfig,
     SendMessageConfiguration,
     StreamResponse,
     SubscribeToTaskRequest,
@@ -72,8 +70,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."""
 
@@ -180,7 +178,7 @@ async def cancel_task(
     @abstractmethod
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,

src/a2a/client/transports/base.py

@@ -8,7 +8,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -97,7 +96,7 @@ async def cancel_task(
     @abstractmethod
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,

src/a2a/client/transports/grpc.py

@@ -27,7 +27,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -208,7 +207,7 @@ async def cancel_task(
     @_handle_grpc_exception
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,

src/a2a/client/transports/jsonrpc.py

@@ -21,7 +21,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -223,7 +222,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,

src/a2a/client/transports/rest.py

@@ -20,7 +20,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -196,7 +195,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,

src/a2a/client/transports/tenant_decorator.py

@@ -5,7 +5,6 @@
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
-    CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
@@ -106,7 +105,7 @@ async def cancel_task(
 
     async def create_task_push_notification_config(
         self,
-        request: CreateTaskPushNotificationConfigRequest,
+        request: TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,

src/a2a/compat/v0_3/conversions.py

@@ -271,9 +271,9 @@ def to_compat_authentication_info(
 
 def to_core_push_notification_config(
     compat_config: types_v03.PushNotificationConfig,
-) -> pb2_v10.PushNotificationConfig:
+) -> pb2_v10.TaskPushNotificationConfig:
     """Convert push notification config to v1.0 core type."""
-    core_config = pb2_v10.PushNotificationConfig(url=compat_config.url)
+    core_config = pb2_v10.TaskPushNotificationConfig(url=compat_config.url)
     if compat_config.id:
         core_config.id = compat_config.id
     if compat_config.token:
@@ -286,11 +286,11 @@ def to_core_push_notification_config(
 
 
 def to_compat_push_notification_config(
-    core_config: pb2_v10.PushNotificationConfig,
+    core_config: pb2_v10.TaskPushNotificationConfig,
 ) -> types_v03.PushNotificationConfig:
     """Convert push notification config to v0.3 compat type."""
     return types_v03.PushNotificationConfig(
-        url=core_config.url,
+        url=core_config.url if core_config.url else '',
         id=core_config.id if core_config.id else None,
         token=core_config.token if core_config.token else None,
         authentication=to_compat_authentication_info(core_config.authentication)
@@ -312,7 +312,7 @@ def to_core_send_message_configuration(
             compat_config.accepted_output_modes
         )
     if compat_config.push_notification_config:
-        core_config.push_notification_config.CopyFrom(
+        core_config.task_push_notification_config.CopyFrom(
             to_core_push_notification_config(
                 compat_config.push_notification_config
             )
@@ -333,9 +333,9 @@ def to_compat_send_message_configuration(
         if core_config.accepted_output_modes
         else None,
         push_notification_config=to_compat_push_notification_config(
-            core_config.push_notification_config
+            core_config.task_push_notification_config
         )
-        if core_config.HasField('push_notification_config')
+        if core_config.HasField('task_push_notification_config')
         else None,
         history_length=core_config.history_length
         if core_config.HasField('history_length')
@@ -1008,7 +1008,7 @@ def to_core_task_push_notification_config(
         task_id=compat_config.task_id
     )
     if compat_config.push_notification_config:
-        core_config.push_notification_config.CopyFrom(
+        core_config.MergeFrom(
             to_core_push_notification_config(
                 compat_config.push_notification_config
             )
@@ -1022,10 +1022,8 @@ def to_compat_task_push_notification_config(
     """Convert task push notification config to v0.3 compat type."""
     return types_v03.TaskPushNotificationConfig(
         task_id=core_config.task_id,
-        push_notification_config=to_compat_push_notification_config(
-            core_config.push_notification_config
-        )
-        if core_config.HasField('push_notification_config')
+        push_notification_config=to_compat_push_notification_config(core_config)
+        if core_config.url
         else types_v03.PushNotificationConfig(url=''),
     )
 
@@ -1179,13 +1177,13 @@ def to_compat_delete_task_push_notification_config_request(
 
 def to_core_create_task_push_notification_config_request(
     compat_req: types_v03.SetTaskPushNotificationConfigRequest,
-) -> pb2_v10.CreateTaskPushNotificationConfigRequest:
+) -> pb2_v10.TaskPushNotificationConfig:
     """Convert create task push notification config request to v1.0 core type."""
-    core_req = pb2_v10.CreateTaskPushNotificationConfigRequest(
+    core_req = pb2_v10.TaskPushNotificationConfig(
         task_id=compat_req.params.task_id
     )
     if compat_req.params.push_notification_config:
-        core_req.config.CopyFrom(
+        core_req.MergeFrom(
             to_core_push_notification_config(
                 compat_req.params.push_notification_config
             )
@@ -1194,7 +1192,7 @@ def to_core_create_task_push_notification_config_request(
 
 
 def to_compat_create_task_push_notification_config_request(
-    core_req: pb2_v10.CreateTaskPushNotificationConfigRequest,
+    core_req: pb2_v10.TaskPushNotificationConfig,
     request_id: str | int,
 ) -> types_v03.SetTaskPushNotificationConfigRequest:
     """Convert create task push notification config request to v0.3 compat type."""
@@ -1203,9 +1201,9 @@ def to_compat_create_task_push_notification_config_request(
         params=types_v03.TaskPushNotificationConfig(
             task_id=core_req.task_id,
             push_notification_config=to_compat_push_notification_config(
-                core_req.config
+                core_req
             )
-            if core_req.HasField('config')
+            if core_req.url
             else types_v03.PushNotificationConfig(url=''),
         ),
     )

src/a2a/compat/v0_3/grpc_transport.py

@@ -264,7 +264,7 @@ async def cancel_task(
     @_handle_grpc_exception
     async def create_task_push_notification_config(
         self,
-        request: a2a_pb2.CreateTaskPushNotificationConfigRequest,
+        request: a2a_pb2.TaskPushNotificationConfig,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,