Skip to content

refactor: avoid using Flowable.fromFuture() which uses blocking get under the hood #727

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
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −11
Open

refactor: avoid using Flowable.fromFuture() which uses blocking get under the hood #727

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
33 changes: 22 additions & 11 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 @@ -17,9 +17,12 @@
package com.google.adk.models;

import static com.google.common.base.StandardSystemProperty.JAVA_VERSION;
import static net.javacrumbs.futureconverter.java8guava.FutureConverter.toListenableFuture;

import com.google.adk.Version;
import com.google.async.rxjava3.Singles;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.genai.Client;
import com.google.genai.ResponseStream;
Expand All @@ -32,11 +35,11 @@
import com.google.genai.types.LiveConnectConfig;
import com.google.genai.types.Part;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.schedulers.Schedulers;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -218,14 +221,17 @@ public Flowable<LlmResponse> generateContent(LlmRequest llmRequest, boolean stre

if (stream) {
logger.debug("Sending streaming generateContent request to model {}", effectiveModelName);
CompletableFuture<ResponseStream<GenerateContentResponse>> streamFuture =
apiClient.async.models.generateContentStream(
effectiveModelName, llmRequest.contents(), config);
ListenableFuture<ResponseStream<GenerateContentResponse>> streamFuture =
toListenableFuture(
apiClient.async.models.generateContentStream(
effectiveModelName, llmRequest.contents(), config));

return Flowable.defer(
() ->
processRawResponses(
Flowable.fromFuture(streamFuture).flatMapIterable(iterable -> iterable)))
Singles.toSingle(() -> streamFuture, Schedulers.io())
.toFlowable()
.flatMapIterable(iterable -> iterable)))
.filter(
llmResponse ->
llmResponse
Expand All @@ -243,12 +249,17 @@ public Flowable<LlmResponse> generateContent(LlmRequest llmRequest, boolean stre
.orElse(false));
} else {
logger.debug("Sending generateContent request to model {}", effectiveModelName);
return Flowable.fromFuture(
apiClient
.async
.models
.generateContent(effectiveModelName, llmRequest.contents(), config)
.thenApplyAsync(LlmResponse::create));
final LlmRequest finalLlmRequest = llmRequest;
return Singles.toSingle(
() ->
toListenableFuture(
apiClient
.async
.models
.generateContent(effectiveModelName, finalLlmRequest.contents(), config)
.thenApplyAsync(LlmResponse::create)),
Schedulers.io())
.toFlowable();
}
}

Expand Down
Loading