agent-starter-pack 0.11.1__py3-none-any.whl → 0.11.2__py3-none-any.whl

{agent_starter_pack-0.11.1.dist-info → agent_starter_pack-0.11.2.dist-info}/METADATA

@@ -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.dist-info → agent_starter_pack-0.11.2.dist-info}/RECORD

@@ -47,13 +47,13 @@ src/base_template/app/utils/typing.py,sha256=DP5OZC3IGvqA1XbvWt8kI3gyAK3ZjzUSL5C
 src/base_template/deployment/README.md,sha256=gZJvSWdQh_Mi-bZ3dmuPv7fMezIw04fgN5tq7KgglPw,692
 src/base_template/deployment/terraform/apis.tf,sha256=KX8Oe2gjT-gh9Bkntz9yIAyRjPc1gZvwOhroJ6NZVp4,1513
 src/base_template/deployment/terraform/github.tf,sha256=KhfNBAzeUH9jDr8FOw_DiypesA5AEC8IZT1PRqntSt8,10838
-src/base_template/deployment/terraform/iam.tf,sha256=1u0qY-4srkhRirRI9kuQE0GAAYBeP5cTztA-w2N4FH8,5657
+src/base_template/deployment/terraform/iam.tf,sha256=I70ROOjXcYiqxtzuak6n0ZNhkjH6vjOzykXQG1Zi1dE,4700
 src/base_template/deployment/terraform/locals.tf,sha256=nvjlavqWRL6e-iIqfIRvsai5JY9l6KhRGcwJQFRdu_U,1653
 src/base_template/deployment/terraform/log_sinks.tf,sha256=eAGh_dCjOKUQjylkqp1fNM9cfE4QB9HSEovjD6_G9Lg,2971
 src/base_template/deployment/terraform/providers.tf,sha256=wNWvXJbpvV3njDYO8t4s6DdDkL0dQpWgkPsmJw61ABM,1167
 src/base_template/deployment/terraform/service_accounts.tf,sha256=iSRrRzxL16pZHel5cZDzC7m15IRTRv8qMxkcg4nd30o,1672
 src/base_template/deployment/terraform/storage.tf,sha256=W0l34U7Ql2wdegfWsWfKzaEooaMaTL2TkU18KM_Vuys,8695
-src/base_template/deployment/terraform/variables.tf,sha256=RudiaEVsIrRSCIHDMWs857gMghenUeZR5g_34kDuoXY,6733
+src/base_template/deployment/terraform/variables.tf,sha256=JD-lvsVYSgE0pR15ZJhmNAn2SAWo5CNDCofXGNVJy1o,6749
 src/base_template/deployment/terraform/{% if cookiecutter.cicd_runner == 'github_actions' %}wif.tf{% else %}unused_wif.tf{% endif %},sha256=rCupUnvaTVj75ahJOckNuzlQ-xcLTik_HpqXzVEEB5g,2666
 src/base_template/deployment/terraform/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}build_triggers.tf{% else %}unused_build_triggers.tf{% endif %},sha256=wb8Frd95PF0PHDRoh9v3QF5kpF-Fi-GDcD7mKmTxGJ8,6813
 src/base_template/deployment/terraform/dev/apis.tf,sha256=R5fyLQGHsZy7JyDdFpuNzUBute6Rn9xR32zIMjkGxzc,1592
@@ -61,7 +61,7 @@ src/base_template/deployment/terraform/dev/iam.tf,sha256=q8dfqbMNSpgMXW96hP7rnAp
 src/base_template/deployment/terraform/dev/log_sinks.tf,sha256=uVdMtDdd8MnxtKhqzVaYqadE11P3r4fs2IdgNecxM4I,2671
 src/base_template/deployment/terraform/dev/providers.tf,sha256=1S9jCh48d6ailVZ1e14EHsUUDSp7DyGZGExJwViFCkM,900
 src/base_template/deployment/terraform/dev/storage.tf,sha256=1mgLs21SUhfcoRICqd7BqUlEVAVGeN3kMsQ4UAQLOh8,4654
-src/base_template/deployment/terraform/dev/variables.tf,sha256=JMo3BQ57t8OTRiNUb9cz1zoWYCOMMhi67Hx0UZ_kZko,4072
+src/base_template/deployment/terraform/dev/variables.tf,sha256=l95zljQbchR6b--wJGJJcCAu89FqsR3UqAiCz_bH7to,4089
 src/base_template/deployment/terraform/dev/vars/env.tfvars,sha256=LoQMjh1AAMR-MGfaSCsVMjdoYTk2T4oS4D9vMH54CdQ,714
 src/base_template/deployment/terraform/vars/env.tfvars,sha256=Jyc36pt-0xNMwQsoXucad0QAWFMeGe67fdimCKXx-tw,1411
 src/base_template/tests/unit/test_dummy.py,sha256=2exfCH8qhkZrLWvK04ZxNTO9MV3fdTbZkJN3uK6zvok,850
@@ -75,7 +75,7 @@ src/cli/main.py,sha256=Dya7Sw3ozMTaGDcwMh_-W7udkGZHGzgAj8aBdSZaZxI,1832
 src/cli/commands/create.py,sha256=mUFukCCpuFV6bgS-JmQEZ6D-zB-_ddxmTMeuygrhogI,43876
 src/cli/commands/enhance.py,sha256=KcSLRmhNDxbQa_XoJqcXtC16enyx8FWq20bkpmLSpyQ,11370
 src/cli/commands/list.py,sha256=qey_XDoJkjBvvuVMilFqjMUdBRmbHkSyqGeM23E3xHM,5502
-src/cli/commands/setup_cicd.py,sha256=ZgpMrYHXg3B_u5h5PxvVuC4T7Q2uQTYMNMwBBOlcKmg,32250
+src/cli/commands/setup_cicd.py,sha256=nSgMUD4_ncYGwLWU1Fl7Ypw3GTJc8qVfjPxwZMLn4xo,32113
 src/cli/utils/__init__.py,sha256=_cTmsXGPqOtK0q8UW5164QTltbJRJFR_Efxq_BRL1-o,1311
 src/cli/utils/cicd.py,sha256=9s_OcusQznT_pSjFP60BfDBoZ5V6bwPE0QWbWdMaVlY,26515
 src/cli/utils/datastores.py,sha256=gv1V6eDcOEKx4MRNG5C3Y-VfixYq1AzQuaYMLp8QRNo,1058
@@ -197,8 +197,8 @@ src/resources/locks/uv-live_api-cloud_run.lock,sha256=xOPEAiyHooNT2nMP1wbnJ2ekOD
 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.11.1.dist-info/METADATA,sha256=fdeIAa2Bx6sAKcoy4p0qgFdbvVoZ5TRd-v9HGhzjUYE,11102
-agent_starter_pack-0.11.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agent_starter_pack-0.11.1.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
-agent_starter_pack-0.11.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-agent_starter_pack-0.11.1.dist-info/RECORD,,
+agent_starter_pack-0.11.2.dist-info/METADATA,sha256=TKkrd80Yfxfp3hFQKQCwakKeLulHCfqEprBiVty9P38,11102
+agent_starter_pack-0.11.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agent_starter_pack-0.11.2.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
+agent_starter_pack-0.11.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+agent_starter_pack-0.11.2.dist-info/RECORD,,

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 %}

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

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' %}

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