Skip to content

fix: improve gemini text aggregation in streaming responses #606

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

Merged
copybara-service merged 1 commit into from
Nov 21, 2025
Merged

fix: improve gemini text aggregation in streaming responses #606

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
66 changes: 44 additions & 22 deletions core/src/main/java/com/google/adk/models/Gemini.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,24 @@ public Flowable<LlmResponse> generateContent(LlmRequest llmRequest, boolean stre
effectiveModelName, llmRequest.contents(), config);

return Flowable.defer(
() ->
processRawResponses(
Flowable.fromFuture(streamFuture).flatMapIterable(iterable -> iterable)));
() ->
processRawResponses(
Flowable.fromFuture(streamFuture).flatMapIterable(iterable -> iterable)))
.filter(
llmResponse ->
llmResponse
.content()
.flatMap(Content::parts)
.map(
parts ->
!parts.isEmpty()
&& parts.stream()
.anyMatch(
p ->
p.functionCall().isPresent()
|| p.functionResponse().isPresent()
|| p.text().map(t -> !t.isBlank()).orElse(false)))
.orElse(false));
} else {
logger.debug("Sending generateContent request to model {}", effectiveModelName);
return Flowable.fromFuture(
Expand Down Expand Up @@ -253,15 +268,16 @@ static Flowable<LlmResponse> processRawResponses(Flowable<GenerateContentRespons
Optional<Part> part = GeminiUtil.getPart0FromLlmResponse(currentProcessedLlmResponse);
String currentTextChunk = part.flatMap(Part::text).orElse("");

if (!currentTextChunk.isEmpty()) {
if (!currentTextChunk.isBlank()) {
if (part.get().thought().orElse(false)) {
accumulatedThoughtText.append(currentTextChunk);
responsesToEmit.add(
thinkingResponseFromText(currentTextChunk).toBuilder().partial(true).build());
} else {
accumulatedText.append(currentTextChunk);
responsesToEmit.add(
responseFromText(currentTextChunk).toBuilder().partial(true).build());
}
LlmResponse partialResponse =
currentProcessedLlmResponse.toBuilder().partial(true).build();
responsesToEmit.add(partialResponse);
} else {
if (accumulatedThoughtText.length() > 0
&& GeminiUtil.shouldEmitAccumulatedText(currentProcessedLlmResponse)) {
Expand All @@ -284,22 +300,28 @@ static Flowable<LlmResponse> processRawResponses(Flowable<GenerateContentRespons
.concatWith(
Flowable.defer(
() -> {
if (accumulatedText.length() > 0 && lastRawResponseHolder[0] != null) {
GenerateContentResponse finalRawResp = lastRawResponseHolder[0];
boolean isStop =
finalRawResp
.candidates()
.flatMap(candidates -> candidates.stream().findFirst())
.flatMap(Candidate::finishReason)
.map(
finishReason -> finishReason.knownEnum() == FinishReason.Known.STOP)
.orElse(false);

if (isStop) {
LlmResponse finalAggregatedTextResponse =
responseFromText(accumulatedText.toString());
return Flowable.just(finalAggregatedTextResponse);
GenerateContentResponse finalRawResp = lastRawResponseHolder[0];
if (finalRawResp == null) {
return Flowable.empty();
}
boolean isStop =
finalRawResp
.candidates()
.flatMap(candidates -> candidates.stream().findFirst())
.flatMap(Candidate::finishReason)
.map(finishReason -> finishReason.knownEnum() == FinishReason.Known.STOP)
.orElse(false);

if (isStop) {
List<LlmResponse> finalResponses = new ArrayList<>();
if (accumulatedThoughtText.length() > 0) {
finalResponses.add(
thinkingResponseFromText(accumulatedThoughtText.toString()));
}
if (accumulatedText.length() > 0) {
finalResponses.add(responseFromText(accumulatedText.toString()));
}
return Flowable.fromIterable(finalResponses);
}
return Flowable.empty();
}));
Expand Down