agent-starter-pack 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

{agent_starter_pack-0.9.0.dist-info → agent_starter_pack-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.9.0
+Version: 0.9.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
@@ -16,11 +16,9 @@ Provides-Extra: jupyter
 Requires-Dist: ipykernel>=6.29.5; extra == 'jupyter'
 Requires-Dist: jupyter; extra == 'jupyter'
 Provides-Extra: lint
-Requires-Dist: codespell~=2.2.0; extra == 'lint'
-Requires-Dist: mypy~=1.15.0; extra == 'lint'
-Requires-Dist: ruff>=0.4.6; extra == 'lint'
-Requires-Dist: types-pyyaml~=6.0.12.20240917; extra == 'lint'
-Requires-Dist: types-requests~=2.32.0.20240914; extra == 'lint'
+Requires-Dist: codespell; extra == 'lint'
+Requires-Dist: mypy; extra == 'lint'
+Requires-Dist: ruff; extra == 'lint'
 Description-Content-Type: text/markdown
 
 # 🚀 Agent Starter Pack

{agent_starter_pack-0.9.0.dist-info → agent_starter_pack-0.9.2.dist-info}/RECORD

@@ -74,16 +74,16 @@ src/base_template/deployment/terraform/dev/vars/env.tfvars,sha256=LoQMjh1AAMR-MG
 src/base_template/deployment/terraform/vars/env.tfvars,sha256=Nze8q1x2Aj6ZUeWC2hDeZWqNUkLp13DgzA_LFmmOzCo,1216
 src/base_template/tests/unit/test_dummy.py,sha256=2exfCH8qhkZrLWvK04ZxNTO9MV3fdTbZkJN3uK6zvok,850
 src/cli/main.py,sha256=fyJKjU1gvRQmuqS-J6sExvqXo0-z7n6Bce8PSbDPa6E,1769
-src/cli/commands/create.py,sha256=yIHngbbeUBvLKWg6IkH87yFwf-IJqdzbebkdqpwEFRQ,31818
-src/cli/commands/list.py,sha256=50sxEcYY5T4Q34Uj7J5h8A9Tq5Zw8GQhkqunBdzzD0U,5288
+src/cli/commands/create.py,sha256=rdN_mWiIxwddsbIYVkrQCApK2x9ABQeSXZZoGtcE074,34764
+src/cli/commands/list.py,sha256=sMMGJiW_IjRUe-Md1bI_8B9wruYJ87JLSEoJfHaypbg,5038
 src/cli/commands/setup_cicd.py,sha256=1ZvgTD-Z2bZk6pWuinz4IP2G1Eb8H1MibRLPS-mZ6Ng,31721
 src/cli/utils/__init__.py,sha256=_cTmsXGPqOtK0q8UW5164QTltbJRJFR_Efxq_BRL1-o,1311
 src/cli/utils/cicd.py,sha256=VSkJTL7OBnXQ6Zbb2gzgw5gLWpwUjfr9XthqTpJ2Oj8,26197
 src/cli/utils/datastores.py,sha256=gv1V6eDcOEKx4MRNG5C3Y-VfixYq1AzQuaYMLp8QRNo,1058
 src/cli/utils/gcp.py,sha256=cnuCyN144eiyYc9aJNEK9JnyWN66rdevugoMdDYC1UU,4032
 src/cli/utils/logging.py,sha256=0lHe4EPi1A8sOx9xkA7gS4UNl0GsIyp2ahydkkuCzLY,1570
-src/cli/utils/remote_template.py,sha256=LA2gAo1i_PCMMB6gqWPOH-WWR8MFyr9CrK9_-f1jVIY,7895
-src/cli/utils/template.py,sha256=GpUWMQ7hfO5nkACRQ3_aFbn5yT2MjO58nr9Hs0Fp8kM,33700
+src/cli/utils/remote_template.py,sha256=RYphQS1IZfzzgtgWJOLdgie0S8HtEWjr2wikyI2doTc,10454
+src/cli/utils/template.py,sha256=ciElaBHEMBLYIzZJLQwNe_rOc0C_HqJfEGJ6z9p1ep4,34320
 src/cli/utils/version.py,sha256=F4udQmzniPStqWZFIgnv3Qg3l9non4mfy2An-Oveqmc,2916
 src/data_ingestion/README.md,sha256=LNxSQoJW9JozK-TbyGQLj5L_MGWNwrfLk6V6RmQ2oBQ,4032
 src/data_ingestion/pyproject.toml,sha256=-1Mf2QB8K70ICQV5UPZDpf-fN3UwEQLVzQyxfakCSTY,445
@@ -179,7 +179,7 @@ src/frontends/streamlit/frontend/utils/multimodal_utils.py,sha256=v6YbCkz_YcnEo-
 src/frontends/streamlit/frontend/utils/stream_handler.py,sha256=-XVRfLH6ck1KP6NS4vrhcvPyZe6z3NLHliEg17s9jjo,12551
 src/frontends/streamlit/frontend/utils/title_summary.py,sha256=B0cadS_KPW-tsbABauI4J681aqjEtuKFDa25e9R1WKc,3030
 src/resources/containers/data_processing/Dockerfile,sha256=VoB9d5yZiiWnqRfWrIq0gGNMzZg-eVy733OgP72ZgO0,950
-src/resources/containers/e2e-tests/Dockerfile,sha256=Q_aTyX_iaFY8j06XZkpMuggJnNO5daiLmmrvqaZHMxw,1611
+src/resources/containers/e2e-tests/Dockerfile,sha256=yA3HxeX0HNpl8B4oEQUICCVZDCXdRn2Igmii4jt-r7k,1895
 src/resources/docs/adk-cheatsheet.md,sha256=KTCdM7hOvsv1-GgwEBMMU6kLk3WHQ69RAs6VWltNaDA,58722
 src/resources/idx/idx-template.json,sha256=07OQZCPp45Iqor2O7Tm1e1Gmsdd-AmmUofSvA7y-oRs,793
 src/resources/idx/idx-template.nix,sha256=sesHGev_PYtVDg0J5tHkg0OO7IR1Bz2iAtl_if3Ar3M,892
@@ -201,8 +201,8 @@ src/resources/setup_cicd/providers.tf,sha256=Km4z6IJt7x7PLaa0kyZbBrO2m3lpuIJZFD5
 src/utils/generate_locks.py,sha256=6V1B8V2BEuevWnXUsxZVTrLjXwFRII8UfsIGrQqZxVs,4320
 src/utils/lock_utils.py,sha256=IFOMUWtb-ypm2Y8w8J5y2oI_-MaPuwPF_JOAAlnNudA,2275
 src/utils/watch_and_rebuild.py,sha256=vP4yIiA7E_lj5sfQdJUl8TXas6V7msDg8XWUutAC05Q,6679
-agent_starter_pack-0.9.0.dist-info/METADATA,sha256=tm8hhXSmxExEPbCj30Q1GlG9U0W5xiLP84JTavvezJI,11286
-agent_starter_pack-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agent_starter_pack-0.9.0.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
-agent_starter_pack-0.9.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-agent_starter_pack-0.9.0.dist-info/RECORD,,
+agent_starter_pack-0.9.2.dist-info/METADATA,sha256=bC09qQ-oHxiJGHYA-3aa1AaSE42t6IIa_Y2BE3Vd33o,11138
+agent_starter_pack-0.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agent_starter_pack-0.9.2.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
+agent_starter_pack-0.9.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+agent_starter_pack-0.9.2.dist-info/RECORD,,

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,6 +36,7 @@ from ..utils.remote_template import (
 )
 from ..utils.template import (
     get_available_agents,
+    get_deployment_targets,
     get_template_path,
     load_template_config,
     process_template,
@@ -128,7 +131,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
@@ -155,7 +158,7 @@ def create(
                 style="bold blue",
             )
             console.print(
-                "Powered by ([link=https://goo.gle/agent-starter-pack]Google's Agent Starter Pack [/link])\n",
+                "Powered by [link=https://goo.gle/agent-starter-pack]Google Cloud - Agent Starter Pack [/link]\n",
             )
             console.print(
                 "This tool will help you create an end-to-end production-ready AI agent in Google Cloud!\n"
@@ -201,17 +204,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 +237,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 +261,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 +323,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 +343,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 +367,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 +404,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"
@@ -441,10 +497,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 +542,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(

src/cli/commands/list.py

@@ -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)
 

src/cli/utils/remote_template.py

@@ -23,6 +23,7 @@ from dataclasses import dataclass
 from typing import Any
 
 import yaml
+from jinja2 import Environment
 
 
 @dataclass
@@ -112,7 +113,9 @@ def parse_agent_spec(agent_spec: str) -> RemoteTemplateSpec | None:
     return None
 
 
-def fetch_remote_template(spec: RemoteTemplateSpec) -> pathlib.Path:
+def fetch_remote_template(
+    spec: RemoteTemplateSpec,
+) -> tuple[pathlib.Path, pathlib.Path]:
     """Fetch remote template and return path to template directory.
 
     Uses Git to clone the remote repository.
@@ -121,7 +124,9 @@ def fetch_remote_template(spec: RemoteTemplateSpec) -> pathlib.Path:
         spec: Remote template specification
 
     Returns:
-        Path to the fetched template directory
+        A tuple containing:
+        - Path to the fetched template directory.
+        - Path to the top-level temporary directory that should be cleaned up.
     """
     temp_dir = tempfile.mkdtemp(prefix="asp_remote_template_")
     temp_path = pathlib.Path(temp_dir)
@@ -169,18 +174,7 @@ def fetch_remote_template(spec: RemoteTemplateSpec) -> pathlib.Path:
                 f"Template path not found in the repository: {spec.template_path}"
             )
 
-        # Exclude Makefile and README.md from remote template to avoid conflicts
-        makefile_path = template_dir / "Makefile"
-        if makefile_path.exists():
-            logging.debug(f"Removing Makefile from remote template: {makefile_path}")
-            makefile_path.unlink()
-
-        readme_path = template_dir / "README.md"
-        if readme_path.exists():
-            logging.debug(f"Removing README.md from remote template: {readme_path}")
-            readme_path.unlink()
-
-        return template_dir
+        return template_dir, temp_path
     except Exception as e:
         # Clean up on error
         shutil.rmtree(temp_path, ignore_errors=True)
@@ -252,3 +246,76 @@ def merge_template_configs(
 
     # Perform the deep merge
     return deep_merge(merged_config, remote_config)
+
+
+def render_and_merge_makefiles(
+    base_template_path: pathlib.Path,
+    final_destination: pathlib.Path,
+    cookiecutter_config: dict,
+    remote_template_path: pathlib.Path | None = None,
+) -> None:
+    """
+    Renders the base and remote Makefiles separately, then merges them.
+
+    If remote_template_path is not provided, only the base Makefile is rendered.
+    """
+
+    env = Environment()
+
+    # Render the base Makefile
+    base_makefile_path = base_template_path / "Makefile"
+    if base_makefile_path.exists():
+        with open(base_makefile_path) as f:
+            base_template = env.from_string(f.read())
+        rendered_base_makefile = base_template.render(cookiecutter=cookiecutter_config)
+    else:
+        rendered_base_makefile = ""
+
+    # Render the remote Makefile if a path is provided
+    rendered_remote_makefile = ""
+    if remote_template_path:
+        remote_makefile_path = remote_template_path / "Makefile"
+        if remote_makefile_path.exists():
+            with open(remote_makefile_path) as f:
+                remote_template = env.from_string(f.read())
+            rendered_remote_makefile = remote_template.render(
+                cookiecutter=cookiecutter_config
+            )
+
+    # Merge the rendered Makefiles
+    if rendered_base_makefile and rendered_remote_makefile:
+        # A simple merge: remote content first, then append missing commands from base
+        base_commands = set(
+            re.findall(r"^([a-zA-Z0-9_-]+):", rendered_base_makefile, re.MULTILINE)
+        )
+        remote_commands = set(
+            re.findall(r"^([a-zA-Z0-9_-]+):", rendered_remote_makefile, re.MULTILINE)
+        )
+        missing_commands = base_commands - remote_commands
+
+        if missing_commands:
+            commands_to_append = ["\n\n# --- Commands from Agent Starter Pack ---\n\n"]
+            for command in sorted(missing_commands):
+                command_block_match = re.search(
+                    rf"^{command}:.*?(?=\n\n(?:^#.*\n)*?^[a-zA-Z0-9_-]+:|" + r"\Z)",
+                    rendered_base_makefile,
+                    re.MULTILINE | re.DOTALL,
+                )
+                if command_block_match:
+                    commands_to_append.append(command_block_match.group(0))
+                    commands_to_append.append("\n\n")
+
+            final_makefile_content = rendered_remote_makefile + "".join(
+                commands_to_append
+            )
+        else:
+            final_makefile_content = rendered_remote_makefile
+    elif rendered_remote_makefile:
+        final_makefile_content = rendered_remote_makefile
+    else:
+        final_makefile_content = rendered_base_makefile
+
+    # Write the final merged Makefile
+    with open(final_destination / "Makefile", "w") as f:
+        f.write(final_makefile_content)
+    logging.debug("Rendered and merged Makefile written to final destination.")

src/cli/utils/template.py

@@ -31,6 +31,7 @@ from src.cli.utils.version import get_current_version
 from .datastores import DATASTORES
 from .remote_template import (
     get_base_template_name,
+    render_and_merge_makefiles,
 )
 
 ADK_FILES = ["app/__init__.py"]
@@ -622,6 +623,7 @@ def process_template(
                     ".pytest_cache/*",
                     ".venv/*",
                     "*templates.py",  # Don't render templates files
+                    "Makefile",  # Don't render Makefile - handled by render_and_merge_makefiles
                     # Don't render agent.py unless it's agentic_rag
                     "app/agent.py" if agent_name != "agentic_rag" else "",
                 ],
@@ -658,6 +660,16 @@ def process_template(
                 shutil.copytree(output_dir, final_destination, dirs_exist_ok=True)
                 logging.debug(f"Project successfully created at {final_destination}")
 
+                # Render and merge Makefiles.
+                # If it's a local template, remote_template_path will be None,
+                # and only the base Makefile will be rendered.
+                render_and_merge_makefiles(
+                    base_template_path=base_template_path,
+                    final_destination=final_destination,
+                    cookiecutter_config=cookiecutter_config,
+                    remote_template_path=remote_template_path,
+                )
+
                 # Delete appropriate files based on ADK tag
                 if "adk" in tags:
                     files_to_delete = [final_destination / f for f in NON_ADK_FILES]

src/resources/containers/e2e-tests/Dockerfile

@@ -1,19 +1,41 @@
-FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim
-RUN apt-get update && apt-get install -y wget sudo apt-transport-https ca-certificates gnupg curl software-properties-common && \
-    # Setup GitHub CLI
-    sudo mkdir -p -m 755 /etc/apt/keyrings && \
-    wget -q -O- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null && \
-    sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg && \
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
-    # Setup Google Cloud SDK
-    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
-    curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
-    # Setup Terraform
-    wget -q -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg > /dev/null && \
-    echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list > /dev/null && \
-    # Install all packages at once
-    apt-get update && \
-    apt-get install -y gh google-cloud-cli terraform && \
-    # Clean up
+# Stage 1: Builder - Prepare APT repositories
+FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim AS builder
+
+# Install tools needed to add repositories
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gnupg && \
+    # GitHub CLI
+    curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
+    # Google Cloud SDK
+    curl -sS https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list && \
+    # Terraform
+    curl -fsSL https://apt.releases.hashicorp.com/gpg | gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com bookworm main" > /etc/apt/sources.list.d/hashicorp.list && \
+    # Clean up builder stage
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
+
+# Stage 2: Final Image
+FROM ghcr.io/astral-sh/uv:python3.11-bookworm-slim
+
+# Copy repository configurations from the builder stage
+COPY --from=builder /etc/apt/sources.list.d/ /etc/apt/sources.list.d/
+COPY --from=builder /usr/share/keyrings/ /usr/share/keyrings/
+
+# Install the final packages
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    gh \
+    google-cloud-cli \
+    terraform \
+    make \
+    nodejs \
+    npm && \
+    # Clean up apt cache
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*