Merge branch 'main' into update-grpc

Author: anFatum

README.md

@@ -24,7 +24,7 @@ We copy https://github.com/a2aproject/A2A/blob/main/specification/grpc/a2a.proto
 ```
 option java_package = "io.a2a.grpc";
 ```
-Then build the `spec-grpc` module with `mvn clean install -Pproto-compile` to regenerate the gRPC classes in the `io.a2a.grpc` package.
+Then build the `spec-grpc` module with `mvn clean install  -Dskip.protobuf.generate=false` to regenerate the gRPC classes in the `io.a2a.grpc` package.
 
 ## Examples
 

boms/sdk/pom.xml

@@ -155,7 +155,7 @@
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
-                <version>${protobuf.version}</version>
+                <version>${protobuf-java.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>

client/base/src/main/java/io/a2a/client/ClientBuilder.java

@@ -92,29 +92,29 @@ private ClientTransport buildClientTransport() throws A2AClientException {
         AgentInterface agentInterface = findBestClientTransport();
 
         // Get the transport provider associated with the protocol
-        ClientTransportProvider clientTransportProvider = transportProviderRegistry.get(agentInterface.transport());
+        ClientTransportProvider clientTransportProvider = transportProviderRegistry.get(agentInterface.protocolBinding());
         if (clientTransportProvider == null) {
-            throw new A2AClientException("No client available for " + agentInterface.transport());
+            throw new A2AClientException("No client available for " + agentInterface.protocolBinding());
         }
         Class<? extends ClientTransport> transportProtocolClass = clientTransportProvider.getTransportProtocolClass();
 
         // Retrieve the configuration associated with the preferred transport
         ClientTransportConfig<? extends ClientTransport> clientTransportConfig = clientTransports.get(transportProtocolClass);
 
         if (clientTransportConfig == null) {
-            throw new A2AClientException("Missing required TransportConfig for " + agentInterface.transport());
+            throw new A2AClientException("Missing required TransportConfig for " + agentInterface.protocolBinding());
         }
 
         return clientTransportProvider.create(clientTransportConfig, agentCard, agentInterface.url());
     }
 
-    private Map<String, String> getServerPreferredTransports() {
+    private Map<String, String> getServerPreferredTransports() throws A2AClientException {
         Map<String, String> serverPreferredTransports = new LinkedHashMap<>();
-        serverPreferredTransports.put(agentCard.preferredTransport(), agentCard.url());
-        if (agentCard.additionalInterfaces() != null) {
-            for (AgentInterface agentInterface : agentCard.additionalInterfaces()) {
-                serverPreferredTransports.putIfAbsent(agentInterface.transport(), agentInterface.url());
-            }
+        if(agentCard.supportedInterfaces() == null || agentCard.supportedInterfaces().isEmpty()) {
+            throw new A2AClientException("No server interface available in the AgentCard");
+        }
+        for (AgentInterface agentInterface : agentCard.supportedInterfaces()) {
+            serverPreferredTransports.putIfAbsent(agentInterface.protocolBinding(), agentInterface.url());
         }
         return serverPreferredTransports;
     }

client/base/src/test/java/io/a2a/client/AuthenticationAuthorizationTest.java

@@ -77,7 +77,6 @@ public void setUp() {
         agentCard = new AgentCard.Builder()
                 .name("Test Agent")
                 .description("Test agent for auth tests")
-                .url(AGENT_URL)
                 .version("1.0.0")
                 .capabilities(new AgentCapabilities.Builder()
                         .streaming(true)  // Support streaming for all tests
@@ -91,7 +90,7 @@ public void setUp() {
                         .tags(Collections.singletonList("test"))
                         .build()))
                 .protocolVersion("0.3.0")
-                .additionalInterfaces(java.util.Arrays.asList(
+                .supportedInterfaces(java.util.Arrays.asList(
                         new AgentInterface(TransportProtocol.JSONRPC.asString(), AGENT_URL),
                         new AgentInterface(TransportProtocol.HTTP_JSON.asString(), AGENT_URL),
                         new AgentInterface(TransportProtocol.GRPC.asString(), grpcServerName)))

client/base/src/test/java/io/a2a/client/ClientBuilderTest.java

@@ -24,7 +24,7 @@ public class ClientBuilderTest {
     private AgentCard card = new AgentCard.Builder()
             .name("Hello World Agent")
                 .description("Just a hello world agent")
-                .url("http://localhost:9999")
+                .supportedInterfaces(Collections.singletonList(new AgentInterface("jsonrpc", "http://localhost:9999")))
                 .version("1.0.0")
                 .documentationUrl("http://example.com/docs")
                 .capabilities(new AgentCapabilities.Builder()

client/transport/grpc/src/main/java/io/a2a/client/transport/grpc/GrpcTransport.java

@@ -16,36 +16,32 @@
 import io.a2a.grpc.A2AServiceGrpc;
 import io.a2a.grpc.A2AServiceGrpc.A2AServiceBlockingV2Stub;
 import io.a2a.grpc.A2AServiceGrpc.A2AServiceStub;
-import io.a2a.grpc.CancelTaskRequest;
-import io.a2a.grpc.CreateTaskPushNotificationConfigRequest;
-import io.a2a.grpc.DeleteTaskPushNotificationConfigRequest;
-import io.a2a.grpc.GetTaskPushNotificationConfigRequest;
-import io.a2a.grpc.GetTaskRequest;
-import io.a2a.grpc.ListTaskPushNotificationConfigRequest;
-import io.a2a.grpc.ListTasksRequest;
-import io.a2a.grpc.SendMessageRequest;
-import io.a2a.grpc.SendMessageResponse;
-import io.a2a.grpc.StreamResponse;
-import io.a2a.grpc.TaskSubscriptionRequest;
 import io.a2a.grpc.utils.ProtoUtils.FromProto;
 import io.a2a.grpc.utils.ProtoUtils.ToProto;
 import io.a2a.spec.A2AClientException;
 import io.a2a.spec.AgentCard;
+import io.a2a.spec.CancelTaskRequest;
 import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
+import io.a2a.spec.DeleteTaskPushNotificationConfigRequest;
 import io.a2a.spec.EventKind;
 import io.a2a.spec.GetTaskPushNotificationConfigParams;
+import io.a2a.spec.GetTaskPushNotificationConfigRequest;
+import io.a2a.spec.GetTaskRequest;
 import io.a2a.spec.ListTaskPushNotificationConfigParams;
+import io.a2a.spec.ListTaskPushNotificationConfigRequest;
 import io.a2a.spec.ListTasksParams;
+import io.a2a.spec.ListTasksRequest;
 import io.a2a.spec.ListTasksResult;
 import io.a2a.spec.MessageSendParams;
+import io.a2a.spec.SendMessageRequest;
 import io.a2a.spec.SendStreamingMessageRequest;
 import io.a2a.spec.SetTaskPushNotificationConfigRequest;
 import io.a2a.spec.StreamingEventKind;
+import io.a2a.spec.SubscribeToTaskRequest;
 import io.a2a.spec.Task;
 import io.a2a.spec.TaskIdParams;
 import io.a2a.spec.TaskPushNotificationConfig;
 import io.a2a.spec.TaskQueryParams;
-import io.a2a.spec.TaskResubscriptionRequest;
 import io.grpc.Channel;
 import io.grpc.Metadata;
 import io.grpc.StatusException;
@@ -84,13 +80,13 @@ public GrpcTransport(Channel channel, AgentCard agentCard, @Nullable List<Client
     public EventKind sendMessage(MessageSendParams request, @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
 
-        SendMessageRequest sendMessageRequest = createGrpcSendMessageRequest(request, context);
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.SendMessageRequest.METHOD, sendMessageRequest,
+        io.a2a.grpc.SendMessageRequest sendMessageRequest = createGrpcSendMessageRequest(request, context);
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(SendMessageRequest.METHOD, sendMessageRequest,
                 agentCard, context);
 
         try {
             A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
-            SendMessageResponse response = stubWithMetadata.sendMessage(sendMessageRequest);
+            io.a2a.grpc.SendMessageResponse response = stubWithMetadata.sendMessage(sendMessageRequest);
             if (response.hasMsg()) {
                 return FromProto.message(response.getMsg());
             } else if (response.hasTask()) {
@@ -108,10 +104,10 @@ public void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEv
                                      Consumer<Throwable> errorConsumer, @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
         checkNotNullParam("eventConsumer", eventConsumer);
-        SendMessageRequest grpcRequest = createGrpcSendMessageRequest(request, context);
+        io.a2a.grpc.SendMessageRequest grpcRequest = createGrpcSendMessageRequest(request, context);
         PayloadAndHeaders payloadAndHeaders = applyInterceptors(SendStreamingMessageRequest.METHOD,
                 grpcRequest, agentCard, context);
-        StreamObserver<StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);
+        StreamObserver<io.a2a.grpc.StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);
 
         try {
             A2AServiceStub stubWithMetadata = createAsyncStubWithMetadata(context, payloadAndHeaders);
@@ -125,11 +121,11 @@ public void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEv
     public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
 
-        GetTaskRequest.Builder requestBuilder = GetTaskRequest.newBuilder();
+        io.a2a.grpc.GetTaskRequest.Builder requestBuilder = io.a2a.grpc.GetTaskRequest.newBuilder();
         requestBuilder.setName("tasks/" + request.id());
         requestBuilder.setHistoryLength(request.historyLength());
-        GetTaskRequest getTaskRequest = requestBuilder.build();
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.GetTaskRequest.METHOD, getTaskRequest,
+        io.a2a.grpc.GetTaskRequest getTaskRequest = requestBuilder.build();
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskRequest.METHOD, getTaskRequest,
                 agentCard, context);
 
         try {
@@ -144,10 +140,10 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
     public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
 
-        CancelTaskRequest cancelTaskRequest = CancelTaskRequest.newBuilder()
+        io.a2a.grpc.CancelTaskRequest cancelTaskRequest = io.a2a.grpc.CancelTaskRequest.newBuilder()
                 .setName("tasks/" + request.id())
                 .build();
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.CancelTaskRequest.METHOD, cancelTaskRequest,
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(CancelTaskRequest.METHOD, cancelTaskRequest,
                 agentCard, context);
 
         try {
@@ -162,35 +158,37 @@ public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context
     public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
 
-        ListTasksRequest.Builder requestBuilder = ListTasksRequest.newBuilder();
+        io.a2a.grpc.ListTasksRequest.Builder builder = io.a2a.grpc.ListTasksRequest.newBuilder();
         if (request.contextId() != null) {
-            requestBuilder.setContextId(request.contextId());
+            builder.setContextId(request.contextId());
         }
         if (request.status() != null) {
-            requestBuilder.setStatus(ToProto.taskState(request.status()));
+            builder.setStatus(ToProto.taskState(request.status()));
         }
         if (request.pageSize() != null) {
-            requestBuilder.setPageSize(request.pageSize());
+            builder.setPageSize(request.pageSize());
         }
         if (request.pageToken() != null) {
-            requestBuilder.setPageToken(request.pageToken());
+            builder.setPageToken(request.pageToken());
         }
         if (request.historyLength() != null) {
-            requestBuilder.setHistoryLength(request.historyLength());
+            builder.setHistoryLength(request.historyLength());
         }
-        if (request.includeArtifacts() != null && request.includeArtifacts()) {
-            requestBuilder.setIncludeArtifacts(true);
+        if (request.lastUpdatedAfter() != null) {
+            builder.setLastUpdatedAfter(request.lastUpdatedAfter().toEpochMilli());
         }
-
-        ListTasksRequest listTasksRequest = requestBuilder.build();
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.ListTasksRequest.METHOD, listTasksRequest,
+        if (request.includeArtifacts() != null) {
+            builder.setIncludeArtifacts(request.includeArtifacts());
+        }
+        io.a2a.grpc.ListTasksRequest listTasksRequest = builder.build();
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(ListTasksRequest.METHOD, listTasksRequest,
                 agentCard, context);
 
         try {
             A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
             io.a2a.grpc.ListTasksResponse grpcResponse = stubWithMetadata.listTasks(listTasksRequest);
 
-            return new io.a2a.spec.ListTasksResult(
+            return new ListTasksResult(
                     grpcResponse.getTasksList().stream()
                             .map(FromProto::task)
                             .collect(Collectors.toList()),
@@ -209,7 +207,7 @@ public TaskPushNotificationConfig setTaskPushNotificationConfiguration(TaskPushN
         checkNotNullParam("request", request);
 
         String configId = request.pushNotificationConfig().id();
-        CreateTaskPushNotificationConfigRequest grpcRequest = CreateTaskPushNotificationConfigRequest.newBuilder()
+        io.a2a.grpc.SetTaskPushNotificationConfigRequest grpcRequest = io.a2a.grpc.SetTaskPushNotificationConfigRequest.newBuilder()
                 .setParent("tasks/" + request.taskId())
                 .setConfig(ToProto.taskPushNotificationConfig(request))
                 .setConfigId(configId != null ? configId : request.taskId())
@@ -219,8 +217,8 @@ public TaskPushNotificationConfig setTaskPushNotificationConfiguration(TaskPushN
 
         try {
             A2AServiceBlockingV2Stub stubWithMetadata = createBlockingStubWithMetadata(context, payloadAndHeaders);
-            return FromProto.taskPushNotificationConfig(stubWithMetadata.createTaskPushNotificationConfig(grpcRequest));
-        } catch (StatusRuntimeException | StatusException e) {
+            return FromProto.taskPushNotificationConfig(stubWithMetadata.setTaskPushNotificationConfig(grpcRequest));
+        } catch (StatusRuntimeException e) {
             throw GrpcErrorMapper.mapGrpcError(e, "Failed to create task push notification config: ");
         }
     }
@@ -231,10 +229,10 @@ public TaskPushNotificationConfig getTaskPushNotificationConfiguration(
             @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
 
-        GetTaskPushNotificationConfigRequest grpcRequest = GetTaskPushNotificationConfigRequest.newBuilder()
+        io.a2a.grpc.GetTaskPushNotificationConfigRequest grpcRequest = io.a2a.grpc.GetTaskPushNotificationConfigRequest.newBuilder()
                 .setName(getTaskPushNotificationConfigName(request))
                 .build();
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.GetTaskPushNotificationConfigRequest.METHOD,
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskPushNotificationConfigRequest.METHOD,
                 grpcRequest, agentCard, context);
 
         try {
@@ -251,10 +249,10 @@ public List<TaskPushNotificationConfig> listTaskPushNotificationConfigurations(
             @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
 
-        ListTaskPushNotificationConfigRequest grpcRequest = ListTaskPushNotificationConfigRequest.newBuilder()
+        io.a2a.grpc.ListTaskPushNotificationConfigRequest grpcRequest = io.a2a.grpc.ListTaskPushNotificationConfigRequest.newBuilder()
                 .setParent("tasks/" + request.id())
                 .build();
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.ListTaskPushNotificationConfigRequest.METHOD,
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(ListTaskPushNotificationConfigRequest.METHOD,
                 grpcRequest, agentCard, context);
 
         try {
@@ -272,10 +270,10 @@ public void deleteTaskPushNotificationConfigurations(DeleteTaskPushNotificationC
                                                          @Nullable ClientCallContext context) throws A2AClientException {
         checkNotNullParam("request", request);
 
-        DeleteTaskPushNotificationConfigRequest grpcRequest = DeleteTaskPushNotificationConfigRequest.newBuilder()
+        io.a2a.grpc.DeleteTaskPushNotificationConfigRequest grpcRequest = io.a2a.grpc.DeleteTaskPushNotificationConfigRequest.newBuilder()
                 .setName(getTaskPushNotificationConfigName(request.id(), request.pushNotificationConfigId()))
                 .build();
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(io.a2a.spec.DeleteTaskPushNotificationConfigRequest.METHOD,
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(DeleteTaskPushNotificationConfigRequest.METHOD,
                 grpcRequest, agentCard, context);
 
         try {
@@ -292,17 +290,17 @@ public void resubscribe(TaskIdParams request, Consumer<StreamingEventKind> event
         checkNotNullParam("request", request);
         checkNotNullParam("eventConsumer", eventConsumer);
 
-        TaskSubscriptionRequest grpcRequest = TaskSubscriptionRequest.newBuilder()
+        io.a2a.grpc.SubscribeToTaskRequest grpcRequest = io.a2a.grpc.SubscribeToTaskRequest.newBuilder()
                 .setName("tasks/" + request.id())
                 .build();
-        PayloadAndHeaders payloadAndHeaders = applyInterceptors(TaskResubscriptionRequest.METHOD,
+        PayloadAndHeaders payloadAndHeaders = applyInterceptors(SubscribeToTaskRequest.METHOD,
                 grpcRequest, agentCard, context);
 
-        StreamObserver<StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);
+        StreamObserver<io.a2a.grpc.StreamResponse> streamObserver = new EventStreamObserver(eventConsumer, errorConsumer);
 
         try {
             A2AServiceStub stubWithMetadata = createAsyncStubWithMetadata(context, payloadAndHeaders);
-            stubWithMetadata.taskSubscription(grpcRequest, streamObserver);
+            stubWithMetadata.subscribeToTask(grpcRequest, streamObserver);
         } catch (StatusRuntimeException e) {
             throw GrpcErrorMapper.mapGrpcError(e, "Failed to resubscribe task push notification config: ");
         }
@@ -318,16 +316,8 @@ public AgentCard getAgentCard(@Nullable ClientCallContext context) throws A2ACli
     public void close() {
     }
 
-    private SendMessageRequest createGrpcSendMessageRequest(MessageSendParams messageSendParams, @Nullable ClientCallContext context) {
-        SendMessageRequest.Builder builder = SendMessageRequest.newBuilder();
-        builder.setRequest(ToProto.message(messageSendParams.message()));
-        if (messageSendParams.configuration() != null) {
-            builder.setConfiguration(ToProto.messageSendConfiguration(messageSendParams.configuration()));
-        }
-        if (messageSendParams.metadata() != null) {
-            builder.setMetadata(ToProto.struct(messageSendParams.metadata()));
-        }
-        return builder.build();
+    private io.a2a.grpc.SendMessageRequest createGrpcSendMessageRequest(MessageSendParams messageSendParams, @Nullable ClientCallContext context) {
+        return ToProto.sendMessageRequest(messageSendParams);
     }
 
     /**