Skip to content

fix: ignore usage-only responses (except for BIDI mode) #1254

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

Open
r4inee wants to merge 1 commit into
base: main
Choose a base branch
from
+67 −4
Open

fix: ignore usage-only responses (except for BIDI mode) #1254

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
3 changes: 2 additions & 1 deletion core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,8 @@ private Flowable<Event> buildPostprocessingEvents(
&& updatedResponse.errorCode().isEmpty()
&& !updatedResponse.interrupted().orElse(false)
&& !updatedResponse.turnComplete().orElse(false)
&& updatedResponse.usageMetadata().isEmpty()
&& (context.runConfig().streamingMode() != StreamingMode.BIDI

@r4inee r4inee Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adk-python seems to fork the logic in LIVE/BIDI mode - mainly kept in consistent with the logic below for now to avoid a larger change.

|| updatedResponse.usageMetadata().isEmpty())
&& updatedResponse.inputTranscription().isEmpty()
&& updatedResponse.outputTranscription().isEmpty()) {
return processorEvents;
Expand Down
35 changes: 32 additions & 3 deletions core/src/test/java/com/google/adk/flows/llmflows/BaseLlmFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.google.adk.agents.InvocationContext;
import com.google.adk.agents.LlmAgent;
import com.google.adk.agents.ReadonlyContext;
import com.google.adk.agents.RunConfig;
import com.google.adk.events.Event;
import com.google.adk.flows.llmflows.RequestProcessor.RequestProcessingResult;
import com.google.adk.flows.llmflows.ResponseProcessor.ResponseProcessingResult;
Expand Down Expand Up @@ -736,7 +737,7 @@ public void run_responseWithTranscriptions_propagatesTranscriptionsToEvent() {
}

@Test
public void postprocess_noResponseProcessors_onlyUsageMetadata_returnsEvent() {
public void postprocess_noResponseProcessors_onlyUsageMetadata_returnsNoEvent() {
GenerateContentResponseUsageMetadata usageMetadata =
createGenerateContentResponseUsageMetadata().build();
LlmResponse llmResponse = LlmResponse.builder().usageMetadata(usageMetadata).build();
Expand All @@ -760,12 +761,40 @@ public void postprocess_noResponseProcessors_onlyUsageMetadata_returnsEvent() {
.toList()
.blockingGet();

assertThat(events).isEmpty();
}

@Test
public void postprocess_bidiUsageMetadataOnlyResponse_returnsEvent() {
GenerateContentResponseUsageMetadata usageMetadata =
createGenerateContentResponseUsageMetadata().build();
LlmResponse llmResponse = LlmResponse.builder().usageMetadata(usageMetadata).build();
InvocationContext invocationContext =
createInvocationContext(
createTestAgent(createTestLlm(llmResponse)),
RunConfig.builder().setStreamingMode(RunConfig.StreamingMode.BIDI).build());
BaseLlmFlow baseLlmFlow = createBaseLlmFlowWithoutProcessors();
Event baseEvent =
Event.builder()
.invocationId(invocationContext.invocationId())
.author(invocationContext.agent().name())
.build();

List<Event> events =
baseLlmFlow
.postprocess(
invocationContext,
baseEvent,
LlmRequest.builder().build(),
llmResponse,
Context.current())
.toList()
.blockingGet();

assertThat(events).hasSize(1);
Event event = getOnlyElement(events);
assertThat(event.content()).isEmpty();
assertThat(event.usageMetadata()).hasValue(usageMetadata);
assertThat(event.author()).isEqualTo(invocationContext.agent().name());
assertThat(event.invocationId()).isEqualTo(invocationContext.invocationId());
}

@Test
Expand Down
33 changes: 33 additions & 0 deletions core/src/test/java/com/google/adk/flows/llmflows/CodeExecutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.adk.flows.llmflows;

import static com.google.adk.testing.TestUtils.createGenerateContentResponseUsageMetadata;
import static com.google.adk.testing.TestUtils.createInvocationContext;
import static com.google.adk.testing.TestUtils.createLlmResponse;
import static com.google.adk.testing.TestUtils.createTestAgentBuilder;
import static com.google.adk.testing.TestUtils.createTestLlm;
Expand Down Expand Up @@ -122,6 +124,37 @@ public void testResponseProcessor_withCode_executesCode() {
.hasValue("Code execution result:\nhello\n\n");
}

@Test
public void run_withCodeExecutionResponseAndUsageMetadata_continuesToFinalAnswer() {
String code = "print('hello')";
Content codeResponseContent =
Content.builder()
.role("model")
.parts(Part.fromText("```tool_code\n" + code + "\n```"))
.build();
var usageMetadata = createGenerateContentResponseUsageMetadata().build();
LlmResponse codeResponse =
createLlmResponse(codeResponseContent).toBuilder().usageMetadata(usageMetadata).build();
Content finalResponseContent = Content.fromParts(Part.fromText("Done."));
testLlm = createTestLlm(codeResponse, createLlmResponse(finalResponseContent));
agent = createTestAgentBuilder(testLlm).codeExecutor(mockCodeExecutor).build();
InvocationContext realInvocationContext = createInvocationContext(agent);
CodeExecutionResult executionResult = CodeExecutionResult.builder().stdout("hello\n").build();
when(mockCodeExecutor.errorRetryAttempts()).thenReturn(2);
when(mockCodeExecutor.executeCode(any(), any())).thenReturn(executionResult);
when(mockCodeExecutor.codeBlockDelimiters())
.thenReturn(ImmutableList.of(ImmutableList.of("```tool_code\n", "\n```")));

ImmutableList<Event> events =
ImmutableList.copyOf(new SingleFlow().run(realInvocationContext).toList().blockingGet());

assertThat(testLlm.getRequests()).hasSize(2);
assertThat(events).hasSize(3);
assertThat(events.get(0).usageMetadata()).isEmpty();
assertThat(events.get(1).hasTrailingCodeExecutionResult()).isTrue();
assertThat(events.get(2).content()).hasValue(finalResponseContent);
}

@Test
public void testRequestProcessor_withCode_hasNoErrors() throws Exception {
// arrange
Expand Down