agent-starter-pack 0.11.1__tar.gz → 0.11.2__tar.gz

{agent_starter_pack-0.11.1 → agent_starter_pack-0.11.2}/.claude/settings.local.json

@@ -13,7 +13,8 @@
       "Bash(set +a)",
       "Bash(bash:*)",
       "Bash(ls:*)",
-      "Bash(python -m pytest tests/cli/commands/test_enhance.py::TestEnhanceCommand::test_enhance_with_interactive_base_template_selection -v)"
+      "Bash(python -m pytest tests/cli/commands/test_enhance.py::TestEnhanceCommand::test_enhance_with_interactive_base_template_selection -v)",
+      "Bash(python tests/cicd/scripts/delete_agent_engines.py:*)"
     ],
     "deny": []
   }

{agent_starter_pack-0.11.1 → agent_starter_pack-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.11.1
+Version: 0.11.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.11.1 → agent_starter_pack-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.11.1"
+version = "0.11.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.11.1 → agent_starter_pack-0.11.2}/src/base_template/deployment/terraform/dev/variables.tf

@@ -49,14 +49,15 @@ variable "app_sa_roles" {
   description = "List of roles to assign to the application service account"
   type        = list(string)
   default = [
-{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+{%- if cookiecutter.session_type == "alloydb" %}
     "roles/secretmanager.secretAccessor",
 {%- endif %}
     "roles/aiplatform.user",
     "roles/discoveryengine.editor",
     "roles/logging.logWriter",
     "roles/cloudtrace.agent",
-    "roles/storage.admin"
+    "roles/storage.admin",
+    "roles/serviceusage.serviceUsageConsumer",
   ]
 }
 {% if cookiecutter.data_ingestion %}

{agent_starter_pack-0.11.1 → agent_starter_pack-0.11.2}/src/base_template/deployment/terraform/iam.tf

@@ -44,19 +44,7 @@ resource "google_project_iam_member" "other_projects_roles" {
   member     = "serviceAccount:${resource.google_service_account.cicd_runner_sa.email}"
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
-{% if cookiecutter.deployment_target == 'cloud_run' %}
-# 3. Allow Cloud Run service SA to pull containers stored in the CICD project
-resource "google_project_iam_member" "cicd_run_invoker_artifact_registry_reader" {
-  for_each = local.deploy_project_ids
-  project  = var.cicd_runner_project_id
-
-  role       = "roles/artifactregistry.reader"
-  member     = "serviceAccount:service-${data.google_project.projects[each.key].number}@serverless-robot-prod.iam.gserviceaccount.com"
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
-
-}
-
-# 4. Grant application SA the required permissions to run the application
+# 3. Grant application SA the required permissions to run the application
 resource "google_project_iam_member" "app_sa_roles" {
   for_each = {
     for pair in setproduct(keys(local.deploy_project_ids), var.app_sa_roles) :
@@ -72,33 +60,21 @@ resource "google_project_iam_member" "app_sa_roles" {
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 
-{% endif %}
-
-{% if cookiecutter.deployment_target == 'agent_engine' %}
-resource "google_project_service_identity" "vertex_sa" {
+{% if cookiecutter.deployment_target == 'cloud_run' %}
+# 4. Allow Cloud Run service SA to pull containers stored in the CICD project
+resource "google_project_iam_member" "cicd_run_invoker_artifact_registry_reader" {
   for_each = local.deploy_project_ids
-  provider = google-beta
-  project  = each.value
-  service  = "aiplatform.googleapis.com"
-}
+  project  = var.cicd_runner_project_id
 
-# 5. Grant required permissions to Vertex AI Service Agent SA for Agent Engine
-resource "google_project_iam_member" "vertex_ai_sa_permissions" {
-  for_each = {
-    for pair in setproduct(keys(local.deploy_project_ids), var.app_sa_roles) :
-    "${pair[0]}_${pair[1]}" => {
-      project = local.deploy_project_ids[pair[0]]
-      role = pair[1]
-    }
-  }
+  role       = "roles/artifactregistry.reader"
+  member     = "serviceAccount:service-${data.google_project.projects[each.key].number}@serverless-robot-prod.iam.gserviceaccount.com"
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 
-  project     = each.value.project
-  role        = each.value.role
-  member      = "serviceAccount:service-${data.google_project.projects[split("_", each.key)[0]].number}@gcp-sa-aiplatform-re.iam.gserviceaccount.com"
-  depends_on  = [resource.google_project_service.deploy_project_services, resource.google_project_service_identity.vertex_sa]
 }
+
 {% endif %}
 
+
 # Special assignment: Allow the CICD SA to create tokens
 resource "google_service_account_iam_member" "cicd_run_invoker_token_creator" {
   service_account_id = google_service_account.cicd_runner_sa.name

{agent_starter_pack-0.11.1 → agent_starter_pack-0.11.2}/src/base_template/deployment/terraform/variables.tf

@@ -70,15 +70,15 @@ variable "app_sa_roles" {
   description = "List of roles to assign to the application service account"
   type        = list(string)
   default = [
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
-    "roles/run.invoker",
+{%- if cookiecutter.session_type == "alloydb" %}
     "roles/secretmanager.secretAccessor",
 {%- endif %}
     "roles/aiplatform.user",
     "roles/discoveryengine.editor",
     "roles/logging.logWriter",
     "roles/cloudtrace.agent",
-    "roles/storage.admin"
+    "roles/storage.admin",
+    "roles/serviceusage.serviceUsageConsumer",
   ]
 }
 {%- if cookiecutter.deployment_target == 'cloud_run' %}

{agent_starter_pack-0.11.1 → agent_starter_pack-0.11.2}/src/cli/commands/setup_cicd.py

@@ -48,7 +48,7 @@ def display_intro_message() -> None:
         "This command helps set up a basic CI/CD pipeline for development and testing purposes."
     )
     console.print("It will:")
-    console.print("- Create a GitHub repository and connect it to Cloud Build")
+    console.print("- Create a GitHub repository and connect it to your CI/CD runner")
     console.print("- Set up development environment infrastructure")
     console.print("- Configure basic CI/CD triggers for PR checks and deployments")
     console.print(
@@ -218,6 +218,34 @@ def validate_working_directory() -> None:
         )
 
 
+def detect_region_from_terraform_vars() -> str | None:
+    """Detect region from Terraform vars file.
+
+    Returns:
+        str | None: The detected region, or None if not found or is default
+    """
+    try:
+        tf_vars_path = Path("deployment/terraform/vars/env.tfvars")
+        if not tf_vars_path.exists():
+            return None
+
+        with open(tf_vars_path, encoding="utf-8") as f:
+            content = f.read()
+
+        # Look for region = "value" pattern
+        region_match = re.search(r'region\s*=\s*"([^"]+)"', content)
+        if region_match:
+            detected_region = region_match.group(1)
+            # Don't auto-detect if it's the default value
+            if detected_region != "us-central1":
+                return detected_region
+
+        return None
+    except Exception:
+        # If any error occurs, return None to use default
+        return None
+
+
 def update_build_triggers(tf_dir: Path) -> None:
     """Update build triggers configuration."""
     build_triggers_path = tf_dir / "build_triggers.tf"
@@ -427,7 +455,9 @@ console = Console()
 @click.option(
     "--cicd-project", help="CICD project ID (defaults to prod project if not specified)"
 )
-@click.option("--region", default="us-central1", help="GCP region")
+@click.option(
+    "--region", help="GCP region (auto-detects from Terraform vars if not specified)"
+)
 @click.option("--repository-name", help="Repository name (optional)")
 @click.option(
     "--repository-owner",
@@ -468,7 +498,7 @@ def setup_cicd(
     staging_project: str | None,
     prod_project: str | None,
     cicd_project: str | None,
-    region: str,
+    region: str | None,
     repository_name: str | None,
     repository_owner: str | None,
     host_connection_name: str | None,
@@ -502,23 +532,24 @@ def setup_cicd(
         cicd_project = prod_project
         console.print(f"Using production project '{prod_project}' for CI/CD resources")
 
-    console.print(
-        "\n⚠️  WARNING: The setup-cicd command is experimental and may have unexpected behavior.",
-        style="bold yellow",
-    )
-    console.print("Please report any issues you encounter.\n")
+    # Auto-detect region if not provided
+    if region is None:
+        detected_region = detect_region_from_terraform_vars()
+        if detected_region:
+            region = detected_region
+            console.print(f"Auto-detected region from Terraform vars: {region}")
+        else:
+            region = "us-central1"
+            console.print(f"Using default region: {region}")
+    else:
+        console.print(f"Using provided region: {region}")
 
-    console.print("\n📋 About this command:", style="bold blue")
-    console.print(
-        "This command helps set up a basic CI/CD pipeline for development and testing purposes."
-    )
-    console.print("It will:")
-    console.print("- Create a GitHub repository and connect it to Cloud Build")
-    console.print("- Set up development environment infrastructure")
-    console.print("- Configure basic CI/CD triggers for PR checks and deployments")
-    console.print(
-        "- Configure remote Terraform state in GCS (use --local-state to use local state instead)"
-    )
+    # Auto-detect CI/CD runner based on Terraform files (moved earlier)
+    tf_dir = Path("deployment/terraform")
+    is_github_actions = (tf_dir / "wif.tf").exists() and (tf_dir / "github.tf").exists()
+    cicd_runner = "github_actions" if is_github_actions else "google_cloud_build"
+
+    display_intro_message()
 
     console.print("\n⚡ Production Setup Note:", style="bold yellow")
     console.print(
@@ -537,28 +568,6 @@ def setup_cicd(
             console.print("\n🛑 Setup cancelled by user", style="bold yellow")
             return
 
-    console.print(
-        "This command helps set up a basic CI/CD pipeline for development and testing purposes."
-    )
-    console.print("It will:")
-    console.print("- Create a GitHub repository and connect it to Cloud Build")
-    console.print("- Set up development environment infrastructure")
-    console.print("- Configure basic CI/CD triggers for PR checks and deployments")
-    console.print(
-        "- Configure remote Terraform state in GCS (use --local-state to use local state instead)"
-    )
-
-    console.print("\n⚡ Production Setup Note:", style="bold yellow")
-    console.print(
-        "For production deployments and maximum flexibility, we recommend following"
-    )
-    console.print("the manual setup instructions in deployment/README.md")
-    console.print("This will give you more control over:")
-    console.print("- Security configurations")
-    console.print("- Custom deployment workflows")
-    console.print("- Environment-specific settings")
-    console.print("- Advanced CI/CD pipeline customization\n")
-
     if debug:
         logging.basicConfig(level=logging.DEBUG)
         console.print("> Debug mode enabled")

agent_starter_pack-0.11.2/tests/cicd/scripts/delete_agent_engines.py

@@ -0,0 +1,242 @@
+#!/usr/bin/env python3
+
+# mypy: ignore-errors
+"""
+Script to delete all Agent Engine services from specified projects.
+
+This script deletes all Agent Engine services from projects specified via environment variables.
+
+Environment Variables:
+- PROJECT_IDS: Comma-separated list of project IDs (e.g., "proj1,proj2,proj3")
+- Alternative: Individual variables CICD_PROJECT_ID, E2E_PR_PROJECT_ID, E2E_ST_PROJECT_ID
+
+Example usage:
+    export PROJECT_IDS="my-project-1,my-project-2,my-project-3"
+    python delete_agent_engines.py
+
+Based on the cleanup logic from tests/cicd/test_e2e_deployment.py
+"""
+
+import logging
+import os
+import sys
+import time
+
+import vertexai
+from google.api_core import exceptions
+from vertexai import agent_engines
+
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(levelname)s - %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
+logger = logging.getLogger(__name__)
+
+
+# Project IDs to clean up - loaded from environment variables
+def get_project_ids() -> list[str]:
+    """Get project IDs from environment variables."""
+    project_ids = []
+
+    # Try to get from comma-separated env var first
+    env_projects = os.getenv("PROJECT_IDS")
+    if env_projects:
+        project_ids = [pid.strip() for pid in env_projects.split(",") if pid.strip()]
+    else:
+        # Fallback to individual env vars for backward compatibility
+        for env_var in ["CICD_PROJECT_ID", "E2E_PR_PROJECT_ID", "E2E_ST_PROJECT_ID"]:
+            project_id = os.getenv(env_var)
+            if project_id:
+                project_ids.append(project_id.strip())
+
+    if not project_ids:
+        raise ValueError(
+            "No project IDs found. Please set either:\n"
+            "- PROJECT_IDS environment variable with comma-separated project IDs, or\n"
+            "- Individual env vars: CICD_PROJECT_ID, E2E_PR_PROJECT_ID, E2E_ST_PROJECT_ID"
+        )
+
+    return project_ids
+
+
+# Default region
+DEFAULT_REGION = "europe-west1"
+
+# Rate limiting configuration
+MAX_RETRIES = 3
+RATE_LIMIT_DELAY = 60  # seconds to wait when hitting rate limits
+RETRY_DELAY = 5  # seconds to wait between retries
+
+
+def delete_single_agent_engine(engine, retry_count: int = 0) -> bool:
+    """
+    Delete a single Agent Engine with retry logic and force deletion.
+
+    Args:
+        engine: The AgentEngine instance to delete
+        retry_count: Current retry attempt number
+
+    Returns:
+        True if deleted successfully, False otherwise
+    """
+    engine_name = engine.display_name or engine.resource_name
+
+    try:
+        logger.info(f"🗑️ Deleting Agent Engine: {engine_name}")
+        logger.info(f"   Resource name: {engine.resource_name}")
+
+        # Try normal deletion first
+        engine.delete()
+        logger.info(f"✅ Successfully deleted Agent Engine: {engine_name}")
+        return True
+
+    except exceptions.BadRequest as e:
+        # Handle child resources error by using force deletion
+        if "contains child resources" in str(e):
+            logger.warning(
+                f"⚠️ Agent Engine {engine_name} has child resources, attempting force deletion..."
+            )
+            try:
+                # Force delete with child resources
+                engine.delete(force=True)
+                logger.info(
+                    f"✅ Force deleted Agent Engine with child resources: {engine_name}"
+                )
+                return True
+            except Exception as force_e:
+                logger.error(f"❌ Force deletion failed for {engine_name}: {force_e}")
+                return False
+        else:
+            logger.error(f"❌ Bad request error for {engine_name}: {e}")
+            return False
+
+    except exceptions.TooManyRequests as e:
+        # Handle rate limiting
+        if retry_count < MAX_RETRIES:
+            logger.warning(
+                f"⏱️ Rate limit hit for {engine_name}, waiting {RATE_LIMIT_DELAY} seconds before retry {retry_count + 1}/{MAX_RETRIES}..."
+            )
+            time.sleep(RATE_LIMIT_DELAY)
+            return delete_single_agent_engine(engine, retry_count + 1)
+        else:
+            logger.error(f"❌ Rate limit exceeded max retries for {engine_name}: {e}")
+            return False
+
+    except Exception as e:
+        # Handle other errors with retry logic
+        if retry_count < MAX_RETRIES:
+            logger.warning(
+                f"⏱️ Error deleting {engine_name}, retrying in {RETRY_DELAY} seconds... (attempt {retry_count + 1}/{MAX_RETRIES})"
+            )
+            time.sleep(RETRY_DELAY)
+            return delete_single_agent_engine(engine, retry_count + 1)
+        else:
+            logger.error(
+                f"❌ Failed to delete {engine_name} after {MAX_RETRIES} retries: {e}"
+            )
+            return False
+
+
+def delete_agent_engines_in_project(
+    project_id: str, region: str = DEFAULT_REGION
+) -> tuple[int, int]:
+    """
+    Delete all Agent Engine services in a specific project.
+
+    Args:
+        project_id: The GCP project ID
+        region: The GCP region (default: europe-west1)
+
+    Returns:
+        Tuple of (successful_deletions, total_engines_found)
+    """
+    logger.info(f"🔍 Checking for Agent Engine services in project {project_id}...")
+
+    try:
+        # Initialize Vertex AI for this project
+        vertexai.init(project=project_id, location=region)
+
+        # List all Agent Engine services in the project
+        logger.info(f"📋 Listing all Agent Engine services in {project_id}...")
+        engines = list(agent_engines.AgentEngine.list())
+
+        if not engines:
+            logger.info(f"✅ No Agent Engine services found in {project_id}")
+            return 0, 0
+
+        logger.info(f"🎯 Found {len(engines)} Agent Engine service(s) in {project_id}")
+
+        # Delete each engine with improved error handling
+        deleted_count = 0
+        for i, engine in enumerate(engines, 1):
+            logger.info(f"📋 Processing engine {i}/{len(engines)} in {project_id}")
+
+            if delete_single_agent_engine(engine):
+                deleted_count += 1
+
+            # Small delay between deletions to avoid overwhelming the API
+            if i < len(engines):  # Don't sleep after the last engine
+                time.sleep(1)
+
+        logger.info(
+            f"🎉 Deleted {deleted_count}/{len(engines)} Agent Engine service(s) in {project_id}"
+        )
+        return deleted_count, len(engines)
+
+    except Exception as e:
+        logger.error(f"❌ Error processing project {project_id}: {e}")
+        return 0, 0
+
+
+def main():
+    """Main function to delete Agent Engine services from all specified projects."""
+    logger.info("🚀 Starting Agent Engine cleanup across multiple projects...")
+
+    try:
+        project_ids = get_project_ids()
+        logger.info(f"🎯 Target projects: {', '.join(project_ids)}")
+    except ValueError as e:
+        logger.error(f"❌ Configuration error: {e}")
+        sys.exit(1)
+
+    total_deleted = 0
+    total_found = 0
+    failed_projects = []
+
+    for project_id in project_ids:
+        try:
+            deleted_count, found_count = delete_agent_engines_in_project(project_id)
+            total_deleted += deleted_count
+            total_found += found_count
+        except Exception as e:
+            logger.error(f"❌ Failed to process project {project_id}: {e}")
+            failed_projects.append(project_id)
+
+    # Summary
+    logger.info("\n" + "=" * 60)
+    logger.info("📊 CLEANUP SUMMARY")
+    logger.info("=" * 60)
+    logger.info(f"🎯 Total Agent Engine services found: {total_found}")
+    logger.info(f"✅ Total Agent Engine services deleted: {total_deleted}")
+    logger.info(f"❌ Failed deletions: {total_found - total_deleted}")
+    logger.info(
+        f"📁 Projects processed: {len(project_ids) - len(failed_projects)}/{len(project_ids)}"
+    )
+
+    if failed_projects:
+        logger.warning(f"⚠️ Failed to process projects: {', '.join(failed_projects)}")
+        sys.exit(1)
+    elif total_found > total_deleted:
+        logger.warning(
+            f"⚠️ Some Agent Engine services could not be deleted ({total_found - total_deleted} failures)"
+        )
+        sys.exit(1)
+    else:
+        logger.info("🎉 All projects processed successfully!")
+        sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

{agent_starter_pack-0.11.1 → agent_starter_pack-0.11.2}/uv.lock

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