agent-starter-pack 0.15.0__tar.gz → 0.15.2__tar.gz

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.15.0
+Version: 0.15.2
 Summary: CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates.
 Author-email: Google LLC <agent-starter-pack@google.com>
 License: Apache-2.0

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/agents/adk_base/.template/templateconfig.yaml

@@ -18,7 +18,7 @@ settings:
   requires_data_ingestion: false
   requires_session: true
   deployment_targets: ["agent_engine", "cloud_run"]
-  extra_dependencies: ["google-adk~=1.8.0"]
+  extra_dependencies: ["google-adk~=1.14.0"]
   tags: ["adk"]
   frontend_type: "None"
     

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/agents/adk_base/README.md

@@ -4,7 +4,7 @@
 
 A basic agent built using the **[Google Agent Development Kit (ADK)](https://google.github.io/adk-docs/)**. This example demonstrates core ADK concepts like agent creation and tool integration in a minimal setup.
 
-This agent uses the `gemini-2.0-flash` model and is equipped with two simple tools:
+This agent uses the `gemini-2.5-flash` model and is equipped with two simple tools:
 *   `get_weather`: Simulates fetching weather (hardcoded for SF).
 *   `get_current_time`: Simulates fetching the time (hardcoded for SF).
 

{agent_starter_pack-0.15.0/agents/agentic_rag → agent_starter_pack-0.15.2/agents/adk_base}/notebooks/adk_app_testing.ipynb

@@ -4,15 +4,12 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# ADK Application Testing\n",
+    "# 🧪 ADK Application Testing\n",
     "\n",
     "This notebook demonstrates how to test an ADK (Agent Development Kit) application.\n",
     "It covers both local and remote testing, both with Agent Engine and Cloud Run.\n",
     "\n",
-    "> **Note**: This notebook assumes that the agent files are stored in the `app` folder. If your agent files are located in a different directory, please update all relevant file paths and references accordingly.\n",
-    "\n",
-    "<img src=\"https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/images/adk_logo.png?raw=true\" width=\"400\">\n",
-    "\n"
+    "> **Note**: This notebook assumes that the agent files are stored in the `app` folder. If your agent files are located in a different directory, please update all relevant file paths and references accordingly."
    ]
   },
   {
@@ -92,12 +89,21 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Replace PROJECT_ID and ENGINE_ID with your values\n",
-    "AGENT_ENGINE_ID = \"projects/PROJECT_ID/locations/us-central1/reasoningEngines/ENGINE_ID\"\n",
+    "# Set to None to auto-detect from ./deployment_metadata.json, or specify manually\n",
+    "# \"projects/PROJECT_ID/locations/us-central1/reasoningEngines/ENGINE_ID\"\n",
+    "REASONING_ENGINE_ID = None\n",
+    "\n",
+    "if REASONING_ENGINE_ID is None:\n",
+    "    try:\n",
+    "        with open(\"../deployment_metadata.json\") as f:\n",
+    "            metadata = json.load(f)\n",
+    "            REASONING_ENGINE_ID = metadata.get(\"remote_agent_engine_id\")\n",
+    "    except (FileNotFoundError, json.JSONDecodeError):\n",
+    "        pass\n",
     "\n",
+    "print(f\"Using REASONING_ENGINE_ID: {REASONING_ENGINE_ID}\")\n",
     "# Get the existing agent engine\n",
-    "remote_agent_engine = client.agent_engines.get(name=AGENT_ENGINE_ID)\n",
-    "print(f\"Retrieved agent engine: {remote_agent_engine.api_resource.name}\")"
+    "remote_agent_engine = client.agent_engines.get(name=REASONING_ENGINE_ID)"
    ]
   },
   {
@@ -354,7 +360,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "myagent-1757939450",
+   "display_name": "myagent-1758791726",
    "language": "python",
    "name": "python3"
   },

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/agents/agentic_rag/.template/templateconfig.yaml

@@ -19,7 +19,7 @@ settings:
   requires_session: true
   deployment_targets: ["agent_engine", "cloud_run"]
   extra_dependencies: [
-    "google-adk~=1.8.0",
+    "google-adk~=1.14.0",
     "langchain-google-vertexai~=2.0.7",
     "langchain~=0.3.24",
     "langchain-core~=0.3.55",

{agent_starter_pack-0.15.0/agents/adk_base → agent_starter_pack-0.15.2/agents/agentic_rag}/notebooks/adk_app_testing.ipynb

@@ -4,15 +4,12 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# ADK Application Testing\n",
+    "# 🧪 ADK Application Testing\n",
     "\n",
     "This notebook demonstrates how to test an ADK (Agent Development Kit) application.\n",
     "It covers both local and remote testing, both with Agent Engine and Cloud Run.\n",
     "\n",
-    "> **Note**: This notebook assumes that the agent files are stored in the `app` folder. If your agent files are located in a different directory, please update all relevant file paths and references accordingly.\n",
-    "\n",
-    "<img src=\"https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/images/adk_logo.png?raw=true\" width=\"400\">\n",
-    "\n"
+    "> **Note**: This notebook assumes that the agent files are stored in the `app` folder. If your agent files are located in a different directory, please update all relevant file paths and references accordingly."
    ]
   },
   {
@@ -92,12 +89,21 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Replace PROJECT_ID and ENGINE_ID with your values\n",
-    "AGENT_ENGINE_ID = \"projects/PROJECT_ID/locations/us-central1/reasoningEngines/ENGINE_ID\"\n",
+    "# Set to None to auto-detect from ./deployment_metadata.json, or specify manually\n",
+    "# \"projects/PROJECT_ID/locations/us-central1/reasoningEngines/ENGINE_ID\"\n",
+    "REASONING_ENGINE_ID = None\n",
+    "\n",
+    "if REASONING_ENGINE_ID is None:\n",
+    "    try:\n",
+    "        with open(\"../deployment_metadata.json\") as f:\n",
+    "            metadata = json.load(f)\n",
+    "            REASONING_ENGINE_ID = metadata.get(\"remote_agent_engine_id\")\n",
+    "    except (FileNotFoundError, json.JSONDecodeError):\n",
+    "        pass\n",
     "\n",
+    "print(f\"Using REASONING_ENGINE_ID: {REASONING_ENGINE_ID}\")\n",
     "# Get the existing agent engine\n",
-    "remote_agent_engine = client.agent_engines.get(name=AGENT_ENGINE_ID)\n",
-    "print(f\"Retrieved agent engine: {remote_agent_engine.api_resource.name}\")"
+    "remote_agent_engine = client.agent_engines.get(name=REASONING_ENGINE_ID)"
    ]
   },
   {
@@ -354,7 +360,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "myagent-1757939450",
+   "display_name": "myagent-1758791726",
    "language": "python",
    "name": "python3"
   },

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/agents/live_api/.template/templateconfig.yaml

@@ -19,6 +19,6 @@ settings:
   deployment_targets: ["cloud_run"]
   extra_dependencies: [
     "backoff~=2.2.1",
-    "google-genai~=1.16.0",
+    "google-genai>=1.16.0",
   ]
 example_question: "What's the weather in San Francisco?"

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.15.0"
+version = "0.15.2"
 description = "CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates."
 authors = [
     { name = "Google LLC", email = "agent-starter-pack@google.com" },

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/src/base_template/pyproject.toml

@@ -16,12 +16,12 @@ dependencies = [
 {%- endif %}
     "google-cloud-logging>=3.12.0",
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
-    "google-cloud-aiplatform[evaluation]~=1.113.0",
+    "google-cloud-aiplatform[evaluation]~=1.116.0",
     "fastapi~=0.115.8",
     "uvicorn~=0.34.0",
     "psycopg2-binary>=2.9.10",
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
-    "google-cloud-aiplatform[evaluation,agent-engines]~=1.113.0"
+    "google-cloud-aiplatform[evaluation,agent-engines]~=1.116.0"
 {%- endif %}
 ]
 {% if cookiecutter.deployment_target == 'cloud_run' %}

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/src/cli/commands/enhance.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import pathlib
+import re
 import sys
 from typing import Any
 
@@ -26,7 +27,7 @@ else:
     import tomli as tomllib
 
 from ..utils.logging import display_welcome_banner, handle_cli_error
-from ..utils.template import get_available_agents
+from ..utils.template import get_available_agents, validate_agent_directory_name
 from .create import (
     create,
     get_available_base_templates,
@@ -96,82 +97,110 @@ 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
-        )
-    ]
+    while True:
+        console.print()
+        console.print("📁 [bold]Agent Directory Selection[/bold]")
+        console.print()
+        console.print("Your project needs an agent directory containing:")
+        console.print("  • [cyan]agent.py[/cyan] file with your agent logic")
+        console.print("  • [cyan]root_agent[/cyan] variable defined in agent.py")
+        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()
+        # Sort directories and create choices
+        available_dirs.sort()
 
-    directory_choices = {}
-    choice_num = 1
-    default_choice = None
+        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
+        # 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
-
-    # 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
+            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_py_exists = (current_dir / dir_name / "agent.py").exists()
+            hint = " (has agent.py)" if agent_py_exists 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
-    )
+        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
+        if choice in directory_choices:
+            selected = directory_choices[choice]
+            if selected == "__custom__":
+                console.print()
+                while True:
+                    custom_dir = Prompt.ask(
+                        "Enter custom agent directory name", default=detected_directory
+                    )
+                    try:
+                        validate_agent_directory_name(custom_dir)
+                        return custom_dir
+                    except ValueError as e:
+                        console.print(f"[bold red]Error:[/] {e}", style="bold red")
+                        console.print("Please try again with a valid directory name.")
+            else:
+                # Validate existing directory selection as well
+                try:
+                    validate_agent_directory_name(selected)
+                    return selected
+                except ValueError as e:
+                    console.print(f"[bold red]Error:[/] {e}", style="bold red")
+                    console.print(
+                        "This directory cannot be used as an agent directory. Please select another option."
+                    )
+                    console.print()
+                    # Continue the loop to re-prompt without recursion
+                    continue
         else:
-            return selected
-    else:
-        raise ValueError(f"Invalid agent directory selection: {choice}")
+            console.print(
+                f"[bold red]Error:[/] Invalid selection: {choice}", style="bold red"
+            )
+            console.print("Please choose a valid option from the list.")
+            console.print()
+            # Continue the loop to re-prompt without recursion
+            continue
 
 
 @click.command()
@@ -389,11 +418,8 @@ def enhance(
                         )
                     pass  # Fall back to default
 
-        # 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:
+        # Interactive agent directory selection if not provided via CLI and not auto-approved
+        if not agent_directory and not auto_approve:
             selected_agent_directory = display_agent_directory_selection(
                 current_dir, detected_agent_directory
             )
@@ -464,16 +490,82 @@ def enhance(
                     console.print("✋ [yellow]Enhancement cancelled.[/yellow]")
                     return
         else:
-            # Check for common agent files
+            # Check for agent.py and validate required object
             agent_py = agent_folder / "agent.py"
+
+            # Determine required object outside of if/else blocks to avoid NameError
+            is_adk = base_template and "adk" in base_template.lower()
+            required_object = "root_agent" if is_adk else "agent"
+
             if agent_py.exists():
                 console.print(
-                    f"Detected existing agent structure with [cyan]/{final_agent_directory}/agent.py[/cyan]"
+                    f"✅ Found [cyan]/{final_agent_directory}/agent.py[/cyan]"
                 )
+
+                try:
+                    content = agent_py.read_text(encoding="utf-8")
+
+                    # Look for the required object definition using static analysis
+                    patterns = [
+                        rf"^\s*{required_object}\s*=",  # assignment: root_agent = ...
+                        rf"^\s*def\s+{required_object}",  # function: def root_agent(...)
+                        rf"from\s+.*\s+import\s+.*{required_object}",  # import: from ... import root_agent
+                    ]
+
+                    found = any(
+                        re.search(pattern, content, re.MULTILINE)
+                        for pattern in patterns
+                    )
+
+                    if found:
+                        console.print(
+                            f"✅ Found '{required_object}' definition in {final_agent_directory}/agent.py"
+                        )
+                    else:
+                        console.print(
+                            f"⚠️  [yellow]Missing '{required_object}' variable in {final_agent_directory}/agent.py[/yellow]"
+                        )
+                        console.print(
+                            "   This variable should contain your main agent instance for deployment."
+                        )
+                        console.print(
+                            f"   Example: [cyan]{required_object} = YourAgentClass()[/cyan]"
+                        )
+                        # Show ADK docs link for ADK templates
+                        if is_adk:
+                            console.print(
+                                "   📖 Learn more: [cyan][link=https://google.github.io/adk-docs/get-started/quickstart/#agentpy]ADK agent.py guide[/link][/cyan]"
+                            )
+                        console.print()
+                        if not auto_approve:
+                            if not click.confirm(
+                                f"Continue enhancement? (You can add '{required_object}' later)",
+                                default=True,
+                            ):
+                                console.print(
+                                    "✋ [yellow]Enhancement cancelled.[/yellow]"
+                                )
+                                return
+
+                except Exception as e:
+                    console.print(
+                        f"⚠️  [yellow]Warning: Could not read {final_agent_directory}/agent.py: {e}[/yellow]"
+                    )
             else:
                 console.print(
-                    f"ℹ️  [blue]Found /{final_agent_directory} folder[/blue] - ensure your agent code is properly organized within it, including an agent.py file"
+                    f"⚠️  [yellow]Warning: {final_agent_directory}/agent.py not found[/yellow]"
                 )
+                console.print(
+                    f"   Create {final_agent_directory}/agent.py with your agent logic and define: [cyan]{required_object} = your_agent_instance[/cyan]"
+                )
+                console.print()
+                if not auto_approve:
+                    if not click.confirm(
+                        f"Continue enhancement? (An example {final_agent_directory}/agent.py will be created for you)",
+                        default=True,
+                    ):
+                        console.print("✋ [yellow]Enhancement cancelled.[/yellow]")
+                        return
 
     # Prepare CLI overrides to pass to create command
     final_cli_overrides: dict[str, Any] = {}

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/src/cli/utils/gcp.py

@@ -147,7 +147,7 @@ def get_dummy_request(project_id: str) -> CountTokensRequest:
     """Creates a simple test request for Gemini."""
     return CountTokensRequest(
         contents=[{"role": "user", "parts": [{"text": "Hi"}]}],
-        endpoint=f"projects/{project_id}/locations/global/publishers/google/models/gemini-2.0-flash",
+        endpoint=f"projects/{project_id}/locations/global/publishers/google/models/gemini-2.5-flash",
     )
 
 

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/src/cli/utils/template.py

@@ -35,6 +35,30 @@ from .remote_template import (
 )
 
 
+def validate_agent_directory_name(agent_dir: str) -> None:
+    """Validate that an agent directory name is a valid Python identifier.
+
+    Args:
+        agent_dir: The agent directory name to validate
+
+    Raises:
+        ValueError: If the agent directory name is not a valid Python identifier
+    """
+    if "-" in agent_dir:
+        raise ValueError(
+            f"Agent directory '{agent_dir}' contains hyphens (-) which are not allowed. "
+            "Agent directories must be valid Python identifiers since they're used as module names. "
+            "Please use underscores (_) or lowercase letters instead."
+        )
+
+    if not agent_dir.replace("_", "a").isidentifier():
+        raise ValueError(
+            f"Agent directory '{agent_dir}' is not a valid Python identifier. "
+            "Agent directories must be valid Python identifiers since they're used as module names. "
+            "Please use only lowercase letters, numbers, and underscores, and don't start with a number."
+        )
+
+
 @dataclass
 class TemplateConfig:
     name: str
@@ -478,13 +502,22 @@ def process_template(
         template_config: dict[str, Any], cli_overrides: dict[str, Any] | None = None
     ) -> str:
         """Get agent directory with CLI override support."""
+        agent_dir = None
         if (
             cli_overrides
             and "settings" in cli_overrides
             and "agent_directory" in cli_overrides["settings"]
         ):
-            return cli_overrides["settings"]["agent_directory"]
-        return template_config.get("settings", {}).get("agent_directory", "app")
+            agent_dir = cli_overrides["settings"]["agent_directory"]
+        else:
+            agent_dir = template_config.get("settings", {}).get(
+                "agent_directory", "app"
+            )
+
+        # Validate agent directory is a valid Python identifier
+        validate_agent_directory_name(agent_dir)
+
+        return agent_dir
 
     # Handle remote vs local templates
     is_remote = remote_template_path is not None

{agent_starter_pack-0.15.0 → agent_starter_pack-0.15.2}/src/deployment_targets/agent_engine/{{cookiecutter.agent_directory}}/agent_engine_app.py

@@ -282,6 +282,12 @@ def deploy_agent_engine_app(
 
     logging.info(f"Agent Engine ID written to {metadata_file}")
 
+{%- if "adk" in cookiecutter.tags %}
+    print(
+        "\n✅ Deployment successful! Test your agent: notebooks/adk_app_testing.ipynb\n"
+    )
+{%- endif %}
+
     return remote_agent