Skip to content

feat: Make A2AClient agnostic to the transport protocol #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brasseld wants to merge 1 commit into from
Closed

feat: Make A2AClient agnostic to the transport protocol #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>a2a-java-sdk-spec-grpc</artifactId>
<artifactId>a2a-java-sdk-transport-jsonrpc</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions client/src/main/java/io/a2a/A2A.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.util.Map;

import io.a2a.client.A2ACardResolver;
import io.a2a.http.A2AHttpClient;
import io.a2a.http.JdkA2AHttpClient;
import io.a2a.transport.jsonrpc.client.A2AHttpClient;
import io.a2a.transport.jsonrpc.client.JdkA2AHttpClient;
import io.a2a.spec.A2AClientError;
import io.a2a.spec.A2AClientJSONError;
import io.a2a.spec.AgentCard;
Expand Down
4 changes: 2 additions & 2 deletions client/src/main/java/io/a2a/client/A2ACardResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import io.a2a.http.A2AHttpClient;
import io.a2a.http.A2AHttpResponse;
import io.a2a.transport.jsonrpc.client.A2AHttpClient;
import io.a2a.transport.jsonrpc.client.A2AHttpResponse;
import io.a2a.spec.A2AClientError;
import io.a2a.spec.A2AClientJSONError;
import io.a2a.spec.AgentCard;
Expand Down
325 changes: 45 additions & 280 deletions client/src/main/java/io/a2a/client/A2AClient.java
View file
Open in desktop

Large diffs are not rendered by default.

200 changes: 0 additions & 200 deletions client/src/main/java/io/a2a/client/A2AGrpcClient.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions client/src/test/java/io/a2a/client/A2ACardResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import java.util.function.Consumer;

import com.fasterxml.jackson.core.type.TypeReference;
import io.a2a.http.A2AHttpClient;
import io.a2a.http.A2AHttpResponse;
import io.a2a.transport.jsonrpc.client.A2AHttpClient;
import io.a2a.transport.jsonrpc.client.A2AHttpResponse;
import io.a2a.spec.A2AClientError;
import io.a2a.spec.A2AClientJSONError;
import io.a2a.spec.AgentCard;
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@
<module>spec-grpc</module>
<module>tck</module>
<module>tests/server-common</module>
<module>transport/spi</module>
<module>transport/jsonrpc</module>
<module>transport/grpc</module>
</modules>
Expand Down
2 changes: 1 addition & 1 deletion reference/grpc/src/main/java/io/a2a/server/grpc/quarkus/QuarkusGrpcHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import jakarta.enterprise.inject.Instance;
import jakarta.inject.Inject;

import io.a2a.grpc.handler.GrpcHandler;
import io.a2a.transport.grpc.server.handler.GrpcHandler;
import io.a2a.server.PublicAgentCard;
import io.a2a.server.requesthandlers.CallContextFactory;
import io.a2a.server.requesthandlers.RequestHandler;
Expand Down
2 changes: 1 addition & 1 deletion reference/grpc/src/test/java/io/a2a/server/grpc/quarkus/A2ATestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import jakarta.ws.rs.core.Response;

import io.a2a.server.apps.common.TestUtilsBean;
import io.a2a.grpc.handler.GrpcHandler;
import io.a2a.transport.grpc.server.handler.GrpcHandler;
import io.a2a.spec.PushNotificationConfig;
import io.a2a.spec.Task;
import io.a2a.spec.TaskArtifactUpdateEvent;
Expand Down
2 changes: 1 addition & 1 deletion reference/jsonrpc/src/main/java/io/a2a/server/apps/quarkus/A2AServerRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.io.JsonEOFException;
import com.fasterxml.jackson.databind.JsonNode;
import io.a2a.jsonrpc.handler.JSONRPCHandler;
import io.a2a.transport.jsonrpc.server.handler.JSONRPCHandler;
import io.a2a.server.ExtendedAgentCard;
import io.a2a.server.ServerCallContext;
import io.a2a.server.auth.UnauthenticatedUser;
Expand Down
4 changes: 2 additions & 2 deletions server-common/src/main/java/io/a2a/server/tasks/BasePushNotificationSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import com.fasterxml.jackson.core.JsonProcessingException;

import io.a2a.http.A2AHttpClient;
import io.a2a.http.JdkA2AHttpClient;
import io.a2a.transport.jsonrpc.client.A2AHttpClient;
import io.a2a.transport.jsonrpc.client.JdkA2AHttpClient;
import io.a2a.spec.PushNotificationConfig;
import io.a2a.spec.Task;
import io.a2a.util.Utils;
Expand Down
4 changes: 2 additions & 2 deletions server-common/src/test/java/io/a2a/server/requesthandlers/AbstractA2ARequestHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import java.util.concurrent.Executors;
import java.util.function.Consumer;

import io.a2a.http.A2AHttpClient;
import io.a2a.http.A2AHttpResponse;
import io.a2a.transport.jsonrpc.client.A2AHttpClient;
import io.a2a.transport.jsonrpc.client.A2AHttpResponse;
import io.a2a.server.agentexecution.AgentExecutor;
import io.a2a.server.agentexecution.RequestContext;
import io.a2a.server.events.EventQueue;
Expand Down
4 changes: 2 additions & 2 deletions tests/server-common/src/test/java/io/a2a/server/apps/common/TestHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.inject.Alternative;

import io.a2a.http.A2AHttpClient;
import io.a2a.http.A2AHttpResponse;
import io.a2a.transport.jsonrpc.client.A2AHttpClient;
import io.a2a.transport.jsonrpc.client.A2AHttpResponse;
import io.a2a.spec.Task;
import io.a2a.util.Utils;

Expand Down
5 changes: 5 additions & 0 deletions transport/grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
<description>Java SDK for the Agent2Agent Protocol (A2A) - gRPC</description>

<dependencies>
<dependency>
<groupId>io.github.a2asdk</groupId>
<artifactId>a2a-java-sdk-transport-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.github.a2asdk</groupId>
<artifactId>a2a-java-sdk-server-common</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions .../io/a2a/client/sse/SSEStreamObserver.java → ...port/grpc/client/EventStreamObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package io.a2a.client.sse;
package io.a2a.transport.grpc.client;


import static io.a2a.grpc.utils.ProtoUtils.FromProto;
import io.a2a.grpc.StreamResponse;
import io.a2a.spec.StreamingEventKind;
import io.grpc.stub.StreamObserver;

import java.util.function.Consumer;
import java.util.logging.Logger;

import io.a2a.grpc.StreamResponse;
import io.a2a.spec.StreamingEventKind;
import io.grpc.stub.StreamObserver;
import static io.a2a.grpc.utils.ProtoUtils.FromProto;

public class SSEStreamObserver implements StreamObserver<StreamResponse> {
public class EventStreamObserver implements StreamObserver<StreamResponse> {

private static final Logger log = Logger.getLogger(SSEStreamObserver.class.getName());
private static final Logger log = Logger.getLogger(EventStreamObserver.class.getName());
private final Consumer<StreamingEventKind> eventHandler;
private final Consumer<Throwable> errorHandler;

public SSEStreamObserver(Consumer<StreamingEventKind> eventHandler, Consumer<Throwable> errorHandler) {
public EventStreamObserver(Consumer<StreamingEventKind> eventHandler, Consumer<Throwable> errorHandler) {
this.eventHandler = eventHandler;
this.errorHandler = errorHandler;
}
Expand Down
Loading
Loading