feat: Enable building of images from ADK CLI

Co-authored-by: Yeesian Ng <ysian@google.com>
PiperOrigin-RevId: 897874029

Author: yeesian

src/google/adk/cli/cli_build.py

@@ -0,0 +1,140 @@
+# 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.
+
+"""Logic for the `adk build` command."""
+
+from __future__ import annotations
+
+import os
+import shutil
+import subprocess
+import tempfile
+from datetime import datetime
+from typing import Optional
+
+import click
+from .utils import build_utils
+from .utils import gcp_utils
+
+
+def run_build_directory(
+    agent_folder: str,
+    project: Optional[str],
+    region: Optional[str],
+    repository: str,
+    image_name: Optional[str],
+    tag: str,
+    adk_version: str,
+    log_level: str = "INFO",
+):
+  """Builds an agent image and pushes it to Artifact Registry.
+
+  Args:
+    agent_folder: Path to the agent source code.
+    project: GCP project ID.
+    region: GCP region.
+    repository: Artifact Registry repository name.
+    image_name: Name of the image. Defaults to agent folder name.
+    tag: Image tag.
+    adk_version: ADK version to use in the image.
+    log_level: Gcloud logging verbosity.
+  """
+  project = gcp_utils.resolve_project(project)
+  if not project:
+    raise ValueError(
+        "GCP Project ID must be specified or configured in gcloud."
+    )
+
+  if not region:
+    # Try to get default region from gcloud config if not provided
+    result = subprocess.run(
+        [gcp_utils.GCLOUD_CMD, "config", "get-value", "compute/region"],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    region = result.stdout.strip() or "us-central1"
+    click.echo(f"Using region: {region}")
+
+  app_name = os.path.basename(agent_folder.rstrip("/"))
+  image_name = image_name or app_name
+
+  temp_folder = os.path.join(
+      tempfile.gettempdir(),
+      "adk_build_src",
+      datetime.now().strftime("%Y%m%d_%H%M%S"),
+  )
+
+  try:
+    click.echo(f"Staging build files in {temp_folder}...")
+    agent_src_path = os.path.join(temp_folder, "agents", app_name)
+    shutil.copytree(agent_folder, agent_src_path)
+
+    requirements_txt_path = os.path.join(agent_src_path, "requirements.txt")
+    install_agent_deps = (
+        f'RUN pip install -r "/app/agents/{app_name}/requirements.txt"'
+        if os.path.exists(requirements_txt_path)
+        else "# No requirements.txt found."
+    )
+
+    dockerfile_content = build_utils.DOCKERFILE_TEMPLATE.format(
+        gcp_project_id=project,
+        gcp_region=region,
+        app_name=app_name,
+        port=8080,  # Default port for container images
+        command="api_server",
+        install_agent_deps=install_agent_deps,
+        service_option=build_utils.get_service_option_by_adk_version(
+            adk_version, None, None, None, False
+        ),
+        trace_to_cloud_option="",
+        otel_to_cloud_option="",
+        allow_origins_option="",
+        adk_version=adk_version,
+        host_option="--host=0.0.0.0",
+        a2a_option="",
+        trigger_sources_option="",
+    )
+
+    dockerfile_path = os.path.join(temp_folder, "Dockerfile")
+    os.makedirs(temp_folder, exist_ok=True)
+    with open(dockerfile_path, "w", encoding="utf-8") as f:
+      f.write(dockerfile_content)
+
+    # image URL format: [REGION]-docker.pkg.dev/[PROJECT]/[REPOSITORY]/[IMAGE]:[TAG]
+    full_image_url = (
+        f"{region}-docker.pkg.dev/{project}/{repository}/{image_name}:{tag}"
+    )
+
+    click.secho(f"\nBuilding image: {full_image_url}", bold=True)
+    subprocess.run(
+        [
+            gcp_utils.GCLOUD_CMD,
+            "builds",
+            "submit",
+            "--tag",
+            full_image_url,
+            "--project",
+            project,
+            "--verbosity",
+            log_level.lower(),
+            temp_folder,
+        ],
+        check=True,
+    )
+    click.secho("\n✅ Image built and pushed successfully.", fg="green")
+
+  finally:
+    if os.path.exists(temp_folder):
+      shutil.rmtree(temp_folder)

src/google/adk/cli/cli_deploy.py

@@ -29,9 +29,6 @@
 import click
 from packaging.version import parse
 
-_IS_WINDOWS = os.name == 'nt'
-_GCLOUD_CMD = 'gcloud.cmd' if _IS_WINDOWS else 'gcloud'
-_LOCAL_STORAGE_FLAG_MIN_VERSION: Final[str] = '1.21.0'
 _AGENT_ENGINE_REQUIREMENT: Final[str] = (
     'google-cloud-aiplatform[adk,agent_engines]'
 )
@@ -63,44 +60,6 @@ def _ensure_agent_engine_dependency(requirements_txt_path: str) -> None:
     f.write(_AGENT_ENGINE_REQUIREMENT + '\n')
 
 
-_DOCKERFILE_TEMPLATE: Final[str] = """
-FROM python:3.11-slim
-WORKDIR /app
-
-# Create a non-root user
-RUN adduser --disabled-password --gecos "" myuser
-
-# Switch to the non-root user
-USER myuser
-
-# Set up environment variables - Start
-ENV PATH="/home/myuser/.local/bin:$PATH"
-
-ENV GOOGLE_GENAI_USE_VERTEXAI=1
-ENV GOOGLE_CLOUD_PROJECT={gcp_project_id}
-ENV GOOGLE_CLOUD_LOCATION={gcp_region}
-
-# Set up environment variables - End
-
-# Install ADK - Start
-RUN pip install google-adk=={adk_version}
-# Install ADK - End
-
-# Copy agent - Start
-
-# Set permission
-COPY --chown=myuser:myuser "agents/{app_name}/" "/app/agents/{app_name}/"
-
-# Copy agent - End
-
-# Install Agent Deps - Start
-{install_agent_deps}
-# Install Agent Deps - End
-
-EXPOSE {port}
-
-CMD adk {command} --port={port} {host_option} {service_option} {trace_to_cloud_option} {otel_to_cloud_option} {allow_origins_option} {a2a_option} {trigger_sources_option} "/app/agents"
-"""
 
 _AGENT_ENGINE_APP_TEMPLATE: Final[str] = """
 import os
@@ -409,17 +368,9 @@ def _ensure_agent_engine_dependency(requirements_txt_path: str) -> None:
 
 
 def _resolve_project(project_in_option: Optional[str]) -> str:
-  if project_in_option:
-    return project_in_option
-
-  result = subprocess.run(
-      [_GCLOUD_CMD, 'config', 'get-value', 'project'],
-      check=True,
-      capture_output=True,
-      text=True,
-  )
-  project = result.stdout.strip()
-  click.echo(f'Use default project: {project}')
+  project = gcp_utils.resolve_project(project_in_option)
+  if not project_in_option:
+    click.echo(f'Use default project: {project}')
   return project
 
 
@@ -585,43 +536,6 @@ def _validate_agent_import(
         sys.modules.pop(key, None)
 
 
-def _get_service_option_by_adk_version(
-    adk_version: str,
-    session_uri: Optional[str],
-    artifact_uri: Optional[str],
-    memory_uri: Optional[str],
-    use_local_storage: Optional[bool] = None,
-) -> str:
-  """Returns service option string based on adk_version."""
-  parsed_version = parse(adk_version)
-  options: list[str] = []
-
-  if parsed_version >= parse('1.3.0'):
-    if session_uri:
-      options.append(f'--session_service_uri={session_uri}')
-    if artifact_uri:
-      options.append(f'--artifact_service_uri={artifact_uri}')
-    if memory_uri:
-      options.append(f'--memory_service_uri={memory_uri}')
-  else:
-    if session_uri:
-      options.append(f'--session_db_url={session_uri}')
-    if parsed_version >= parse('1.2.0') and artifact_uri:
-      options.append(f'--artifact_storage_uri={artifact_uri}')
-
-  if use_local_storage is not None and parsed_version >= parse(
-      _LOCAL_STORAGE_FLAG_MIN_VERSION
-  ):
-    # Only valid when session/artifact URIs are unset; otherwise the CLI
-    # rejects the combination to avoid confusing precedence.
-    if session_uri is None and artifact_uri is None:
-      options.append((
-          '--use_local_storage'
-          if use_local_storage
-          else '--no_use_local_storage'
-      ))
-
-  return ' '.join(options)
 
 
 def to_cloud_run(
@@ -719,14 +633,14 @@ def to_cloud_run(
     trigger_sources_option = (
         f'--trigger_sources={trigger_sources}' if trigger_sources else ''
     )
-    dockerfile_content = _DOCKERFILE_TEMPLATE.format(
+    dockerfile_content = build_utils.DOCKERFILE_TEMPLATE.format(
         gcp_project_id=project,
         gcp_region=region,
         app_name=app_name,
         port=port,
         command='web' if with_ui else 'api_server',
         install_agent_deps=install_agent_deps,
-        service_option=_get_service_option_by_adk_version(
+        service_option=build_utils.get_service_option_by_adk_version(
             adk_version,
             session_service_uri,
             artifact_service_uri,
@@ -764,7 +678,7 @@ def to_cloud_run(
 
     # Build the command with extra gcloud args
     gcloud_cmd = [
-        _GCLOUD_CMD,
+        gcp_utils.GCLOUD_CMD,
         'run',
         'deploy',
         service_name,
@@ -1261,14 +1175,14 @@ def to_gke(
     click.secho('\nSTEP 2: Generating deployment files...', bold=True)
     click.echo('  - Creating Dockerfile...')
     host_option = '--host=0.0.0.0' if adk_version > '0.5.0' else ''
-    dockerfile_content = _DOCKERFILE_TEMPLATE.format(
+    dockerfile_content = build_utils.DOCKERFILE_TEMPLATE.format(
         gcp_project_id=project,
         gcp_region=region,
         app_name=app_name,
         port=port,
         command='web' if with_ui else 'api_server',
         install_agent_deps=install_agent_deps,
-        service_option=_get_service_option_by_adk_version(
+        service_option=build_utils.get_service_option_by_adk_version(
             adk_version,
             session_service_uri,
             artifact_service_uri,