Merge branch 'main' into fix/subprocess-blocklist-bypass

Author: RobertoLuzanilla

src/google/adk/cli/cli_create.py

@@ -15,14 +15,12 @@
 from __future__ import annotations
 
 import os
-import subprocess
 from typing import Optional
-from typing import Tuple
 
 import click
 
 from ..apps.app import validate_app_name
-from .utils import gcp_utils
+from .utils import _onboarding
 
 _INIT_PY_TEMPLATE = """\
 from . import agent
@@ -48,33 +46,11 @@
 """
 
 
-_GOOGLE_API_MSG = """
-Don't have API Key? Create one in AI Studio: https://aistudio.google.com/apikey
-"""
-
-_GOOGLE_CLOUD_SETUP_MSG = """
-You need an existing Google Cloud account and project, check out this link for details:
-https://google.github.io/adk-docs/get-started/quickstart/#gemini---google-cloud-vertex-ai
-"""
-
 _OTHER_MODEL_MSG = """
 Please see below guide to configure other models:
 https://google.github.io/adk-docs/agents/models
 """
 
-_EXPRESS_TOS_MSG = """
-Google Cloud Express Mode Terms of Service: https://cloud.google.com/terms/google-cloud-express
-By using this application, you agree to the Google Cloud Express Mode terms of service and any
-applicable services and APIs: https://console.cloud.google.com/terms. You also agree to only use
-this application for your trade, business, craft, or profession.
-"""
-
-_NOT_ELIGIBLE_MSG = """
-You are not eligible for Express Mode.
-Please follow these instructions to set up a full Google Cloud project:
-https://google.github.io/adk-docs/get-started/quickstart/#gemini---google-cloud-vertex-ai
-"""
-
 _SUCCESS_MSG_CODE = """
 Agent created in {agent_folder}:
 - .env
@@ -96,98 +72,6 @@
 """
 
 
-def _get_gcp_project_from_gcloud() -> str:
-  """Uses gcloud to get default project."""
-  try:
-    result = subprocess.run(
-        ["gcloud", "config", "get-value", "project"],
-        capture_output=True,
-        text=True,
-        check=True,
-    )
-    return result.stdout.strip()
-  except (subprocess.CalledProcessError, FileNotFoundError):
-    return ""
-
-
-def _get_gcp_region_from_gcloud() -> str:
-  """Uses gcloud to get default region."""
-  try:
-    result = subprocess.run(
-        ["gcloud", "config", "get-value", "compute/region"],
-        capture_output=True,
-        text=True,
-        check=True,
-    )
-    return result.stdout.strip()
-  except (subprocess.CalledProcessError, FileNotFoundError):
-    return ""
-
-
-def _prompt_str(
-    prompt_prefix: str,
-    *,
-    prior_msg: Optional[str] = None,
-    default_value: Optional[str] = None,
-) -> str:
-  if prior_msg:
-    click.secho(prior_msg, fg="green")
-  while True:
-    value: str = click.prompt(
-        prompt_prefix, default=default_value or None, type=str
-    )
-    if value and value.strip():
-      return value.strip()
-
-
-def _prompt_for_google_cloud(
-    google_cloud_project: Optional[str],
-) -> str:
-  """Prompts user for Google Cloud project ID."""
-  google_cloud_project = (
-      google_cloud_project
-      or os.environ.get("GOOGLE_CLOUD_PROJECT", None)
-      or _get_gcp_project_from_gcloud()
-  )
-
-  google_cloud_project = _prompt_str(
-      "Enter Google Cloud project ID", default_value=google_cloud_project
-  )
-
-  return google_cloud_project
-
-
-def _prompt_for_google_cloud_region(
-    google_cloud_region: Optional[str],
-) -> str:
-  """Prompts user for Google Cloud region."""
-  google_cloud_region = (
-      google_cloud_region
-      or os.environ.get("GOOGLE_CLOUD_LOCATION", None)
-      or _get_gcp_region_from_gcloud()
-  )
-
-  google_cloud_region = _prompt_str(
-      "Enter Google Cloud region",
-      default_value=google_cloud_region or "us-central1",
-  )
-  return google_cloud_region
-
-
-def _prompt_for_google_api_key(
-    google_api_key: Optional[str],
-) -> str:
-  """Prompts user for Google API key."""
-  google_api_key = google_api_key or os.environ.get("GOOGLE_API_KEY", None)
-
-  google_api_key = _prompt_str(
-      "Enter Google API key",
-      prior_msg=_GOOGLE_API_MSG,
-      default_value=google_api_key,
-  )
-  return google_api_key
-
-
 def _generate_files(
     agent_folder: str,
     *,
@@ -256,155 +140,6 @@ def _prompt_for_model() -> str:
     return "<FILL_IN_MODEL>"
 
 
-def _prompt_to_choose_backend(
-    google_api_key: Optional[str],
-    google_cloud_project: Optional[str],
-    google_cloud_region: Optional[str],
-) -> Tuple[Optional[str], Optional[str], Optional[str]]:
-  """Prompts user to choose backend.
-
-  Returns:
-    A tuple of (google_api_key, google_cloud_project, google_cloud_region).
-  """
-  backend_choice = click.prompt(
-      "1. Google AI\n2. Vertex AI\n3. Login with Google\nChoose a backend",
-      type=click.Choice(["1", "2", "3"]),
-  )
-  if backend_choice == "1":
-    google_api_key = _prompt_for_google_api_key(google_api_key)
-  elif backend_choice == "2":
-    click.secho(_GOOGLE_CLOUD_SETUP_MSG, fg="green")
-    google_cloud_project = _prompt_for_google_cloud(google_cloud_project)
-    google_cloud_region = _prompt_for_google_cloud_region(google_cloud_region)
-  elif backend_choice == "3":
-    google_api_key, google_cloud_project, google_cloud_region = (
-        _handle_login_with_google()
-    )
-  return google_api_key, google_cloud_project, google_cloud_region
-
-
-def _handle_login_with_google() -> (
-    Tuple[Optional[str], Optional[str], Optional[str]]
-):
-  """Handles the "Login with Google" flow."""
-  if not gcp_utils.check_adc():
-    click.secho(
-        "No Application Default Credentials found. "
-        "Opening browser for login...",
-        fg="yellow",
-    )
-    try:
-      gcp_utils.login_adc()
-    except RuntimeError as e:
-      click.secho(str(e), fg="red")
-      raise click.Abort()
-
-  # Check for existing Express project
-  express_project = gcp_utils.retrieve_express_project()
-  if express_project:
-    api_key = express_project.get("api_key")
-    project_id = express_project.get("project_id")
-    region = express_project.get("region", "us-central1")
-    if project_id:
-      click.secho(f"Using existing Express project: {project_id}", fg="green")
-      return api_key, project_id, region
-
-  # Check for existing full GCP projects
-  projects = gcp_utils.list_gcp_projects(limit=20)
-  if projects:
-    click.secho("Recently created Google Cloud projects found:", fg="green")
-    click.echo("0. Enter project ID manually")
-    for i, (p_id, p_name) in enumerate(projects, 1):
-      click.echo(f"{i}. {p_name} ({p_id})")
-
-    project_index = click.prompt(
-        "Select a project",
-        type=click.IntRange(0, len(projects)),
-    )
-    if project_index == 0:
-      selected_project_id = _prompt_for_google_cloud(None)
-    else:
-      selected_project_id = projects[project_index - 1][0]
-    region = _prompt_for_google_cloud_region(None)
-    return None, selected_project_id, region
-
-  click.secho(
-      "A Google Cloud project is required to continue. You can enter an"
-      " existing project ID or create an Express Mode project. Learn more:"
-      " https://cloud.google.com/resources/cloud-express-faqs",
-      fg="green",
-  )
-  action = click.prompt(
-      "1. Enter an existing Google Cloud project ID\n"
-      "2. Create a new project (Express Mode)\n"
-      "3. Abandon\n"
-      "Choose an action",
-      type=click.Choice(["1", "2", "3"]),
-  )
-
-  if action == "3":
-    raise click.Abort()
-
-  if action == "1":
-    google_cloud_project = _prompt_for_google_cloud(None)
-    google_cloud_region = _prompt_for_google_cloud_region(None)
-    return None, google_cloud_project, google_cloud_region
-
-  elif action == "2":
-    if gcp_utils.check_express_eligibility():
-      click.secho(_EXPRESS_TOS_MSG, fg="yellow")
-      if click.confirm("Do you accept the Terms of Service?", default=False):
-        selected_region = click.prompt(
-            """\
-Choose a region for Express Mode:
-1. us-central1
-2. europe-west1
-3. asia-southeast1
-Choose region""",
-            type=click.Choice(["1", "2", "3"]),
-            default="1",
-        )
-        region_map = {
-            "1": "us-central1",
-            "2": "europe-west1",
-            "3": "asia-southeast1",
-        }
-        region = region_map[selected_region]
-        express_info = gcp_utils.sign_up_express(location=region)
-        api_key = express_info.get("api_key")
-        project_id = express_info.get("project_id")
-        region = express_info.get("region", region)
-        click.secho(
-            f"Express Mode project created: {project_id}",
-            fg="green",
-        )
-        current_proj = _get_gcp_project_from_gcloud()
-        if current_proj and current_proj != project_id:
-          click.secho(
-              "Warning: Your default gcloud project is set to"
-              f" '{current_proj}'. This might conflict with or override your"
-              f" Express Mode project '{project_id}'. We recommend"
-              " unsetting it.",
-              fg="yellow",
-          )
-          if click.confirm("Run 'gcloud config unset project'?", default=True):
-            try:
-              subprocess.run(
-                  ["gcloud", "config", "unset", "project"],
-                  check=True,
-                  capture_output=True,
-              )
-              click.secho("Unset default gcloud project.", fg="green")
-            except Exception:
-              click.secho(
-                  "Failed to unset project. Please do it manually.", fg="red"
-              )
-        return api_key, project_id, region
-
-    click.secho(_NOT_ELIGIBLE_MSG, fg="red")
-    raise click.Abort()
-
-
 def _prompt_to_choose_type() -> str:
   """Prompts user to choose type of agent to create."""
   type_choice = click.prompt(
@@ -464,11 +199,18 @@ def run_cmd(
 
   if not google_api_key and not (google_cloud_project and google_cloud_region):
     if model.startswith("gemini"):
-      google_api_key, google_cloud_project, google_cloud_region = (
-          _prompt_to_choose_backend(
-              google_api_key, google_cloud_project, google_cloud_region
-          )
+      auth_info = _onboarding.prompt_to_choose_backend(
+          google_api_key, google_cloud_project, google_cloud_region
       )
+      if isinstance(auth_info, _onboarding.GoogleAIAuth):
+        google_api_key = auth_info.api_key
+      elif isinstance(auth_info, _onboarding.VertexAIAuth):
+        google_cloud_project = auth_info.project_id
+        google_cloud_region = auth_info.region
+      elif isinstance(auth_info, _onboarding.ExpressModeAuth):
+        google_api_key = auth_info.api_key
+        google_cloud_project = auth_info.project_id
+        google_cloud_region = auth_info.region
 
   if not type:
     type = _prompt_to_choose_type()

src/google/adk/cli/cli_deploy.py

@@ -29,6 +29,8 @@
 import click
 from packaging.version import parse
 
+from .utils import _onboarding
+
 _IS_WINDOWS = os.name == 'nt'
 _GCLOUD_CMD = 'gcloud.cmd' if _IS_WINDOWS else 'gcloud'
 _LOCAL_STORAGE_FLAG_MIN_VERSION: Final[str] = '1.21.0'
@@ -1108,10 +1110,22 @@ def to_agent_engine(
       )
     else:
       click.echo(
-          'No project/region or api_key provided. '
-          'Please specify either project/region or api_key.'
+          'No project/region or api_key provided. Starting onboarding flow...'
       )
-      return
+      auth_info = _onboarding.handle_login_with_google()
+      if isinstance(auth_info, _onboarding.VertexAIAuth):
+        click.echo('Initializing Vertex AI...')
+        client = vertexai.Client(
+            project=auth_info.project_id,
+            location=auth_info.region,
+            http_options={'headers': get_tracking_headers()},
+        )
+      elif isinstance(auth_info, _onboarding.ExpressModeAuth):
+        click.echo('Initializing Vertex AI in Express Mode with API key...')
+        client = vertexai.Client(
+            api_key=auth_info.api_key,
+            http_options={'headers': get_tracking_headers()},
+        )
     click.echo('Vertex AI initialized.')
 
     is_config_agent = False