Merge branch 'main' into codex/adk-4697-discovery-regional-endpoint

Author: rohityan

contributing/samples/gepa/OWNERS

@@ -20,14 +20,52 @@
 from google.adk.code_executors.unsafe_local_code_executor import UnsafeLocalCodeExecutor
 from google.adk.skills import load_skill_from_dir
 from google.adk.skills import models
+from google.adk.tools.base_tool import BaseTool
 from google.adk.tools.skill_toolset import SkillToolset
+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_current_humidity(location: str) -> str:
+  """Returns the current humidity for a given location."""
+  return f"The humidity in {location} is 45%."
+
 
 greeting_skill = models.Skill(
     frontmatter=models.Frontmatter(
         name="greeting-skill",
         description=(
             "A friendly greeting skill that can say hello to a specific person."
         ),
+        metadata={"adk_additional_tools": ["get_timezone"]},
     ),
     instructions=(
         "Step 1: Read the 'references/hello_world.txt' file to understand how"
@@ -49,6 +87,7 @@
 # be used in production environments.
 my_skill_toolset = SkillToolset(
     skills=[greeting_skill, weather_skill],
+    additional_tools=[GetTimezoneTool(), get_current_humidity],
     code_executor=UnsafeLocalCodeExecutor(),
 )
 

contributing/samples/skills_agent/agent.py

@@ -0,0 +1,10 @@
+---
+name: weather-skill
+description: A skill that provides weather information based on reference data.
+metadata:
+  adk_additional_tools:
+    - get_current_humidity
+---
+
+Step 1: Check 'references/weather_info.md' for the current weather.
+Step 2: Provide the weather update to the user.

contributing/samples/skills_agent/skills/weather_skill/SKILL.md

@@ -0,0 +1,15 @@
+# Copyright 2026 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/skills_agent_gcs/__init__.py

@@ -0,0 +1,102 @@
+# Copyright 2026 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.
+
+"""Example agent demonstrating the use of SkillToolset with GCS.
+
+Set the following environment variables before running:
+SAMPLE_SKILLS_SANDBOX_RESOURCE_NAME="projects/{PROJECT_NUMBER}/locations/{LOCATION}/reasoningEngines/{ENGINE_ID}/sandboxEnvironments/{SANDBOX_ID}"
+SAMPLE_SKILLS_AGENT_ENGINE_RESOURCE_NAME="projects/{PROJECT_NUMBER}/locations/{LOCATION}/reasoningEngines/{ENGINE_ID}"
+
+Go to parent directory and run with `adk web --host=0.0.0.0`.
+"""
+
+import asyncio
+import logging
+import os
+
+from google.adk import Agent
+from google.adk import Runner
+from google.adk.code_executors.agent_engine_sandbox_code_executor import AgentEngineSandboxCodeExecutor
+from google.adk.plugins import LoggingPlugin
+from google.adk.skills import list_skills_in_gcs_dir
+from google.adk.skills import load_skill_from_gcs_dir
+from google.adk.tools.skill_toolset import SkillToolset
+
+# Define the GCS bucket and skills prefix
+BUCKET_NAME = "sample-skills"
+SKILLS_PREFIX = "static-skills"
+
+logging.info("Loading skills from gs://%s/%s...", BUCKET_NAME, SKILLS_PREFIX)
+
+# List and load skills from GCS
+skills = []
+try:
+  available_skills = list_skills_in_gcs_dir(
+      bucket_name=BUCKET_NAME, skills_base_path=SKILLS_PREFIX
+  )
+  for skill_id in available_skills.keys():
+    skills.append(
+        load_skill_from_gcs_dir(
+            bucket_name=BUCKET_NAME,
+            skills_base_path=SKILLS_PREFIX,
+            skill_id=skill_id,
+        )
+    )
+  logging.info("Loaded %d skills successfully.", len(skills))
+except Exception as e:  # pylint: disable=broad-exception-caught
+  logging.error("Failed to load skills from GCS: %s", e)
+
+# Create the SkillToolset
+my_skill_toolset = SkillToolset(skills=skills)
+
+# Create the Agent
+root_agent = Agent(
+    model="gemini-3-flash-preview",
+    name="skill_user_agent",
+    description="An agent that can use specialized skills loaded from GCS.",
+    tools=[
+        my_skill_toolset,
+    ],
+    code_executor=AgentEngineSandboxCodeExecutor(
+        sandbox_resource_name=os.getenv("SAMPLE_SKILLS_SANDBOX_RESOURCE_NAME"),
+        agent_engine_resource_name=os.getenv(
+            "SAMPLE_SKILLS_AGENT_ENGINE_RESOURCE_NAME"
+        ),
+    ),
+)
+
+
+async def main():
+  # Initialize the plugins
+  logging_plugin = LoggingPlugin()
+
+  # Create a Runner
+  runner = Runner(
+      agents=[root_agent],
+      plugins=[logging_plugin],
+  )
+
+  # Example run
+  print("Agent initialized with GCS skills. Sending a test prompt...")
+  # You can replace this with an interactive loop if needed.
+  responses = await runner.run(
+      user_input="Hello! What skills do you have access to?"
+  )
+
+  if responses and responses[-1].content and responses[-1].content.parts:
+    print(f"\nResponse: {responses[-1].content.parts[0].text}")
+
+
+if __name__ == "__main__":
+  asyncio.run(main())

contributing/samples/skills_agent_gcs/agent.py

@@ -12,11 +12,14 @@ Before starting, ensure you have Python installed on your system.
 
 ### 1. Install Toolbox
 
-Run the following command to download and install the toolbox:
+Run the following command to download and install the MCP Toolbox binary.
+
+> [!NOTE]
+> You can find the latest version on the [Releases page](https://github.com/googleapis/genai-toolbox/releases) and update the version in the URL below.
 
 ```bash
 export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-curl -O https://storage.googleapis.com/genai-toolbox/v0.5.0/$OS/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.28.0/$OS/toolbox
 chmod +x toolbox
 ```
 

contributing/samples/toolbox_agent/README.md

@@ -13,16 +13,18 @@
 # limitations under the License.
 
 from google.adk.agents.llm_agent import Agent
+from google.adk.apps import App
 from google.adk.tools.toolbox_toolset import ToolboxToolset
 
 root_agent = Agent(
-    model="gemini-2.0-flash",
+    model="gemini-2.5-flash",
     name="root_agent",
     instruction="You are a helpful assistant",
     # Add Toolbox tools to ADK agent
-    tools=[
-        ToolboxToolset(
-            server_url="http://127.0.0.1:5000", toolset_name="my-toolset"
-        )
-    ],
+    tools=[ToolboxToolset(server_url="http://127.0.0.1:5000")],
+)
+
+app = App(
+    root_agent=root_agent,
+    name="app",
 )

contributing/samples/toolbox_agent/agent.py

@@ -164,12 +164,12 @@ extensions = [
   "llama-index-embeddings-google-genai>=0.3.0", # For files retrieval using LlamaIndex.
   "lxml>=5.3.0",                                # For load_web_page tool.
   "pypika>=0.50.0",                             # For crewai->chromadb dependency
-  "toolbox-adk>=0.5.7, <0.6.0",                 # For tools.toolbox_toolset.ToolboxToolset
+  "toolbox-adk>=0.7.0, <0.8.0",                 # For tools.toolbox_toolset.ToolboxToolset
 ]
 
 otel-gcp = ["opentelemetry-instrumentation-google-genai>=0.6b0, <1.0.0"]
 
-toolbox = ["toolbox-adk>=0.5.7, <0.6.0"]
+toolbox = ["toolbox-adk>=0.7.0, <0.8.0"]
 
 [tool.pyink]
 # Format py files following Google style-guide

pyproject.toml

@@ -22,7 +22,6 @@
 from typing import Dict
 from typing import List
 from typing import Optional
-import uuid
 
 from a2a.server.events import Event as A2AEvent
 from a2a.types import DataPart
@@ -34,6 +33,8 @@
 from a2a.types import TaskStatus
 from a2a.types import TaskStatusUpdateEvent
 from a2a.types import TextPart
+from google.adk.platform import time as platform_time
+from google.adk.platform import uuid as platform_uuid
 from google.genai import types as genai_types
 
 from ...agents.invocation_context import InvocationContext
@@ -254,7 +255,7 @@ def convert_a2a_task_to_event(
         invocation_id=(
             invocation_context.invocation_id
             if invocation_context
-            else str(uuid.uuid4())
+            else platform_uuid.new_uuid()
         ),
         author=author or "a2a agent",
         branch=invocation_context.branch if invocation_context else None,
@@ -299,7 +300,7 @@ def convert_a2a_message_to_event(
         invocation_id=(
             invocation_context.invocation_id
             if invocation_context
-            else str(uuid.uuid4())
+            else platform_uuid.new_uuid()
         ),
         author=author or "a2a agent",
         branch=invocation_context.branch if invocation_context else None,
@@ -349,7 +350,7 @@ def convert_a2a_message_to_event(
         invocation_id=(
             invocation_context.invocation_id
             if invocation_context
-            else str(uuid.uuid4())
+            else platform_uuid.new_uuid()
         ),
         author=author or "a2a agent",
         branch=invocation_context.branch if invocation_context else None,
@@ -406,7 +407,7 @@ def convert_event_to_a2a_message(
 
     if output_parts:
       return Message(
-          message_id=str(uuid.uuid4()), role=role, parts=output_parts
+          message_id=platform_uuid.new_uuid(), role=role, parts=output_parts
       )
 
   except Exception as e:
@@ -447,7 +448,7 @@ def _create_error_status_event(
       status=TaskStatus(
           state=TaskState.failed,
           message=Message(
-              message_id=str(uuid.uuid4()),
+              message_id=platform_uuid.new_uuid(),
               role=Role.agent,
               parts=[TextPart(text=error_message)],
               metadata={
@@ -456,7 +457,9 @@ def _create_error_status_event(
               if event.error_code
               else {},
           ),
-          timestamp=datetime.now(timezone.utc).isoformat(),
+          timestamp=datetime.fromtimestamp(
+              platform_time.get_time(), tz=timezone.utc
+          ).isoformat(),
       ),
       final=False,
   )
@@ -484,7 +487,9 @@ def _create_status_update_event(
   status = TaskStatus(
       state=TaskState.working,
       message=message,
-      timestamp=datetime.now(timezone.utc).isoformat(),
+      timestamp=datetime.fromtimestamp(
+          platform_time.get_time(), tz=timezone.utc
+      ).isoformat(),
   )
 
   if any(