diff --git a/src/google/adk/evaluation/evaluation_generator.py b/src/google/adk/evaluation/evaluation_generator.py index e9c7dc5436e..2a13abdde81 100644 --- a/src/google/adk/evaluation/evaluation_generator.py +++ b/src/google/adk/evaluation/evaluation_generator.py @@ -33,6 +33,8 @@ from ..runners import Runner 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 ..sessions.session import Session from ..utils.context_utils import Aclosing from ._retry_options_utils import EnsureRetryOptionsPlugin @@ -192,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]: @@ -207,14 +210,44 @@ 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 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, - state=initial_session.state if initial_session else {}, session_id=session_id, - ) + ) + if session: + # session exists, do nothing + pass + else: + # session does not exist, create a new session + session = 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, + ) + + 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: + 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 + ) 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..18e0381c84c 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 @@ -60,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.""" @@ -74,10 +72,10 @@ def __init__( eval_sets_manager: EvalSetsManager, metric_evaluator_registry: Optional[MetricEvaluatorRegistry] = None, session_service: Optional[BaseSessionService] = None, + session_id_supplier: BaseSessionIdSupplier = None, 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(), + user_simulator_provider: Optional[UserSimulatorProvider] = UserSimulatorProvider(), memory_service: Optional[BaseMemoryService] = None, ): self._root_agent = root_agent @@ -87,6 +85,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 @@ -394,7 +393,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, 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..bc0f4a829ef --- /dev/null +++ b/src/google/adk/sessions/pre_created_session_id_supplier.py @@ -0,0 +1,19 @@ +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: + 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