Merge branch 'main' into deploy-docker

Author: hangfei

contributing/samples/ma_basic/README.md

@@ -0,0 +1,35 @@
+# Config-based Agent Sample - Learning Assistant
+
+This sample demonstrates a minimal multi-agent setup with a learning assistant that delegates to specialized tutoring agents.
+
+## Structure
+
+- `root_agent.yaml` - Main learning assistant agent that routes questions to appropriate tutors
+- `code_tutor_agent.yaml` - Specialized agent for programming and coding questions
+- `math_tutor_agent.yaml` - Specialized agent for mathematical concepts and problems
+
+## Usage
+
+The root agent will automatically delegate:
+- Coding/programming questions → `code_tutor_agent`
+- Math questions → `math_tutor_agent`
+
+This example shows how to create a simple multi-agent system without tools, focusing on clear delegation and specialized expertise.
+
+## Sample Queries
+
+### Coding Questions
+
+```
+"How do I create a for loop in Python?"
+"Can you help me debug this function?"
+"What are the best practices for variable naming?"
+```
+
+### Math Questions
+
+```
+"Can you explain the quadratic formula?"
+"How do I solve this algebra problem: 2x + 5 = 15?"
+"What's the difference between mean and median?"
+```

contributing/samples/ma_basic/code_tutor_agent.yaml

@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/google/adk-python/refs/heads/main/src/google/adk/agents/config_schemas/AgentConfig.json
+agent_class: LlmAgent
+name: code_tutor_agent
+description: Coding tutor that helps with programming concepts and questions.
+instruction: |
+  You are a helpful coding tutor that specializes in teaching programming concepts.
+
+  Your role is to:
+  1. Explain programming concepts clearly and simply
+  2. Help debug code issues
+  3. Provide code examples and best practices
+  4. Guide students through problem-solving approaches
+  5. Encourage good coding habits
+
+  Always be patient, encouraging, and provide step-by-step explanations.

contributing/samples/ma_basic/math_tutor_agent.yaml

@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/google/adk-python/refs/heads/main/src/google/adk/agents/config_schemas/AgentConfig.json
+agent_class: LlmAgent
+name: math_tutor_agent
+description: Math tutor that helps with mathematical concepts and problems.
+instruction: |
+  You are a helpful math tutor that specializes in teaching mathematical concepts.
+
+  Your role is to:
+  1. Explain mathematical concepts clearly with examples
+  2. Help solve math problems step by step
+  3. Provide different approaches to solving problems
+  4. Help students understand the reasoning behind solutions
+  5. Encourage mathematical thinking and problem-solving skills
+
+  Always break down complex problems into manageable steps and be patient with explanations.

contributing/samples/ma_basic/root_agent.yaml

@@ -0,0 +1,17 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/google/adk-python/refs/heads/main/src/google/adk/agents/config_schemas/AgentConfig.json
+agent_class: LlmAgent
+model: gemini-2.5-flash
+name: root_agent
+description: Learning assistant that provides tutoring in code and math.
+instruction: |
+  You are a learning assistant that helps students with coding and math questions.
+
+  You delegate coding questions to the code_tutor_agent and math questions to the math_tutor_agent.
+
+  Follow these steps:
+  1. If the user asks about programming or coding, delegate to the code_tutor_agent.
+  2. If the user asks about math concepts or problems, delegate to the math_tutor_agent.
+  3. Always provide clear explanations and encourage learning.
+sub_agents:
+  - config_path: code_tutor_agent.yaml
+  - config_path: math_tutor_agent.yaml

contributing/samples/oauth_calendar_agent/agent.py

@@ -46,7 +46,8 @@
     # google calendar tool by adding `calendar_events_list` in the filter list
     client_id=oauth_client_id,
     client_secret=oauth_client_secret,
-    tool_filter=["calendar_events_get"],
+    tool_filter=["calendar_events_get", "calendar_events_update"],
+    tool_name_prefix="google",
 )
 
 
@@ -125,7 +126,7 @@ def update_time(callback_context: CallbackContext):
 
       Scenario2:
       User want to know the details of one of the listed calendar events.
-      Use get_calendar_event to get the details of a calendar event.
+      Use google_calendar_events_get to get the details of a calendar event.
 
 
       Current user:

src/google/adk/agents/llm_agent.py

@@ -130,7 +130,7 @@ class LlmAgent(BaseAgent):
   When not set, the agent will inherit the model from its ancestor.
   """
 
-  config_type: ClassVar[type[BaseAgentConfig]] = LlmAgentConfig
+  config_type: ClassVar[Type[BaseAgentConfig]] = LlmAgentConfig
   """The config type for this agent."""
 
   instruction: Union[str, InstructionProvider] = ''

src/google/adk/agents/sequential_agent.py

@@ -17,6 +17,7 @@
 from __future__ import annotations
 
 from typing import AsyncGenerator
+from typing import ClassVar
 from typing import Type
 
 from typing_extensions import override
@@ -33,7 +34,7 @@
 class SequentialAgent(BaseAgent):
   """A shell agent that runs its sub-agents in sequence."""
 
-  config_type: Type[BaseAgentConfig] = SequentialAgentConfig
+  config_type: ClassVar[Type[BaseAgentConfig]] = SequentialAgentConfig
   """The config type for this agent."""
 
   @override

src/google/adk/cli/cli_deploy.py

@@ -19,9 +19,12 @@
 from typing import Optional
 
 import click
+from packaging.version import parse
+
+BASE_BUILD_IMAGE = 'python:3.11-slim'
 
 _DOCKERFILE_TEMPLATE = """
-FROM python:3.11-slim
+FROM {build_image}
 WORKDIR /app
 
 # Create a non-root user
@@ -88,7 +91,8 @@ def _get_service_option_by_adk_version(
     memory_uri: Optional[str],
 ) -> str:
   """Returns service option string based on adk_version."""
-  if adk_version >= '1.3.0':
+  parsed_version = parse(adk_version)
+  if parsed_version >= parse('1.3.0'):
     session_option = (
         f'--session_service_uri={session_uri}' if session_uri else ''
     )
@@ -97,7 +101,7 @@ def _get_service_option_by_adk_version(
     )
     memory_option = f'--memory_service_uri={memory_uri}' if memory_uri else ''
     return f'{session_option} {artifact_option} {memory_option}'
-  elif adk_version >= '1.2.0':
+  elif parsed_version >= parse('1.2.0'):
     session_option = f'--session_db_url={session_uri}' if session_uri else ''
     artifact_option = (
         f'--artifact_storage_uri={artifact_uri}' if artifact_uri else ''
@@ -125,6 +129,7 @@ def to_cloud_run(
     session_service_uri: Optional[str] = None,
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
+    build_image: Optional[str] = BASE_BUILD_IMAGE,
     a2a: bool = False,
 ):
   """Deploys an agent to Google Cloud Run.
@@ -158,6 +163,7 @@ def to_cloud_run(
     session_service_uri: The URI of the session service.
     artifact_service_uri: The URI of the artifact service.
     memory_service_uri: The URI of the memory service.
+    build_image: The image to use for building the Dockerfile.
   """
   app_name = app_name or os.path.basename(agent_folder)
 
@@ -206,6 +212,7 @@ def to_cloud_run(
         adk_version=adk_version,
         host_option=host_option,
         a2a_option=a2a_option,
+        build_image=build_image,
     )
     dockerfile_path = os.path.join(temp_folder, 'Dockerfile')
     os.makedirs(temp_folder, exist_ok=True)
@@ -469,6 +476,7 @@ def to_gke(
     session_service_uri: Optional[str] = None,
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
+    build_image: Optional[str] = BASE_BUILD_IMAGE,
     a2a: bool = False,
 ):
   """Deploys an agent to Google Kubernetes Engine(GKE).
@@ -490,6 +498,7 @@ def to_gke(
     session_service_uri: The URI of the session service.
     artifact_service_uri: The URI of the artifact service.
     memory_service_uri: The URI of the memory service.
+    build_image: The image to use for building the Dockerfile.
   """
   click.secho(
       '\n🚀 Starting ADK Agent Deployment to GKE...', fg='cyan', bold=True
@@ -551,6 +560,7 @@ def to_gke(
         adk_version=adk_version,
         host_option=host_option,
         a2a_option='--a2a' if a2a else '',
+        build_image=build_image,
     )
     dockerfile_path = os.path.join(temp_folder, 'Dockerfile')
     os.makedirs(temp_folder, exist_ok=True)

src/google/adk/cli/cli_tools_click.py

@@ -44,6 +44,8 @@
     case_sensitive=False,
 )
 
+BASE_BUILD_IMAGE = "python:3.11-slim"
+
 
 class HelpfulCommand(click.Command):
   """Command that shows full help on error instead of just the error message.
@@ -968,6 +970,13 @@ def cli_api_server(
     help="Optional. Any additional origins to allow for CORS.",
     multiple=True,
 )
+@click.option(
+    "--build_image",
+    type=str,
+    default=BASE_BUILD_IMAGE,
+    show_default=True,
+    help="Optional. The docker build version used in Cloud Run deployment. ",
+)
 # TODO: Add eval_storage_uri option back when evals are supported in Cloud Run.
 @adk_services_options()
 @deprecated_adk_services_options()
@@ -991,6 +1000,7 @@ def cli_deploy_cloud_run(
     session_db_url: Optional[str] = None,  # Deprecated
     artifact_storage_uri: Optional[str] = None,  # Deprecated
     a2a: bool = False,
+    build_image: Optional[str] = BASE_BUILD_IMAGE,
 ):
   """Deploys an agent to Cloud Run.
 
@@ -1029,6 +1039,7 @@ def cli_deploy_cloud_run(
         artifact_service_uri=artifact_service_uri,
         memory_service_uri=memory_service_uri,
         a2a=a2a,
+        build_image=build_image,
     )
   except Exception as e:
     click.secho(f"Deploy failed: {e}", fg="red", err=True)
@@ -1281,6 +1292,13 @@ def cli_deploy_agent_engine(
         " version in the dev environment)"
     ),
 )
+@click.option(
+    "--build_image",
+    type=str,
+    default=BASE_BUILD_IMAGE,
+    show_default=True,
+    help="Optional. The docker build version used in GKE deployment. ",
+)
 @adk_services_options()
 @click.argument(
     "agent",
@@ -1304,6 +1322,7 @@ def cli_deploy_gke(
     session_service_uri: Optional[str] = None,
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
+    build_image: Optional[str] = BASE_BUILD_IMAGE,
 ):
   """Deploys an agent to GKE.
 
@@ -1330,6 +1349,7 @@ def cli_deploy_gke(
         session_service_uri=session_service_uri,
         artifact_service_uri=artifact_service_uri,
         memory_service_uri=memory_service_uri,
+        build_image=build_image,
     )
   except Exception as e:
     click.secho(f"Deploy failed: {e}", fg="red", err=True)

src/google/adk/tools/google_api_tool/google_api_toolset.py

@@ -36,6 +36,15 @@ class GoogleApiToolset(BaseToolset):
   Usually one toolsets will contains tools only related to one Google API, e.g.
   Google Bigquery API toolset will contains tools only related to Google
   Bigquery API, like list dataset tool, list table tool etc.
+
+  Args:
+    api_name: The name of the Google API (e.g., "calendar", "gmail").
+    api_version: The version of the API (e.g., "v3", "v1").
+    client_id: OAuth2 client ID for authentication.
+    client_secret: OAuth2 client secret for authentication.
+    tool_filter: Optional filter to include only specific tools or use a predicate function.
+    service_account: Optional service account for authentication.
+    tool_name_prefix: Optional prefix to add to all tool names in this toolset.
   """
 
   def __init__(
@@ -46,8 +55,9 @@ def __init__(
       client_secret: Optional[str] = None,
       tool_filter: Optional[Union[ToolPredicate, List[str]]] = None,
       service_account: Optional[ServiceAccount] = None,
+      tool_name_prefix: Optional[str] = None,
   ):
-    super().__init__(tool_filter=tool_filter)
+    super().__init__(tool_filter=tool_filter, tool_name_prefix=tool_name_prefix)
     self.api_name = api_name
     self.api_version = api_version
     self._client_id = client_id