Skip to content

Commit e1df2ab

Browse files
Roland Kakonyirolandkakonyi
authored andcommitted
Fix Vertex session user IDs
1 parent 6bae658 commit e1df2ab

2 files changed

Lines changed: 29 additions & 1 deletion

File tree

core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private ListSessionsResponse parseListSessionsResponse(
148148
Session session =
149149
Session.builder(sessionId)
150150
.appName(appName)
151-
.userId(userId)
151+
.userId((String) apiSession.get("userId"))
152152
.state(
153153
apiSession.get("sessionState") == null
154154
? new ConcurrentHashMap<>()

core/src/test/java/com/google/adk/sessions/VertexAiSessionServiceTest.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,34 @@ public void listSessions_success() {
279279
assertThat(sessionsList).hasSize(2);
280280
ImmutableList<String> ids = sessionsList.stream().map(Session::id).collect(toImmutableList());
281281
assertThat(ids).containsExactly("1", "2");
282+
ImmutableList<String> userIds =
283+
sessionsList.stream().map(Session::userId).collect(toImmutableList());
284+
assertThat(userIds).containsExactly("user", "user");
285+
}
286+
287+
@Test
288+
public void listSessions_usesResponseUserId() throws Exception {
289+
when(mockApiClient.request(
290+
"GET", "reasoningEngines/123/sessions?filter=user_id%3D%22user1%22", ""))
291+
.thenAnswer(
292+
new MockApiAnswer(
293+
"""
294+
{
295+
"sessions": [
296+
{
297+
"name": "projects/test-project/locations/test-location/reasoningEngines/123/sessions/3",
298+
"userId": "user2",
299+
"updateTime": "2024-12-14T12:12:12.123456Z"
300+
}
301+
]
302+
}\
303+
"""));
304+
305+
ListSessionsResponse sessions =
306+
vertexAiSessionService.listSessions("123", "user1").blockingGet();
307+
308+
assertThat(sessions.sessions()).hasSize(1);
309+
assertThat(sessions.sessions().get(0).userId()).isEqualTo("user2");
282310
}
283311

284312
@Test

0 commit comments

Comments
 (0)