Merge branch 'main' into feat/gcs-file-data-support

Author: blueeye-040

contributing/samples/local_environment_skill/agent.py

@@ -15,38 +15,7 @@
 
 from google.adk import Agent
 from google.adk.environment import LocalEnvironment
-from google.adk.tools.base_tool import BaseTool
 from google.adk.tools.environment import EnvironmentToolset
-from google.genai import types
-
-
-class GetTimezoneTool(BaseTool):
-  """A tool to get the timezone for a given location."""
-
-  def __init__(self):
-    super().__init__(
-        name="get_timezone",
-        description="Returns the timezone for a given location.",
-    )
-
-  def _get_declaration(self) -> types.FunctionDeclaration | None:
-    return types.FunctionDeclaration(
-        name=self.name,
-        description=self.description,
-        parameters_json_schema={
-            "type": "object",
-            "properties": {
-                "location": {
-                    "type": "string",
-                    "description": "The location to get the timezone for.",
-                },
-            },
-            "required": ["location"],
-        },
-    )
-
-  async def run_async(self, *, args: dict, tool_context) -> str:
-    return f"The timezone for {args['location']} is UTC+00:00."
 
 
 def get_wind_speed(location: str) -> str:
@@ -89,7 +58,6 @@ def get_wind_speed(location: str) -> str:
                 working_dir=pathlib.Path(__file__).parent
             ),
         ),
-        GetTimezoneTool(),
         get_wind_speed,
     ],
 )

contributing/samples/local_environment_skill/skills/weather-skill/SKILL.md

@@ -1,9 +1,6 @@
 ---
 name: weather-skill
 description: A skill that provides weather information based on reference data.
-metadata:
-  adk_additional_tools:
-    - get_wind_speed
 ---
 
 Step 1: Check 'references/weather_info.md' for the current weather.

pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
   "fastapi>=0.124.1, <1.0.0",                                # FastAPI framework
   "google-api-python-client>=2.157.0, <3.0.0",               # Google API client discovery
   "google-auth[pyopenssl]>=2.47.0",                          # Google Auth library
-  "google-cloud-aiplatform[agent_engines]>=1.132.0, <2.0.0", # For VertexAI integrations, e.g. example store.
+  "google-cloud-aiplatform[agent_engines]>=1.148.0, <2.0.0", # For VertexAI integrations, e.g. example store.
   "google-cloud-bigquery-storage>=2.0.0",
   "google-cloud-bigquery>=2.2.0",
   "google-cloud-bigtable>=2.32.0",                           # For Bigtable database
@@ -111,7 +111,7 @@ eval = [
   # go/keep-sorted start
   "Jinja2>=3.1.4,<4.0.0",                         # For eval template rendering
   "gepa>=0.1.0",
-  "google-cloud-aiplatform[evaluation]>=1.143.0",
+  "google-cloud-aiplatform[evaluation]>=1.148.0",
   "pandas>=2.2.3",
   "rouge-score>=0.1.2",
   "tabulate>=0.9.0",

src/google/adk/agents/common_configs.py

@@ -118,7 +118,7 @@ class AgentRefConfig(BaseModel):
     my_custom_agent = LlmAgent(
         name="my_custom_agent",
         instruction="You are a helpful custom agent.",
-        model="gemini-2.0-flash",
+        model="gemini-2.5-flash",
     )
     ```
 

src/google/adk/agents/config_schemas/AgentConfig.json

@@ -2461,7 +2461,7 @@
             }
           ],
           "default": null,
-          "description": "Optional. LlmAgent.model. Provide a model name string (e.g. \"gemini-2.0-flash\"). If not set, the model will be inherited from the ancestor or fall back to the system default (gemini-2.5-flash unless overridden via LlmAgent.set_default_model). To construct a model instance from code, use model_code.",
+          "description": "Optional. LlmAgent.model. Provide a model name string (e.g. \"gemini-2.5-flash\"). If not set, the model will be inherited from the ancestor or fall back to the system default (gemini-2.5-flash unless overridden via LlmAgent.set_default_model). To construct a model instance from code, use model_code.",
           "title": "Model"
         },
         "instruction": {

src/google/adk/agents/llm_agent_config.py

@@ -55,7 +55,7 @@ class LlmAgentConfig(BaseAgentConfig):
       default=None,
       description=(
           'Optional. LlmAgent.model. Provide a model name string (e.g.'
-          ' "gemini-2.0-flash"). If not set, the model will be inherited from'
+          ' "gemini-2.5-flash"). If not set, the model will be inherited from'
           ' the ancestor or fall back to the system default (gemini-2.5-flash'
           ' unless overridden via LlmAgent.set_default_model). To construct a'
           ' model instance from code, use model_code.'

src/google/adk/agents/loop_agent.py

@@ -108,11 +108,12 @@ async def _run_async_impl(
         if should_exit or pause_invocation:
           break  # break inner for loop
 
-      # Restart from the beginning of the loop.
-      start_index = 0
-      times_looped += 1
-      # Reset the state of all sub-agents in the loop.
-      ctx.reset_sub_agent_states(self.name)
+      if not pause_invocation:
+        # Restart from the beginning of the loop.
+        start_index = 0
+        times_looped += 1
+        # Reset the state of all sub-agents in the loop.
+        ctx.reset_sub_agent_states(self.name)
 
     # If the invocation is paused, we should not yield the end of agent event.
     if pause_invocation:

src/google/adk/cli/browser/index.html

@@ -30,5 +30,5 @@
 <style>html{--mat-sys-background:#151316;--mat-sys-error:#ffb4ab;--mat-sys-error-container:#93000a;--mat-sys-inverse-on-surface:#323033;--mat-sys-inverse-primary:#7d00fa;--mat-sys-inverse-surface:#e6e1e6;--mat-sys-on-background:#e6e1e6;--mat-sys-on-error:#690005;--mat-sys-on-error-container:#ffdad6;--mat-sys-on-primary:#42008a;--mat-sys-on-primary-container:#ecdcff;--mat-sys-on-primary-fixed:#270057;--mat-sys-on-primary-fixed-variant:#5f00c0;--mat-sys-on-secondary:#352d40;--mat-sys-on-secondary-container:#eadef7;--mat-sys-on-secondary-fixed:#1f182a;--mat-sys-on-secondary-fixed-variant:#4b4357;--mat-sys-on-surface:#e6e1e6;--mat-sys-on-surface-variant:#e8e0eb;--mat-sys-on-tertiary:#42008a;--mat-sys-on-tertiary-container:#ecdcff;--mat-sys-on-tertiary-fixed:#270057;--mat-sys-on-tertiary-fixed-variant:#5f00c0;--mat-sys-outline:#958e99;--mat-sys-outline-variant:#49454e;--mat-sys-primary:#d5baff;--mat-sys-primary-container:#5f00c0;--mat-sys-primary-fixed:#ecdcff;--mat-sys-primary-fixed-dim:#d5baff;--mat-sys-scrim:#000000;--mat-sys-secondary:#cec2db;--mat-sys-secondary-container:#4b4357;--mat-sys-secondary-fixed:#eadef7;--mat-sys-secondary-fixed-dim:#cec2db;--mat-sys-shadow:#000000;--mat-sys-surface:#151316;--mat-sys-surface-bright:#3b383c;--mat-sys-surface-container:#211f22;--mat-sys-surface-container-high:#2b292d;--mat-sys-surface-container-highest:#363437;--mat-sys-surface-container-low:#1d1b1e;--mat-sys-surface-container-lowest:#0f0d11;--mat-sys-surface-dim:#151316;--mat-sys-surface-tint:#d5baff;--mat-sys-surface-variant:#49454e;--mat-sys-tertiary:#d5baff;--mat-sys-tertiary-container:#5f00c0;--mat-sys-tertiary-fixed:#ecdcff;--mat-sys-tertiary-fixed-dim:#d5baff;--mat-sys-neutral-variant20:#332f37;--mat-sys-neutral10:#1d1b1e;--mat-sys-level0:0px 0px 0px 0px rgba(0, 0, 0, .2), 0px 0px 0px 0px rgba(0, 0, 0, .14), 0px 0px 0px 0px rgba(0, 0, 0, .12);--mat-sys-level1:0px 2px 1px -1px rgba(0, 0, 0, .2), 0px 1px 1px 0px rgba(0, 0, 0, .14), 0px 1px 3px 0px rgba(0, 0, 0, .12);--mat-sys-level2:0px 3px 3px -2px rgba(0, 0, 0, .2), 0px 3px 4px 0px rgba(0, 0, 0, .14), 0px 1px 8px 0px rgba(0, 0, 0, .12);--mat-sys-level3:0px 3px 5px -1px rgba(0, 0, 0, .2), 0px 6px 10px 0px rgba(0, 0, 0, .14), 0px 1px 18px 0px rgba(0, 0, 0, .12);--mat-sys-level4:0px 5px 5px -3px rgba(0, 0, 0, .2), 0px 8px 10px 1px rgba(0, 0, 0, .14), 0px 3px 14px 2px rgba(0, 0, 0, .12);--mat-sys-level5:0px 7px 8px -4px rgba(0, 0, 0, .2), 0px 12px 17px 2px rgba(0, 0, 0, .14), 0px 5px 22px 4px rgba(0, 0, 0, .12);--mat-sys-body-large:400 1rem / 1.5rem Google Sans;--mat-sys-body-large-font:Google Sans;--mat-sys-body-large-line-height:1.5rem;--mat-sys-body-large-size:1rem;--mat-sys-body-large-tracking:.031rem;--mat-sys-body-large-weight:400;--mat-sys-body-medium:400 .875rem / 1.25rem Google Sans;--mat-sys-body-medium-font:Google Sans;--mat-sys-body-medium-line-height:1.25rem;--mat-sys-body-medium-size:.875rem;--mat-sys-body-medium-tracking:.016rem;--mat-sys-body-medium-weight:400;--mat-sys-body-small:400 .75rem / 1rem Google Sans;--mat-sys-body-small-font:Google Sans;--mat-sys-body-small-line-height:1rem;--mat-sys-body-small-size:.75rem;--mat-sys-body-small-tracking:.025rem;--mat-sys-body-small-weight:400;--mat-sys-display-large:400 3.562rem / 4rem Google Sans;--mat-sys-display-large-font:Google Sans;--mat-sys-display-large-line-height:4rem;--mat-sys-display-large-size:3.562rem;--mat-sys-display-large-tracking:-.016rem;--mat-sys-display-large-weight:400;--mat-sys-display-medium:400 2.812rem / 3.25rem Google Sans;--mat-sys-display-medium-font:Google Sans;--mat-sys-display-medium-line-height:3.25rem;--mat-sys-display-medium-size:2.812rem;--mat-sys-display-medium-tracking:0;--mat-sys-display-medium-weight:400;--mat-sys-display-small:400 2.25rem / 2.75rem Google Sans;--mat-sys-display-small-font:Google Sans;--mat-sys-display-small-line-height:2.75rem;--mat-sys-display-small-size:2.25rem;--mat-sys-display-small-tracking:0;--mat-sys-display-small-weight:400;--mat-sys-headline-large:400 2rem / 2.5rem Google Sans;--mat-sys-headline-large-font:Google Sans;--mat-sys-headline-large-line-height:2.5rem;--mat-sys-headline-large-size:2rem;--mat-sys-headline-large-tracking:0;--mat-sys-headline-large-weight:400;--mat-sys-headline-medium:400 1.75rem / 2.25rem Google Sans;--mat-sys-headline-medium-font:Google Sans;--mat-sys-headline-medium-line-height:2.25rem;--mat-sys-headline-medium-size:1.75rem;--mat-sys-headline-medium-tracking:0;--mat-sys-headline-medium-weight:400;--mat-sys-headline-small:400 1.5rem / 2rem Google Sans;--mat-sys-headline-small-font:Google Sans;--mat-sys-headline-small-line-height:2rem;--mat-sys-headline-small-size:1.5rem;--mat-sys-headline-small-tracking:0;--mat-sys-headline-small-weight:400;--mat-sys-label-large:500 .875rem / 1.25rem Google Sans;--mat-sys-label-large-font:Google Sans;--mat-sys-label-large-line-height:1.25rem;--mat-sys-label-large-size:.875rem;--mat-sys-label-large-tracking:.006rem;--mat-sys-label-large-weight:500;--mat-sys-label-large-weight-prominent:700;--mat-sys-label-medium:500 .75rem / 1rem Google Sans;--mat-sys-label-medium-font:Google Sans;--mat-sys-label-medium-line-height:1rem;--mat-sys-label-medium-size:.75rem;--mat-sys-label-medium-tracking:.031rem;--mat-sys-label-medium-weight:500;--mat-sys-label-medium-weight-prominent:700;--mat-sys-label-small:500 .688rem / 1rem Google Sans;--mat-sys-label-small-font:Google Sans;--mat-sys-label-small-line-height:1rem;--mat-sys-label-small-size:.688rem;--mat-sys-label-small-tracking:.031rem;--mat-sys-label-small-weight:500;--mat-sys-title-large:400 1.375rem / 1.75rem Google Sans;--mat-sys-title-large-font:Google Sans;--mat-sys-title-large-line-height:1.75rem;--mat-sys-title-large-size:1.375rem;--mat-sys-title-large-tracking:0;--mat-sys-title-large-weight:400;--mat-sys-title-medium:500 1rem / 1.5rem Google Sans;--mat-sys-title-medium-font:Google Sans;--mat-sys-title-medium-line-height:1.5rem;--mat-sys-title-medium-size:1rem;--mat-sys-title-medium-tracking:.009rem;--mat-sys-title-medium-weight:500;--mat-sys-title-small:500 .875rem / 1.25rem Google Sans;--mat-sys-title-small-font:Google Sans;--mat-sys-title-small-line-height:1.25rem;--mat-sys-title-small-size:.875rem;--mat-sys-title-small-tracking:.006rem;--mat-sys-title-small-weight:500;--mat-sys-corner-extra-large:28px;--mat-sys-corner-extra-large-top:28px 28px 0 0;--mat-sys-corner-extra-small:4px;--mat-sys-corner-extra-small-top:4px 4px 0 0;--mat-sys-corner-full:9999px;--mat-sys-corner-large:16px;--mat-sys-corner-large-end:0 16px 16px 0;--mat-sys-corner-large-start:16px 0 0 16px;--mat-sys-corner-large-top:16px 16px 0 0;--mat-sys-corner-medium:12px;--mat-sys-corner-none:0;--mat-sys-corner-small:8px;--mat-sys-dragged-state-layer-opacity:.16;--mat-sys-focus-state-layer-opacity:.12;--mat-sys-hover-state-layer-opacity:.08;--mat-sys-pressed-state-layer-opacity:.12;color-scheme:dark;--mat-sys-primary:#7cc4ff;--mat-sys-on-primary:#003366;--mat-sys-primary-container:#004b8d;--mat-sys-on-primary-container:#d1e4ff;--mat-sys-secondary:#b5c9e2;--mat-sys-on-secondary:#203246;--mat-sys-secondary-container:#3a485a;--mat-sys-on-secondary-container:#d7e3f7}body{height:100vh;margin:0;font-family:Roboto,Helvetica Neue,sans-serif}</style><link rel="stylesheet" href="./styles-2ORK6PRA.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="./styles-2ORK6PRA.css"></noscript></head>
 <body>
   <app-root></app-root>
-<link rel="modulepreload" href="./chunk-EN473UE3.js"><link rel="modulepreload" href="./chunk-W7GRJBO5.js"><script src="./polyfills-5CFQRCPP.js" type="module"></script><script src="./main-IY3KRCSN.js" type="module"></script></body>
+<link rel="modulepreload" href="./chunk-EN473UE3.js"><link rel="modulepreload" href="./chunk-W7GRJBO5.js"><script src="./polyfills-5CFQRCPP.js" type="module"></script><script src="./main-3OBAHHYV.js" type="module"></script></body>
 </html>

…/google/adk/cli/browser/main-IY3KRCSN.js …/google/adk/cli/browser/main-3OBAHHYV.jssrc/google/adk/cli/browser/main-IY3KRCSN.js renamed to src/google/adk/cli/browser/main-3OBAHHYV.js src/google/adk/cli/browser/main-IY3KRCSN.js renamed to src/google/adk/cli/browser/main-3OBAHHYV.js

@@ -720,19 +720,21 @@ async def _receive_from_model(
   ) -> AsyncGenerator[Event, None]:
     """Receive data from model and process events using BaseLlmConnection."""
 
-    def get_author_for_event(llm_response):
+    def get_author_for_event(llm_response: LlmResponse) -> str:
       """Get the author of the event.
 
-      When the model returns transcription, the author is "user". Otherwise, the
-      author is the agent name(not 'model').
+      When the model returns input transcription, the author is set to "user".
+      Otherwise, the author is the agent name (not 'model').
 
       Args:
         llm_response: The LLM response from the LLM call.
+
+      Returns:
+        The author of the event as a string, either "user" or the agent's name.
       """
-      if (
-          llm_response
-          and llm_response.content
-          and llm_response.content.role == 'user'
+      if llm_response and (
+          llm_response.input_transcription
+          or (llm_response.content and llm_response.content.role == 'user')
       ):
         return 'user'
       else: