Merge pull request #44 from kabir/align-a2ajava

Align with latest a2a-java changes

Author: kabir

.github/workflows/run-tck.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   # Tag of the TCK
-  TCK_VERSION: spec_1.0 # 1.0 WIP branch
+  TCK_VERSION: main # 1.0 WIP branch
   # Tells uv to not need a venv, and instead use system
   UV_SYSTEM_PYTHON: 1
 

README.md

@@ -2,7 +2,7 @@
 
 This is the integration of the [A2A Java SDK](https://github.com/a2aproject/a2a-java) for use in Jakarta servers. It is currently tested on **WildFly**, but it should be usable in other compliant Jakarta servers such as Tomcat, Jetty, and OpenLiberty. For Quarkus, use the reference implementation in the [A2A Java SDK](https://github.com/a2aproject/a2a-java) project.
 
-This implementation is aligned with **A2A Protocol Specification 1.0.0**.
+This implementation is aligned with **A2A Protocol Specification 1.0** and uses **A2A Java SDK 1.0.0.Alpha2** (pre-release).
 
 For more information about the A2A protocol, see [here](https://github.com/a2aproject/A2A).
 

examples/simple/README.md

@@ -15,15 +15,19 @@ Currently, the `grpc` dependencies also include the `jsonrpc` ones, mainly becau
 
 Note that we need to exclude some transitive dependencies of jars which are provided by WildFly. Other Jakarta runtimes may provide different dependencies and need different exclusions.
 
-To create your own agent, you need to implement `AgentCard` and `AgentExecutor` beans. 
+To create your own agent, you need to implement `AgentCard` and `AgentExecutor` beans.
 
-* The `AgentCard` shows the capabilities of the agent.
-* The `AgentExecutor` handles the interaction with the LLM.
+* The `AgentCard` shows the capabilities of the agent, including supported transports and protocol version. This is the public version of the AgentCard, as this example does not provide an extended AgentCard. To provide an extended AgentCard, you produce it the same way, but with the @ExtendedAgentCard qualifier.
+* The `AgentExecutor` handles the interaction with the LLM and task execution.
 
 You can see our simple implementations at:
 
-* [`SimpleExampleAgentCardProducer.java`](./server/src/main/java/org/wildfly/extras/a2a/examples/simple/SimpleExampleAgentCardProducer.java) - note that this has some logic to determine the transports that exist on the classpath, which is then added to the additionalInterfaces of the AgentCard
-* [`SimpleExampleAgentExecutorProducer.java`](./server/src/main/java/org/wildfly/extras/a2a/examples/simple/SimpleExampleAgentExecutorProducer.java)
+* [`SimpleExampleAgentCardProducer.java`](./server/src/main/java/org/wildfly/extras/a2a/examples/simple/SimpleExampleAgentCardProducer.java) - configures the agent card with transport URLs and protocol version. Note that this has logic to determine which transports exist on the classpath, which are then added to the supportedInterfaces of the AgentCard.
+* [`SimpleExampleAgentExecutorProducer.java`](./server/src/main/java/org/wildfly/extras/a2a/examples/simple/SimpleExampleAgentExecutorProducer.java) - implements task execution using `AgentEmitter` to manage task lifecycle and artifacts
+
+The `AgentExecutor` interface provides two methods:
+* `execute(RequestContext context, AgentEmitter emitter)` - handles incoming requests, using the `AgentEmitter` to signal work progress, add artifacts, and complete tasks
+* `cancel(RequestContext context, AgentEmitter emitter)` - handles cancellation requests for running tasks
 
 In this example, the LLM interaction is mocked. For more advanced examples on how to interact with an LLM, please refer to the a2a-samples repository.
 

examples/simple/server/src/main/java/org/wildfly/extras/a2a/examples/simple/SimpleExampleAgentExecutorProducer.java

@@ -8,8 +8,7 @@
 
 import io.a2a.server.agentexecution.AgentExecutor;
 import io.a2a.server.agentexecution.RequestContext;
-import io.a2a.server.events.EventQueue;
-import io.a2a.server.tasks.TaskUpdater;
+import io.a2a.server.tasks.AgentEmitter;
 import io.a2a.spec.A2AError;
 import io.a2a.spec.Part;
 import io.a2a.spec.TaskNotCancelableError;
@@ -25,11 +24,10 @@ public AgentExecutor mockExecutor() {
 
     private static class SimpleExampleAgentExecutor implements AgentExecutor {
         @Override
-        public void execute(RequestContext context, EventQueue eventQueue) throws A2AError {
-            TaskUpdater updater = new TaskUpdater(context, eventQueue);
+        public void execute(RequestContext context, AgentEmitter emitter) throws A2AError {
 
             // Signal we've started working
-            updater.startWork();
+            emitter.startWork();
 
             // Get the name sent in the user's message
             List<Part<?>> partsList = context.getMessage().parts();
@@ -42,14 +40,14 @@ public void execute(RequestContext context, EventQueue eventQueue) throws A2AErr
             // Simulate doing work with the LLM, and adding that as an artifact.
             // In this case we just add "Hello <name>" to the list of aritfacts
             String response = "Hello " + name;
-            updater.addArtifact(Collections.singletonList(new TextPart(response)), null, "response", null);
+            emitter.addArtifact(Collections.singletonList(new TextPart(response)), null, "response", null);
 
             // We have completed our simple example Task
-            updater.complete();
+            emitter.complete();
         }
 
         @Override
-        public void cancel(RequestContext context, EventQueue eventQueue) throws A2AError {
+        public void cancel(RequestContext context, AgentEmitter emitter) throws A2AError {
             throw new TaskNotCancelableError();
         }
     }

impl/grpc/src/main/java/org/wildfly/extras/a2a/server/apps/grpc/GrpcBeanInitializer.java

@@ -9,6 +9,7 @@
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
+import io.a2a.server.ExtendedAgentCard;
 import io.a2a.server.PublicAgentCard;
 import io.a2a.server.requesthandlers.RequestHandler;
 import io.a2a.server.util.async.Internal;
@@ -29,6 +30,10 @@ public class GrpcBeanInitializer {
     @PublicAgentCard
     AgentCard agentCard;
 
+    @Inject
+    @ExtendedAgentCard
+    Instance<AgentCard> extendedAgentCard;
+
     @Inject
     RequestHandler requestHandler;
 
@@ -46,14 +51,15 @@ public void onStartup(@Observes @Initialized(ApplicationScoped.class) Object ini
         try {
             // Cache CDI beans for gRPC threads to use since CDI is not available on those threads
             CallContextFactory ccf = callContextFactory.isUnsatisfied() ? null : callContextFactory.get();
-            WildFlyGrpcHandler.setStaticBeans(agentCard, requestHandler, ccf, executor);
+            AgentCard extCard = extendedAgentCard.isUnsatisfied() ? null : extendedAgentCard.get();
+            WildFlyGrpcHandler.setStaticBeans(agentCard, extCard, requestHandler, ccf, executor);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     @PreDestroy
     public void cleanup() {
-        WildFlyGrpcHandler.setStaticBeans(null, null, null, null);
+        WildFlyGrpcHandler.setStaticBeans(null, null, null, null, null);
     }
 }

impl/grpc/src/main/java/org/wildfly/extras/a2a/server/apps/grpc/WildFlyGrpcHandler.java

@@ -23,6 +23,7 @@ public class WildFlyGrpcHandler extends GrpcHandler {
 
     // Static cache populated during application startup by GrpcBeanInitializer
     private static volatile AgentCard staticAgentCard;
+    private static volatile AgentCard staticExtendedAgentCard;
     private static volatile RequestHandler staticRequestHandler;
     private static volatile CallContextFactory staticCallContextFactory;
     private static volatile Executor staticExecutor;
@@ -35,8 +36,9 @@ public WildFlyGrpcHandler() {
      * Called by GrpcBeanInitializer during CDI initialization to cache beans
      * for use by gRPC threads where CDI is not available.
      */
-    static void setStaticBeans(AgentCard agentCard, RequestHandler requestHandler, CallContextFactory callContextFactory, Executor executor) {
+    static void setStaticBeans(AgentCard agentCard, AgentCard extendedAgentCard, RequestHandler requestHandler, CallContextFactory callContextFactory, Executor executor) {
         staticAgentCard = agentCard;
+        staticExtendedAgentCard = extendedAgentCard;
         staticRequestHandler = requestHandler;
         staticCallContextFactory = callContextFactory;
         staticExecutor = executor;
@@ -58,6 +60,11 @@ protected AgentCard getAgentCard() {
         return staticAgentCard;
     }
 
+    @Override
+    protected AgentCard getExtendedAgentCard() {
+        return staticExtendedAgentCard; // Can be null if not configured
+    }
+
     @Override
     protected CallContextFactory getCallContextFactory() {
         return staticCallContextFactory; // Can be null if not configured