From 12820aa571210376e7fc12b5be6b7b049edd609c Mon Sep 17 00:00:00 2001 From: Sehlani042 <257166922+Sehlani042@users.noreply.github.com> Date: Fri, 3 Jul 2026 09:41:17 +0800 Subject: [PATCH 1/3] fix(sessions): Order database sessions deterministically DatabaseSessionService.list_sessions previously returned rows without an ORDER BY, so callers using sessions[-1] could receive an older session depending on database heap order. Order rows by create_time with stable primary-key tie breakers so the newest created session is last. Fixes #6272 --- .../adk/sessions/database_session_service.py | 5 ++ .../sessions/test_session_service.py | 46 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/src/google/adk/sessions/database_session_service.py b/src/google/adk/sessions/database_session_service.py index 6c3572b8d66..5264a34fbb2 100644 --- a/src/google/adk/sessions/database_session_service.py +++ b/src/google/adk/sessions/database_session_service.py @@ -663,6 +663,11 @@ async def list_sessions( ) if user_id is not None: stmt = stmt.filter(schema.StorageSession.user_id == user_id) + stmt = stmt.order_by( + schema.StorageSession.create_time.asc(), + schema.StorageSession.user_id.asc(), + schema.StorageSession.id.asc(), + ) result = await sql_session.execute(stmt) results = result.scalars().all() diff --git a/tests/unittests/sessions/test_session_service.py b/tests/unittests/sessions/test_session_service.py index 157e4fb21aa..8763df42179 100644 --- a/tests/unittests/sessions/test_session_service.py +++ b/tests/unittests/sessions/test_session_service.py @@ -35,6 +35,7 @@ import pytest from sqlalchemy import delete from sqlalchemy import text +from sqlalchemy import update from sqlalchemy.ext.asyncio import create_async_engine from sqlalchemy.pool import StaticPool @@ -404,6 +405,51 @@ async def test_create_and_list_sessions(session_service): assert session.state == {'key': 'value' + session.id} +@pytest.mark.asyncio +async def test_database_session_service_list_sessions_orders_by_create_time_then_id(): + """Database list_sessions returns oldest sessions first, with stable ties.""" + service = DatabaseSessionService('sqlite+aiosqlite:///:memory:') + try: + app_name = 'my_app' + user_id = 'test_user' + session_ids = ['newest', 'oldest_b', 'middle', 'oldest_a'] + for session_id in session_ids: + await service.create_session( + app_name=app_name, + user_id=user_id, + session_id=session_id, + ) + + schema = service._get_schema_classes() + create_times = { + 'oldest_a': datetime(2026, 1, 1, tzinfo=timezone.utc), + 'oldest_b': datetime(2026, 1, 1, tzinfo=timezone.utc), + 'middle': datetime(2026, 1, 2, tzinfo=timezone.utc), + 'newest': datetime(2026, 1, 3, tzinfo=timezone.utc), + } + async with service.database_session_factory() as sql_session: + for session_id, create_time in create_times.items(): + await sql_session.execute( + update(schema.StorageSession) + .where(schema.StorageSession.app_name == app_name) + .where(schema.StorageSession.user_id == user_id) + .where(schema.StorageSession.id == session_id) + .values(create_time=create_time) + ) + await sql_session.commit() + + response = await service.list_sessions(app_name=app_name, user_id=user_id) + + assert [session.id for session in response.sessions] == [ + 'oldest_a', + 'oldest_b', + 'middle', + 'newest', + ] + finally: + await service.close() + + @pytest.mark.asyncio async def test_list_sessions_all_users(session_service): app_name = 'my_app' From 2b1cede1cf3eaf1bfacb044bbd068342671b6b27 Mon Sep 17 00:00:00 2001 From: Sehlani042 <257166922+Sehlani042@users.noreply.github.com> Date: Fri, 3 Jul 2026 14:06:03 +0800 Subject: [PATCH 2/3] chore: retrigger checks after CLA From 11fea65f6b02cf5058d0e09ecc978210f3250e8e Mon Sep 17 00:00:00 2001 From: Sehlani042 <257166922+Sehlani042@users.noreply.github.com> Date: Mon, 13 Jul 2026 23:30:39 +0800 Subject: [PATCH 3/3] fix(sessions): order sessions by activity --- .../adk/sessions/database_session_service.py | 2 +- .../sessions/test_session_service.py | 29 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/google/adk/sessions/database_session_service.py b/src/google/adk/sessions/database_session_service.py index 5264a34fbb2..a21bee926d1 100644 --- a/src/google/adk/sessions/database_session_service.py +++ b/src/google/adk/sessions/database_session_service.py @@ -664,7 +664,7 @@ async def list_sessions( if user_id is not None: stmt = stmt.filter(schema.StorageSession.user_id == user_id) stmt = stmt.order_by( - schema.StorageSession.create_time.asc(), + schema.StorageSession.update_time.asc(), schema.StorageSession.user_id.asc(), schema.StorageSession.id.asc(), ) diff --git a/tests/unittests/sessions/test_session_service.py b/tests/unittests/sessions/test_session_service.py index 8763df42179..3a8dfbceea9 100644 --- a/tests/unittests/sessions/test_session_service.py +++ b/tests/unittests/sessions/test_session_service.py @@ -406,13 +406,13 @@ async def test_create_and_list_sessions(session_service): @pytest.mark.asyncio -async def test_database_session_service_list_sessions_orders_by_create_time_then_id(): - """Database list_sessions returns oldest sessions first, with stable ties.""" +async def test_database_session_service_list_sessions_orders_by_update_time_then_id(): + """Database list_sessions returns least-active sessions first, with stable ties.""" service = DatabaseSessionService('sqlite+aiosqlite:///:memory:') try: app_name = 'my_app' user_id = 'test_user' - session_ids = ['newest', 'oldest_b', 'middle', 'oldest_a'] + session_ids = ['orphan', 'active_b', 'middle', 'active_a'] for session_id in session_ids: await service.create_session( app_name=app_name, @@ -422,10 +422,16 @@ async def test_database_session_service_list_sessions_orders_by_create_time_then schema = service._get_schema_classes() create_times = { - 'oldest_a': datetime(2026, 1, 1, tzinfo=timezone.utc), - 'oldest_b': datetime(2026, 1, 1, tzinfo=timezone.utc), + 'active_b': datetime(2026, 1, 1, tzinfo=timezone.utc), 'middle': datetime(2026, 1, 2, tzinfo=timezone.utc), - 'newest': datetime(2026, 1, 3, tzinfo=timezone.utc), + 'active_a': datetime(2026, 1, 3, tzinfo=timezone.utc), + 'orphan': datetime(2026, 1, 4, tzinfo=timezone.utc), + } + update_times = { + 'orphan': datetime(2026, 1, 1, tzinfo=timezone.utc), + 'middle': datetime(2026, 1, 2, tzinfo=timezone.utc), + 'active_a': datetime(2026, 1, 3, tzinfo=timezone.utc), + 'active_b': datetime(2026, 1, 3, tzinfo=timezone.utc), } async with service.database_session_factory() as sql_session: for session_id, create_time in create_times.items(): @@ -434,17 +440,20 @@ async def test_database_session_service_list_sessions_orders_by_create_time_then .where(schema.StorageSession.app_name == app_name) .where(schema.StorageSession.user_id == user_id) .where(schema.StorageSession.id == session_id) - .values(create_time=create_time) + .values( + create_time=create_time, + update_time=update_times[session_id], + ) ) await sql_session.commit() response = await service.list_sessions(app_name=app_name, user_id=user_id) assert [session.id for session in response.sessions] == [ - 'oldest_a', - 'oldest_b', + 'orphan', 'middle', - 'newest', + 'active_a', + 'active_b', ] finally: await service.close()