Skip to content

fix: Runner now includes Singles from appendEvent in the Rx graph #260

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
Jul 11, 2025
+12 −5
Merged

fix: Runner now includes Singles from appendEvent in the Rx graph #260

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
17 changes: 12 additions & 5 deletions core/src/main/java/com/google/adk/runner/Runner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.core.Completable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -83,7 +84,7 @@ public BaseSessionService sessionService() {
*
* @throws IllegalArgumentException if message has no parts.
*/
private void appendNewMessageToSession(
private Completable appendNewMessageToSession(
Session session,
Content newMessage,
InvocationContext invocationContext,
Expand Down Expand Up @@ -123,7 +124,7 @@ private void appendNewMessageToSession(
.author("user")
.content(Optional.of(newMessage))
.build();
this.sessionService.appendEvent(session, event);
return this.sessionService.appendEvent(session, event).ignoreElement();
}

/**
Expand Down Expand Up @@ -190,14 +191,20 @@ public Flowable<Event> runAsync(Session session, Content newMessage, RunConfig r
newMessage,
runConfig);

Completable newMessageCompletable = Completable.complete();
if (newMessage != null) {
appendNewMessageToSession(
sess, newMessage, invocationContext, runConfig.saveInputBlobsAsArtifacts());
newMessageCompletable =
appendNewMessageToSession(
sess,
newMessage,
invocationContext,
runConfig.saveInputBlobsAsArtifacts());
}

invocationContext.agent(this.findAgentToRun(sess, rootAgent));
Flowable<Event> events = invocationContext.agent().runAsync(invocationContext);
return events.doOnNext(event -> this.sessionService.appendEvent(sess, event));
return newMessageCompletable.andThen(
events.concatMapSingle(event -> this.sessionService.appendEvent(sess, event)));
})
.doOnError(
throwable -> {
Expand Down