Merge branch 'main' into main

Author: secprog

contributing/samples/api_registry_agent/README.md

@@ -0,0 +1,21 @@
+# BigQuery API Registry Agent
+
+This agent demonstrates how to use `ApiRegistry` to discover and interact with Google Cloud services like BigQuery via tools exposed by an MCP server registered in an API Registry.
+
+## Prerequisites
+
+-   A Google Cloud project with the API Registry API enabled.
+-   An MCP server exposing BigQuery tools registered in API Registry.
+
+## Configuration & Running
+
+1.  **Configure:** Edit `agent.py` and replace `your-google-cloud-project-id` and `your-mcp-server-name` with your Google Cloud Project ID and the name of your registered MCP server.
+2.  **Run in CLI:**
+    ```bash
+    adk run contributing/samples/api_registry_agent -- --log-level DEBUG
+    ```
+3.  **Run in Web UI:**
+    ```bash
+    adk web contributing/samples/
+    ```
+    Navigate to `http://127.0.0.1:8080` and select the `api_registry_agent` agent.

contributing/samples/api_registry_agent/__init__.py

@@ -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/api_registry_agent/agent.py

@@ -0,0 +1,39 @@
+# 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.
+
+import os
+
+from google.adk.agents.llm_agent import LlmAgent
+from google.adk.tools.api_registry import ApiRegistry
+
+# TODO: Fill in with your GCloud project id and MCP server name
+PROJECT_ID = "your-google-cloud-project-id"
+MCP_SERVER_NAME = "your-mcp-server-name"
+
+# Header required for BigQuery MCP server
+header_provider = lambda context: {
+    "x-goog-user-project": PROJECT_ID,
+}
+api_registry = ApiRegistry(PROJECT_ID, header_provider=header_provider)
+registry_tools = api_registry.get_toolset(
+    mcp_server_name=MCP_SERVER_NAME,
+)
+root_agent = LlmAgent(
+    model="gemini-2.0-flash",
+    name="bigquery_assistant",
+    instruction="""
+Help user access their BigQuery data via API Registry tools.
+    """,
+    tools=[registry_tools],
+)

contributing/samples/hello_world_stream_fc_args/__init__.py

@@ -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/hello_world_stream_fc_args/agent.py

@@ -0,0 +1,55 @@
+# 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.genai import types
+
+
+def concat_number_and_string(num: int, s: str) -> str:
+  """Concatenate a number and a string.
+
+  Args:
+    num: The number to concatenate.
+    s: The string to concatenate.
+
+  Returns:
+    The concatenated string.
+  """
+  return str(num) + ': ' + s
+
+
+root_agent = Agent(
+    model='gemini-3-pro-preview',
+    name='hello_world_stream_fc_args',
+    description='Demo agent showcasing streaming function call arguments.',
+    instruction="""
+      You are a helpful assistant.
+      You can use the `concat_number_and_string` tool to concatenate a number and a string.
+      You should always call the concat_number_and_string tool to concatenate a number and a string.
+      You should never concatenate on your own.
+    """,
+    tools=[
+        concat_number_and_string,
+    ],
+    generate_content_config=types.GenerateContentConfig(
+        automatic_function_calling=types.AutomaticFunctionCallingConfig(
+            disable=True,
+        ),
+        tool_config=types.ToolConfig(
+            function_calling_config=types.FunctionCallingConfig(
+                stream_function_call_arguments=True,
+            ),
+        ),
+    ),
+)

pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
   "google-cloud-spanner>=3.56.0, <4.0.0",                    # For Spanner database
   "google-cloud-speech>=2.30.0, <3.0.0",                     # For Audio Transcription
   "google-cloud-storage>=2.18.0, <4.0.0",                    # For GCS Artifact service
-  "google-genai>=1.45.0, <2.0.0",                            # Google GenAI SDK
+  "google-genai>=1.51.0, <2.0.0",                            # Google GenAI SDK
   "graphviz>=0.20.2, <1.0.0",                                # Graphviz for graph rendering
   "jsonschema>=4.23.0, <5.0.0",                              # Agent Builder config validation
   "mcp>=1.10.0, <2.0.0",                                     # For MCP Toolset

src/google/adk/cli/cli_tools_click.py

@@ -36,6 +36,7 @@
 from . import cli_deploy
 from .. import version
 from ..evaluation.constants import MISSING_EVAL_DEPENDENCIES_MESSAGE
+from ..sessions.migration import migration_runner
 from .cli import run_cli
 from .fast_api import get_fast_api_app
 from .utils import envs
@@ -1485,6 +1486,41 @@ def cli_deploy_cloud_run(
     click.secho(f"Deploy failed: {e}", fg="red", err=True)
 
 
+@main.group()
+def migrate():
+  """Migrate ADK database schemas."""
+  pass
+
+
+@migrate.command("session", cls=HelpfulCommand)
+@click.option(
+    "--source_db_url",
+    required=True,
+    help="SQLAlchemy URL of source database.",
+)
+@click.option(
+    "--dest_db_url",
+    required=True,
+    help="SQLAlchemy URL of destination database.",
+)
+@click.option(
+    "--log_level",
+    type=LOG_LEVELS,
+    default="INFO",
+    help="Optional. Set the logging level",
+)
+def cli_migrate_session(
+    *, source_db_url: str, dest_db_url: str, log_level: str
+):
+  """Migrates a session database to the latest schema version."""
+  logs.setup_adk_logger(getattr(logging, log_level.upper()))
+  try:
+    migration_runner.upgrade(source_db_url, dest_db_url)
+    click.secho("Migration check and upgrade process finished.", fg="green")
+  except Exception as e:
+    click.secho(f"Migration failed: {e}", fg="red", err=True)
+
+
 @deploy.command("agent_engine")
 @click.option(
     "--api_key",

src/google/adk/cli/fast_api.py

@@ -106,15 +106,13 @@ def get_fast_api_app(
       base_dir=agents_dir,
       session_service_uri=session_service_uri,
       session_db_kwargs=session_db_kwargs,
-      per_agent=True,  # Multi-agent mode
   )
 
   # Build the Artifact service
   try:
     artifact_service = create_artifact_service_from_options(
         base_dir=agents_dir,
         artifact_service_uri=artifact_service_uri,
-        per_agent=True,  # Multi-agent mode
     )
   except ValueError as exc:
     raise click.ClickException(str(exc)) from exc

src/google/adk/cli/service_registry.py

@@ -271,18 +271,14 @@ def gcs_artifact_factory(uri: str, **kwargs):
 
     kwargs_copy = kwargs.copy()
     kwargs_copy.pop("agents_dir", None)
+    kwargs_copy.pop("per_agent", None)
     parsed_uri = urlparse(uri)
     bucket_name = parsed_uri.netloc
     return GcsArtifactService(bucket_name=bucket_name, **kwargs_copy)
 
-  def file_artifact_factory(uri: str, **kwargs):
+  def file_artifact_factory(uri: str, **_):
     from ..artifacts.file_artifact_service import FileArtifactService
 
-    per_agent = kwargs.get("per_agent", False)
-    if per_agent:
-      raise ValueError(
-          "file:// artifact URIs are not supported in multi-agent mode."
-      )
     parsed_uri = urlparse(uri)
     if parsed_uri.netloc not in ("", "localhost"):
       raise ValueError(

src/google/adk/cli/utils/local_storage.py

@@ -58,27 +58,20 @@ def create_local_database_session_service(
 
 
 def create_local_artifact_service(
-    *, base_dir: Path | str, per_agent: bool = False
+    *, base_dir: Path | str
 ) -> BaseArtifactService:
   """Creates a file-backed artifact service rooted in `.adk/artifacts`.
 
   Args:
     base_dir: Directory whose `.adk` folder will store artifacts.
-    per_agent: Indicates whether the service is being used in multi-agent mode.
 
   Returns:
     A `FileArtifactService` scoped to the derived root directory.
   """
   manager = DotAdkFolder(base_dir)
   artifact_root = manager.artifacts_dir
   artifact_root.mkdir(parents=True, exist_ok=True)
-  if per_agent:
-    logger.info(
-        "Using shared file artifact service rooted at %s for multi-agent mode",
-        artifact_root,
-    )
-  else:
-    logger.info("Using file artifact service at %s", artifact_root)
+  logger.info("Using file artifact service at %s", artifact_root)
   return FileArtifactService(root_dir=artifact_root)