Skip to content

fix!: update basellmflow postprocessing to allow emitting original response prior to generating new events #469

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
Oct 3, 2025
Merged

fix!: update basellmflow postprocessing to allow emitting original response prior to generating new events #469

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
100 changes: 42 additions & 58 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 @@ -52,7 +52,6 @@
import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
import io.reactivex.rxjava3.schedulers.Schedulers;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -131,9 +130,10 @@ protected Single<RequestProcessingResult> preprocess(

/**
* Post-processes the LLM response after receiving it from the LLM. Executes all registered {@link
* ResponseProcessor} instances. Handles function calls if present in the response.
* ResponseProcessor} instances. Emits events for the model response and any subsequent function
* calls.
*/
protected Single<ResponseProcessingResult> postprocess(
protected Flowable<Event> postprocess(
InvocationContext context,
Event baseEventForLlmResponse,
LlmRequest llmRequest,
Expand All @@ -154,46 +154,36 @@ protected Single<ResponseProcessingResult> postprocess(
.map(ResponseProcessingResult::updatedResponse);
}

return currentLlmResponse.flatMap(
return currentLlmResponse.flatMapPublisher(
updatedResponse -> {
Flowable<Event> processorEvents = Flowable.fromIterable(Iterables.concat(eventIterables));

if (updatedResponse.content().isEmpty()
&& updatedResponse.errorCode().isEmpty()
&& !updatedResponse.interrupted().orElse(false)
&& !updatedResponse.turnComplete().orElse(false)) {
return Single.just(
ResponseProcessingResult.create(
updatedResponse, Iterables.concat(eventIterables), Optional.empty()));
return processorEvents;
}

Event modelResponseEvent =
buildModelResponseEvent(baseEventForLlmResponse, llmRequest, updatedResponse);
eventIterables.add(Collections.singleton(modelResponseEvent));

Maybe<Event> maybeFunctionCallEvent;
Flowable<Event> modelEventStream = Flowable.just(modelResponseEvent);

if (modelResponseEvent.functionCalls().isEmpty()) {
maybeFunctionCallEvent = Maybe.empty();
} else if (context.runConfig().streamingMode() == StreamingMode.BIDI) {
return processorEvents.concatWith(modelEventStream);
}

Maybe<Event> maybeFunctionCallEvent;
if (context.runConfig().streamingMode() == StreamingMode.BIDI) {
maybeFunctionCallEvent =
Functions.handleFunctionCallsLive(context, modelResponseEvent, llmRequest.tools());
} else {
maybeFunctionCallEvent =
Functions.handleFunctionCalls(context, modelResponseEvent, llmRequest.tools());
}
return maybeFunctionCallEvent
.map(Optional::of)
.defaultIfEmpty(Optional.empty())
.map(
functionCallEventOpt -> {
Optional<String> transferToAgent = Optional.empty();
if (functionCallEventOpt.isPresent()) {
Event functionCallEvent = functionCallEventOpt.get();
eventIterables.add(Collections.singleton(functionCallEvent));
transferToAgent = functionCallEvent.actions().transferToAgent();
}
Iterable<Event> combinedEvents = Iterables.concat(eventIterables);
return ResponseProcessingResult.create(
updatedResponse, combinedEvents, transferToAgent);
});

return processorEvents.concatWith(modelEventStream).concatWith(maybeFunctionCallEvent);
});
}

Expand Down Expand Up @@ -374,33 +364,27 @@ private Flowable<Event> runOneStep(InvocationContext context) {
Flowable<Event> restOfFlow =
callLlm(context, llmRequestAfterPreprocess, mutableEventTemplate)
.concatMap(
llmResponse -> {
Single<ResponseProcessingResult> postResultSingle =
postprocess(
context,
mutableEventTemplate,
llmRequestAfterPreprocess,
llmResponse);

return postResultSingle
.doOnSuccess(
ignored -> {
String oldId = mutableEventTemplate.id();
mutableEventTemplate.setId(Event.generateEventId());
logger.debug(
"Updated mutableEventTemplate ID from {} to {} for next"
+ " LlmResponse",
oldId,
mutableEventTemplate.id());
})
.toFlowable();
})
llmResponse ->
postprocess(
context,
mutableEventTemplate,
llmRequestAfterPreprocess,
llmResponse)
.doFinally(
() -> {
String oldId = mutableEventTemplate.id();
mutableEventTemplate.setId(Event.generateEventId());
logger.debug(
"Updated mutableEventTemplate ID from {} to {} for"
+ " next LlmResponse",
oldId,
mutableEventTemplate.id());
}))
.concatMap(
postResult -> {
Flowable<Event> postProcessedEvents =
Flowable.fromIterable(postResult.events());
if (postResult.transferToAgent().isPresent()) {
String agentToTransfer = postResult.transferToAgent().get();
event -> {
Flowable<Event> postProcessedEvents = Flowable.just(event);
if (event.actions().transferToAgent().isPresent()) {
String agentToTransfer = event.actions().transferToAgent().get();
logger.debug("Transferring to agent: {}", agentToTransfer);
BaseAgent rootAgent = context.agent().rootAgent();
BaseAgent nextAgent = rootAgent.findAgent(agentToTransfer);
Expand Down Expand Up @@ -569,7 +553,7 @@ public void onError(Throwable e) {
Flowable<Event> receiveFlow =
connection
.receive()
.flatMapSingle(
.flatMap(
llmResponse -> {
Event baseEventForThisLlmResponse =
liveEventBuilderTemplate.id(Event.generateEventId()).build();
Expand All @@ -580,15 +564,15 @@ public void onError(Throwable e) {
llmResponse);
})
.flatMap(
postResult -> {
Flowable<Event> events = Flowable.fromIterable(postResult.events());
if (postResult.transferToAgent().isPresent()) {
event -> {
Flowable<Event> events = Flowable.just(event);
if (event.actions().transferToAgent().isPresent()) {
BaseAgent rootAgent = invocationContext.agent().rootAgent();
BaseAgent nextAgent =
rootAgent.findAgent(postResult.transferToAgent().get());
rootAgent.findAgent(event.actions().transferToAgent().get());
if (nextAgent == null) {
throw new IllegalStateException(
"Agent not found: " + postResult.transferToAgent().get());
"Agent not found: " + event.actions().transferToAgent().get());
}
Flowable<Event> nextAgentEvents =
nextAgent.runLive(invocationContext);
Expand Down