agent-starter-pack 0.17.2__tar.gz → 0.17.3__tar.gz

{agent_starter_pack-0.17.2 → agent_starter_pack-0.17.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.17.2
+Version: 0.17.3
 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.17.2 → agent_starter_pack-0.17.3}/agent_starter_pack/cli/commands/create.py

@@ -470,7 +470,9 @@ def create(
         # Load template configuration based on whether it's remote or local
         if template_source_path:
             # Prepare CLI overrides for remote template config
-            cli_overrides = {}
+            # Initialize cli_overrides if not provided (e.g., from enhance command)
+            if cli_overrides is None:
+                cli_overrides = {}
             if base_template:
                 cli_overrides["base_template"] = base_template
 
@@ -491,7 +493,7 @@ def create(
                 logging.debug(f"Using base template: {base_template_name}")
 
             base_template_path = (
-                pathlib.Path(__file__).parent.parent.parent.parent
+                pathlib.Path(__file__).parent.parent.parent
                 / "agents"
                 / base_template_name
                 / ".template"
@@ -504,7 +506,7 @@ def create(
             template_path = template_source_path / ".template"
         else:
             template_path = (
-                pathlib.Path(__file__).parent.parent.parent.parent
+                pathlib.Path(__file__).parent.parent.parent
                 / "agents"
                 / final_agent
                 / ".template"

{agent_starter_pack-0.17.2 → agent_starter_pack-0.17.3}/agent_starter_pack/cli/commands/enhance.py

@@ -329,10 +329,7 @@ def enhance(
         console.print()
 
     # Determine agent specification based on template_path
-    # If base_template is specified, use it as the agent spec
-    if base_template:
-        agent_spec = base_template
-    elif template_path == pathlib.Path("."):
+    if template_path == pathlib.Path("."):
         # Current directory - use local@ syntax
         agent_spec = "local@."
     elif template_path.is_dir():
@@ -367,6 +364,8 @@ def enhance(
             selected_base_template = display_base_template_selection(
                 original_base_template_name
             )
+            # Always set base_template to the selected value (even if unchanged)
+            base_template = selected_base_template
             if selected_base_template != original_base_template_name:
                 # Update CLI overrides with the selected base template
                 cli_overrides["base_template"] = selected_base_template
@@ -374,7 +373,6 @@ def enhance(
                 if agent_directory:
                     cli_overrides["settings"] = cli_overrides.get("settings", {})
                     cli_overrides["settings"]["agent_directory"] = agent_directory
-                base_template = selected_base_template
                 console.print(
                     f"✅ Selected base template: [cyan]{selected_base_template}[/cyan]"
                 )
@@ -582,9 +580,10 @@ def enhance(
         final_cli_overrides["base_template"] = base_template
 
     # For current directory templates, ensure agent_directory is included in cli_overrides
-    if template_path == pathlib.Path(".") and agent_directory:
+    # final_agent_directory is set from interactive selection or CLI/detection
+    if template_path == pathlib.Path(".") and final_agent_directory:
         final_cli_overrides["settings"] = final_cli_overrides.get("settings", {})
-        final_cli_overrides["settings"]["agent_directory"] = agent_directory
+        final_cli_overrides["settings"]["agent_directory"] = final_agent_directory
 
     # Call the create command with in-folder mode enabled
     ctx.invoke(

{agent_starter_pack-0.17.2 → agent_starter_pack-0.17.3}/agent_starter_pack/cli/utils/template.py

@@ -579,8 +579,8 @@ def process_template(
             )
             # Get agent directory from config early for use in file copying
             # Load config early to get agent_directory
-            if is_remote:
-                early_config = remote_config or {}
+            if remote_config:
+                early_config = remote_config
             else:
                 template_path = pathlib.Path(template_dir)
                 early_config = load_template_config(template_path)
@@ -620,25 +620,16 @@ def process_template(
                 )
                 copy_data_ingestion_files(project_template, datastore)
 
-            # 4. Process frontend files
-            # Load template config
-            template_config = load_template_config(pathlib.Path(template_dir))
-            frontend_type = template_config.get("settings", {}).get(
-                "frontend_type", DEFAULT_FRONTEND
-            )
-            copy_frontend_files(frontend_type, project_template)
-            logging.debug(f"4. Processed frontend files for type: {frontend_type}")
-
-            # 6. Skip remote template files during cookiecutter processing
+            # 4. Skip remote template files during cookiecutter processing
             # Remote files will be copied after cookiecutter to avoid Jinja conflicts
             if is_remote and remote_template_path:
                 logging.debug(
-                    "6. Skipping remote template files during cookiecutter processing - will copy after templating"
+                    "4. Skipping remote template files during cookiecutter processing - will copy after templating"
                 )
 
             # Load and validate template config first
-            if is_remote:
-                config = remote_config or {}
+            if remote_config:
+                config = remote_config
             else:
                 template_path = pathlib.Path(template_dir)
                 config = load_template_config(template_path)
@@ -659,7 +650,14 @@ def process_template(
             # Use the already loaded config
             template_config = config
 
-            # 5. Copy agent-specific files to override base template (using final config)
+            # Process frontend files (after config is properly loaded with CLI overrides)
+            frontend_type = template_config.get("settings", {}).get(
+                "frontend_type", DEFAULT_FRONTEND
+            )
+            copy_frontend_files(frontend_type, project_template)
+            logging.debug(f"5. Processed frontend files for type: {frontend_type}")
+
+            # 6. Copy agent-specific files to override base template (using final config)
             if agent_path.exists():
                 agent_directory = get_agent_directory(template_config, cli_overrides)
 
@@ -673,7 +671,7 @@ def process_template(
                 target_agent_folder = project_template / agent_directory
                 if source_agent_folder.exists():
                     logging.debug(
-                        f"5. Copying agent folder {template_agent_directory} -> {agent_directory} with override"
+                        f"6. Copying agent folder {template_agent_directory} -> {agent_directory} with override"
                     )
                     copy_files(
                         source_agent_folder,
@@ -689,7 +687,7 @@ def process_template(
                     agent_folder = agent_path / folder
                     project_folder = project_template / folder
                     if agent_folder.exists():
-                        logging.debug(f"5. Copying {folder} folder with override")
+                        logging.debug(f"6. Copying {folder} folder with override")
                         copy_files(
                             agent_folder,
                             project_folder,

{agent_starter_pack-0.17.2 → agent_starter_pack-0.17.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.17.2"
+version = "0.17.3"
 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.17.2 → agent_starter_pack-0.17.3}/tests/cli/commands/test_enhance.py

@@ -344,7 +344,13 @@ agent = RunnablePassthrough()
                 f"Enhance failed with output:\n{result.output}"
             )
 
-            # Verify agent_engine_app.py was created
+            # Verify agent.py content was NOT modified (customer file preservation)
+            preserved_agent_content = agent_file.read_text()
+            assert preserved_agent_content == agent_content, (
+                f"agent.py was modified! Expected:\n{agent_content}\n\nGot:\n{preserved_agent_content}"
+            )
+
+            # Verify agent_engine_app.py was created (deployment target specific)
             agent_engine_app = agent_dir / "agent_engine_app.py"
             assert agent_engine_app.exists(), (
                 f"agent_engine_app.py not created in {agent_dir}"
@@ -368,15 +374,14 @@ agent = RunnablePassthrough()
             agent_dir = pathlib.Path("my_custom_agent")
             agent_dir.mkdir()
             agent_file = agent_dir / "agent.py"
-            agent_file.write_text(
-                """from google.adk.agents import Agent
+            agent_content = """from google.adk.agents import Agent
 
 root_agent = Agent(
     name="test_agent",
     model="gemini-2.0-flash-001",
 )
 """
-            )
+            agent_file.write_text(agent_content)
 
             # Run enhance with custom agent directory
             result = runner.invoke(
@@ -399,6 +404,12 @@ root_agent = Agent(
                 f"Enhance failed with output:\n{result.output}"
             )
 
+            # Verify agent.py content was NOT modified (customer file preservation)
+            preserved_agent_content = agent_file.read_text()
+            assert preserved_agent_content == agent_content, (
+                f"agent.py in custom directory was modified! Expected:\n{agent_content}\n\nGot:\n{preserved_agent_content}"
+            )
+
             # Verify agent_engine_app.py was created in custom directory
             agent_engine_app = agent_dir / "agent_engine_app.py"
             assert agent_engine_app.exists(), (
@@ -483,3 +494,192 @@ class TestEnhanceAgentDirectoryPrompt:
                     call_args = mock_display_selection.call_args
                     # The base_template should be passed to the function
                     assert call_args[0][2] == "langgraph_base_react"
+
+
+class TestEnhanceFilePopulation:
+    """Test that enhance properly populates files based on configuration."""
+
+    def test_adk_live_populates_frontend_files(self, tmp_path: pathlib.Path) -> None:
+        """Test that adk_live agent populates frontend files (regression test for bug)."""
+        runner = CliRunner()
+
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            # Create agent directory with adk_live agent.py
+            agent_dir = pathlib.Path("app")
+            agent_dir.mkdir()
+            agent_file = agent_dir / "agent.py"
+
+            agent_content = """from google.adk.agents import Agent
+
+root_agent = Agent(
+    name="test_agent",
+    model="gemini-2.0-flash-001",
+)
+"""
+            agent_file.write_text(agent_content)
+
+            # Run enhance with adk_live base template
+            result = runner.invoke(
+                enhance,
+                [
+                    ".",
+                    "--base-template",
+                    "adk_live",
+                    "--deployment-target",
+                    "agent_engine",
+                    "--auto-approve",
+                    "--skip-checks",
+                ],
+            )
+
+            # Check that enhance succeeded
+            assert result.exit_code == 0, (
+                f"Enhance failed with output:\n{result.output}"
+            )
+
+            # Verify frontend files were populated for adk_live
+            # adk_live uses adk_live_react frontend
+            frontend_dir = pathlib.Path("frontend")
+            assert frontend_dir.exists(), "Frontend directory was not created"
+
+            # Check for key frontend files
+            key_frontend_files = [
+                frontend_dir / "src" / "App.tsx",
+                frontend_dir / "src" / "index.tsx",
+                frontend_dir / "package.json",
+            ]
+
+            for frontend_file in key_frontend_files:
+                assert frontend_file.exists(), (
+                    f"Expected frontend file {frontend_file} was not created for adk_live"
+                )
+
+            # Verify agent.py was NOT modified (customer file preservation)
+            preserved_agent_content = agent_file.read_text()
+            assert preserved_agent_content == agent_content, (
+                "agent.py was modified during enhance!"
+            )
+
+    def test_cloud_run_deployment_populates_files(self, tmp_path: pathlib.Path) -> None:
+        """Test that Cloud Run deployment target populates deployment-specific files."""
+        runner = CliRunner()
+
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            # Create agent directory
+            agent_dir = pathlib.Path("app")
+            agent_dir.mkdir()
+            agent_file = agent_dir / "agent.py"
+
+            agent_content = """from google.adk.agents import Agent
+
+root_agent = Agent(
+    name="test_agent",
+    model="gemini-2.0-flash-001",
+)
+"""
+            agent_file.write_text(agent_content)
+
+            # Run enhance with cloud_run deployment target
+            result = runner.invoke(
+                enhance,
+                [
+                    ".",
+                    "--base-template",
+                    "adk_base",
+                    "--deployment-target",
+                    "cloud_run",
+                    "--auto-approve",
+                    "--skip-checks",
+                ],
+            )
+
+            # Check that enhance succeeded
+            assert result.exit_code == 0, (
+                f"Enhance failed with output:\n{result.output}"
+            )
+
+            # Verify Cloud Run specific files were populated
+            cloud_run_files = [
+                agent_dir / "server.py",  # Cloud Run server
+                pathlib.Path("Dockerfile"),  # Cloud Run Dockerfile
+                pathlib.Path("deployment") / "terraform" / "service.tf",
+            ]
+
+            for cloud_run_file in cloud_run_files:
+                assert cloud_run_file.exists(), (
+                    f"Expected Cloud Run file {cloud_run_file} was not created"
+                )
+
+            # Verify agent.py was NOT modified
+            preserved_agent_content = agent_file.read_text()
+            assert preserved_agent_content == agent_content, (
+                "agent.py was modified during enhance!"
+            )
+
+    def test_data_ingestion_populates_files(self, tmp_path: pathlib.Path) -> None:
+        """Test that --include-data-ingestion actually populates data pipeline files."""
+        runner = CliRunner()
+
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            # Create agent directory
+            agent_dir = pathlib.Path("app")
+            agent_dir.mkdir()
+            agent_file = agent_dir / "agent.py"
+
+            agent_content = """from google.adk.agents import Agent
+
+root_agent = Agent(
+    name="test_agent",
+    model="gemini-2.0-flash-001",
+)
+"""
+            agent_file.write_text(agent_content)
+
+            # Run enhance with data ingestion enabled
+            result = runner.invoke(
+                enhance,
+                [
+                    ".",
+                    "--base-template",
+                    "adk_base",
+                    "--deployment-target",
+                    "agent_engine",
+                    "--include-data-ingestion",
+                    "--auto-approve",
+                    "--skip-checks",
+                ],
+            )
+
+            # Check that enhance succeeded
+            assert result.exit_code == 0, (
+                f"Enhance failed with output:\n{result.output}"
+            )
+
+            # Verify data ingestion files were populated
+            data_ingestion_files = [
+                pathlib.Path("data_ingestion")
+                / "data_ingestion_pipeline"
+                / "pipeline.py",
+                pathlib.Path("data_ingestion")
+                / "data_ingestion_pipeline"
+                / "submit_pipeline.py",
+                pathlib.Path("data_ingestion")
+                / "data_ingestion_pipeline"
+                / "components"
+                / "ingest_data.py",
+                pathlib.Path("data_ingestion")
+                / "data_ingestion_pipeline"
+                / "components"
+                / "process_data.py",
+            ]
+
+            for data_file in data_ingestion_files:
+                assert data_file.exists(), (
+                    f"Expected data ingestion file {data_file} was not created"
+                )
+
+            # Verify agent.py was NOT modified
+            preserved_agent_content = agent_file.read_text()
+            assert preserved_agent_content == agent_content, (
+                "agent.py was modified during enhance!"
+            )

{agent_starter_pack-0.17.2 → agent_starter_pack-0.17.3}/uv.lock

@@ -11,7 +11,7 @@ resolution-markers = [
 
 [[package]]
 name = "agent-starter-pack"
-version = "0.17.2"
+version = "0.17.3"
 source = { editable = "." }
 dependencies = [
     { name = "backoff" },