Skip to content

Commit 5a7ab20

Browse files
google-genai-botcopybara-github
authored andcommitted
fix: reverting incorrect fix handling appendEvent singles
PiperOrigin-RevId: 784558207
1 parent e7cc6f5 commit 5a7ab20

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

core/src/main/java/com/google/adk/runner/Runner.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import io.reactivex.rxjava3.core.Flowable;
3939
import io.reactivex.rxjava3.core.Maybe;
4040
import io.reactivex.rxjava3.core.Single;
41-
import io.reactivex.rxjava3.core.Completable;
4241
import java.util.ArrayList;
4342
import java.util.Collections;
4443
import java.util.List;
@@ -84,7 +83,7 @@ public BaseSessionService sessionService() {
8483
*
8584
* @throws IllegalArgumentException if message has no parts.
8685
*/
87-
private Completable appendNewMessageToSession(
86+
private void appendNewMessageToSession(
8887
Session session,
8988
Content newMessage,
9089
InvocationContext invocationContext,
@@ -124,7 +123,7 @@ private Completable appendNewMessageToSession(
124123
.author("user")
125124
.content(Optional.of(newMessage))
126125
.build();
127-
return this.sessionService.appendEvent(session, event).ignoreElement();
126+
this.sessionService.appendEvent(session, event);
128127
}
129128

130129
/**
@@ -191,20 +190,14 @@ public Flowable<Event> runAsync(Session session, Content newMessage, RunConfig r
191190
newMessage,
192191
runConfig);
193192

194-
Completable newMessageCompletable = Completable.complete();
195193
if (newMessage != null) {
196-
newMessageCompletable =
197-
appendNewMessageToSession(
198-
sess,
199-
newMessage,
200-
invocationContext,
201-
runConfig.saveInputBlobsAsArtifacts());
194+
appendNewMessageToSession(
195+
sess, newMessage, invocationContext, runConfig.saveInputBlobsAsArtifacts());
202196
}
203197

204198
invocationContext.agent(this.findAgentToRun(sess, rootAgent));
205199
Flowable<Event> events = invocationContext.agent().runAsync(invocationContext);
206-
return newMessageCompletable.andThen(
207-
events.concatMapSingle(event -> this.sessionService.appendEvent(sess, event)));
200+
return events.doOnNext(event -> this.sessionService.appendEvent(sess, event));
208201
})
209202
.doOnError(
210203
throwable -> {

0 commit comments

Comments
 (0)