Merge branch 'main' into main

Author: ayam04

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

@@ -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

contributing/samples/json_passing_agent/__init__.py

@@ -0,0 +1,122 @@
+# 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 google.adk import Agent
+from google.adk.agents import sequential_agent
+from google.adk.tools import tool_context
+from pydantic import BaseModel
+
+SequentialAgent = sequential_agent.SequentialAgent
+ToolContext = tool_context.ToolContext
+
+
+# 1. Define the data structure for the pizza order.
+class PizzaOrder(BaseModel):
+  """A data class to hold the details of a pizza order."""
+
+  size: str
+  crust: str
+  toppings: list[str]
+
+
+# 2. Define tools for the order intake agent.
+def get_available_sizes() -> list[str]:
+  """Returns the available pizza sizes."""
+  return ['small', 'medium', 'large']
+
+
+def get_available_crusts() -> list[str]:
+  """Returns the available pizza crusts."""
+  return ['thin', 'thick', 'stuffed']
+
+
+def get_available_toppings() -> list[str]:
+  """Returns the available pizza toppings."""
+  return ['pepperoni', 'mushrooms', 'onions', 'sausage', 'bacon', 'pineapple']
+
+
+# 3. Define the order intake agent.
+# This agent's job is to interact with the user to fill out a PizzaOrder object.
+# It uses the output_schema to structure its response as a JSON object that
+# conforms to the PizzaOrder model.
+order_intake_agent = Agent(
+    name='order_intake_agent',
+    model='gemini-2.5-flash',
+    instruction=(
+        "You are a pizza order intake agent. Your goal is to get the user's"
+        ' pizza order. Use the available tools to find out what sizes, crusts,'
+        ' and toppings are available. Once you have all the information,'
+        ' provide it in the requested format. Your output MUST be a JSON object'
+        ' that conforms to the PizzaOrder schema and nothing else.'
+    ),
+    output_key='pizza_order',
+    output_schema=PizzaOrder,
+    tools=[get_available_sizes, get_available_crusts, get_available_toppings],
+)
+
+
+# 4. Define a tool for the order confirmation agent.
+def calculate_price(tool_context: ToolContext) -> str:
+  """Calculates the price of a pizza order and returns a descriptive string."""
+  order_dict = tool_context.state.get('pizza_order')
+  if not order_dict:
+    return "I can't find an order to calculate the price for."
+
+  order = PizzaOrder.model_validate(order_dict)
+
+  price = 0.0
+  if order.size == 'small':
+    price += 8.0
+  elif order.size == 'medium':
+    price += 10.0
+  elif order.size == 'large':
+    price += 12.0
+
+  if order.crust == 'stuffed':
+    price += 2.0
+
+  price += len(order.toppings) * 1.5
+  return f'The total price for your order is ${price:.2f}.'
+
+
+# 5. Define the order confirmation agent.
+# This agent reads the PizzaOrder object from the session state (placed there by
+# the order_intake_agent) and confirms the order with the user.
+order_confirmation_agent = Agent(
+    name='order_confirmation_agent',
+    model='gemini-2.5-flash',
+    instruction=(
+        'Confirm the pizza order with the user. The order is in the state'
+        ' variable `pizza_order`. First, use the `calculate_price` tool to get'
+        ' the price. Then, summarize the order details from {pizza_order} and'
+        ' include the price in your summary. For example: "You ordered a large'
+        ' thin crust pizza with pepperoni and mushrooms. The total price is'
+        ' $15.00."'
+    ),
+    tools=[calculate_price],
+)
+
+# 6. Define the root agent as a sequential agent.
+# This agent directs the conversation by running its sub-agents in order.
+root_agent = SequentialAgent(
+    name='pizza_ordering_agent',
+    sub_agents=[
+        order_intake_agent,
+        order_confirmation_agent,
+    ],
+    description=(
+        'This agent is used to order pizza. It will ask the user for their'
+        ' pizza order and then confirm the order with the user.'
+    ),
+)