Skip to content

Commit 2d20d1b

Browse files
google-genai-botcopybara-github
authored andcommitted
fix: update Java ADK ResponseConverter to propagate long-running tool IDs on AUTH_REQUIRED state
PiperOrigin-RevId: 965910141
1 parent 4e1539f commit 2d20d1b

2 files changed

Lines changed: 91 additions & 3 deletions

File tree

‎a2a/src/main/java/com/google/adk/a2a/converters/ResponseConverter.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ private static Optional<Event> handleTaskUpdate(
150150
return messageToEvent(value, context, PENDING_STATES.contains(taskState));
151151
});
152152

153-
if (statusEvent.isFinal()) {
153+
if (statusEvent.isFinal()
154+
|| taskState == TaskState.INPUT_REQUIRED
155+
|| taskState == TaskState.AUTH_REQUIRED) {
154156
messageEvent =
155157
messageEvent
156158
.map(Event::toBuilder)
@@ -256,15 +258,18 @@ public static Event taskToEvent(Task task, InvocationContext invocationContext)
256258

257259
ImmutableList<Part> finalParts = genaiParts.build();
258260
boolean isFinal =
259-
task.getStatus().state().isFinal() || task.getStatus().state() == TaskState.INPUT_REQUIRED;
261+
task.getStatus().state().isFinal()
262+
|| task.getStatus().state() == TaskState.INPUT_REQUIRED
263+
|| task.getStatus().state() == TaskState.AUTH_REQUIRED;
260264

261265
if (finalParts.isEmpty() && !isFinal) {
262266
return emptyEvent(invocationContext);
263267
}
264268
if (!finalParts.isEmpty()) {
265269
eventBuilder.content(fromModelParts(finalParts));
266270
}
267-
if (task.getStatus().state() == TaskState.INPUT_REQUIRED) {
271+
if (task.getStatus().state() == TaskState.INPUT_REQUIRED
272+
|| task.getStatus().state() == TaskState.AUTH_REQUIRED) {
268273
eventBuilder.longRunningToolIds(longRunningToolIds.build());
269274
}
270275
eventBuilder.turnComplete(isFinal);

‎a2a/src/test/java/com/google/adk/a2a/converters/ResponseConverterTest.java‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,43 @@ public void taskToEvent_withInputRequired_parsesLongRunningToolIds() {
359359
assertThat(event.longRunningToolIds().get()).containsExactly("call_123", "msg_123");
360360
}
361361

362+
@Test
363+
public void taskToEvent_withAuthRequired_parsesLongRunningToolIds() {
364+
ImmutableMap<String, Object> data =
365+
ImmutableMap.of("name", "myTool", "id", "call_123", "args", ImmutableMap.of());
366+
ImmutableMap<String, Object> metadata =
367+
ImmutableMap.of(
368+
A2AMetadataKey.TYPE.getType(),
369+
"function_call",
370+
A2AMetadataKey.IS_LONG_RUNNING.getType(),
371+
true);
372+
DataPart dataPart = new DataPart(data, metadata);
373+
ImmutableMap<String, Object> statusData =
374+
ImmutableMap.of("name", "messageTools", "id", "msg_123", "args", ImmutableMap.of());
375+
ImmutableMap<String, Object> statusMetadata =
376+
ImmutableMap.of(
377+
A2AMetadataKey.TYPE.getType(),
378+
"function_call",
379+
A2AMetadataKey.IS_LONG_RUNNING.getType(),
380+
true);
381+
DataPart statusDataPart = new DataPart(statusData, statusMetadata);
382+
Message statusMessage =
383+
new Message.Builder()
384+
.role(Message.Role.AGENT)
385+
.parts(ImmutableList.of(statusDataPart))
386+
.build();
387+
TaskStatus status = new TaskStatus(TaskState.AUTH_REQUIRED, statusMessage, null);
388+
389+
Artifact artifact =
390+
new Artifact.Builder().artifactId("artifact-1").parts(ImmutableList.of(dataPart)).build();
391+
Task task = testTask().status(status).artifacts(ImmutableList.of(artifact)).build();
392+
393+
Event event = ResponseConverter.taskToEvent(task, invocationContext);
394+
assertThat(event).isNotNull();
395+
assertThat(event.longRunningToolIds().get()).containsExactly("call_123", "msg_123");
396+
assertThat(event.turnComplete()).hasValue(true);
397+
}
398+
362399
@Test
363400
public void taskToEvent_withDataPartWithoutMetadata_fallsBackToInlineJson() {
364401
DataPart dataPart =
@@ -597,6 +634,52 @@ public void clientEventToEvent_withFinalTaskStatusUpdateEvent_withoutMessage_ret
597634
assertThat(resultEvent.turnComplete()).hasValue(true);
598635
}
599636

637+
@Test
638+
public void
639+
clientEventToEvent_withAuthRequiredTaskStatusUpdateEvent_evenIfNonFinal_returnsTurnComplete() {
640+
Message statusMessage =
641+
new Message.Builder()
642+
.role(Message.Role.AGENT)
643+
.parts(ImmutableList.of(new TextPart("Auth required message")))
644+
.build();
645+
TaskStatus status = new TaskStatus(TaskState.AUTH_REQUIRED, statusMessage, null);
646+
TaskStatusUpdateEvent updateEvent =
647+
testTaskStatusUpdateEvent().isFinal(false).status(status).build();
648+
649+
TaskUpdateEvent event = new TaskUpdateEvent(testTask().status(status).build(), updateEvent);
650+
651+
Optional<Event> optionalEvent = ResponseConverter.clientEventToEvent(event, invocationContext);
652+
assertThat(optionalEvent).isPresent();
653+
Event resultEvent = optionalEvent.get();
654+
assertThat(resultEvent.content().get().parts().get().get(0).text())
655+
.hasValue("Auth required message");
656+
assertThat(resultEvent.partial().orElse(false)).isFalse();
657+
assertThat(resultEvent.turnComplete()).hasValue(true);
658+
}
659+
660+
@Test
661+
public void
662+
clientEventToEvent_withInputRequiredTaskStatusUpdateEvent_evenIfNonFinal_returnsTurnComplete() {
663+
Message statusMessage =
664+
new Message.Builder()
665+
.role(Message.Role.AGENT)
666+
.parts(ImmutableList.of(new TextPart("Input required message")))
667+
.build();
668+
TaskStatus status = new TaskStatus(TaskState.INPUT_REQUIRED, statusMessage, null);
669+
TaskStatusUpdateEvent updateEvent =
670+
testTaskStatusUpdateEvent().isFinal(false).status(status).build();
671+
672+
TaskUpdateEvent event = new TaskUpdateEvent(testTask().status(status).build(), updateEvent);
673+
674+
Optional<Event> optionalEvent = ResponseConverter.clientEventToEvent(event, invocationContext);
675+
assertThat(optionalEvent).isPresent();
676+
Event resultEvent = optionalEvent.get();
677+
assertThat(resultEvent.content().get().parts().get().get(0).text())
678+
.hasValue("Input required message");
679+
assertThat(resultEvent.partial().orElse(false)).isFalse();
680+
assertThat(resultEvent.turnComplete()).hasValue(true);
681+
}
682+
600683
@Test
601684
public void clientEventToEvent_withNonFinalTaskStatusUpdateEvent_withoutMessage_returnsEmpty() {
602685
TaskStatus status = new TaskStatus(TaskState.WORKING, null, null);

0 commit comments

Comments
 (0)