Skip to content

fix: InMemorySessionService mergeWithGlobalState not called in appendEvent #563

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 31, 2025
Merged

fix: InMemorySessionService mergeWithGlobalState not called in appendEvent #563

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions core/src/main/java/com/google/adk/sessions/InMemorySessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ public Single<Event> appendEvent(Session session, Event event) {
.computeIfAbsent(appName, k -> new ConcurrentHashMap<>())
.computeIfAbsent(userId, k -> new ConcurrentHashMap<>())
.put(userStateKey, value);
} else {
session.state().put(key, value);
}
});
}
Expand All @@ -265,6 +267,8 @@ public Single<Event> appendEvent(Session session, Event event) {
.getOrDefault(userId, new ConcurrentHashMap<>())
.put(sessionId, session);

mergeWithGlobalState(appName, userId, session);

return Single.just(event);
}

Expand Down
44 changes: 24 additions & 20 deletions core/src/test/java/com/google/adk/sessions/InMemorySessionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,32 +107,36 @@ public void lifecycle_deleteSession() {
}

@Test
public void appendEvent_withStateDelta_mutatesStateCorrectly() {
ConcurrentMap<String, Object> startingState1 = new ConcurrentHashMap<>();
startingState1.put("key_to_be_removed", "value_to_be_removed");
ConcurrentMap<String, Object> startingState2 = new ConcurrentHashMap<>();
startingState2.put("key_to_be_removed", "value_to_be_removed");

ConcurrentMap<String, Object> stateDelta = new ConcurrentHashMap<>();
State expectedFinalState = new State(startingState1, stateDelta);
expectedFinalState.remove("key_to_be_removed");
expectedFinalState.put("new_key", "new_value");

public void appendEvent_updatesSessionState() {
InMemorySessionService sessionService = new InMemorySessionService();
Session session =
sessionService
.createSession("app-name", "user-id", startingState2, /* sessionId= */ null)
.createSession("app", "user", new ConcurrentHashMap<>(), "session1")
.blockingGet();

var unused =
ConcurrentMap<String, Object> stateDelta = new ConcurrentHashMap<>();
stateDelta.put("sessionKey", "sessionValue");
stateDelta.put("_app_appKey", "appValue");
stateDelta.put("_user_userKey", "userValue");

Event event =
Event.builder().actions(EventActions.builder().stateDelta(stateDelta).build()).build();

var unused = sessionService.appendEvent(session, event).blockingGet();

// After appendEvent, session state in memory should contain session-specific state from delta
// and merged global state.
assertThat(session.state()).containsEntry("sessionKey", "sessionValue");
assertThat(session.state()).containsEntry("_app_appKey", "appValue");
assertThat(session.state()).containsEntry("_user_userKey", "userValue");

// getSession should return session with merged state.
Session retrievedSession =
sessionService
.appendEvent(
session,
Event.builder()
.actions(EventActions.builder().stateDelta(stateDelta).build())
.build())
.getSession(session.appName(), session.userId(), session.id(), Optional.empty())
.blockingGet();

assertThat(session.state().entrySet()).containsExactlyElementsIn(expectedFinalState.entrySet());
assertThat(retrievedSession.state()).containsEntry("sessionKey", "sessionValue");
assertThat(retrievedSession.state()).containsEntry("_app_appKey", "appValue");
assertThat(retrievedSession.state()).containsEntry("_user_userKey", "userValue");
}
}