Skip to content

Commit cbe0d72

Browse files
committed
feat: add CancelTaskParams record with builder and tenant support
Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
1 parent d3204a3 commit cbe0d72

28 files changed

Lines changed: 238 additions & 82 deletions

File tree

‎client/base/src/main/java/io/a2a/client/AbstractClient.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
1212
import io.a2a.spec.A2AClientException;
1313
import io.a2a.spec.AgentCard;
14+
import io.a2a.spec.CancelTaskParams;
1415
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
1516
import io.a2a.spec.GetTaskPushNotificationConfigParams;
1617
import io.a2a.spec.ListTaskPushNotificationConfigParams;
@@ -230,7 +231,7 @@ public ListTasksResult listTasks(ListTasksParams request) throws A2AClientExcept
230231
* @return the cancelled task
231232
* @throws A2AClientException if cancelling the task fails for any reason
232233
*/
233-
public Task cancelTask(TaskIdParams request) throws A2AClientException {
234+
public Task cancelTask(CancelTaskParams request) throws A2AClientException {
234235
return cancelTask(request, null);
235236
}
236237

@@ -242,7 +243,7 @@ public Task cancelTask(TaskIdParams request) throws A2AClientException {
242243
* @return the cancelled task
243244
* @throws A2AClientException if cancelling the task fails for any reason
244245
*/
245-
public abstract Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException;
246+
public abstract Task cancelTask(CancelTaskParams request, @Nullable ClientCallContext context) throws A2AClientException;
246247

247248
/**
248249
* Create or update the push notification configuration for a specific task.

‎client/base/src/main/java/io/a2a/client/Client.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.a2a.spec.A2AClientException;
1616
import io.a2a.spec.A2AClientInvalidStateError;
1717
import io.a2a.spec.AgentCard;
18+
import io.a2a.spec.CancelTaskParams;
1819
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
1920
import io.a2a.spec.EventKind;
2021
import io.a2a.spec.GetExtendedAgentCardParams;
@@ -445,7 +446,7 @@ public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallCo
445446
* @see io.a2a.spec.TaskNotFoundError
446447
*/
447448
@Override
448-
public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException {
449+
public Task cancelTask(CancelTaskParams request, @Nullable ClientCallContext context) throws A2AClientException {
449450
return clientTransport.cancelTask(request, context);
450451
}
451452

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
3434
import io.a2a.spec.A2AClientException;
3535
import io.a2a.spec.AgentCard;
36+
import io.a2a.spec.CancelTaskParams;
3637
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
3738
import io.a2a.spec.EventKind;
3839
import io.a2a.spec.GetExtendedAgentCardParams;
@@ -161,7 +162,7 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
161162
}
162163

163164
@Override
164-
public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException {
165+
public Task cancelTask(CancelTaskParams request, @Nullable ClientCallContext context) throws A2AClientException {
165166
checkNotNullParam("request", request);
166167

167168
io.a2a.grpc.CancelTaskRequest cancelTaskRequest = io.a2a.grpc.CancelTaskRequest.newBuilder()

‎client/transport/jsonrpc/src/main/java/io/a2a/client/transport/jsonrpc/JSONRPCTransport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import io.a2a.spec.A2AError;
5050
import io.a2a.spec.AgentCard;
5151
import io.a2a.spec.AgentInterface;
52+
import io.a2a.spec.CancelTaskParams;
5253
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
5354
import io.a2a.spec.EventKind;
5455
import io.a2a.spec.GetExtendedAgentCardParams;
@@ -152,7 +153,7 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
152153
}
153154

154155
@Override
155-
public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException {
156+
public Task cancelTask(CancelTaskParams request, @Nullable ClientCallContext context) throws A2AClientException {
156157
checkNotNullParam("request", request);
157158
PayloadAndHeaders payloadAndHeaders = applyInterceptors(CANCEL_TASK_METHOD, ProtoUtils.ToProto.cancelTaskRequest(request),
158159
agentCard, context);

‎client/transport/jsonrpc/src/test/java/io/a2a/client/transport/jsonrpc/JSONRPCTransportTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import io.a2a.spec.AgentSkill;
4545
import io.a2a.spec.Artifact;
4646
import io.a2a.spec.AuthenticationInfo;
47+
import io.a2a.spec.CancelTaskParams;
4748
import io.a2a.spec.DataPart;
4849
import io.a2a.spec.EventKind;
4950
import io.a2a.spec.FileContent;
@@ -61,7 +62,6 @@
6162
import io.a2a.spec.SecurityRequirement;
6263
import io.a2a.spec.SecurityScheme;
6364
import io.a2a.spec.Task;
64-
import io.a2a.spec.TaskIdParams;
6565
import io.a2a.spec.TaskPushNotificationConfig;
6666
import io.a2a.spec.TaskQueryParams;
6767
import io.a2a.spec.TaskState;
@@ -286,7 +286,7 @@ public void testA2AClientCancelTask() throws Exception {
286286
);
287287

288288
JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
289-
Task task = client.cancelTask(new TaskIdParams("de38c76d-d54c-436c-8b9f-4c2703648d64"), null);
289+
Task task = client.cancelTask(new CancelTaskParams("de38c76d-d54c-436c-8b9f-4c2703648d64"), null);
290290
assertEquals("de38c76d-d54c-436c-8b9f-4c2703648d64", task.id());
291291
assertEquals("c295ea44-7543-4f78-b524-7a38915ad6e4", task.contextId());
292292
assertEquals(TaskState.TASK_STATE_CANCELED, task.status().state());

‎client/transport/rest/src/main/java/io/a2a/client/transport/rest/RestTransport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import io.a2a.spec.A2AClientException;
4444
import io.a2a.spec.AgentCard;
4545
import io.a2a.spec.AgentInterface;
46+
import io.a2a.spec.CancelTaskParams;
4647
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
4748
import io.a2a.spec.EventKind;
4849
import io.a2a.spec.GetExtendedAgentCardParams;
@@ -163,7 +164,7 @@ public Task getTask(TaskQueryParams taskQueryParams, @Nullable ClientCallContext
163164
}
164165

165166
@Override
166-
public Task cancelTask(TaskIdParams taskIdParams, @Nullable ClientCallContext context) throws A2AClientException {
167+
public Task cancelTask(CancelTaskParams taskIdParams, @Nullable ClientCallContext context) throws A2AClientException {
167168
checkNotNullParam("taskIdParams", taskIdParams);
168169
io.a2a.grpc.CancelTaskRequest.Builder builder = io.a2a.grpc.CancelTaskRequest.newBuilder(ProtoUtils.ToProto.cancelTaskRequest(taskIdParams));
169170
PayloadAndHeaders payloadAndHeaders = applyInterceptors(CANCEL_TASK_METHOD, builder, agentCard, context);

‎client/transport/rest/src/test/java/io/a2a/client/transport/rest/RestTransportTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import io.a2a.spec.AgentSkill;
3838
import io.a2a.spec.Artifact;
3939
import io.a2a.spec.AuthenticationInfo;
40+
import io.a2a.spec.CancelTaskParams;
4041
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
4142
import io.a2a.spec.EventKind;
4243
import io.a2a.spec.ExtensionSupportRequiredError;
@@ -172,7 +173,7 @@ public void testCancelTask() throws Exception {
172173
);
173174
ClientCallContext context = null;
174175
RestTransport instance = new RestTransport(CARD);
175-
Task task = instance.cancelTask(new TaskIdParams("de38c76d-d54c-436c-8b9f-4c2703648d64"), context);
176+
Task task = instance.cancelTask(new CancelTaskParams("de38c76d-d54c-436c-8b9f-4c2703648d64"), context);
176177
assertEquals("de38c76d-d54c-436c-8b9f-4c2703648d64", task.id());
177178
assertEquals(TaskState.TASK_STATE_CANCELED, task.status().state());
178179
assertNull(task.status().message());

‎client/transport/spi/src/main/java/io/a2a/client/transport/spi/ClientTransport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
77
import io.a2a.spec.A2AClientException;
88
import io.a2a.spec.AgentCard;
9+
import io.a2a.spec.CancelTaskParams;
910
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
1011
import io.a2a.spec.EventKind;
1112
import io.a2a.spec.GetExtendedAgentCardParams;
@@ -67,7 +68,7 @@ void sendMessageStreaming(MessageSendParams request, Consumer<StreamingEventKind
6768
* @return the cancelled task
6869
* @throws A2AClientException if cancelling the task fails for any reason
6970
*/
70-
Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException;
71+
Task cancelTask(CancelTaskParams request, @Nullable ClientCallContext context) throws A2AClientException;
7172

7273
/**
7374
* List tasks with optional filtering and pagination.

‎extras/opentelemetry/client-propagation/src/main/java/io/a2a/extras/opentelemetry/client/propagation/OpenTelemetryClientPropagatorTransport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.a2a.jsonrpc.common.wrappers.ListTasksResult;
66
import io.a2a.spec.A2AClientException;
77
import io.a2a.spec.AgentCard;
8+
import io.a2a.spec.CancelTaskParams;
89
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
910
import io.a2a.spec.EventKind;
1011
import io.a2a.spec.GetExtendedAgentCardParams;
@@ -73,7 +74,7 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
7374
}
7475

7576
@Override
76-
public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException {
77+
public Task cancelTask(CancelTaskParams request, @Nullable ClientCallContext context) throws A2AClientException {
7778
return delegate.cancelTask(request, propagateContext(context));
7879
}
7980

‎extras/opentelemetry/client/src/main/java/io/a2a/extras/opentelemetry/client/OpenTelemetryClientTransport.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.a2a.spec.A2AClientException;
2020
import io.a2a.spec.A2AMethods;
2121
import io.a2a.spec.AgentCard;
22+
import io.a2a.spec.CancelTaskParams;
2223
import io.a2a.spec.DeleteTaskPushNotificationConfigParams;
2324
import io.a2a.spec.EventKind;
2425
import io.a2a.spec.GetExtendedAgentCardParams;
@@ -181,7 +182,7 @@ public Task getTask(TaskQueryParams request, @Nullable ClientCallContext context
181182
}
182183

183184
@Override
184-
public Task cancelTask(TaskIdParams request, @Nullable ClientCallContext context) throws A2AClientException {
185+
public Task cancelTask(CancelTaskParams request, @Nullable ClientCallContext context) throws A2AClientException {
185186
ClientCallContext clientContext = createContext(context);
186187
SpanBuilder spanBuilder = tracer.spanBuilder(A2AMethods.CANCEL_TASK_METHOD).setSpanKind(SpanKind.CLIENT);
187188
spanBuilder.setAttribute(GENAI_OPERATION_NAME, A2AMethods.CANCEL_TASK_METHOD);

0 commit comments

Comments
 (0)