Skip to content

Commit b30613d

Browse files
ehsavoieehsavoie
committed
WIP
Signed-off-by: Emmanuel Hugonnet <[email protected]>
1 parent a05627e commit b30613d

File tree

8 files changed

+150
-113
lines changed

8 files changed

+150
-113
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void testRestNonStreamingUnauthenticated() throws A2AClientException {
194194
server.when(
195195
request()
196196
.withMethod("POST")
197-
.withPath("/v1/message:send")
197+
.withPath("/message:send")
198198
).respond(
199199
response()
200200
.withStatusCode(401)
@@ -215,7 +215,7 @@ public void testRestNonStreamingUnauthorized() throws A2AClientException {
215215
server.when(
216216
request()
217217
.withMethod("POST")
218-
.withPath("/v1/message:send")
218+
.withPath("/message:send")
219219
).respond(
220220
response()
221221
.withStatusCode(403)
@@ -236,7 +236,7 @@ public void testRestStreamingUnauthenticated() throws Exception {
236236
server.when(
237237
request()
238238
.withMethod("POST")
239-
.withPath("/v1/message:stream")
239+
.withPath("/message:stream")
240240
).respond(
241241
response()
242242
.withStatusCode(401)
@@ -253,7 +253,7 @@ public void testRestStreamingUnauthorized() throws Exception {
253253
server.when(
254254
request()
255255
.withMethod("POST")
256-
.withPath("/v1/message:stream")
256+
.withPath("/message:stream")
257257
).respond(
258258
response()
259259
.withStatusCode(403)

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

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public EventKind sendMessage(MessageSendParams messageSendParams, @Nullable Clie
8383
io.a2a.grpc.SendMessageRequest.Builder builder = io.a2a.grpc.SendMessageRequest.newBuilder(ProtoUtils.ToProto.sendMessageRequest(messageSendParams));
8484
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SendMessageRequest.METHOD, builder, agentCard, context);
8585
try {
86-
String httpResponseBody = sendPostRequest(agentUrl + "/v1/message:send", payloadAndHeaders);
86+
String httpResponseBody = sendPostRequest(buildBaseUrl(messageSendParams.tenant()) + "/message:send", payloadAndHeaders);
8787
io.a2a.grpc.SendMessageResponse.Builder responseBuilder = io.a2a.grpc.SendMessageResponse.newBuilder();
8888
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
8989
if (responseBuilder.hasMsg()) {
@@ -111,7 +111,7 @@ public void sendMessageStreaming(MessageSendParams messageSendParams, Consumer<S
111111
AtomicReference<CompletableFuture<Void>> ref = new AtomicReference<>();
112112
RestSSEEventListener sseEventListener = new RestSSEEventListener(eventConsumer, errorConsumer);
113113
try {
114-
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(agentUrl + "/v1/message:stream", payloadAndHeaders);
114+
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(buildBaseUrl(messageSendParams.tenant()) + "/message:stream", payloadAndHeaders);
115115
ref.set(postBuilder.postAsyncSSE(
116116
msg -> sseEventListener.onMessage(msg, ref.get()),
117117
throwable -> sseEventListener.onError(throwable, ref.get()),
@@ -137,9 +137,9 @@ public Task getTask(TaskQueryParams taskQueryParams, @Nullable ClientCallContext
137137
try {
138138
String url;
139139
if (taskQueryParams.historyLength() != null && taskQueryParams.historyLength() > 0) {
140-
url = agentUrl + String.format("/v1/tasks/%1s?historyLength=%2d", taskQueryParams.id(), taskQueryParams.historyLength());
140+
url = buildBaseUrl(taskQueryParams.tenant()) + String.format("/tasks/%1s?historyLength=%2d", taskQueryParams.id(), taskQueryParams.historyLength());
141141
} else {
142-
url = agentUrl + String.format("/v1/tasks/%1s", taskQueryParams.id());
142+
url = buildBaseUrl(taskQueryParams.tenant()) + String.format("/tasks/%1s", taskQueryParams.id());
143143
}
144144
A2AHttpClient.GetBuilder getBuilder = httpClient.createGet().url(url);
145145
if (payloadAndHeaders.getHeaders() != null) {
@@ -170,7 +170,7 @@ public Task cancelTask(TaskIdParams taskIdParams, @Nullable ClientCallContext co
170170
PayloadAndHeaders payloadAndHeaders = applyInterceptors(CancelTaskRequest.METHOD, builder,
171171
agentCard, context);
172172
try {
173-
String httpResponseBody = sendPostRequest(agentUrl + String.format("/v1/tasks/%1s:cancel", taskIdParams.id()), payloadAndHeaders);
173+
String httpResponseBody = sendPostRequest(buildBaseUrl(taskIdParams.tenant()) + String.format("/tasks/%1s:cancel", taskIdParams.id()), payloadAndHeaders);
174174
io.a2a.grpc.Task.Builder responseBuilder = io.a2a.grpc.Task.newBuilder();
175175
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
176176
return ProtoUtils.FromProto.task(responseBuilder);
@@ -212,11 +212,8 @@ public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallCo
212212

213213
try {
214214
// Build query string
215-
StringBuilder urlBuilder = new StringBuilder(agentUrl);
216-
// if (request.tenant() != null && !request.tenant().isBlank()) {
217-
// urlBuilder.append('/').append(request.tenant());
218-
// }
219-
urlBuilder.append("/v1/tasks");
215+
StringBuilder urlBuilder = new StringBuilder(buildBaseUrl(request.tenant()));
216+
urlBuilder.append("/tasks");
220217
String queryParams = buildListTasksQueryString(request);
221218
if (!queryParams.isEmpty()) {
222219
urlBuilder.append("?").append(queryParams);
@@ -249,6 +246,25 @@ public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallCo
249246
}
250247
}
251248

249+
private String buildBaseUrl(@Nullable String tenant) {
250+
StringBuilder urlBuilder = new StringBuilder(agentUrl);
251+
urlBuilder.append(extractTenant(tenant));
252+
return urlBuilder.toString();
253+
}
254+
255+
private String extractTenant(@Nullable String tenant) {
256+
String tenantPath = tenant;
257+
if (tenantPath == null || tenantPath.isBlank()) {
258+
return "";
259+
}
260+
if(! tenantPath.startsWith("/")){
261+
tenantPath = '/' + tenantPath;
262+
}
263+
if(!tenantPath.endsWith("/")){
264+
tenantPath = tenantPath.substring(tenantPath.lastIndexOf('/'));
265+
}
266+
return tenantPath;
267+
}
252268
private String buildListTasksQueryString(ListTasksParams request) {
253269
java.util.List<String> queryParts = new java.util.ArrayList<>();
254270
if (request.contextId() != null) {
@@ -284,7 +300,7 @@ public TaskPushNotificationConfig setTaskPushNotificationConfiguration(TaskPushN
284300
}
285301
PayloadAndHeaders payloadAndHeaders = applyInterceptors(SetTaskPushNotificationConfigRequest.METHOD, builder, agentCard, context);
286302
try {
287-
String httpResponseBody = sendPostRequest(agentUrl + String.format("/v1/tasks/%1s/pushNotificationConfigs", request.taskId()), payloadAndHeaders);
303+
String httpResponseBody = sendPostRequest(buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs", request.taskId()), payloadAndHeaders);
288304
io.a2a.grpc.TaskPushNotificationConfig.Builder responseBuilder = io.a2a.grpc.TaskPushNotificationConfig.newBuilder();
289305
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
290306
return ProtoUtils.FromProto.taskPushNotificationConfig(responseBuilder);
@@ -300,11 +316,21 @@ public TaskPushNotificationConfig getTaskPushNotificationConfiguration(GetTaskPu
300316
checkNotNullParam("request", request);
301317
io.a2a.grpc.GetTaskPushNotificationConfigRequest.Builder builder
302318
= io.a2a.grpc.GetTaskPushNotificationConfigRequest.newBuilder();
303-
builder.setName(String.format("/tasks/%1s/pushNotificationConfigs/%2s", request.id(), request.pushNotificationConfigId()));
319+
String configId = request.pushNotificationConfigId();
320+
if (configId != null && !configId.isEmpty()) {
321+
builder.setName(String.format("/tasks/%1s/pushNotificationConfigs/%2s", request.id(), configId));
322+
} else {
323+
builder.setName(String.format("/tasks/%1s/pushNotificationConfigs", request.id()));
324+
}
304325
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskPushNotificationConfigRequest.METHOD, builder,
305326
agentCard, context);
306327
try {
307-
String url = agentUrl + String.format("/v1/tasks/%1s/pushNotificationConfigs/%2s", request.id(), request.pushNotificationConfigId());
328+
String url;
329+
if (configId != null && !configId.isEmpty()) {
330+
url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs/%2s", request.id(), configId);
331+
} else {
332+
url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs", request.id());
333+
}
308334
A2AHttpClient.GetBuilder getBuilder = httpClient.createGet().url(url);
309335
if (payloadAndHeaders.getHeaders() != null) {
310336
for (Map.Entry<String, String> entry : payloadAndHeaders.getHeaders().entrySet()) {
@@ -335,7 +361,7 @@ public List<TaskPushNotificationConfig> listTaskPushNotificationConfigurations(L
335361
PayloadAndHeaders payloadAndHeaders = applyInterceptors(ListTaskPushNotificationConfigRequest.METHOD, builder,
336362
agentCard, context);
337363
try {
338-
String url = agentUrl + String.format("/v1/tasks/%1s/pushNotificationConfigs", request.id());
364+
String url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs", request.id());
339365
A2AHttpClient.GetBuilder getBuilder = httpClient.createGet().url(url);
340366
if (payloadAndHeaders.getHeaders() != null) {
341367
for (Map.Entry<String, String> entry : payloadAndHeaders.getHeaders().entrySet()) {
@@ -364,7 +390,7 @@ public void deleteTaskPushNotificationConfigurations(DeleteTaskPushNotificationC
364390
PayloadAndHeaders payloadAndHeaders = applyInterceptors(DeleteTaskPushNotificationConfigRequest.METHOD, builder,
365391
agentCard, context);
366392
try {
367-
String url = agentUrl + String.format("/v1/tasks/%1s/pushNotificationConfigs/%2s", request.id(), request.pushNotificationConfigId());
393+
String url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs/%2s", request.id(), request.pushNotificationConfigId());
368394
A2AHttpClient.DeleteBuilder deleteBuilder = httpClient.createDelete().url(url);
369395
if (payloadAndHeaders.getHeaders() != null) {
370396
for (Map.Entry<String, String> entry : payloadAndHeaders.getHeaders().entrySet()) {
@@ -393,7 +419,7 @@ public void resubscribe(TaskIdParams request, Consumer<StreamingEventKind> event
393419
AtomicReference<CompletableFuture<Void>> ref = new AtomicReference<>();
394420
RestSSEEventListener sseEventListener = new RestSSEEventListener(eventConsumer, errorConsumer);
395421
try {
396-
String url = agentUrl + String.format("/v1/tasks/%1s:subscribe", request.id());
422+
String url = buildBaseUrl(request.tenant()) + String.format("/tasks/%1s:subscribe", request.id());
397423
A2AHttpClient.PostBuilder postBuilder = createPostBuilder(url, payloadAndHeaders);
398424
ref.set(postBuilder.postAsyncSSE(
399425
msg -> sseEventListener.onMessage(msg, ref.get()),
@@ -424,7 +450,7 @@ public AgentCard getAgentCard(@Nullable ClientCallContext context) throws A2ACli
424450
}
425451
PayloadAndHeaders payloadAndHeaders = applyInterceptors(GetTaskRequest.METHOD, null,
426452
agentCard, context);
427-
String url = agentUrl + String.format("/v1/card");
453+
String url = buildBaseUrl("") + String.format("/extendedAgentCard");
428454
A2AHttpClient.GetBuilder getBuilder = httpClient.createGet().url(url);
429455
if (payloadAndHeaders.getHeaders() != null) {
430456
for (Map.Entry<String, String> entry : payloadAndHeaders.getHeaders().entrySet()) {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void testSendMessage() throws Exception {
117117
this.server.when(
118118
request()
119119
.withMethod("POST")
120-
.withPath("/v1/message:send")
120+
.withPath("/message:send")
121121
.withBody(JsonBody.json(SEND_MESSAGE_TEST_REQUEST, MatchType.ONLY_MATCHING_FIELDS))
122122
)
123123
.respond(
@@ -160,7 +160,7 @@ public void testCancelTask() throws Exception {
160160
this.server.when(
161161
request()
162162
.withMethod("POST")
163-
.withPath("/v1/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64:cancel")
163+
.withPath("/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64:cancel")
164164
.withBody(JsonBody.json(CANCEL_TASK_TEST_REQUEST, MatchType.ONLY_MATCHING_FIELDS))
165165
)
166166
.respond(
@@ -186,7 +186,7 @@ public void testGetTask() throws Exception {
186186
this.server.when(
187187
request()
188188
.withMethod("GET")
189-
.withPath("/v1/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64")
189+
.withPath("/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64")
190190
)
191191
.respond(
192192
response()
@@ -238,7 +238,7 @@ public void testSendMessageStreaming() throws Exception {
238238
this.server.when(
239239
request()
240240
.withMethod("POST")
241-
.withPath("/v1/message:stream")
241+
.withPath("/message:stream")
242242
.withBody(JsonBody.json(SEND_MESSAGE_STREAMING_TEST_REQUEST, MatchType.ONLY_MATCHING_FIELDS))
243243
)
244244
.respond(
@@ -290,7 +290,7 @@ public void testSetTaskPushNotificationConfiguration() throws Exception {
290290
this.server.when(
291291
request()
292292
.withMethod("POST")
293-
.withPath("/v1/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs")
293+
.withPath("/tenant/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs")
294294
.withBody(JsonBody.json(SET_TASK_PUSH_NOTIFICATION_CONFIG_TEST_REQUEST, MatchType.ONLY_MATCHING_FIELDS))
295295
)
296296
.respond(
@@ -324,7 +324,7 @@ public void testGetTaskPushNotificationConfiguration() throws Exception {
324324
this.server.when(
325325
request()
326326
.withMethod("GET")
327-
.withPath("/v1/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs/10")
327+
.withPath("/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs/10")
328328
)
329329
.respond(
330330
response()
@@ -351,7 +351,7 @@ public void testListTaskPushNotificationConfigurations() throws Exception {
351351
this.server.when(
352352
request()
353353
.withMethod("GET")
354-
.withPath("/v1/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs")
354+
.withPath("/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs")
355355
)
356356
.respond(
357357
response()
@@ -388,7 +388,7 @@ public void testDeleteTaskPushNotificationConfigurations() throws Exception {
388388
this.server.when(
389389
request()
390390
.withMethod("DELETE")
391-
.withPath("/v1/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs/10")
391+
.withPath("/tasks/de38c76d-d54c-436c-8b9f-4c2703648d64/pushNotificationConfigs/10")
392392
)
393393
.respond(
394394
response()
@@ -409,7 +409,7 @@ public void testResubscribe() throws Exception {
409409
this.server.when(
410410
request()
411411
.withMethod("POST")
412-
.withPath("/v1/tasks/task-1234:subscribe")
412+
.withPath("/tasks/task-1234:subscribe")
413413
)
414414
.respond(
415415
response()

0 commit comments

Comments
 (0)