fix: merging errors

Author: sokoliva

src/a2a/client/transports/base.py

@@ -2,8 +2,8 @@
 from collections.abc import AsyncGenerator, Callable
 from types import TracebackType
 
-from typing_extensions import Self
 from google.protobuf.message import Message
+from typing_extensions import Self
 
 from a2a.client.middleware import ClientCallContext
 from a2a.types.a2a_pb2 import (
@@ -179,7 +179,7 @@ def update_tenant(self, request: Message) -> str | None:
             return current_tenant
 
         if self._tenant and hasattr(request, 'tenant'):
-            request.tenant = self._tenant
+            setattr(request, 'tenant', self._tenant)
             return self._tenant
         return None
 
@@ -249,7 +249,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,
         *,
@@ -258,11 +258,11 @@ async def set_task_callback(
     ) -> TaskPushNotificationConfig:
         """Sets or updates the push notification configuration for a specific task."""
         self.update_tenant(request)
-        return await self._base.set_task_callback(
+        return await self._base.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,
         *,
@@ -271,11 +271,11 @@ async def get_task_callback(
     ) -> TaskPushNotificationConfig:
         """Retrieves the push notification configuration for a specific task."""
         self.update_tenant(request)
-        return await self._base.get_task_callback(
+        return await self._base.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,
         *,
@@ -284,11 +284,11 @@ async def list_task_callback(
     ) -> ListTaskPushNotificationConfigsResponse:
         """Lists push notification configurations for a specific task."""
         self.update_tenant(request)
-        return await self._base.list_task_callback(
+        return await self._base.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,
         *,
@@ -297,7 +297,7 @@ async def delete_task_callback(
     ) -> None:
         """Deletes the push notification configuration for a specific task."""
         self.update_tenant(request)
-        await self._base.delete_task_callback(
+        await self._base.delete_task_push_notification_config(
             request, context=context, extensions=extensions
         )
 

src/a2a/client/transports/rest.py

@@ -7,7 +7,6 @@
 import httpx
 
 from google.protobuf.json_format import MessageToDict, Parse, ParseDict
-from google.protobuf.message import Message
 from httpx_sse import SSEError, aconnect_sse
 
 from a2a.client.errors import (

tests/client/transports/test_rest_client.py

@@ -401,28 +401,28 @@ class TestRestTransportTenant:
                 '/my-tenant/v1/tasks/task-123:cancel',
             ),
             (
-                'set_task_callback',
+                'create_task_push_notification_config',
                 CreateTaskPushNotificationConfigRequest(
                     tenant='my-tenant', task_id='task-123'
                 ),
                 '/my-tenant/v1/tasks/task-123/pushNotificationConfigs',
             ),
             (
-                'get_task_callback',
+                'get_task_push_notification_config',
                 GetTaskPushNotificationConfigRequest(
                     tenant='my-tenant', task_id='task-123', id='cfg-1'
                 ),
                 '/my-tenant/v1/tasks/task-123/pushNotificationConfigs/cfg-1',
             ),
             (
-                'list_task_callback',
+                'list_task_push_notification_configs',
                 ListTaskPushNotificationConfigsRequest(
                     tenant='my-tenant', task_id='task-123'
                 ),
                 '/my-tenant/v1/tasks/task-123/pushNotificationConfigs',
             ),
             (
-                'delete_task_callback',
+                'delete_task_push_notification_config',
                 DeleteTaskPushNotificationConfigRequest(
                     tenant='my-tenant', task_id='task-123', id='cfg-1'
                 ),