Skip to content

refactor: refactor BaseLlmFlow to make code more readable #310

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: refactor BaseLlmFlow to make code more readable #310

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
67 changes: 32 additions & 35 deletions 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 @@ -454,45 +454,16 @@ public Flowable<Event> runLive(InvocationContext invocationContext) {

String eventIdForSendData = Event.generateEventId();
LlmAgent agent = (LlmAgent) invocationContext.agent();
BaseLlm llm =
agent.resolvedModel().model().isPresent()
? agent.resolvedModel().model().get()
: LlmRegistry.getLlm(agent.resolvedModel().modelName().get());
BaseLlm llm = agent.resolvedModel().model()
.orElseGet(() -> LlmRegistry.getLlm(agent.resolvedModel().modelName()
.orElseThrow()));

BaseLlmConnection connection = llm.connect(llmRequestAfterPreprocess);
Completable historySent =
llmRequestAfterPreprocess.contents().isEmpty()
? Completable.complete()
: Completable.defer(
() -> {
Span sendDataSpan =
Telemetry.getTracer().spanBuilder("send_data").startSpan();
try (Scope scope = sendDataSpan.makeCurrent()) {
return connection
.sendHistory(llmRequestAfterPreprocess.contents())
.doOnComplete(
() -> {
try (Scope innerScope = sendDataSpan.makeCurrent()) {
Telemetry.traceSendData(
invocationContext,
eventIdForSendData,
llmRequestAfterPreprocess.contents());
}
})
.doOnError(
error -> {
sendDataSpan.setStatus(
StatusCode.ERROR, error.getMessage());
sendDataSpan.recordException(error);
try (Scope innerScope = sendDataSpan.makeCurrent()) {
Telemetry.traceSendData(
invocationContext,
eventIdForSendData,
llmRequestAfterPreprocess.contents());
}
})
.doFinally(sendDataSpan::end);
}
});
() -> sendHistory(invocationContext, connection, llmRequestAfterPreprocess, eventIdForSendData));

Flowable<LiveRequest> liveRequests = invocationContext.liveRequestQueue().get().get();
Disposable sendTask =
Expand Down Expand Up @@ -588,7 +559,33 @@ public void onError(Throwable e) {
});
}

/**
private static Completable sendHistory(
final InvocationContext invocationContext,
final BaseLlmConnection connection,
final LlmRequest llmRequestAfterPreprocess,
final String eventIdForSendData) {
Span sendDataSpan = Telemetry.getTracer().spanBuilder("send_data").startSpan();
try (Scope scope = sendDataSpan.makeCurrent()) {
return connection
.sendHistory(llmRequestAfterPreprocess.contents())
.doOnEvent(
error -> {
if (error != null) {
sendDataSpan.setStatus(StatusCode.ERROR, error.getMessage());
sendDataSpan.recordException(error);
}
try (Scope innerScope = sendDataSpan.makeCurrent()) {
Telemetry.traceSendData(
invocationContext,
eventIdForSendData,
llmRequestAfterPreprocess.contents());
}
})
.doFinally(sendDataSpan::end);
}
}

/**
* Builds an {@link Event} from LLM response, request, and base event data.
*
* <p>Populates the event with LLM output and tool function call metadata.
Expand Down
Loading