Merge branch 'google:main' into oauth-audience-prompt

Author: mescanne

README.md

@@ -27,6 +27,11 @@ Agent Development Kit (ADK) is a flexible and modular framework for developing a
 
 ---
 
+## ✨ What's new
+
+- **Agent Config**: Build agents without code. Check out the
+  [Agent Config](https://google.github.io/adk-docs/agents/config/) feature.
+
 ## ✨ Key Features
 
 - **Rich Tool Ecosystem**: Utilize pre-built tools, custom functions,

autoformat.sh

@@ -52,16 +52,16 @@ echo '---------------------------------------'
 echo '|  Auto-formatting src/...'
 echo '---------------------------------------'
 
-find -L src/ -type f -name "*.py" -exec pyink --config pyproject.toml {} +
+find -L src/ -not -path "*/.*" -type f -name "*.py" -exec pyink --config pyproject.toml {} +
 
 echo '---------------------------------------'
 echo '|  Auto-formatting tests/...'
 echo '---------------------------------------'
 
-find -L tests/ -type f -name "*.py" -exec pyink --config pyproject.toml {} +
+find -L tests/ -not -path "*/.*" -type f -name "*.py" -exec pyink --config pyproject.toml {} +
 
 echo '---------------------------------------'
 echo '|  Auto-formatting contributing/...'
 echo '---------------------------------------'
 
-find -L contributing/ -type f -name "*.py" -exec pyink --config pyproject.toml {} +
+find -L contributing/ -not -path "*/.*" -type f -name "*.py" -exec pyink --config pyproject.toml {} +

contributing/samples/adk_pr_triaging_agent/agent.py

@@ -32,6 +32,7 @@
     "documentation": "polong-lin",
     "services": "DeanChensj",
     "tools": "seanzhou1023",
+    "mcp": "seanzhou1023",
     "eval": "ankursharmas",
     "live": "hangfei",
     "models": "genquan9",
@@ -267,6 +268,7 @@ def add_comment_to_pr(pr_number: int, comment: str) -> dict[str, Any]:
       - If it's about model support(non-Gemini, like Litellm, Ollama, OpenAI models), label it with "models".
       - If it's about tracing, label it with "tracing".
       - If it's agent orchestration, agent definition, label it with "core".
+      - If it's about Model Context Protocol (e.g. MCP tool, MCP toolset, MCP session management etc.), label it with "mcp".
       - If you can't find a appropriate labels for the PR, follow the previous instruction that starts with "IMPORTANT:".
 
       Here is the contribution guidelines:

contributing/samples/adk_triaging_agent/agent.py

@@ -31,6 +31,7 @@
     "documentation": "polong-lin",
     "services": "DeanChensj",
     "question": "",
+    "mcp": "seanzhou1023",
     "tools": "seanzhou1023",
     "eval": "ankursharmas",
     "live": "hangfei",
@@ -182,6 +183,7 @@ def change_issue_type(issue_number: int, issue_type: str) -> dict[str, Any]:
       - If it's about tracing, label it with "tracing".
       - If it's agent orchestration, agent definition, label it with "core".
       - If it's about agent engine, label it with "agent engine".
+      - If it's about Model Context Protocol (e.g. MCP tool, MCP toolset, MCP session management etc.), label it with "mcp".
       - If you can't find a appropriate labels for the issue, follow the previous instruction that starts with "IMPORTANT:".
 
       Call the `add_label_and_owner_to_issue` tool to label the issue, which will also assign the issue to the owner of the label.

contributing/samples/bigquery/README.md

@@ -25,6 +25,16 @@ distributed via the `google.adk.tools.bigquery` module. These tools include:
 
   Runs a SQL query in BigQuery.
 
+1. `ask_data_insights`
+
+  Natural language-in, natural language-out tool that answers questions
+  about structured data in BigQuery. Provides a one-stop solution for generating
+  insights from data.
+
+  **Note**: This tool requires additional setup in your project. Please refer to
+  the official [Conversational Analytics API documentation](https://cloud.google.com/gemini/docs/conversational-analytics-api/overview)
+  for instructions.
+
 ## How to use
 
 Set up environment variables in your `.env` file for using

contributing/samples/live_bidi_streaming_single_agent/agent.py

@@ -65,8 +65,8 @@ async def check_prime(nums: list[int]) -> str:
 
 
 root_agent = Agent(
-    model='gemini-2.0-flash-live-preview-04-09',  # for Vertex project
-    # model='gemini-2.0-flash-live-001',  # for AI studio key
+    # model='gemini-2.0-flash-live-preview-04-09',  # for Vertex project
+    model='gemini-2.0-flash-live-001',  # for AI studio key
     name='hello_world_agent',
     description=(
         'hello world agent that can roll a dice of 8 sides and check prime'

contributing/samples/multi_agent_llm_config/README.md

@@ -1,3 +1,3 @@
 # Config-based Agent Sample - LLM multi-agent
 
-http://google3/third_party/py/google/adk/open_source_workspace/contributing/samples/hello_world_ma/
+From contributing/samples/hello_world_ma/

contributing/samples/tool_human_in_the_loop_config/README.md

@@ -1,3 +1,3 @@
 # Config-based Agent Sample - Human-In-The-Loop
 
-http://google3/third_party/py/google/adk/open_source_workspace/contributing/samples/human_in_loop/
+From contributing/samples/human_in_loop/

contributing/samples/tool_mcp_stdio_notion_config/README.md

@@ -0,0 +1,48 @@
+# Config-based Agent Sample - MCP Toolset with Notion MCP Server
+
+This sample demonstrates how to configure an ADK agent to use the Notion MCP server for interacting with Notion pages and databases.
+
+## Setup Instructions
+
+### 1. Create a Notion Integration
+
+1. Go to [Notion Integrations](https://www.notion.so/my-integrations)
+2. Click "New integration"
+3. Give it a name and select your workspace
+4. Copy the "Internal Integration Secret" (starts with `ntn_`)
+
+For detailed setup instructions, see the [Notion MCP Server documentation](https://www.npmjs.com/package/@notionhq/notion-mcp-server).
+
+### 2. Configure the Agent
+
+Replace `<your_notion_token>` in `root_agent.yaml` with your actual Notion integration token:
+
+```yaml
+env:
+  OPENAPI_MCP_HEADERS: '{"Authorization": "Bearer secret_your_actual_token_here", "Notion-Version": "2022-06-28"}'
+```
+
+### 3. Grant Integration Access
+
+**Important**: After creating the integration, you must grant it access to specific pages and databases:
+
+1. Go to `Access` tab in [Notion Integrations](https://www.notion.so/my-integrations) page
+2. Click "Edit access"
+3. Add pages or databases as needed
+
+### 4. Run the Agent
+
+Use the `adk web` to run the agent and interact with your Notion workspace.
+
+## Example Queries
+
+- "What can you do for me?"
+- "Search for 'project' in my pages"
+- "Create a new page called 'Meeting Notes'"
+- "List all my databases"
+
+## Troubleshooting
+
+- If you get "Unauthorized" errors, check that your token is correct
+- If you get "Object not found" errors, ensure you've granted the integration access to the specific pages/databases
+- Make sure the Notion API version in the headers matches what the MCP server expects

contributing/samples/tool_mcp_stdio_notion_config/root_agent.yaml

@@ -13,4 +13,4 @@ tools:
       - "-y"
       - "@notionhq/notion-mcp-server"
       env:
-        OPENAPI_MCP_HEADERS: "{'Authorization': 'Bearer fake_notion_api_key', 'Notion-Version': '2022-06-28'}"
+        OPENAPI_MCP_HEADERS: '{"Authorization": "Bearer <your_notion_token>", "Notion-Version": "2022-06-28"}'