Merge branch 'main' into add-customizable-memory_service-extension-for-get_fast_api_app

Author: stonyme

.github/workflows/check-file-contents.yml

@@ -96,7 +96,7 @@ jobs:
             echo ""
 
             set +e
-            FILES_WITH_FORBIDDEN_IMPORT=$(grep -lE '^from.*cli.*import.*$' $CHANGED_FILES)
+            FILES_WITH_FORBIDDEN_IMPORT=$(grep -lE '^from.*\bcli\b.*import.*$' $CHANGED_FILES)
             GREP_EXIT_CODE=$?
             set -e
 

.github/workflows/stale-bot.yml

@@ -23,6 +23,7 @@ on:
 
 jobs:
   audit-stale-issues:
+    if: github.repository == 'google/adk-python'
     runs-on: ubuntu-latest
     timeout-minutes: 60
 

.github/workflows/triage.yml

@@ -15,9 +15,11 @@ jobs:
     # - New issues (need component labeling)
     # - Issues labeled with "planned" (need owner assignment)
     if: >-
-      github.event_name == 'schedule' ||
-      github.event.action == 'opened' ||
-      github.event.label.name == 'planned'
+      github.repository == 'google/adk-python' && (
+        github.event_name == 'schedule' ||
+        github.event.action == 'opened' ||
+        github.event.label.name == 'planned'
+      )
     permissions:
       issues: write
       contents: read

.github/workflows/upload-adk-docs-to-vertex-ai-search.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   upload-adk-docs-to-vertex-ai-search:
+    if: github.repository == 'google/adk-python'
     runs-on: ubuntu-latest
 
     steps:

contributing/samples/live_bidi_streaming_tools_agent/agent.py

@@ -18,7 +18,6 @@
 from google.adk.agents import LiveRequestQueue
 from google.adk.agents.llm_agent import Agent
 from google.adk.tools.function_tool import FunctionTool
-from google.genai import Client
 from google.genai import types as genai_types
 
 
@@ -54,6 +53,8 @@ async def monitor_video_stream(
 ) -> AsyncGenerator[str, None]:
   """Monitor how many people are in the video streams."""
   print("start monitor_video_stream!")
+  from google.genai import Client
+
   client = Client(vertexai=False)
   prompt_text = (
       "Count the number of people in this image. Just respond with a numeric"
@@ -87,7 +88,7 @@ async def monitor_video_stream(
 
       # Call the model to generate content based on the provided image and prompt
       response = client.models.generate_content(
-          model="gemini-2.0-flash-exp",
+          model="gemini-2.5-flash",
           contents=contents,
           config=genai_types.GenerateContentConfig(
               system_instruction=(
@@ -121,9 +122,11 @@ def stop_streaming(function_name: str):
 
 
 root_agent = Agent(
-    # find supported models here: https://google.github.io/adk-docs/get-started/streaming/quickstart-streaming/
-    model="gemini-2.0-flash-live-preview-04-09",  # for Vertex project
-    # model="gemini-live-2.5-flash-preview",  # for AI studio key
+    # see https://docs.cloud.google.com/vertex-ai/generative-ai/docs/migrate
+    # for vertex model names
+    model="gemini-live-2.5-flash-native-audio",  # vertex
+    # see https://ai.google.dev/gemini-api/docs/models for AIS model names
+    # model='gemini-2.5-flash-native-audio-latest',  # for AI studio
     name="video_streaming_agent",
     instruction="""
       You are a monitoring agent. You can do video monitoring and stock price monitoring

contributing/samples/toolbox_agent/README.md

@@ -26,10 +26,10 @@ Install SQLite from [https://sqlite.org/](https://sqlite.org/)
 
 ### 3. Install Required Python Dependencies
 
-**Important**: The ADK's `ToolboxToolset` class requires the `toolbox-core` package, which is not automatically installed with the ADK. Install it using:
+**Important**: The ADK's `ToolboxToolset` class requires the `toolbox-adk` package, which is not automatically installed with the ADK. Install it using:
 
 ```bash
-pip install toolbox-core
+pip install google-adk[toolbox]
 ```
 
 ### 4. Create Database (Optional)

pyproject.toml

@@ -157,11 +157,12 @@ extensions = [
   "llama-index-readers-file>=0.4.0",            # For retrieval using LlamaIndex.
   "llama-index-embeddings-google-genai>=0.3.0", # For files retrieval using LlamaIndex.
   "lxml>=5.3.0",                                # For load_web_page tool.
-  "toolbox-adk>=0.1.0",                         # For tools.toolbox_toolset.ToolboxToolset
+  "toolbox-adk>=0.5.7, <0.6.0",                 # For tools.toolbox_toolset.ToolboxToolset
 ]
 
 otel-gcp = ["opentelemetry-instrumentation-google-genai>=0.3b0, <1.0.0"]
 
+toolbox = ["toolbox-adk>=0.5.7, <0.6.0"]
 
 [tool.pyink]
 # Format py files following Google style-guide

src/google/adk/a2a/converters/part_converter.py

@@ -40,6 +40,9 @@
 A2A_DATA_PART_METADATA_TYPE_FUNCTION_RESPONSE = 'function_response'
 A2A_DATA_PART_METADATA_TYPE_CODE_EXECUTION_RESULT = 'code_execution_result'
 A2A_DATA_PART_METADATA_TYPE_EXECUTABLE_CODE = 'executable_code'
+A2A_DATA_PART_TEXT_MIME_TYPE = 'text/plain'
+A2A_DATA_PART_START_TAG = b'<a2a_datapart_json>'
+A2A_DATA_PART_END_TAG = b'</a2a_datapart_json>'
 
 
 A2APartToGenAIPartConverter = Callable[
@@ -130,7 +133,16 @@ def convert_a2a_part_to_genai_part(
                 part.data, by_alias=True
             )
         )
-    return genai_types.Part(text=json.dumps(part.data))
+    return genai_types.Part(
+        inline_data=genai_types.Blob(
+            data=A2A_DATA_PART_START_TAG
+            + part.model_dump_json(by_alias=True, exclude_none=True).encode(
+                'utf-8'
+            )
+            + A2A_DATA_PART_END_TAG,
+            mime_type=A2A_DATA_PART_TEXT_MIME_TYPE,
+        )
+    )
 
   logger.warning(
       'Cannot convert unsupported part type: %s for A2A part: %s',
@@ -163,6 +175,20 @@ def convert_genai_part_to_a2a_part(
     )
 
   if part.inline_data:
+    if (
+        part.inline_data.mime_type == A2A_DATA_PART_TEXT_MIME_TYPE
+        and part.inline_data.data is not None
+        and part.inline_data.data.startswith(A2A_DATA_PART_START_TAG)
+        and part.inline_data.data.endswith(A2A_DATA_PART_END_TAG)
+    ):
+      return a2a_types.Part(
+          root=a2a_types.DataPart.model_validate_json(
+              part.inline_data.data[
+                  len(A2A_DATA_PART_START_TAG) : -len(A2A_DATA_PART_END_TAG)
+              ]
+          )
+      )
+    # The default case for inline_data is to convert it to FileWithBytes.
     a2a_part = a2a_types.FilePart(
         file=a2a_types.FileWithBytes(
             bytes=base64.b64encode(part.inline_data.data).decode('utf-8'),

src/google/adk/agents/llm_agent.py

@@ -285,7 +285,7 @@ class LlmAgent(BaseAgent):
   """The additional content generation configurations.
 
   NOTE: not all fields are usable, e.g. tools must be configured via `tools`,
-  thinking_config must be configured via `planner` in LlmAgent.
+  thinking_config can be configured here or via the `planner`. If both are set, the planner's configuration takes precedence.
 
   For example: use this config to adjust model temperature, configure safety
   settings, etc.
@@ -849,8 +849,6 @@ def validate_generate_content_config(
   ) -> types.GenerateContentConfig:
     if not generate_content_config:
       return types.GenerateContentConfig()
-    if generate_content_config.thinking_config:
-      raise ValueError('Thinking config should be set via LlmAgent.planner.')
     if generate_content_config.tools:
       raise ValueError('All tools must be set via LlmAgent.tools.')
     if generate_content_config.system_instruction:
@@ -863,6 +861,23 @@ def validate_generate_content_config(
       )
     return generate_content_config
 
+  @override
+  def model_post_init(self, __context: Any) -> None:
+    """Provides a warning if multiple thinking configurations are found."""
+    super().model_post_init(__context)
+
+    # Note: Using getattr to check both locations for thinking_config
+    if getattr(
+        self.generate_content_config, 'thinking_config', None
+    ) and getattr(self.planner, 'thinking_config', None):
+      warnings.warn(
+          'Both `thinking_config` in `generate_content_config` and a '
+          'planner with `thinking_config` are provided. The '
+          "planner's configuration will take precedence.",
+          UserWarning,
+          stacklevel=3,
+      )
+
   @classmethod
   @experimental
   def _resolve_tools(

src/google/adk/agents/remote_a2a_agent.py

@@ -348,6 +348,13 @@ def _create_a2a_request_for_user_function_response(
 
     return a2a_message
 
+  def _is_remote_response(self, event: Event) -> bool:
+    return (
+        event.author == self.name
+        and event.custom_metadata
+        and event.custom_metadata.get(A2A_METADATA_PREFIX + "response", False)
+    )
+
   def _construct_message_parts_from_session(
       self, ctx: InvocationContext
   ) -> tuple[list[A2APart], Optional[str]]:
@@ -365,7 +372,7 @@ def _construct_message_parts_from_session(
 
     events_to_process = []
     for event in reversed(ctx.session.events):
-      if event.author == self.name:
+      if self._is_remote_response(event):
         # stop on content generated by current a2a agent given it should already
         # be in remote session
         if event.custom_metadata:
@@ -436,7 +443,8 @@ async def _handle_a2a_response(
               and event.content is not None
               and event.content.parts
           ):
-            event.content.parts[0].thought = True
+            for part in event.content.parts:
+              part.thought = True
         elif (
             isinstance(update, A2ATaskStatusUpdateEvent)
             and update.status