agent-starter-pack 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

src/cli/commands/enhance.py

@@ -18,7 +18,7 @@ from typing import Any
 
 import click
 from rich.console import Console
-from rich.prompt import IntPrompt
+from rich.prompt import IntPrompt, Prompt
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -36,6 +36,19 @@ from .create import (
 
 console = Console()
 
+# Directories to exclude when scanning for agent directories
+_EXCLUDED_DIRS = {
+    ".git",
+    ".github",
+    "__pycache__",
+    "node_modules",
+    ".venv",
+    "venv",
+    "build",
+    "dist",
+    ".terraform",
+}
+
 
 def display_base_template_selection(current_base: str) -> str:
     """Display available base templates and prompt for selection."""
@@ -79,6 +92,88 @@ def display_base_template_selection(current_base: str) -> str:
         raise ValueError(f"Invalid base template selection: {choice}")
 
 
+def display_agent_directory_selection(
+    current_dir: pathlib.Path, detected_directory: str
+) -> str:
+    """Display available directories and prompt for agent directory selection."""
+    console.print()
+    console.print("📁 [bold]Agent Directory Selection[/bold]")
+    console.print()
+    console.print("Choose where your agent code is located:")
+
+    # Get all directories in the current path (excluding hidden and common non-agent dirs)
+    available_dirs = [
+        item.name
+        for item in current_dir.iterdir()
+        if (
+            item.is_dir()
+            and not item.name.startswith(".")
+            and item.name not in _EXCLUDED_DIRS
+        )
+    ]
+
+    # Sort directories and create choices
+    available_dirs.sort()
+
+    directory_choices = {}
+    choice_num = 1
+    default_choice = None
+
+    # Only include the detected directory if it actually exists
+    if detected_directory in available_dirs:
+        directory_choices[choice_num] = detected_directory
+        current_indicator = (
+            " (detected)" if detected_directory != "app" else " (default)"
+        )
+        console.print(
+            f"  {choice_num}. [bold]{detected_directory}[/]{current_indicator}"
+        )
+        default_choice = choice_num
+        choice_num += 1
+        # Remove from available_dirs to avoid duplication
+        available_dirs.remove(detected_directory)
+
+    # Add other available directories
+    for dir_name in available_dirs:
+        directory_choices[choice_num] = dir_name
+        # Check if this directory might contain agent code
+        agent_files_exist = any((current_dir / dir_name).glob("*agent*.py"))
+        hint = " (contains agent*.py)" if agent_files_exist else ""
+        console.print(f"  {choice_num}. [bold]{dir_name}[/]{hint}")
+        if (
+            default_choice is None
+        ):  # If no detected directory exists, use first available as default
+            default_choice = choice_num
+        choice_num += 1
+
+    # Add option for custom directory
+    custom_choice = choice_num
+    directory_choices[custom_choice] = "__custom__"
+    console.print(f"  {custom_choice}. [bold]Enter custom directory name[/]")
+
+    # If no directories found and no default set, default to custom option
+    if default_choice is None:
+        default_choice = custom_choice
+
+    console.print()
+    choice = IntPrompt.ask(
+        "Select agent directory", default=default_choice, show_default=True
+    )
+
+    if choice in directory_choices:
+        selected = directory_choices[choice]
+        if selected == "__custom__":
+            console.print()
+            custom_dir = Prompt.ask(
+                "Enter custom agent directory name", default=detected_directory
+            )
+            return custom_dir
+        else:
+            return selected
+    else:
+        raise ValueError(f"Invalid agent directory selection: {choice}")
+
+
 @click.command()
 @click.pass_context
 @click.argument(
@@ -94,11 +189,13 @@ def display_base_template_selection(current_base: str) -> str:
 )
 @click.option(
     "--base-template",
+    "-b",
     help="Base template to inherit from (e.g., adk_base, langgraph_base_react, agentic_rag)",
 )
 @click.option(
-    "--agent-directory",
-    help="Custom directory name for agent files (default: 'app' or auto-detected from pyproject.toml)",
+    "--adk",
+    is_flag=True,
+    help="Shortcut for --base-template adk_base",
 )
 @shared_template_options
 @handle_cli_error
@@ -115,7 +212,9 @@ def enhance(
     auto_approve: bool,
     region: str,
     skip_checks: bool,
+    agent_garden: bool,
     base_template: str | None,
+    adk: bool,
     agent_directory: str | None,
 ) -> None:
     """Enhance your existing project with AI agent capabilities.
@@ -139,6 +238,14 @@ def enhance(
     # Display welcome banner for enhance command
     display_welcome_banner(enhance_mode=True)
 
+    # Handle --adk shortcut
+    if adk:
+        if base_template:
+            raise click.ClickException(
+                "Cannot use --adk with --base-template. Use one or the other."
+            )
+        base_template = "adk_base"
+
     # Validate base template if provided
     if base_template and not validate_base_template(base_template):
         available_templates = get_available_base_templates()
@@ -282,7 +389,21 @@ def enhance(
                         )
                     pass  # Fall back to default
 
-        final_agent_directory = agent_directory or detected_agent_directory
+        # Check if detected/default app folder exists before showing interactive selection
+        app_folder_exists = (current_dir / detected_agent_directory).exists()
+
+        # Interactive agent directory selection if not provided via CLI, no app folder exists, and not auto-approved
+        if not agent_directory and not app_folder_exists and not auto_approve:
+            selected_agent_directory = display_agent_directory_selection(
+                current_dir, detected_agent_directory
+            )
+            final_agent_directory = selected_agent_directory
+            console.print(
+                f"✅ Selected agent directory: [cyan]{selected_agent_directory}[/cyan]"
+            )
+            console.print()
+        else:
+            final_agent_directory = agent_directory or detected_agent_directory
 
         # Show info about agent directory selection
         if agent_directory:
@@ -358,7 +479,9 @@ def enhance(
     final_cli_overrides: dict[str, Any] = {}
     if base_template:
         final_cli_overrides["base_template"] = base_template
-    if agent_directory:
+
+    # For current directory templates, ensure agent_directory is included in cli_overrides
+    if template_path == pathlib.Path(".") and agent_directory:
         final_cli_overrides["settings"] = final_cli_overrides.get("settings", {})
         final_cli_overrides["settings"]["agent_directory"] = agent_directory
 
@@ -378,7 +501,10 @@ def enhance(
         region=region,
         skip_checks=skip_checks,
         in_folder=True,  # Always use in-folder mode for enhance
-        agent_directory=agent_directory,
+        agent_directory=final_agent_directory
+        if template_path == pathlib.Path(".")
+        else agent_directory,
+        agent_garden=agent_garden,
         base_template=base_template,
         skip_welcome=True,  # Skip welcome message since enhance shows its own
         cli_overrides=final_cli_overrides if final_cli_overrides else None,

src/cli/commands/setup_cicd.py

@@ -272,15 +272,24 @@ def update_build_triggers(tf_dir: Path) -> None:
 
 
 def prompt_for_repository_details(
-    repository_name: str | None = None, repository_owner: str | None = None
+    repository_name: str | None = None,
+    repository_owner: str | None = None,
+    create_repository: bool = False,
+    use_existing_repository: bool = False,
 ) -> tuple[str, str, bool]:
     """Interactive prompt for repository details with option to use existing repo."""
     # Get current GitHub username as default owner
     result = run_command(["gh", "api", "user", "--jq", ".login"], capture_output=True)
     default_owner = result.stdout.strip()
-    create_repository = False
 
-    if not (repository_name and repository_owner):
+    # Step 1: Determine create_repository value
+    if create_repository and use_existing_repository:
+        raise ValueError(
+            "Cannot specify both create_repository and use_existing_repository"
+        )
+
+    # If neither flag is set, prompt for the choice
+    if not create_repository and not use_existing_repository:
         console.print("\n📦 Repository Configuration", style="bold blue")
         console.print("Choose an option:")
         console.print("1. Create new repository")
@@ -289,44 +298,41 @@ def prompt_for_repository_details(
         choice = click.prompt(
             "Select option", type=click.Choice(["1", "2"]), default="1"
         )
-        if choice == "1":
-            # New repository
-            create_repository = True
-            if not repository_name:
-                # Get project name from pyproject.toml
-                with open("pyproject.toml", encoding="utf-8") as f:
-                    for line in f:
-                        if line.strip().startswith("name ="):
-                            default_name = line.split("=")[1].strip().strip("\"'")
-                            break
-                    else:
-                        default_name = f"genai-app-{int(time.time())}"
-                repository_name = click.prompt(
-                    "Enter new repository name", default=default_name
-                )
-            if not repository_owner:
-                repository_owner = click.prompt(
-                    "Enter repository owner", default=default_owner
-                )
-        else:
-            # Existing repository
-            create_repository = False
-            while True:
-                repo_url = click.prompt(
-                    "Enter existing repository URL (e.g., https://github.com/owner/repo)"
-                )
-                # Extract owner and repo name from URL
-                match = re.search(r"github\.com/([^/]+)/([^/]+)", repo_url)
-                if match:
-                    repository_owner = match.group(1)
-                    # Remove .git suffix if present
-                    repository_name = match.group(2).rstrip(".git")
-                    break
+        create_repository = choice == "1"
+    # If use_existing_repository is True, create_repository should be False
+    elif use_existing_repository:
+        create_repository = False
+    # Otherwise create_repository is already True from the flag
+
+    # Step 2: Get repository name if missing
+    if not repository_name:
+        # Get project name from pyproject.toml as default
+        try:
+            with open("pyproject.toml", encoding="utf-8") as f:
+                for line in f:
+                    if line.strip().startswith("name ="):
+                        default_name = line.split("=")[1].strip().strip("\"'")
+                        break
                 else:
-                    console.print(
-                        "❌ Invalid repository URL format. Please use https://github.com/owner/repo",
-                        style="bold red",
-                    )
+                    default_name = f"genai-app-{int(time.time())}"
+        except FileNotFoundError:
+            default_name = f"genai-app-{int(time.time())}"
+
+        prompt_text = (
+            "Enter new repository name"
+            if create_repository
+            else "Enter existing repository name"
+        )
+        repository_name = click.prompt(prompt_text, default=default_name)
+
+    # Step 3: Get repository owner if missing
+    if not repository_owner:
+        prompt_text = (
+            "Enter repository owner"
+            if create_repository
+            else "Enter existing repository owner"
+        )
+        repository_owner = click.prompt(prompt_text, default=default_owner)
 
     if repository_name is None or repository_owner is None:
         raise ValueError("Repository name and owner must be provided")
@@ -487,6 +493,12 @@ console = Console()
     default=False,
     help="Flag indicating whether to create a new repository",
 )
+@click.option(
+    "--use-existing-repository",
+    is_flag=True,
+    default=False,
+    help="Flag indicating whether to use an existing repository",
+)
 @backoff.on_exception(
     backoff.expo,
     (subprocess.CalledProcessError, click.ClickException),
@@ -508,9 +520,16 @@ def setup_cicd(
     debug: bool,
     auto_approve: bool,
     create_repository: bool,
+    use_existing_repository: bool,
 ) -> None:
     """Set up CI/CD infrastructure using Terraform."""
 
+    # Validate mutually exclusive flags
+    if create_repository and use_existing_repository:
+        raise click.UsageError(
+            "Cannot specify both --create-repository and --use-existing-repository flags"
+        )
+
     # Check if we're in the root folder by looking for pyproject.toml
     if not Path("pyproject.toml").exists():
         raise click.UsageError(
@@ -592,36 +611,39 @@ def setup_cicd(
     console.print("\n🔍 Checking GitHub CLI scopes...")
     check_github_scopes(cicd_runner)
 
-    # Gather repository details if not provided
-    if not (repository_name and repository_owner):
-        if auto_approve:
-            # Auto-generate repository details when auto-approve is used
-            if not repository_owner:
-                repository_owner = run_command(
-                    ["gh", "api", "user", "--jq", ".login"], capture_output=True
-                ).stdout.strip()
-            if not repository_name:
-                # Get project name from pyproject.toml or generate one
-                try:
-                    with open("pyproject.toml", encoding="utf-8") as f:
-                        for line in f:
-                            if line.strip().startswith("name ="):
-                                repository_name = (
-                                    line.split("=")[1].strip().strip("\"'")
-                                )
-                                break
-                        else:
-                            repository_name = f"genai-app-{int(time.time())}"
-                except FileNotFoundError:
-                    repository_name = f"genai-app-{int(time.time())}"
-            console.print(
-                f"✅ Auto-generated repository: {repository_owner}/{repository_name}"
-            )
-            # Keep the CLI argument value for create_repository
-        else:
-            repository_name, repository_owner, create_repository = (
-                prompt_for_repository_details(repository_name, repository_owner)
+    # Gather repository details
+    if auto_approve:
+        # Auto-generate repository details when auto-approve is used
+        if not repository_owner:
+            repository_owner = run_command(
+                ["gh", "api", "user", "--jq", ".login"], capture_output=True
+            ).stdout.strip()
+        if not repository_name:
+            # Get project name from pyproject.toml or generate one
+            try:
+                with open("pyproject.toml", encoding="utf-8") as f:
+                    for line in f:
+                        if line.strip().startswith("name ="):
+                            repository_name = line.split("=")[1].strip().strip("\"'")
+                            break
+                    else:
+                        repository_name = f"genai-app-{int(time.time())}"
+            except FileNotFoundError:
+                repository_name = f"genai-app-{int(time.time())}"
+        console.print(
+            f"✅ Auto-generated repository: {repository_owner}/{repository_name}"
+        )
+        # Keep the CLI argument value for create_repository
+    else:
+        # Use prompt_for_repository_details to fill in any missing information
+        repository_name, repository_owner, create_repository = (
+            prompt_for_repository_details(
+                repository_name,
+                repository_owner,
+                create_repository,
+                use_existing_repository,
             )
+        )
 
     assert repository_name is not None, "Repository name must be provided"
     assert repository_owner is not None, "Repository owner must be provided"

src/cli/utils/cicd.py

@@ -103,6 +103,111 @@ def create_github_connection(
     """
     console.print("\n🔗 Creating GitHub connection...")
 
+    # First, ensure Cloud Build API is enabled
+    console.print("🔧 Ensuring Cloud Build API is enabled...")
+    try:
+        run_command(
+            [
+                "gcloud",
+                "services",
+                "enable",
+                "cloudbuild.googleapis.com",
+                "--project",
+                project_id,
+            ],
+            capture_output=True,
+            check=False,  # Don't fail if already enabled
+        )
+        console.print("✅ Cloud Build API enabled")
+
+        # Wait for the API to fully initialize and create the service account
+        console.print(
+            "⏳ Waiting for Cloud Build service account to be created (this typically takes 5-10 seconds)..."
+        )
+        time.sleep(10)
+    except subprocess.CalledProcessError as e:
+        console.print(f"⚠️ Could not enable Cloud Build API: {e}", style="yellow")
+
+    # Get the Cloud Build service account and grant permissions with retry logic
+    try:
+        project_number_result = run_command(
+            [
+                "gcloud",
+                "projects",
+                "describe",
+                project_id,
+                "--format=value(projectNumber)",
+            ],
+            capture_output=True,
+            check=True,
+        )
+        project_number = project_number_result.stdout.strip()
+        cloud_build_sa = (
+            f"service-{project_number}@gcp-sa-cloudbuild.iam.gserviceaccount.com"
+        )
+
+        console.print(
+            "🔧 Granting Secret Manager permissions to Cloud Build service account..."
+        )
+
+        # Try to grant permissions with retry logic
+        max_retries = 3
+        for attempt in range(max_retries):
+            try:
+                # Grant Secret Manager Admin role to Cloud Build service account
+                result = run_command(
+                    [
+                        "gcloud",
+                        "projects",
+                        "add-iam-policy-binding",
+                        project_id,
+                        f"--member=serviceAccount:{cloud_build_sa}",
+                        "--role=roles/secretmanager.admin",
+                        "--condition=None",
+                    ],
+                    capture_output=True,
+                    check=True,
+                )
+                console.print(
+                    "✅ Secret Manager permissions granted to Cloud Build service account"
+                )
+                break
+            except subprocess.CalledProcessError as e:
+                if "does not exist" in str(e.stderr) and attempt < max_retries - 1:
+                    console.print(
+                        f"⚠️ Service account not ready yet (attempt {attempt + 1}/{max_retries}). Retrying in 10 seconds...",
+                        style="yellow",
+                    )
+                    time.sleep(10)
+                elif attempt < max_retries - 1:
+                    console.print(
+                        f"⚠️ Failed to grant permissions (attempt {attempt + 1}/{max_retries}). Retrying in 5 seconds...",
+                        style="yellow",
+                    )
+                    time.sleep(5)
+                else:
+                    console.print(
+                        f"⚠️ Could not grant Secret Manager permissions after {max_retries} attempts",
+                        style="yellow",
+                    )
+                    console.print(
+                        "You may need to manually grant the permissions if the connection creation fails."
+                    )
+                    # Don't fail here, let the connection creation attempt proceed
+
+        # Wait for IAM changes to propagate
+        console.print(
+            "⏳ Waiting for IAM permissions to propagate (this typically takes 5-10 seconds)..."
+        )
+        time.sleep(10)  # Give IAM time to propagate before proceeding
+    except subprocess.CalledProcessError as e:
+        console.print(
+            f"⚠️ Could not setup Cloud Build service account: {e}", style="yellow"
+        )
+        console.print(
+            "You may need to manually grant the permissions if the connection creation fails."
+        )
+
     def try_create_connection() -> subprocess.CompletedProcess[str]:
         cmd = [
             "gcloud",

src/cli/utils/gcp.py

@@ -35,12 +35,14 @@ from src.cli.utils.version import PACKAGE_NAME, get_current_version
 console = Console()
 
 
-def enable_vertex_ai_api(project_id: str, auto_approve: bool = False) -> bool:
+def enable_vertex_ai_api(
+    project_id: str, auto_approve: bool = False, context: str | None = None
+) -> bool:
     """Enable Vertex AI API with user confirmation and propagation waiting."""
     api_name = "aiplatform.googleapis.com"
 
     # First test if API is already working with a direct connection
-    if _test_vertex_ai_connection(project_id):
+    if _test_vertex_ai_connection(project_id, context=context):
         return True
 
     if not auto_approve:
@@ -80,7 +82,7 @@ def enable_vertex_ai_api(project_id: str, auto_approve: bool = False) -> bool:
         start_time = time.time()
 
         while time.time() - start_time < max_wait_time:
-            if _test_vertex_ai_connection(project_id):
+            if _test_vertex_ai_connection(project_id, context=context):
                 console.print("✓ Vertex AI API is now available")
                 return True
             time.sleep(check_interval)
@@ -97,7 +99,9 @@ def enable_vertex_ai_api(project_id: str, auto_approve: bool = False) -> bool:
         return False
 
 
-def _test_vertex_ai_connection(project_id: str, location: str = "us-central1") -> bool:
+def _test_vertex_ai_connection(
+    project_id: str, location: str = "us-central1", context: str | None = None
+) -> bool:
     """Test Vertex AI connection without raising exceptions."""
     try:
         credentials, _ = google.auth.default()
@@ -106,7 +110,7 @@ def _test_vertex_ai_connection(project_id: str, location: str = "us-central1") -
             client_options=ClientOptions(
                 api_endpoint=f"{location}-aiplatform.googleapis.com"
             ),
-            client_info=get_client_info(),
+            client_info=get_client_info(context),
             transport=initializer.global_config._api_transport,
         )
         request = get_dummy_request(project_id=project_id)
@@ -116,15 +120,16 @@ def _test_vertex_ai_connection(project_id: str, location: str = "us-central1") -
         return False
 
 
-def get_user_agent() -> str:
-    """Returns custom user agent header tuple (version, agent string)."""
+def get_user_agent(context: str | None = None) -> str:
+    """Returns a custom user agent string."""
     version = get_current_version()
-    return f"{version}-{PACKAGE_NAME}/{version}-{PACKAGE_NAME}"
+    prefix = "ag" if context == "agent-garden" else ""
+    return f"{prefix}{version}-{PACKAGE_NAME}/{prefix}{version}-{PACKAGE_NAME}"
 
 
-def get_client_info() -> ClientInfo:
+def get_client_info(context: str | None = None) -> ClientInfo:
     """Returns ClientInfo with custom user agent."""
-    user_agent = get_user_agent()
+    user_agent = get_user_agent(context)
     return ClientInfo(client_library_version=user_agent, user_agent=user_agent)
 
 
@@ -140,14 +145,15 @@ def verify_vertex_connection(
     project_id: str,
     location: str = "us-central1",
     auto_approve: bool = False,
+    context: str | None = None,
 ) -> None:
     """Verifies Vertex AI connection with a test Gemini request."""
     # First try direct connection - if it works, we're done
-    if _test_vertex_ai_connection(project_id, location):
+    if _test_vertex_ai_connection(project_id, location, context):
         return
 
     # If that failed, try to enable the API
-    if not enable_vertex_ai_api(project_id, auto_approve):
+    if not enable_vertex_ai_api(project_id, auto_approve, context):
         raise Exception("Vertex AI API is not enabled and user declined to enable it")
 
     # After enabling, test again with proper error handling
@@ -157,7 +163,7 @@ def verify_vertex_connection(
         client_options=ClientOptions(
             api_endpoint=f"{location}-aiplatform.googleapis.com"
         ),
-        client_info=get_client_info(),
+        client_info=get_client_info(context),
         transport=initializer.global_config._api_transport,
     )
     request = get_dummy_request(project_id=project_id)

src/cli/utils/logging.py

@@ -25,13 +25,14 @@ F = TypeVar("F", bound=Callable[..., Any])
 
 
 def display_welcome_banner(
-    agent: str | None = None, enhance_mode: bool = False
+    agent: str | None = None, enhance_mode: bool = False, agent_garden: bool = False
 ) -> None:
     """Display the Agent Starter Pack welcome banner.
 
     Args:
         agent: Optional agent specification to customize the welcome message
         enhance_mode: Whether this is for enhancement mode
+        agent_garden: Whether this deployment is from Agent Garden
     """
     if enhance_mode:
         console.print(
@@ -42,6 +43,17 @@ def display_welcome_banner(
             "Enhancing your existing project with production-ready agent capabilities!\n",
             style="green",
         )
+    elif agent_garden:
+        console.print(
+            "\n=== Welcome to Agent Garden! 🌱 ===",
+            style="bold blue",
+        )
+        console.print(
+            "Powered by [link=https://goo.gle/agent-starter-pack]Google Cloud - Agent Starter Pack [/link]\n",
+        )
+        console.print(
+            "This tool will help you deploy production-ready AI agents from Agent Garden to Google Cloud!\n"
+        )
     elif agent and agent.startswith("adk@"):
         console.print(
             "\n=== Welcome to [link=https://github.com/google/adk-samples]google/adk-samples[/link]! ✨ ===",

src/cli/utils/template.py

@@ -448,6 +448,7 @@ def process_template(
     remote_config: dict[str, Any] | None = None,
     in_folder: bool = False,
     cli_overrides: dict[str, Any] | None = None,
+    agent_garden: bool = False,
 ) -> None:
     """Process the template directory and create a new project.
 
@@ -465,6 +466,7 @@ def process_template(
         remote_config: Optional remote template configuration
         in_folder: Whether to template directly into the output directory instead of creating a subdirectory
         cli_overrides: Optional CLI override values that should take precedence over template config
+        agent_garden: Whether this deployment is from Agent Garden
     """
     logging.debug(f"Processing template from {template_dir}")
     logging.debug(f"Project name: {project_name}")
@@ -703,6 +705,7 @@ def process_template(
                 "data_ingestion": include_data_ingestion,
                 "datastore_type": datastore if datastore else "",
                 "agent_directory": get_agent_directory(template_config, cli_overrides),
+                "agent_garden": agent_garden,
                 "adk_cheatsheet": adk_cheatsheet_content,
                 "llm_txt": llm_txt_content,
                 "_copy_without_render": [