From 1c16b5faeb1fa68644a5b2d8d8f238b8bc2a155d Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Tue, 26 Aug 2025 19:07:52 +0300 Subject: [PATCH 01/21] returned session id and used it in evals. --- .../adk/evaluation/evaluation_generator.py | 18 +++++++++++++++--- .../adk/evaluation/local_eval_service.py | 3 ++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index e9c7dc5436e..d78a043457d 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -32,6 +32,7 @@ from ..memory.in_memory_memory_service import InMemoryMemoryService from ..runners import Runner from ..sessions.base_session_service import BaseSessionService +from ..sessions.vertex_ai_session_service import VertexAiSessionService # TODO: some users won't have this dependency. from ..sessions.in_memory_session_service import InMemorySessionService from ..sessions.session import Session from ..utils.context_utils import Aclosing @@ -207,14 +208,25 @@ async def _generate_inferences_from_root_agent( initial_session.app_name if initial_session else "EvaluationGenerator" ) user_id = initial_session.user_id if initial_session else "test_user_id" - session_id = session_id if session_id else str(uuid.uuid4()) - _ = await session_service.create_session( + if isinstance(session_service, VertexAiSessionService): + vertex_session = await session_service.create_session( + app_name=app_name, + user_id=user_id, + state=initial_session.state if initial_session else {} + ) + if hasattr(vertex_session, "id"): + session_id = vertex_session.id + else: + raise ValueError("Session ID was not returned by the Vertex AI session service during session creation.") + else: + session_id = session_id if session_id else str(uuid.uuid4()) + _ = await session_service.create_session( app_name=app_name, user_id=user_id, state=initial_session.state if initial_session else {}, session_id=session_id, - ) + ) if not artifact_service: artifact_service = InMemoryArtifactService() diff --git a/src/google/adk/evaluation/local_eval_service.py b/src/google/adk/evaluation/local_eval_service.py index 806a8d690d5..2a76cae9534 100644 --- a/src/google/adk/evaluation/local_eval_service.py +++ b/src/google/adk/evaluation/local_eval_service.py @@ -403,7 +403,7 @@ async def _perform_inference_single_eval_item( ) try: - inferences = ( + inferences, session_id = ( await EvaluationGenerator._generate_inferences_from_root_agent( root_agent=root_agent, user_simulator=self._user_simulator_provider.provide(eval_case), @@ -416,6 +416,7 @@ async def _perform_inference_single_eval_item( ) inference_result.inferences = inferences + inference_result.session_id = session_id # Relevant for Vertex AI Session Service and other services that use ad-hoc session id. inference_result.status = InferenceStatus.SUCCESS return inference_result From 795a1872b21b4ebba9b14ace2396dded29df2184 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 30 Aug 2025 18:03:02 +0300 Subject: [PATCH 02/21] added catching an import error on VertexAiSessionService --- src/google/adk/evaluation/evaluation_generator.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index d78a043457d..1963a68939a 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -32,7 +32,10 @@ from ..memory.in_memory_memory_service import InMemoryMemoryService from ..runners import Runner from ..sessions.base_session_service import BaseSessionService -from ..sessions.vertex_ai_session_service import VertexAiSessionService # TODO: some users won't have this dependency. +try: + from ..sessions.vertex_ai_session_service import VertexAiSessionService # TODO: some users won't have this dependency. +except ImportError: + VertexAiSessionService = None from ..sessions.in_memory_session_service import InMemorySessionService from ..sessions.session import Session from ..utils.context_utils import Aclosing @@ -209,7 +212,7 @@ async def _generate_inferences_from_root_agent( ) user_id = initial_session.user_id if initial_session else "test_user_id" - if isinstance(session_service, VertexAiSessionService): + if VertexAiSessionService and isinstance(session_service, VertexAiSessionService): vertex_session = await session_service.create_session( app_name=app_name, user_id=user_id, From f41d17e07a4c0e2d0da201a1b54a8ef639458bd7 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 30 Aug 2025 18:13:09 +0300 Subject: [PATCH 03/21] erased the todo in trying to import vertex after fixing the todo --- src/google/adk/evaluation/evaluation_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index 1963a68939a..051757b786f 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -33,7 +33,7 @@ from ..runners import Runner from ..sessions.base_session_service import BaseSessionService try: - from ..sessions.vertex_ai_session_service import VertexAiSessionService # TODO: some users won't have this dependency. + from ..sessions.vertex_ai_session_service import VertexAiSessionService except ImportError: VertexAiSessionService = None from ..sessions.in_memory_session_service import InMemorySessionService From df5cb0a534abcbe92a595ad3859f5cdf484edf0a Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 30 Aug 2025 18:21:59 +0300 Subject: [PATCH 04/21] the session_id is used if it not null or the vertex session service is not used. From 7d1c90f2aa6aa6cb193897c57e32ff97df11438a Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 30 Aug 2025 18:41:38 +0300 Subject: [PATCH 05/21] fixing the following the comment in the PR - The create_session method is type-hinted to return a Session object, which should have an id attribute according to its definition. Using hasattr to check for the attribute is less idiomatic and can mask underlying type issues. It's better to directly access vertex_session.id and rely on the type contract. If an implementation of create_session violates this contract, an AttributeError will be raised, which provides a clearer and faster failure signal. --- src/google/adk/evaluation/evaluation_generator.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index 051757b786f..ae0abbda4b4 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -218,10 +218,7 @@ async def _generate_inferences_from_root_agent( user_id=user_id, state=initial_session.state if initial_session else {} ) - if hasattr(vertex_session, "id"): - session_id = vertex_session.id - else: - raise ValueError("Session ID was not returned by the Vertex AI session service during session creation.") + session_id = vertex_session.id else: session_id = session_id if session_id else str(uuid.uuid4()) _ = await session_service.create_session( From 2dacd2ae7c38722e078d818ea11d578b4fe54eaf Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 6 Sep 2025 23:41:58 +0300 Subject: [PATCH 06/21] added added BaseSessionIdSupplier and PreCreatedSessionIdSupplier --- .../adk/sessions/base_session_id_supplier.py | 11 ++++++++++ .../pre_created_session_id_supplier.py | 20 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 src/google/adk/sessions/base_session_id_supplier.py create mode 100644 src/google/adk/sessions/pre_created_session_id_supplier.py diff --git a/src/google/adk/sessions/base_session_id_supplier.py b/src/google/adk/sessions/base_session_id_supplier.py new file mode 100644 index 00000000000..951c07d906a --- /dev/null +++ b/src/google/adk/sessions/base_session_id_supplier.py @@ -0,0 +1,11 @@ +from abc import ABC, abstractmethod +from typing import Any, Optional + + +class BaseSessionIdSupplier(ABC): + @abstractmethod + async def get_session_id(self, app_name: str, user_id: str, initial_state: Optional[dict[str, Any]] = None) -> str: + """ + Get a session id for a given app name and user id. + """ + pass diff --git a/src/google/adk/sessions/pre_created_session_id_supplier.py b/src/google/adk/sessions/pre_created_session_id_supplier.py new file mode 100644 index 00000000000..75cc09b99f1 --- /dev/null +++ b/src/google/adk/sessions/pre_created_session_id_supplier.py @@ -0,0 +1,20 @@ +from typing import Optional +from typing import Any +from typing_extensions import override +from google.adk.sessions.base_session_id_supplier import BaseSessionIdSupplier +from google.adk.sessions.base_session_service import BaseSessionService + + +class PreCreatedSessionIdSupplier(BaseSessionIdSupplier): + def __init__(self, session_service: BaseSessionService): + self.session_service = session_service + + @override + async def get_session_id(self, app_name: Optional[str], user_id: Optional[str], initial_state: Optional[dict[str, Any]] = None) -> str: + # TODO: check the signature of the func, not sure that's the case + created_session = await self.session_service.create_session( + app_name=app_name, + user_id=user_id, + state=initial_state + ) + return created_session.id \ No newline at end of file From c031ec6a25aba7884b1a7e622f82c3e27ad7b968 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 6 Sep 2025 23:44:33 +0300 Subject: [PATCH 07/21] reverted VertexAiSessionService specific logic, upgraded session_id_supplier to use the SessionIdSupplier logic --- .../adk/evaluation/evaluation_generator.py | 70 +++++++++++++++---- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index ae0abbda4b4..d0510e61f8d 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -32,11 +32,9 @@ from ..memory.in_memory_memory_service import InMemoryMemoryService from ..runners import Runner from ..sessions.base_session_service import BaseSessionService -try: - from ..sessions.vertex_ai_session_service import VertexAiSessionService -except ImportError: - VertexAiSessionService = None from ..sessions.in_memory_session_service import InMemorySessionService +from ..sessions.base_session_id_supplier import BaseSessionIdSupplier +from ..sessions.pre_created_session_id_supplier import PreCreatedSessionIdSupplier from ..sessions.session import Session from ..utils.context_utils import Aclosing from ._retry_options_utils import EnsureRetryOptionsPlugin @@ -196,6 +194,7 @@ async def _generate_inferences_from_root_agent( initial_session: Optional[SessionInput] = None, session_id: Optional[str] = None, session_service: Optional[BaseSessionService] = None, + session_id_supplier: Optional[BaseSessionIdSupplier] = None, artifact_service: Optional[BaseArtifactService] = None, memory_service: Optional[BaseMemoryService] = None, ) -> list[Invocation]: @@ -210,23 +209,64 @@ async def _generate_inferences_from_root_agent( app_name = ( initial_session.app_name if initial_session else "EvaluationGenerator" ) - user_id = initial_session.user_id if initial_session else "test_user_id" + user_id = initial_session.user_id if initial_session else None # TODO: remove this "test_user_id" - if VertexAiSessionService and isinstance(session_service, VertexAiSessionService): - vertex_session = await session_service.create_session( + # if session_is is provided, check if the session exists + if session_id: + session = await session_service.get_session( + app_name=app_name, + user_id=user_id, + session_id=session_id, + ) + if session: + # session exists, do nothing + pass + else: + # session does not exist, create a new session + # TODO: this won't work with VertexAiSessionService + session = await session_service.create_session( app_name=app_name, user_id=user_id, - state=initial_session.state if initial_session else {} - ) - session_id = vertex_session.id + state=initial_session.state if initial_session else {}, + session_id=session_id, + ) + + session_id = session.id else: - session_id = session_id if session_id else str(uuid.uuid4()) + # session_id is not provided, create a new session id from the provider + if not session_id_supplier: + session_id_supplier_service = PreCreatedSessionIdSupplier(session_service) + + session_id = await session_id_supplier_service.get_session_id( + app_name=app_name, + user_id=user_id, + initial_state=initial_session.state if initial_session else {} + ) + _ = await session_service.create_session( - app_name=app_name, - user_id=user_id, - state=initial_session.state if initial_session else {}, - session_id=session_id, + app_name=app_name, + user_id=user_id, + state=initial_session.state if initial_session else {}, + session_id=session_id ) + + + # TODO: remove this after the changes + # if VertexAiSessionService and isinstance(session_service, VertexAiSessionService): + # vertex_session = await session_service.create_session( + # app_name=app_name, + # user_id=user_id, + # state=initial_session.state if initial_session else {} + # ) + # session_id = vertex_session.id + # else: + # session_id = session_id if session_id else str(uuid.uuid4()) + # _ = await session_service.create_session( + # app_name=app_name, + # user_id=user_id, + # state=initial_session.state if initial_session else {}, + # session_id=session_id, + # ) if not artifact_service: artifact_service = InMemoryArtifactService() From 6556ba132361ad406ef848b60ec85297fcb0617e Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 6 Sep 2025 23:45:02 +0300 Subject: [PATCH 08/21] added SessionIdSupplier logic to local eval service --- .../adk/evaluation/local_eval_service.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/google/adk/evaluation/local_eval_service.py b/src/google/adk/evaluation/local_eval_service.py index 2a76cae9534..8522b52c712 100644 --- a/src/google/adk/evaluation/local_eval_service.py +++ b/src/google/adk/evaluation/local_eval_service.py @@ -31,6 +31,8 @@ from ..memory.base_memory_service import BaseMemoryService from ..sessions.base_session_service import BaseSessionService from ..sessions.in_memory_session_service import InMemorySessionService +from ..sessions.base_session_id_supplier import BaseSessionIdSupplier +from ..sessions.pre_created_session_id_supplier import PreCreatedSessionIdSupplier from ..utils.feature_decorator import experimental from .base_eval_service import BaseEvalService from .base_eval_service import EvaluateConfig @@ -74,11 +76,9 @@ def __init__( eval_sets_manager: EvalSetsManager, metric_evaluator_registry: Optional[MetricEvaluatorRegistry] = None, session_service: Optional[BaseSessionService] = None, + session_id_supplier: BaseSessionIdSupplier = PreCreatedSessionIdSupplier(InMemorySessionService()), artifact_service: Optional[BaseArtifactService] = None, eval_set_results_manager: Optional[EvalSetResultsManager] = None, - session_id_supplier: Callable[[], str] = _get_session_id, - user_simulator_provider: UserSimulatorProvider = UserSimulatorProvider(), - memory_service: Optional[BaseMemoryService] = None, ): self._root_agent = root_agent self._eval_sets_manager = eval_sets_manager @@ -394,7 +394,13 @@ async def _perform_inference_single_eval_item( root_agent: BaseAgent, ) -> InferenceResult: initial_session = eval_case.session_input - session_id = self._session_id_supplier() + + session_id = await self._session_id_supplier.get_session_id( + app_name=app_name, + user_id=initial_session.user_id if initial_session else "test_user_id", + initial_state=initial_session.state if initial_session else {} + ) + inference_result = InferenceResult( app_name=app_name, eval_set_id=eval_set_id, @@ -403,7 +409,7 @@ async def _perform_inference_single_eval_item( ) try: - inferences, session_id = ( + inferences = ( await EvaluationGenerator._generate_inferences_from_root_agent( root_agent=root_agent, user_simulator=self._user_simulator_provider.provide(eval_case), @@ -416,7 +422,8 @@ async def _perform_inference_single_eval_item( ) inference_result.inferences = inferences - inference_result.session_id = session_id # Relevant for Vertex AI Session Service and other services that use ad-hoc session id. + # TODO: remove this after the changes + # inference_result.session_id = session_id # Relevant for Vertex AI Session Service and other services that use ad-hoc session id. inference_result.status = InferenceStatus.SUCCESS return inference_result From 286de8d00b016cfe4b4ab2708467e91ed4be95a3 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sun, 7 Sep 2025 00:55:14 +0300 Subject: [PATCH 09/21] fixed bug in session id assignment and removed session id from being returned in _generate_inferences_from_root_agent --- src/google/adk/evaluation/evaluation_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index d0510e61f8d..59615af5e77 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -231,7 +231,7 @@ async def _generate_inferences_from_root_agent( session_id=session_id, ) - session_id = session.id + session_id = session['id'] else: # session_id is not provided, create a new session id from the provider if not session_id_supplier: From a23ceb48e5a54a09e220dc0713507f025d89eae2 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sun, 7 Sep 2025 20:57:29 +0300 Subject: [PATCH 10/21] removed reduncant created session id --- src/google/adk/evaluation/local_eval_service.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/google/adk/evaluation/local_eval_service.py b/src/google/adk/evaluation/local_eval_service.py index 8522b52c712..39eac3d9e67 100644 --- a/src/google/adk/evaluation/local_eval_service.py +++ b/src/google/adk/evaluation/local_eval_service.py @@ -62,10 +62,6 @@ EVAL_SESSION_ID_PREFIX = '___eval___session___' -def _get_session_id() -> str: - return f'{EVAL_SESSION_ID_PREFIX}{str(uuid.uuid4())}' - - @experimental class LocalEvalService(BaseEvalService): """An implementation of BaseEvalService, that runs the evals locally.""" From f800dbc2c7ee6270c3c14edf1a278c089946423b Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sun, 7 Sep 2025 21:00:47 +0300 Subject: [PATCH 11/21] added a test_user_id in case it's not given instead of none and added a temporary todo to check if this is in fact required --- src/google/adk/evaluation/evaluation_generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index 59615af5e77..9fd4d43ab56 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -209,7 +209,7 @@ async def _generate_inferences_from_root_agent( app_name = ( initial_session.app_name if initial_session else "EvaluationGenerator" ) - user_id = initial_session.user_id if initial_session else None # TODO: remove this "test_user_id" + user_id = initial_session.user_id if initial_session else 'test_user_id' # TODO: remove this "test_user_id" # if session_is is provided, check if the session exists if session_id: @@ -231,7 +231,7 @@ async def _generate_inferences_from_root_agent( session_id=session_id, ) - session_id = session['id'] + session_id = session.id # TODO: some other service didn't have this.. else: # session_id is not provided, create a new session id from the provider if not session_id_supplier: From 4110a134c4e1043af881e74167ed1a77d7437d91 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 13:44:51 +0300 Subject: [PATCH 12/21] upgraded test to return the correct session structure returned by the create_session abstract interface instead of a JSON From e539232cb62fda9b187c2759b770f6d7760f3216 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 13:45:53 +0300 Subject: [PATCH 13/21] added BaseSessionIdSupplier to the LocalEvalService --- src/google/adk/evaluation/local_eval_service.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/google/adk/evaluation/local_eval_service.py b/src/google/adk/evaluation/local_eval_service.py index 39eac3d9e67..94d575df66c 100644 --- a/src/google/adk/evaluation/local_eval_service.py +++ b/src/google/adk/evaluation/local_eval_service.py @@ -72,7 +72,7 @@ def __init__( eval_sets_manager: EvalSetsManager, metric_evaluator_registry: Optional[MetricEvaluatorRegistry] = None, session_service: Optional[BaseSessionService] = None, - session_id_supplier: BaseSessionIdSupplier = PreCreatedSessionIdSupplier(InMemorySessionService()), + session_id_supplier: BaseSessionIdSupplier = None, artifact_service: Optional[BaseArtifactService] = None, eval_set_results_manager: Optional[EvalSetResultsManager] = None, ): @@ -83,6 +83,7 @@ def __init__( ) session_service = session_service or InMemorySessionService() artifact_service = artifact_service or InMemoryArtifactService() + session_id_supplier = session_id_supplier or PreCreatedSessionIdSupplier(session_service) self._metric_evaluator_registry = metric_evaluator_registry self._session_service = session_service self._artifact_service = artifact_service From 108c58b6bc7b1ad65d555a0ec006e1f9281a022f Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 13:47:51 +0300 Subject: [PATCH 14/21] upgraded documentation to conform to the session interface instead of session as a dictionary --- llms-full.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llms-full.txt b/llms-full.txt index 4c744512e40..619223a71f1 100644 --- a/llms-full.txt +++ b/llms-full.txt @@ -5847,18 +5847,18 @@ remote_app.list_sessions(user_id="u_456") #### Get a specific session (remote) ```py -remote_app.get_session(user_id="u_456", session_id=remote_session["id"]) +remote_app.get_session(user_id="u_456", session_id=remote_session.id) ``` !!!note - While using your agent locally, session ID is stored in `session.id`, when using your agent remotely on Agent Engine, session ID is stored in `remote_session["id"]`. + While using your agent locally, session ID is stored in `session.id`, when using your agent remotely on Agent Engine, session ID is stored in `remote_session.id`. #### Send queries to your agent (remote) ```py for event in remote_app.stream_query( user_id="u_456", - session_id=remote_session["id"], + session_id=remote_session.id, message="whats the weather in new york", ): print(event) From b1d0fd9b0471ff1a19e6ac0cb44834d043bc2336 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 13:49:34 +0300 Subject: [PATCH 15/21] removed the old session as dict From 75d3b639dfeedf3e7742ddc6b6cd87ba35f8e679 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 18:49:28 +0300 Subject: [PATCH 16/21] reverted _generate_inferences_from_root_agento again only return invocations as per CR From 133a9e8fdcda0dde38a5eff6c176abf8c686bf66 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 18:58:07 +0300 Subject: [PATCH 17/21] removed TODOs that were fixed and cleaned commented out code --- .../adk/evaluation/evaluation_generator.py | 21 +------------------ .../adk/evaluation/local_eval_service.py | 2 -- .../pre_created_session_id_supplier.py | 1 - 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index 9fd4d43ab56..6066f6a2fa6 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -209,7 +209,7 @@ async def _generate_inferences_from_root_agent( app_name = ( initial_session.app_name if initial_session else "EvaluationGenerator" ) - user_id = initial_session.user_id if initial_session else 'test_user_id' # TODO: remove this "test_user_id" + user_id = initial_session.user_id if initial_session else 'test_user_id' # if session_is is provided, check if the session exists if session_id: @@ -223,7 +223,6 @@ async def _generate_inferences_from_root_agent( pass else: # session does not exist, create a new session - # TODO: this won't work with VertexAiSessionService session = await session_service.create_session( app_name=app_name, user_id=user_id, @@ -249,24 +248,6 @@ async def _generate_inferences_from_root_agent( state=initial_session.state if initial_session else {}, session_id=session_id ) - - - # TODO: remove this after the changes - # if VertexAiSessionService and isinstance(session_service, VertexAiSessionService): - # vertex_session = await session_service.create_session( - # app_name=app_name, - # user_id=user_id, - # state=initial_session.state if initial_session else {} - # ) - # session_id = vertex_session.id - # else: - # session_id = session_id if session_id else str(uuid.uuid4()) - # _ = await session_service.create_session( - # app_name=app_name, - # user_id=user_id, - # state=initial_session.state if initial_session else {}, - # session_id=session_id, - # ) if not artifact_service: artifact_service = InMemoryArtifactService() diff --git a/src/google/adk/evaluation/local_eval_service.py b/src/google/adk/evaluation/local_eval_service.py index 94d575df66c..842671984fc 100644 --- a/src/google/adk/evaluation/local_eval_service.py +++ b/src/google/adk/evaluation/local_eval_service.py @@ -419,8 +419,6 @@ async def _perform_inference_single_eval_item( ) inference_result.inferences = inferences - # TODO: remove this after the changes - # inference_result.session_id = session_id # Relevant for Vertex AI Session Service and other services that use ad-hoc session id. inference_result.status = InferenceStatus.SUCCESS return inference_result diff --git a/src/google/adk/sessions/pre_created_session_id_supplier.py b/src/google/adk/sessions/pre_created_session_id_supplier.py index 75cc09b99f1..bc0f4a829ef 100644 --- a/src/google/adk/sessions/pre_created_session_id_supplier.py +++ b/src/google/adk/sessions/pre_created_session_id_supplier.py @@ -11,7 +11,6 @@ def __init__(self, session_service: BaseSessionService): @override async def get_session_id(self, app_name: Optional[str], user_id: Optional[str], initial_state: Optional[dict[str, Any]] = None) -> str: - # TODO: check the signature of the func, not sure that's the case created_session = await self.session_service.create_session( app_name=app_name, user_id=user_id, From 080ebef981bc7613c62fb728fffae5eddf45d5b6 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 19:28:18 +0300 Subject: [PATCH 18/21] changed single quotes to double quotes --- src/google/adk/evaluation/evaluation_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index 6066f6a2fa6..2a13abdde81 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -209,7 +209,7 @@ async def _generate_inferences_from_root_agent( app_name = ( initial_session.app_name if initial_session else "EvaluationGenerator" ) - user_id = initial_session.user_id if initial_session else 'test_user_id' + user_id = initial_session.user_id if initial_session else "test_user_id" # if session_is is provided, check if the session exists if session_id: From df9f758d576cefde48671687e7c65489858be81f Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 19:36:39 +0300 Subject: [PATCH 19/21] reverted the session_id return as part of _process_query From 2f575ae5a7594f30b81d6db8fa8fe37900ae3333 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Sat, 20 Sep 2025 19:46:42 +0300 Subject: [PATCH 20/21] reverted the changes to llms-full.txt --- llms-full.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llms-full.txt b/llms-full.txt index 619223a71f1..4c744512e40 100644 --- a/llms-full.txt +++ b/llms-full.txt @@ -5847,18 +5847,18 @@ remote_app.list_sessions(user_id="u_456") #### Get a specific session (remote) ```py -remote_app.get_session(user_id="u_456", session_id=remote_session.id) +remote_app.get_session(user_id="u_456", session_id=remote_session["id"]) ``` !!!note - While using your agent locally, session ID is stored in `session.id`, when using your agent remotely on Agent Engine, session ID is stored in `remote_session.id`. + While using your agent locally, session ID is stored in `session.id`, when using your agent remotely on Agent Engine, session ID is stored in `remote_session["id"]`. #### Send queries to your agent (remote) ```py for event in remote_app.stream_query( user_id="u_456", - session_id=remote_session.id, + session_id=remote_session["id"], message="whats the weather in new york", ): print(event) From 3991859815b523788c87da377adb6525bd674b71 Mon Sep 17 00:00:00 2001 From: Shahar Katz Date: Thu, 20 Nov 2025 12:47:20 +0200 Subject: [PATCH 21/21] aligned with main --- src/google/adk/evaluation/local_eval_service.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/google/adk/evaluation/local_eval_service.py b/src/google/adk/evaluation/local_eval_service.py index 842671984fc..18e0381c84c 100644 --- a/src/google/adk/evaluation/local_eval_service.py +++ b/src/google/adk/evaluation/local_eval_service.py @@ -75,6 +75,8 @@ def __init__( session_id_supplier: BaseSessionIdSupplier = None, artifact_service: Optional[BaseArtifactService] = None, eval_set_results_manager: Optional[EvalSetResultsManager] = None, + user_simulator_provider: Optional[UserSimulatorProvider] = UserSimulatorProvider(), + memory_service: Optional[BaseMemoryService] = None, ): self._root_agent = root_agent self._eval_sets_manager = eval_sets_manager