agent-starter-pack 0.9.1__py3-none-any.whl → 0.10.0__py3-none-any.whl

src/cli/commands/create.py

@@ -15,14 +15,16 @@
 import logging
 import os
 import pathlib
+import shutil
 import subprocess
+import tempfile
 
 import click
 from click.core import ParameterSource
 from rich.console import Console
 from rich.prompt import IntPrompt, Prompt
 
-from ..utils.datastores import DATASTORE_TYPES
+from ..utils.datastores import DATASTORE_TYPES, DATASTORES
 from ..utils.gcp import verify_credentials, verify_vertex_connection
 from ..utils.logging import handle_cli_error
 from ..utils.remote_template import (
@@ -34,9 +36,11 @@ from ..utils.remote_template import (
 )
 from ..utils.template import (
     get_available_agents,
+    get_deployment_targets,
     get_template_path,
     load_template_config,
     process_template,
+    prompt_cicd_runner_selection,
     prompt_datastore_selection,
     prompt_deployment_target,
     prompt_session_type_selection,
@@ -93,6 +97,11 @@ def normalize_project_name(project_name: str) -> str:
     type=click.Choice(["agent_engine", "cloud_run"]),
     help="Deployment target name",
 )
+@click.option(
+    "--cicd-runner",
+    type=click.Choice(["google_cloud_build", "github_actions"]),
+    help="CI/CD runner to use",
+)
 @click.option(
     "--include-data-ingestion",
     "-i",
@@ -107,7 +116,7 @@ def normalize_project_name(project_name: str) -> str:
 )
 @click.option(
     "--session-type",
-    type=click.Choice(["in_memory", "alloydb"]),
+    type=click.Choice(["in_memory", "alloydb", "agent_engine"]),
     help="Type of session storage to use",
 )
 @click.option("--debug", is_flag=True, help="Enable debug logging")
@@ -128,7 +137,7 @@ def normalize_project_name(project_name: str) -> str:
 @click.option(
     "--skip-checks",
     is_flag=True,
-    help="Skip verification checks for uv, GCP and Vertex AI",
+    help="Skip verification checks for GCP and Vertex AI",
     default=False,
 )
 @handle_cli_error
@@ -137,6 +146,7 @@ def create(
     project_name: str,
     agent: str | None,
     deployment_target: str | None,
+    cicd_runner: str | None,
     include_data_ingestion: bool,
     datastore: str | None,
     session_type: str | None,
@@ -201,17 +211,28 @@ def create(
         # Agent selection - handle remote templates
         selected_agent = None
         template_source_path = None
+        temp_dir_to_clean = None
 
         if agent:
             if agent.startswith("local@"):
                 path_str = agent.split("@", 1)[1]
-                template_source_path = pathlib.Path(path_str).resolve()
-                if not template_source_path.is_dir():
+                local_path = pathlib.Path(path_str).resolve()
+                if not local_path.is_dir():
                     raise click.ClickException(
-                        f"Local path not found or not a directory: {template_source_path}"
+                        f"Local path not found or not a directory: {local_path}"
                     )
+
+                # Create a temporary directory and copy the local template to it
+                temp_dir = tempfile.mkdtemp(prefix="asp_local_template_")
+                temp_dir_to_clean = temp_dir
+                template_source_path = pathlib.Path(temp_dir) / local_path.name
+                shutil.copytree(local_path, template_source_path)
+
                 selected_agent = f"local_{template_source_path.name}"
-                console.print(f"Using local template: {template_source_path}")
+                console.print(f"Using local template: {local_path}")
+                logging.debug(
+                    f"Copied local template to temporary dir: {template_source_path}"
+                )
             else:
                 # Check if it's a remote template specification
                 remote_spec = parse_agent_spec(agent)
@@ -223,7 +244,10 @@ def create(
                         )
                     else:
                         console.print(f"Fetching remote template: {agent}")
-                    template_source_path = fetch_remote_template(remote_spec)
+                    template_source_path, temp_dir_path = fetch_remote_template(
+                        remote_spec
+                    )
+                    temp_dir_to_clean = str(temp_dir_path)
                     selected_agent = f"remote_{hash(agent)}"  # Generate unique name for remote template
                 else:
                     # Handle local agent selection
@@ -244,13 +268,17 @@ def create(
                                 f"Invalid agent name or number: {agent}"
                             ) from err
 
-        final_agent = (
-            selected_agent
-            if selected_agent
-            else display_agent_selection(deployment_target)
-        )
+        # Agent selection
+        final_agent = selected_agent
+        if not final_agent:
+            if auto_approve:
+                raise click.ClickException(
+                    "Error: --agent is required when running with --auto-approve."
+                )
+            final_agent = display_agent_selection(deployment_target)
+
         if debug:
-            logging.debug(f"Selected agent: {agent}")
+            logging.debug(f"Selected agent: {final_agent}")
 
         # Load template configuration based on whether it's remote or local
         if template_source_path:
@@ -302,14 +330,19 @@ def create(
             config = load_template_config(template_path)
         # Data ingestion and datastore selection
         if include_data_ingestion or datastore:
-            # If datastore is specified but include_data_ingestion is not, set it to True
             include_data_ingestion = True
-
-            # If include_data_ingestion is True but no datastore is specified, prompt for it
             if not datastore:
-                # Pass a flag to indicate this is from explicit CLI flag
-                datastore = prompt_datastore_selection(final_agent, from_cli_flag=True)
-
+                if auto_approve:
+                    # Default to the first available datastore in non-interactive mode
+                    datastore = next(iter(DATASTORES.keys()))
+                    console.print(
+                        f"Info: --datastore not specified. Defaulting to '{datastore}' in auto-approve mode.",
+                        style="yellow",
+                    )
+                else:
+                    datastore = prompt_datastore_selection(
+                        final_agent, from_cli_flag=True
+                    )
             if debug:
                 logging.debug(f"Data ingestion enabled: {include_data_ingestion}")
                 logging.debug(f"Selected datastore type: {datastore}")
@@ -317,8 +350,15 @@ def create(
             # Check if the agent requires data ingestion
             if config and config.get("settings", {}).get("requires_data_ingestion"):
                 include_data_ingestion = True
-                datastore = prompt_datastore_selection(final_agent)
-
+                if not datastore:
+                    if auto_approve:
+                        datastore = next(iter(DATASTORES.keys()))
+                        console.print(
+                            f"Info: --datastore not specified. Defaulting to '{datastore}' in auto-approve mode.",
+                            style="yellow",
+                        )
+                    else:
+                        datastore = prompt_datastore_selection(final_agent)
                 if debug:
                     logging.debug(
                         f"Data ingestion required by agent: {include_data_ingestion}"
@@ -334,13 +374,25 @@ def create(
             deployment_agent_name = get_base_template_name(config)
             remote_config = config
 
-        final_deployment = (
-            deployment_target
-            if deployment_target
-            else prompt_deployment_target(
+        final_deployment = deployment_target
+        if not final_deployment:
+            available_targets = get_deployment_targets(
                 deployment_agent_name, remote_config=remote_config
             )
-        )
+            if auto_approve:
+                if not available_targets:
+                    raise click.ClickException(
+                        f"Error: No deployment targets available for agent '{deployment_agent_name}'."
+                    )
+                final_deployment = available_targets[0]
+                console.print(
+                    f"Info: --deployment-target not specified. Defaulting to '{final_deployment}' in auto-approve mode.",
+                    style="yellow",
+                )
+            else:
+                final_deployment = prompt_deployment_target(
+                    deployment_agent_name, remote_config=remote_config
+                )
         if debug:
             logging.debug(f"Selected deployment target: {final_deployment}")
 
@@ -359,8 +411,19 @@ def create(
                 )
                 return
 
-            if final_deployment in ("cloud_run") and not session_type:
-                final_session_type = prompt_session_type_selection()
+            if (
+                final_deployment is not None
+                and final_deployment in ("cloud_run")
+                and not session_type
+            ):
+                if auto_approve:
+                    final_session_type = "in_memory"
+                    console.print(
+                        "Info: --session-type not specified. Defaulting to 'in_memory' in auto-approve mode.",
+                        style="yellow",
+                    )
+                else:
+                    final_session_type = prompt_session_type_selection()
         else:
             # Agents that don't require session management always use in-memory sessions
             final_session_type = "in_memory"
@@ -374,6 +437,20 @@ def create(
         if debug and final_session_type:
             logging.debug(f"Selected session type: {final_session_type}")
 
+        # CI/CD runner selection
+        final_cicd_runner = cicd_runner
+        if not final_cicd_runner:
+            if auto_approve:
+                final_cicd_runner = "google_cloud_build"
+                console.print(
+                    "Info: --cicd-runner not specified. Defaulting to 'google_cloud_build' in auto-approve mode.",
+                    style="yellow",
+                )
+            else:
+                final_cicd_runner = prompt_cicd_runner_selection()
+        if debug:
+            logging.debug(f"Selected CI/CD runner: {final_cicd_runner}")
+
         # Region confirmation (if not explicitly passed)
         if (
             not auto_approve
@@ -404,7 +481,7 @@ def create(
                 )
                 console.print(
                     "> Please check your authentication settings and permissions. "
-                    "Visit https://cloud.google.com/vertex-ai/docs/authentication for help.",
+                    "> Visit https://cloud.google.com/vertex-ai/docs/authentication for help.",
                     style="yellow",
                 )
                 console.print(
@@ -434,6 +511,7 @@ def create(
                 template_path,
                 project_name,
                 deployment_target=final_deployment,
+                cicd_runner=final_cicd_runner,
                 include_data_ingestion=include_data_ingestion,
                 datastore=datastore,
                 session_type=final_session_type,
@@ -441,10 +519,22 @@ def create(
                 remote_template_path=template_source_path,
                 remote_config=config if template_source_path else None,
             )
-        finally:
+
             # Replace region in all files if a different region was specified
             if region != "us-central1":
                 replace_region_in_files(project_path, region, debug=debug)
+        finally:
+            # Clean up the temporary directory if one was created
+            if temp_dir_to_clean:
+                try:
+                    shutil.rmtree(temp_dir_to_clean)
+                    logging.debug(
+                        f"Successfully cleaned up temporary directory: {temp_dir_to_clean}"
+                    )
+                except OSError as e:
+                    logging.warning(
+                        f"Failed to clean up temporary directory {temp_dir_to_clean}: {e}"
+                    )
 
         project_path = destination_dir / project_name
         cd_path = project_path if output_dir else project_name
@@ -474,14 +564,12 @@ def create(
         console.print("\n🚀 To get started, run the following command:")
 
         # Check if the agent has a 'dev' command in its settings
-        if config["settings"].get("commands", {}).get("extra", {}).get("dev"):
-            console.print(
-                f"   [bold bright_green]cd {cd_path} && make install && make dev[/]"
-            )
-        else:
-            console.print(
-                f"   [bold bright_green]cd {cd_path} && make install && make playground[/]"
-            )
+        interactive_command = config.get("settings", {}).get(
+            "interactive_command", "playground"
+        )
+        console.print(
+            f"   [bold bright_green]cd {cd_path} && make install && make {interactive_command}[/]"
+        )
     except Exception:
         if debug:
             logging.exception(
@@ -518,14 +606,108 @@ def display_agent_selection(deployment_target: str | None = None) -> str:
             f"{num}. [bold]{agent['name']}[/] - [dim]{agent['description']}[/]"
         )
 
+    # Add special option for adk-samples
+    adk_samples_option = len(agents) + 1
+    console.print(
+        f"{adk_samples_option}. [bold]Browse agents from [link=https://github.com/google/adk-samples]google/adk-samples[/link][/] - [dim]Discover additional samples[/]"
+    )
+
     choice = IntPrompt.ask(
         "\nEnter the number of your template choice", default=1, show_default=True
     )
 
-    if choice not in agents:
+    if choice == adk_samples_option:
+        return display_adk_samples_selection()
+    elif choice in agents:
+        return agents[choice]["name"]
+    else:
         raise ValueError(f"Invalid agent selection: {choice}")
 
-    return agents[choice]["name"]
+
+def display_adk_samples_selection() -> str:
+    """Display adk-samples agents and prompt for selection."""
+
+    from ..utils.remote_template import fetch_remote_template, parse_agent_spec
+
+    console.print("\n> Fetching agents from [bold blue]google/adk-samples[/]...")
+
+    try:
+        # Parse the adk-samples repository
+        spec = parse_agent_spec("https://github.com/google/adk-samples")
+        if not spec:
+            raise RuntimeError("Failed to parse adk-samples repository")
+
+        # Fetch the repository
+        repo_path, _ = fetch_remote_template(spec)
+
+        # Scan for agents in the repository
+        adk_agents = {}
+        agent_count = 1
+
+        # Search for templateconfig.yaml files to identify agents
+        for config_path in sorted(repo_path.glob("**/templateconfig.yaml")):
+            try:
+                import yaml
+
+                with open(config_path, encoding="utf-8") as f:
+                    config = yaml.safe_load(f)
+
+                agent_name = config.get("name", config_path.parent.parent.name)
+                description = config.get("description", "No description available")
+
+                # Get the relative path from repo root
+                relative_path = config_path.parent.parent.relative_to(repo_path)
+
+                adk_agents[agent_count] = {
+                    "name": agent_name,
+                    "description": description,
+                    "path": str(relative_path),
+                    "spec": f"adk@{relative_path}",
+                }
+                agent_count += 1
+
+            except Exception as e:
+                logging.warning(
+                    f"Could not load agent from {config_path.parent.parent}: {e}"
+                )
+
+        if not adk_agents:
+            console.print("No agents found in adk-samples repository", style="yellow")
+            # Fall back to local agents
+            return display_agent_selection()
+
+        console.print("\n> Available agents from [bold blue]google/adk-samples[/]:")
+        for num, agent in adk_agents.items():
+            console.print(
+                f"{num}. [bold]{agent['name']}[/] - [dim]{agent['description']}[/]"
+            )
+
+        # Add option to go back to local agents
+        back_option = len(adk_agents) + 1
+        console.print(
+            f"{back_option}. [bold]← Back to built-in agents[/] - [dim]Return to local agent selection[/]"
+        )
+
+        choice = IntPrompt.ask(
+            "\nEnter the number of your choice", default=1, show_default=True
+        )
+
+        if choice == back_option:
+            return display_agent_selection()
+        elif choice in adk_agents:
+            # Return the adk@ spec for the selected agent
+            selected_agent = adk_agents[choice]
+            console.print(
+                f"\n> Selected: [bold]{selected_agent['name']}[/] from adk-samples"
+            )
+            return selected_agent["spec"]
+        else:
+            raise ValueError(f"Invalid agent selection: {choice}")
+
+    except Exception as e:
+        console.print(f"Error fetching adk-samples agents: {e}", style="bold red")
+        console.print("Falling back to built-in agents...", style="yellow")
+        return display_agent_selection()
 
 
 def set_gcp_project(project_id: str, set_quota_project: bool = True) -> None:

src/cli/commands/list.py

@@ -45,7 +45,7 @@ def display_agents_from_path(base_path: pathlib.Path, source_name: str) -> None:
     # Search for templateconfig.yaml files to identify agents
     for config_path in sorted(base_path.glob("**/templateconfig.yaml")):
         try:
-            with open(config_path) as f:
+            with open(config_path, encoding="utf-8") as f:
                 config = yaml.safe_load(f)
 
             agent_name = config.get("name", config_path.parent.parent.name)
@@ -82,15 +82,9 @@ def list_remote_agents(remote_source: str, scan_from_root: bool = False) -> None
         # specific template directory within the repo.
         template_dir_path = fetch_remote_template(spec)
 
-        if scan_from_root:
-            # For ADK, we want to scan the entire repo. We need to find the
-            # root of the repo and scan from there.
-            scan_path = template_dir_path
-            while not (scan_path / ".git").exists() and scan_path.parent != scan_path:
-                scan_path = scan_path.parent
-        else:
-            # For other git repos, respect the path given in the URL.
-            scan_path = template_dir_path
+        # fetch_remote_template always returns a tuple of (repo_path, template_path)
+        repo_path, template_path = template_dir_path
+        scan_path = repo_path if scan_from_root else template_path
 
         display_agents_from_path(scan_path, remote_source)