agent-starter-pack 0.17.1__py3-none-any.whl → 0.17.3__py3-none-any.whl

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/cli/commands/enhance.py

@@ -94,16 +94,22 @@ def display_base_template_selection(current_base: str) -> str:
 
 
 def display_agent_directory_selection(
-    current_dir: pathlib.Path, detected_directory: str
+    current_dir: pathlib.Path, detected_directory: str, base_template: str | None = None
 ) -> str:
     """Display available directories and prompt for agent directory selection."""
+    # Determine the required object name based on base template
+    is_adk = base_template and "adk" in base_template.lower()
+    required_object = "root_agent" if is_adk else "agent"
+
     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(
+            f"  • [cyan]{required_object}[/cyan] variable defined in agent.py"
+        )
         console.print()
         console.print("Choose where your agent code is located:")
 
@@ -358,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
@@ -365,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]"
                 )
@@ -421,7 +428,7 @@ def enhance(
         # 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
+                current_dir, detected_agent_directory, base_template
             )
             final_agent_directory = selected_agent_directory
             console.print(
@@ -573,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/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.1.dist-info → agent_starter_pack-0.17.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.17.1
+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.1.dist-info → agent_starter_pack-0.17.3.dist-info}/RECORD

@@ -69,8 +69,8 @@ agent_starter_pack/base_template/{{cookiecutter.agent_directory}}/utils/gcs.py,s
 agent_starter_pack/base_template/{{cookiecutter.agent_directory}}/utils/tracing.py,sha256=QxI-6NbiqMLFL2WSpZjNsxCPUY6xm2_maS2sRtbtG6Y,6040
 agent_starter_pack/base_template/{{cookiecutter.agent_directory}}/utils/typing.py,sha256=cfirFUBZQOwfQjEs9EYYP2nubv6BEpVzFHPj85PTMmg,4221
 agent_starter_pack/cli/main.py,sha256=eKi-Oi6pv2-LNiN3RYdrmvDiLXInWHkNMn8lGlkmVP4,1982
-agent_starter_pack/cli/commands/create.py,sha256=wuRL9lX6_AL6EucRSlixP91iIo5ROeDlLUAOIGOoCbA,47322
-agent_starter_pack/cli/commands/enhance.py,sha256=AF58CFikNLPib8PULKkzM6r9JGXkTvRWspBaEvGnR3k,24237
+agent_starter_pack/cli/commands/create.py,sha256=n81dkq-bO7mRlAv2Qw88b01Xg8KILQxw-biphQqdXKs,47434
+agent_starter_pack/cli/commands/enhance.py,sha256=dpITDtlMMbo_FIfebNo_i8YxmOIOWCBqRgJ5G4s3nTU,24669
 agent_starter_pack/cli/commands/list.py,sha256=ZGol9eYB9Yon7JysMUCtpEOwdXzrApdTHzErx6KvT04,6856
 agent_starter_pack/cli/commands/setup_cicd.py,sha256=UnhU8p9emfBV-7_6uKYdUfTQBnsbSIFQbJoMHMq8pik,32507
 agent_starter_pack/cli/utils/__init__.py,sha256=_cTmsXGPqOtK0q8UW5164QTltbJRJFR_Efxq_BRL1-o,1311
@@ -79,7 +79,7 @@ agent_starter_pack/cli/utils/datastores.py,sha256=gv1V6eDcOEKx4MRNG5C3Y-VfixYq1A
 agent_starter_pack/cli/utils/gcp.py,sha256=N6pvNU9gT6DpS7Peipfs57ckvqcUWU7OK1zdqBcQV0M,9276
 agent_starter_pack/cli/utils/logging.py,sha256=61ulUY1hUrpxHDFi0szqsjPlrpxdBvwzfYEEV0o97GA,3530
 agent_starter_pack/cli/utils/remote_template.py,sha256=CD5imiJPGIMVRhGOCiB11oFsz9Pusy_A2kdxsvMfscE,24129
-agent_starter_pack/cli/utils/template.py,sha256=DawkOJzHV3PvT3MuVvTvoHNOdgYfEb_IR009ox3rNC8,52527
+agent_starter_pack/cli/utils/template.py,sha256=9U3eZOqISbCQ-uOmGwLCWagTDjaGPmIKqiei1XiID8w,52459
 agent_starter_pack/cli/utils/version.py,sha256=F4udQmzniPStqWZFIgnv3Qg3l9non4mfy2An-Oveqmc,2916
 agent_starter_pack/data_ingestion/README.md,sha256=LNxSQoJW9JozK-TbyGQLj5L_MGWNwrfLk6V6RmQ2oBQ,4032
 agent_starter_pack/data_ingestion/pyproject.toml,sha256=-1Mf2QB8K70ICQV5UPZDpf-fN3UwEQLVzQyxfakCSTY,445
@@ -172,8 +172,8 @@ agent_starter_pack/utils/generate_locks.py,sha256=LwR46w25CV0_ySF_MS9W2vp7S1Nf17
 agent_starter_pack/utils/lock_utils.py,sha256=vqFHTN7lju9to74MKOmLvz80BA47G0CVkxrd1MyLWYQ,2309
 agent_starter_pack/utils/watch_and_rebuild.py,sha256=1hMn29eLpVblfvixV9FEo46u8efmnLuRIn-bPrfdW3g,6694
 llm.txt,sha256=z9FTkAnj3cErCzHj3IES9eB35wW3JGaVsd8a0wA7IMs,15380
-agent_starter_pack-0.17.1.dist-info/METADATA,sha256=m18MZ3DYwCLYcuyhsZU0krkfLq-h8VuK_dh_NhGmkNY,11195
-agent_starter_pack-0.17.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agent_starter_pack-0.17.1.dist-info/entry_points.txt,sha256=QLSX_97UynG0vLpoZ3ePfyCQkaR-g0qglp2b26G4KHQ,71
-agent_starter_pack-0.17.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-agent_starter_pack-0.17.1.dist-info/RECORD,,
+agent_starter_pack-0.17.3.dist-info/METADATA,sha256=AoJJ2_IV8bTBJlXB2n_GYo42d_LNuF_olt-jlnKd9i0,11195
+agent_starter_pack-0.17.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agent_starter_pack-0.17.3.dist-info/entry_points.txt,sha256=QLSX_97UynG0vLpoZ3ePfyCQkaR-g0qglp2b26G4KHQ,71
+agent_starter_pack-0.17.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+agent_starter_pack-0.17.3.dist-info/RECORD,,