Merge branch 'main' into patch-1

Author: hangfei

.github/copybara-pr-handler.yml

@@ -0,0 +1,134 @@
+name: Copybara PR Handler
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number to close (for testing)'
+        required: true
+        type: string
+      commit_sha:
+        description: 'Commit SHA reference (optional, for testing)'
+        required: false
+        type: string
+
+jobs:
+  close-imported-pr:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      issues: write
+      contents: read
+
+    steps:
+      - name: Check for Copybara commits and close PRs
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.ADK_TRIAGE_AGENT }}
+          script: |
+            // Check if this is a manual test run
+            const isManualRun = context.eventName === 'workflow_dispatch';
+
+            let prsToClose = [];
+
+            if (isManualRun) {
+              // Manual testing mode
+              const prNumber = parseInt(context.payload.inputs.pr_number);
+              const commitSha = context.payload.inputs.commit_sha || context.sha.substring(0, 7);
+
+              console.log('=== MANUAL TEST MODE ===');
+              console.log(`Testing with PR #${prNumber}, commit ${commitSha}`);
+
+              prsToClose.push({ prNumber, commitSha });
+            } else {
+              // Normal mode: process commits from push event
+              const commits = context.payload.commits || [];
+              console.log(`Found ${commits.length} commit(s) in this push`);
+
+              // Process each commit
+              for (const commit of commits) {
+                const sha = commit.id;
+                const committer = commit.committer.name;
+                const message = commit.message;
+
+                console.log(`\n--- Processing commit ${sha.substring(0, 7)} ---`);
+                console.log(`Committer: ${committer}`);
+
+                // Check if this is a Copybara commit
+                if (committer !== 'Copybara-Service') {
+                  console.log('Not a Copybara commit, skipping');
+                  continue;
+                }
+
+                // Extract PR number from commit message
+                // Pattern: "Merge https://github.com/google/adk-python/pull/3333"
+                const prMatch = message.match(/Merge https:\/\/github\.com\/google\/adk-python\/pull\/(\d+)/);
+
+                if (!prMatch) {
+                  console.log('No PR number found in Copybara commit message');
+                  continue;
+                }
+
+                const prNumber = parseInt(prMatch[1]);
+                const commitSha = sha.substring(0, 7);
+
+                prsToClose.push({ prNumber, commitSha });
+              }
+            }
+
+            // Process PRs to close
+            for (const { prNumber, commitSha } of prsToClose) {
+              console.log(`\n--- Processing PR #${prNumber} ---`);
+
+              // Get PR details to check if it's open
+              let pr;
+              try {
+                pr = await github.rest.pulls.get({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  pull_number: prNumber
+                });
+              } catch (error) {
+                console.log(`PR #${prNumber} not found or inaccessible:`, error.message);
+                continue;
+              }
+
+              // Only close if PR is still open
+              if (pr.data.state !== 'open') {
+                console.log(`PR #${prNumber} is already ${pr.data.state}, skipping`);
+                continue;
+              }
+
+              const author = pr.data.user.login;
+
+              try {
+                // Add comment with commit reference
+                await github.rest.issues.createComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: prNumber,
+                  body: `Thank you @${author} for your contribution! 🎉\n\nYour changes have been successfully imported and merged via Copybara in commit ${commitSha}.\n\nClosing this PR as the changes are now in the main branch.`
+                });
+
+                // Close the PR
+                await github.rest.pulls.update({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  pull_number: prNumber,
+                  state: 'closed'
+                });
+
+                console.log(`Successfully closed PR #${prNumber}`);
+              } catch (error) {
+                console.log(`Error closing PR #${prNumber}:`, error.message);
+              }
+            }
+
+            if (isManualRun) {
+              console.log('\n=== TEST COMPLETED ===');
+            } else {
+              console.log('\n--- Finished processing all commits ---');
+            }

contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py

@@ -26,14 +26,14 @@
 from google.adk.tools import FunctionTool
 from google.genai import types
 
-from .sub_agents.adk_knowledge_agent import create_adk_knowledge_agent
 from .sub_agents.google_search_agent import create_google_search_agent
 from .sub_agents.url_context_agent import create_url_context_agent
 from .tools.cleanup_unused_files import cleanup_unused_files
 from .tools.delete_files import delete_files
 from .tools.explore_project import explore_project
 from .tools.read_config_files import read_config_files
 from .tools.read_files import read_files
+from .tools.search_adk_knowledge import search_adk_knowledge
 from .tools.search_adk_source import search_adk_source
 from .tools.write_config_files import write_config_files
 from .tools.write_files import write_files
@@ -69,11 +69,9 @@ def create_agent(
     # - Maintains compatibility with existing ADK tool ecosystem
 
     # Built-in ADK tools wrapped as sub-agents
-    adk_knowledge_agent = create_adk_knowledge_agent()
     google_search_agent = create_google_search_agent()
     url_context_agent = create_url_context_agent()
     agent_tools = [
-        AgentTool(adk_knowledge_agent),
         AgentTool(google_search_agent),
         AgentTool(url_context_agent),
     ]
@@ -99,6 +97,8 @@ def create_agent(
         FunctionTool(cleanup_unused_files),
         # ADK source code search (regex-based)
         FunctionTool(search_adk_source),  # Search ADK source with regex
+        # ADK knowledge search
+        FunctionTool(search_adk_knowledge),  # Search ADK knowledge base
     ]
 
     # Combine all tools

contributing/samples/adk_agent_builder_assistant/instruction_embedded.template

@@ -272,9 +272,9 @@ tools:
 
 ### ADK Knowledge and Research Tools
 
-**Default research tool**: Use `adk_knowledge_agent` first for ADK concepts, APIs,
+**Default research tool**: Use `search_adk_knowledge` first for ADK concepts, APIs,
 examples, and troubleshooting. Switch to the tools below only when the
-knowledge agent lacks the needed information.
+knowledge base lacks the needed information.
 
 - `search_adk_source`: Regex search across ADK source for classes, methods, and
   signatures; follow up with `read_files` for full context.
@@ -287,7 +287,7 @@ need agent-type clarification, want best practices, hit errors, express
 uncertainty about architecture, or you otherwise need authoritative guidance.
 
 **Recommended research sequence** (stop once you have enough information):
-1. `adk_knowledge_agent`
+1. `search_adk_knowledge`
 2. `search_adk_source` → `read_files`
 3. `google_search_agent`
 4. `url_context_agent`

contributing/samples/adk_agent_builder_assistant/sub_agents/__init__.py

@@ -14,12 +14,10 @@
 
 """Sub-agents for Agent Builder Assistant."""
 
-from .adk_knowledge_agent import create_adk_knowledge_agent
 from .google_search_agent import create_google_search_agent
 from .url_context_agent import create_url_context_agent
 
 __all__ = [
-    'create_adk_knowledge_agent',
     'create_google_search_agent',
     'create_url_context_agent',
 ]

contributing/samples/adk_agent_builder_assistant/sub_agents/adk_knowledge_agent.py

@@ -0,0 +1,85 @@
+# 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.
+
+"""ADK knowledge search tool."""
+
+from typing import Any
+import uuid
+
+import requests
+
+KNOWLEDGE_SERVICE_APP_URL = "https://adk-agent-builder-knowledge-service-654646711756.us-central1.run.app"
+KNOWLEDGE_SERVICE_APP_NAME = "adk_knowledge_agent"
+KNOWLEDGE_SERVICE_APP_USER_NAME = "agent_builder_assistant"
+
+HEADERS = {
+    "Content-Type": "application/json",
+    "Accept": "application/json",
+}
+
+
+def search_adk_knowledge(
+    query: str,
+) -> dict[str, Any]:
+  """Searches ADK knowledge base for relevant information.
+
+  Args:
+    query: The query to search in ADK knowledge base.
+
+  Returns:
+    A dict with status and the response from the knowledge service.
+  """
+  # Create a new session
+  session_id = uuid.uuid4()
+  create_session_url = f"{KNOWLEDGE_SERVICE_APP_URL}/apps/{KNOWLEDGE_SERVICE_APP_NAME}/users/{KNOWLEDGE_SERVICE_APP_USER_NAME}/sessions/{session_id}"
+
+  try:
+    create_session_response = post_request(
+        create_session_url,
+        {},
+    )
+  except requests.exceptions.RequestException as e:
+    return error_response(f"Failed to create session: {e}")
+  session_id = create_session_response["id"]
+
+  # Search ADK knowledge base
+  search_url = f"{KNOWLEDGE_SERVICE_APP_URL}/run"
+  try:
+    search_response = post_request(
+        search_url,
+        {
+            "app_name": KNOWLEDGE_SERVICE_APP_NAME,
+            "user_id": KNOWLEDGE_SERVICE_APP_USER_NAME,
+            "session_id": session_id,
+            "new_message": {"role": "user", "parts": [{"text": query}]},
+        },
+    )
+  except requests.exceptions.RequestException as e:
+    return error_response(f"Failed to search ADK knowledge base: {e}")
+  return {
+      "status": "success",
+      "response": search_response,
+  }
+
+
+def error_response(error_message: str) -> dict[str, Any]:
+  """Returns an error response."""
+  return {"status": "error", "error_message": error_message}
+
+
+def post_request(url: str, payload: dict[str, Any]) -> dict[str, Any]:
+  """Executes a POST request."""
+  response = requests.post(url, headers=HEADERS, json=payload, timeout=60)
+  response.raise_for_status()
+  return response.json()

contributing/samples/adk_agent_builder_assistant/tools/search_adk_knowledge.py

@@ -21,6 +21,9 @@ distributed via the `google.adk.tools.bigquery` module. These tools include:
 
   Fetches metadata about a BigQuery table.
 
+5. `get_job_info`
+  Fetches metadata about a BigQuery job.
+
 5. `execute_sql`
 
   Runs or dry-runs a SQL query in BigQuery.

contributing/samples/bigquery/README.md

@@ -0,0 +1,24 @@
+# JSON Passing Agent
+
+This sample demonstrates how to pass structured JSON data between agents. The example uses a pizza ordering scenario where one agent takes the order and passes it to another agent for confirmation.
+
+## How to run
+
+1. Run the agent:
+```bash
+adk run .
+```
+
+2. Talk to the agent:
+```
+I want to order a pizza
+```
+
+## Example conversation
+```
+[user]: I'd like a large pizza with pepperoni and mushrooms on a thin crust.
+[order_intake_agent]: (tool call to get available sizes, crusts, toppings)
+[order_intake_agent]: (returns a PizzaOrder JSON)
+[order_confirmation_agent]: (tool call to calculate_price)
+[order_confirmation_agent]: You ordered a large thin crust pizza with pepperoni and mushrooms. The total price is $15.00.
+```

contributing/samples/json_passing_agent/README.md

@@ -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.
+
+from . import agent