google-adk 1.2.1__py3-none-any.whl → 1.4.1__py3-none-any.whl

google/adk/evaluation/local_eval_sets_manager.py

@@ -27,7 +27,11 @@ from google.genai import types as genai_types
 from pydantic import ValidationError
 from typing_extensions import override
 
-from ..errors.not_found_error import NotFoundError
+from ._eval_sets_manager_utils import add_eval_case_to_eval_set
+from ._eval_sets_manager_utils import delete_eval_case_from_eval_set
+from ._eval_sets_manager_utils import get_eval_case_from_eval_set
+from ._eval_sets_manager_utils import get_eval_set_from_app_and_id
+from ._eval_sets_manager_utils import update_eval_case_in_eval_set
 from .eval_case import EvalCase
 from .eval_case import IntermediateData
 from .eval_case import Invocation
@@ -218,7 +222,7 @@ class LocalEvalSetsManager(EvalSetsManager):
           eval_cases=[],
           creation_timestamp=time.time(),
       )
-      self._write_eval_set(new_eval_set_path, new_eval_set)
+      self._write_eval_set_to_path(new_eval_set_path, new_eval_set)
 
   @override
   def list_eval_sets(self, app_name: str) -> list[str]:
@@ -233,51 +237,27 @@ class LocalEvalSetsManager(EvalSetsManager):
 
     return sorted(eval_sets)
 
-  @override
-  def add_eval_case(self, app_name: str, eval_set_id: str, eval_case: EvalCase):
-    """Adds the given EvalCase to an existing EvalSet identified by app_name and eval_set_id.
-
-    Raises:
-      NotFoundError: If the eval set is not found.
-    """
-    eval_case_id = eval_case.eval_id
-    self._validate_id(id_name="Eval Case Id", id_value=eval_case_id)
-
-    eval_set = self.get_eval_set(app_name, eval_set_id)
-
-    if not eval_set:
-      raise NotFoundError(f"Eval set `{eval_set_id}` not found.")
-
-    if [x for x in eval_set.eval_cases if x.eval_id == eval_case_id]:
-      raise ValueError(
-          f"Eval id `{eval_case_id}` already exists in `{eval_set_id}`"
-          " eval set.",
-      )
-
-    eval_set.eval_cases.append(eval_case)
-
-    eval_set_file_path = self._get_eval_set_file_path(app_name, eval_set_id)
-    self._write_eval_set(eval_set_file_path, eval_set)
-
   @override
   def get_eval_case(
       self, app_name: str, eval_set_id: str, eval_case_id: str
   ) -> Optional[EvalCase]:
     """Returns an EvalCase if found, otherwise None."""
     eval_set = self.get_eval_set(app_name, eval_set_id)
-
     if not eval_set:
       return None
+    return get_eval_case_from_eval_set(eval_set, eval_case_id)
 
-    eval_case_to_find = None
+  @override
+  def add_eval_case(self, app_name: str, eval_set_id: str, eval_case: EvalCase):
+    """Adds the given EvalCase to an existing EvalSet identified by app_name and eval_set_id.
 
-    # Look up the eval case by eval_case_id
-    for eval_case in eval_set.eval_cases:
-      if eval_case.eval_id == eval_case_id:
-        eval_case_to_find = eval_case
-        break
+    Raises:
+      NotFoundError: If the eval set is not found.
+    """
+    eval_set = get_eval_set_from_app_and_id(self, app_name, eval_set_id)
+    updated_eval_set = add_eval_case_to_eval_set(eval_set, eval_case)
 
-    return eval_case_to_find
+    self._save_eval_set(app_name, eval_set_id, updated_eval_set)
 
   @override
   def update_eval_case(
@@ -288,28 +268,9 @@ class LocalEvalSetsManager(EvalSetsManager):
     Raises:
       NotFoundError: If the eval set or the eval case is not found.
     """
-    eval_case_id = updated_eval_case.eval_id
-
-    # Find the eval case to be updated.
-    eval_case_to_update = self.get_eval_case(
-        app_name, eval_set_id, eval_case_id
-    )
-
-    if eval_case_to_update:
-      # Remove the eval case from the existing eval set.
-      eval_set = self.get_eval_set(app_name, eval_set_id)
-      eval_set.eval_cases.remove(eval_case_to_update)
-
-      # Add the updated eval case to the existing eval set.
-      eval_set.eval_cases.append(updated_eval_case)
-
-      # Persit the eval set.
-      eval_set_file_path = self._get_eval_set_file_path(app_name, eval_set_id)
-      self._write_eval_set(eval_set_file_path, eval_set)
-    else:
-      raise NotFoundError(
-          f"Eval Set `{eval_set_id}` or Eval id `{eval_case_id}` not found.",
-      )
+    eval_set = get_eval_set_from_app_and_id(self, app_name, eval_set_id)
+    updated_eval_set = update_eval_case_in_eval_set(eval_set, updated_eval_case)
+    self._save_eval_set(app_name, eval_set_id, updated_eval_set)
 
   @override
   def delete_eval_case(
@@ -320,25 +281,9 @@ class LocalEvalSetsManager(EvalSetsManager):
     Raises:
       NotFoundError: If the eval set or the eval case to delete is not found.
     """
-    # Find the eval case that needs to be deleted.
-    eval_case_to_remove = self.get_eval_case(
-        app_name, eval_set_id, eval_case_id
-    )
-
-    if eval_case_to_remove:
-      logger.info(
-          "EvalCase`%s` was found in the eval set. It will be removed"
-          " permanently.",
-          eval_case_id,
-      )
-      eval_set = self.get_eval_set(app_name, eval_set_id)
-      eval_set.eval_cases.remove(eval_case_to_remove)
-      eval_set_file_path = self._get_eval_set_file_path(app_name, eval_set_id)
-      self._write_eval_set(eval_set_file_path, eval_set)
-    else:
-      raise NotFoundError(
-          f"Eval Set `{eval_set_id}` or Eval id `{eval_case_id}` not found.",
-      )
+    eval_set = get_eval_set_from_app_and_id(self, app_name, eval_set_id)
+    updated_eval_set = delete_eval_case_from_eval_set(eval_set, eval_case_id)
+    self._save_eval_set(app_name, eval_set_id, updated_eval_set)
 
   def _get_eval_set_file_path(self, app_name: str, eval_set_id: str) -> str:
     return os.path.join(
@@ -354,6 +299,10 @@ class LocalEvalSetsManager(EvalSetsManager):
           f"Invalid {id_name}. {id_name} should have the `{pattern}` format",
       )
 
-  def _write_eval_set(self, eval_set_path: str, eval_set: EvalSet):
+  def _write_eval_set_to_path(self, eval_set_path: str, eval_set: EvalSet):
     with open(eval_set_path, "w") as f:
       f.write(eval_set.model_dump_json(indent=2))
+
+  def _save_eval_set(self, app_name: str, eval_set_id: str, eval_set: EvalSet):
+    eval_set_file_path = self._get_eval_set_file_path(app_name, eval_set_id)
+    self._write_eval_set_to_path(eval_set_file_path, eval_set)

google/adk/flows/llm_flows/basic.py

@@ -65,6 +65,15 @@ class _BasicLlmRequestProcessor(BaseLlmRequestProcessor):
     llm_request.live_connect_config.input_audio_transcription = (
         invocation_context.run_config.input_audio_transcription
     )
+    llm_request.live_connect_config.realtime_input_config = (
+        invocation_context.run_config.realtime_input_config
+    )
+    llm_request.live_connect_config.enable_affective_dialog = (
+        invocation_context.run_config.enable_affective_dialog
+    )
+    llm_request.live_connect_config.proactivity = (
+        invocation_context.run_config.proactivity
+    )
 
     # TODO: handle tool append here, instead of in BaseTool.process_llm_request.
 

google/adk/flows/llm_flows/functions.py

@@ -288,8 +288,7 @@ async def handle_function_calls_live(
       trace_tool_call(
           tool=tool,
           args=function_args,
-          response_event_id=function_response_event.id,
-          function_response=function_response,
+          function_response_event=function_response_event,
       )
       function_response_events.append(function_response_event)
 

google/adk/models/anthropic_llm.py

@@ -201,7 +201,7 @@ def function_declaration_to_tool_param(
 
 
 class Claude(BaseLlm):
-  """ "Integration with Claude models served from Vertex AI.
+  """Integration with Claude models served from Vertex AI.
 
   Attributes:
     model: The name of the Claude model.

google/adk/models/gemini_llm_connection.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import logging
 from typing import AsyncGenerator
 

google/adk/models/google_llm.py

@@ -23,6 +23,7 @@ import sys
 from typing import AsyncGenerator
 from typing import cast
 from typing import TYPE_CHECKING
+from typing import Union
 
 from google.genai import Client
 from google.genai import types
@@ -94,6 +95,13 @@ class Gemini(BaseLlm):
     )
     logger.info(_build_request_log(llm_request))
 
+    # add tracking headers to custom headers given it will override the headers
+    # set in the api client constructor
+    if llm_request.config and llm_request.config.http_options:
+      if not llm_request.config.http_options.headers:
+        llm_request.config.http_options.headers = {}
+      llm_request.config.http_options.headers.update(self._tracking_headers)
+
     if stream:
       responses = await self.api_client.aio.models.generate_content_stream(
           model=llm_request.model,
@@ -200,24 +208,21 @@ class Gemini(BaseLlm):
     return tracking_headers
 
   @cached_property
-  def _live_api_client(self) -> Client:
+  def _live_api_version(self) -> str:
     if self._api_backend == GoogleLLMVariant.VERTEX_AI:
       # use beta version for vertex api
-      api_version = 'v1beta1'
-      # use default api version for vertex
-      return Client(
-          http_options=types.HttpOptions(
-              headers=self._tracking_headers, api_version=api_version
-          )
-      )
+      return 'v1beta1'
     else:
       # use v1alpha for using API KEY from Google AI Studio
-      api_version = 'v1alpha'
-      return Client(
-          http_options=types.HttpOptions(
-              headers=self._tracking_headers, api_version=api_version
-          )
-      )
+      return 'v1alpha'
+
+  @cached_property
+  def _live_api_client(self) -> Client:
+    return Client(
+        http_options=types.HttpOptions(
+            headers=self._tracking_headers, api_version=self._live_api_version
+        )
+    )
 
   @contextlib.asynccontextmanager
   async def connect(self, llm_request: LlmRequest) -> BaseLlmConnection:
@@ -229,6 +234,21 @@ class Gemini(BaseLlm):
     Yields:
       BaseLlmConnection, the connection to the Gemini model.
     """
+    # add tracking headers to custom headers and set api_version given
+    # the customized http options will override the one set in the api client
+    # constructor
+    if (
+        llm_request.live_connect_config
+        and llm_request.live_connect_config.http_options
+    ):
+      if not llm_request.live_connect_config.http_options.headers:
+        llm_request.live_connect_config.http_options.headers = {}
+      llm_request.live_connect_config.http_options.headers.update(
+          self._tracking_headers
+      )
+      llm_request.live_connect_config.http_options.api_version = (
+          self._live_api_version
+      )
 
     llm_request.live_connect_config.system_instruction = types.Content(
         role='system',
@@ -244,9 +264,18 @@ class Gemini(BaseLlm):
 
   def _preprocess_request(self, llm_request: LlmRequest) -> None:
 
-    if llm_request.config and self._api_backend == GoogleLLMVariant.GEMINI_API:
+    if self._api_backend == GoogleLLMVariant.GEMINI_API:
       # Using API key from Google AI Studio to call model doesn't support labels.
-      llm_request.config.labels = None
+      if llm_request.config:
+        llm_request.config.labels = None
+
+      if llm_request.contents:
+        for content in llm_request.contents:
+          if not content.parts:
+            continue
+          for part in content.parts:
+            _remove_display_name_if_present(part.inline_data)
+            _remove_display_name_if_present(part.file_data)
 
 
 def _build_function_declaration_log(
@@ -324,3 +353,15 @@ Raw response:
 {resp.model_dump_json(exclude_none=True)}
 -----------------------------------------------------------
 """
+
+
+def _remove_display_name_if_present(
+    data_obj: Union[types.Blob, types.FileData, None],
+):
+  """Sets display_name to None for the Gemini API (non-Vertex) backend.
+
+  This backend does not support the display_name parameter for file uploads,
+  so it must be removed to prevent request failures.
+  """
+  if data_obj and data_obj.display_name:
+    data_obj.display_name = None

google/adk/models/lite_llm.py

@@ -739,11 +739,12 @@ class LiteLlm(BaseLlm):
                 _message_to_generate_content_response(
                     ChatCompletionAssistantMessage(
                         role="assistant",
-                        content="",
+                        content=text,
                         tool_calls=tool_calls,
                     )
                 )
             )
+            text = ""
             function_calls.clear()
           elif finish_reason == "stop" and text:
             aggregated_llm_response = _message_to_generate_content_response(

google/adk/platform/__init__.py

@@ -0,0 +1,13 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

google/adk/platform/internal/__init__.py

@@ -0,0 +1,15 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Code in this directory is internal to Google.

google/adk/platform/internal/thread.py

@@ -0,0 +1,30 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import asyncio
+from typing import Callable
+
+from google3.learning.deepmind.python.threading import g3_executor
+from google3.learning.deepmind.python.threading import g3_thread
+
+# TODO(b/423882251): Switch to copybara replacements.
+# Right now this doesn't work because the ADK runs unit and integration tests,
+# outside google3, before copybara replacements.
+
+
+def create_thread(target: Callable[..., None], *args, **kwargs):
+  """Creates a thread."""
+  return g3_thread.G3Thread(target=target, args=args, kwargs=kwargs)

google/adk/platform/thread.py

@@ -0,0 +1,31 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+import threading
+from typing import Callable
+
+internal_thread = None
+try:
+  from .internal import thread as internal_thread
+except ImportError:
+  internal_thread = None
+
+
+def create_thread(target: Callable[..., None], *args, **kwargs):
+  """Creates a thread."""
+  if internal_thread:
+    return internal_thread.create_thread(target, *args, **kwargs)
+  return threading.Thread(target=target, args=args, kwargs=kwargs)

google/adk/runners.py

@@ -17,7 +17,6 @@ from __future__ import annotations
 import asyncio
 import logging
 import queue
-import threading
 from typing import AsyncGenerator
 from typing import Generator
 from typing import Optional
@@ -34,10 +33,12 @@ from .agents.llm_agent import LlmAgent
 from .agents.run_config import RunConfig
 from .artifacts.base_artifact_service import BaseArtifactService
 from .artifacts.in_memory_artifact_service import InMemoryArtifactService
+from .auth.credential_service.base_credential_service import BaseCredentialService
 from .code_executors.built_in_code_executor import BuiltInCodeExecutor
 from .events.event import Event
 from .memory.base_memory_service import BaseMemoryService
 from .memory.in_memory_memory_service import InMemoryMemoryService
+from .platform.thread import create_thread
 from .sessions.base_session_service import BaseSessionService
 from .sessions.in_memory_session_service import InMemorySessionService
 from .sessions.session import Session
@@ -72,6 +73,8 @@ class Runner:
   """The session service for the runner."""
   memory_service: Optional[BaseMemoryService] = None
   """The memory service for the runner."""
+  credential_service: Optional[BaseCredentialService] = None
+  """The credential service for the runner."""
 
   def __init__(
       self,
@@ -81,6 +84,7 @@ class Runner:
       artifact_service: Optional[BaseArtifactService] = None,
       session_service: BaseSessionService,
       memory_service: Optional[BaseMemoryService] = None,
+      credential_service: Optional[BaseCredentialService] = None,
   ):
     """Initializes the Runner.
 
@@ -96,6 +100,7 @@ class Runner:
     self.artifact_service = artifact_service
     self.session_service = session_service
     self.memory_service = memory_service
+    self.credential_service = credential_service
 
   def run(
       self,
@@ -139,7 +144,7 @@ class Runner:
       finally:
         event_queue.put(None)
 
-    thread = threading.Thread(target=_asyncio_thread_main)
+    thread = create_thread(target=_asyncio_thread_main)
     thread.start()
 
     # consumes and re-yield the events from background thread.
@@ -417,6 +422,7 @@ class Runner:
         artifact_service=self.artifact_service,
         session_service=self.session_service,
         memory_service=self.memory_service,
+        credential_service=self.credential_service,
         invocation_id=invocation_id,
         agent=self.agent,
         session=session,

google/adk/sessions/in_memory_session_service.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
 
 import copy
 import logging
@@ -223,6 +224,7 @@ class InMemorySessionService(BaseSessionService):
       sessions_without_events.append(copied_session)
     return ListSessionsResponse(sessions=sessions_without_events)
 
+  @override
   async def delete_session(
       self, *, app_name: str, user_id: str, session_id: str
   ) -> None:
@@ -247,7 +249,7 @@ class InMemorySessionService(BaseSessionService):
         )
         is None
     ):
-      return None
+      return
 
     self.sessions[app_name][user_id].pop(session_id)
 
@@ -261,11 +263,20 @@ class InMemorySessionService(BaseSessionService):
     app_name = session.app_name
     user_id = session.user_id
     session_id = session.id
+
+    def _warning(message: str) -> None:
+      logger.warning(
+          f'Failed to append event to session {session_id}: {message}'
+      )
+
     if app_name not in self.sessions:
+      _warning(f'app_name {app_name} not in sessions')
       return event
     if user_id not in self.sessions[app_name]:
+      _warning(f'user_id {user_id} not in sessions[app_name]')
       return event
     if session_id not in self.sessions[app_name][user_id]:
+      _warning(f'session_id {session_id} not in sessions[app_name][user_id]')
       return event
 
     if event.actions and event.actions.state_delta: