Skip to content

refactor: GeminiLlmConnection: Unwrap List from Optional #765

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
Jan 23, 2026
Merged

refactor: GeminiLlmConnection: Unwrap List from Optional #765

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
30 changes: 12 additions & 18 deletions core/src/main/java/com/google/adk/models/GeminiLlmConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ private void handleReceiveError(Throwable throwable) {
if (closed.compareAndSet(false, true)) {
logger.error("Error during WebSocket receive operation", throwable);
responseProcessor.onError(throwable);
sessionFuture.thenAccept(this::closeSessionIgnoringErrors).exceptionally(err -> null);
sessionFuture.thenAccept(this::closeSessionIgnoringErrors).exceptionally(unusedError -> null);
}
}

Expand All @@ -198,26 +198,22 @@ public Completable sendHistory(List<Content> history) {
public Completable sendContent(Content content) {
Objects.requireNonNull(content, "content cannot be null");

Optional<List<FunctionResponse>> functionResponses = extractFunctionResponses(content);

if (functionResponses.isPresent()) {
return sendToolResponseInternal(
LiveSendToolResponseParameters.builder()
.functionResponses(functionResponses.get())
.build());
} else {
List<FunctionResponse> functionResponses = extractFunctionResponses(content);
if (functionResponses.isEmpty()) {
return sendClientContentInternal(
LiveSendClientContentParameters.builder()
.turns(ImmutableList.of(content))
.turnComplete(true)
.build());
}
return sendToolResponseInternal(
LiveSendToolResponseParameters.builder().functionResponses(functionResponses).build());
}

/** Extracts FunctionResponse parts from a Content object if all parts are FunctionResponses. */
private Optional<List<FunctionResponse>> extractFunctionResponses(Content content) {
private List<FunctionResponse> extractFunctionResponses(Content content) {
if (content.parts().isEmpty() || content.parts().get().isEmpty()) {
return Optional.empty();
return ImmutableList.of();
}

ImmutableList<FunctionResponse> responses =
Expand All @@ -226,12 +222,8 @@ private Optional<List<FunctionResponse>> extractFunctionResponses(Content conten
.flatMap(Optional::stream)
.collect(toImmutableList());

// Ensure *all* parts were function responses
if (responses.size() == content.parts().get().size()) {
return Optional.of(responses);
} else {
return Optional.empty();
}
// Ensure *all* parts were function responses.
return (responses.size() == content.parts().get().size()) ? responses : ImmutableList.of();
}

@Override
Expand Down Expand Up @@ -283,7 +275,9 @@ private void closeInternal(Throwable throwable) {
}

if (sessionFuture.isDone()) {
sessionFuture.thenAccept(this::closeSessionIgnoringErrors).exceptionally(err -> null);
sessionFuture
.thenAccept(this::closeSessionIgnoringErrors)
.exceptionally(unusedError -> null);
} else {
sessionFuture.cancel(false);
}
Expand Down