agent-starter-pack 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

src/deployment_targets/cloud_run/deployment/terraform/dev/service.tf

@@ -0,0 +1,231 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Get project information to access the project number
+data "google_project" "project" {
+  project_id = var.dev_project_id
+}
+
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+
+# VPC Network for AlloyDB
+resource "google_compute_network" "default" {
+  name                    = "${var.project_name}-alloydb-network"
+  project                 = var.dev_project_id
+  auto_create_subnetworks = false
+  depends_on = [resource.google_project_service.services]
+}
+
+# Subnet for AlloyDB
+resource "google_compute_subnetwork" "default" {
+  name          = "${var.project_name}-alloydb-network"
+  ip_cidr_range = "10.0.0.0/24"
+  region        = var.region
+  network       = google_compute_network.default.id
+  project       = var.dev_project_id
+
+  # This is required for Cloud Run VPC connectors
+  purpose       = "PRIVATE"
+
+  private_ip_google_access = true
+}
+
+# Private IP allocation for AlloyDB
+resource "google_compute_global_address" "private_ip_alloc" {
+  name          = "${var.project_name}-private-ip"
+  project       = var.dev_project_id
+  address_type  = "INTERNAL"
+  purpose       = "VPC_PEERING"
+  prefix_length = 16
+  network       = google_compute_network.default.id
+
+  depends_on = [resource.google_project_service.services]
+}
+
+# VPC connection for AlloyDB
+resource "google_service_networking_connection" "vpc_connection" {
+  network                 = google_compute_network.default.id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
+}
+
+# AlloyDB Cluster
+resource "google_alloydb_cluster" "session_db_cluster" {
+  project    = var.dev_project_id
+  cluster_id = "${var.project_name}-alloydb-cluster"
+  location   = var.region
+
+  network_config {
+    network = google_compute_network.default.id
+  }
+
+  depends_on = [
+    google_service_networking_connection.vpc_connection
+  ]
+}
+
+# AlloyDB Instance
+resource "google_alloydb_instance" "session_db_instance" {
+  cluster       = google_alloydb_cluster.session_db_cluster.name
+  instance_id   = "${var.project_name}-alloydb-instance"
+  instance_type = "PRIMARY"
+
+  availability_type = "REGIONAL" # Regional redundancy
+
+  machine_config {
+    cpu_count = 2
+  }
+}
+
+# Generate a random password for the database user
+resource "random_password" "db_password" {
+  length           = 16
+  special          = true
+  override_special = "!#$%&*()-_=+[]{}<>:?"
+}
+
+# Store the password in Secret Manager
+resource "google_secret_manager_secret" "db_password" {
+  project   = var.dev_project_id
+  secret_id = "${var.project_name}-db-password"
+
+  replication {
+    auto {}
+  }
+
+  depends_on = [resource.google_project_service.services]
+}
+
+resource "google_secret_manager_secret_version" "db_password" {
+  secret      = google_secret_manager_secret.db_password.id
+  secret_data = random_password.db_password.result
+}
+
+resource "google_alloydb_user" "db_user" {
+  cluster        = google_alloydb_cluster.session_db_cluster.name
+  user_id        = "postgres"
+  user_type      = "ALLOYDB_BUILT_IN"
+  password       = random_password.db_password.result
+  database_roles = ["alloydbsuperuser"]
+
+  depends_on = [google_alloydb_instance.session_db_instance]
+}
+
+{%- endif %}
+
+
+resource "google_cloud_run_v2_service" "app" {
+  name                = var.project_name
+  location            = var.region
+  project             = var.dev_project_id
+  deletion_protection = false
+  ingress             = "INGRESS_TRAFFIC_ALL"
+
+  template {
+    containers {
+      image = "us-docker.pkg.dev/cloudrun/container/hello"
+
+      resources {
+        limits = {
+          cpu    = "4"
+          memory = "8Gi"
+        }
+      }
+{%- if cookiecutter.data_ingestion %}
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
+
+      env {
+        name  = "DATA_STORE_ID"
+        value = resource.google_discovery_engine_data_store.data_store_dev.data_store_id
+      }
+
+      env {
+        name  = "DATA_STORE_REGION"
+        value = var.data_store_region
+      }
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+      env {
+        name  = "VECTOR_SEARCH_INDEX"
+        value = resource.google_vertex_ai_index.vector_search_index.id
+      }
+
+      env {
+        name  = "VECTOR_SEARCH_INDEX_ENDPOINT"
+        value = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint.id
+      }
+
+      env {
+        name  = "VECTOR_SEARCH_BUCKET"
+        value = "gs://${resource.google_storage_bucket.data_ingestion_PIPELINE_GCS_ROOT.name}"
+      }
+{%- endif %}
+{%- endif %}
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+
+      env {
+        name  = "DB_HOST"
+        value = google_alloydb_instance.session_db_instance.ip_address
+      }
+
+      env {
+        name = "DB_PASS"
+        value_source {
+          secret_key_ref {
+            secret  = google_secret_manager_secret.db_password.secret_id
+            version = "latest"
+          }
+        }
+      }
+{%- endif %}
+    }
+
+    service_account = google_service_account.cloud_run_app_sa.email
+    max_instance_request_concurrency = 40
+
+    scaling {
+      min_instance_count = 1
+      max_instance_count = 10
+    }
+
+    session_affinity = true
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+    # VPC access for AlloyDB connectivity
+    vpc_access {
+      network_interfaces {
+        network    = google_compute_network.default.id
+        subnetwork = google_compute_subnetwork.default.id
+      }
+    }
+{%- endif %}
+  }
+
+  traffic {
+    type    = "TRAFFIC_TARGET_ALLOCATION_TYPE_LATEST"
+    percent = 100
+  }
+
+  # This lifecycle block prevents Terraform from overwriting the container image when it's
+  # updated by Cloud Run deployments outside of Terraform (e.g., via CI/CD pipelines)
+  lifecycle {
+    ignore_changes = [
+      template[0].containers[0].image,
+    ]
+  }
+
+  # Make dependencies conditional to avoid errors.
+  depends_on = [resource.google_project_service.services]
+}

src/deployment_targets/cloud_run/deployment/terraform/service.tf

@@ -0,0 +1,360 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Get project information to access the project number
+data "google_project" "project" {
+  for_each = local.deploy_project_ids
+
+  project_id = local.deploy_project_ids[each.key]
+}
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+
+# VPC Network for AlloyDB
+resource "google_compute_network" "default" {
+  for_each = local.deploy_project_ids
+  
+  name                    = "${var.project_name}-alloydb-network"
+  project                 = local.deploy_project_ids[each.key]
+  auto_create_subnetworks = false
+  
+  depends_on = [google_project_service.deploy_project_services]
+}
+
+# Subnet for AlloyDB
+resource "google_compute_subnetwork" "default" {
+  for_each = local.deploy_project_ids
+  
+  name          = "${var.project_name}-alloydb-network"
+  ip_cidr_range = "10.0.0.0/24"
+  region        = var.region
+  network       = google_compute_network.default[each.key].id
+  project       = local.deploy_project_ids[each.key]
+
+  # This is required for Cloud Run VPC connectors
+  purpose       = "PRIVATE"
+
+  private_ip_google_access = true
+}
+
+# Private IP allocation for AlloyDB
+resource "google_compute_global_address" "private_ip_alloc" {
+  for_each = local.deploy_project_ids
+  
+  name          = "${var.project_name}-private-ip"
+  project       = local.deploy_project_ids[each.key]
+  address_type  = "INTERNAL"
+  purpose       = "VPC_PEERING"
+  prefix_length = 16
+  network       = google_compute_network.default[each.key].id
+
+  depends_on = [google_project_service.deploy_project_services]
+}
+
+# VPC connection for AlloyDB
+resource "google_service_networking_connection" "vpc_connection" {
+  for_each = local.deploy_project_ids
+  
+  network                 = google_compute_network.default[each.key].id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc[each.key].name]
+}
+
+# AlloyDB Cluster
+resource "google_alloydb_cluster" "session_db_cluster" {
+  for_each = local.deploy_project_ids
+  
+  project    = local.deploy_project_ids[each.key]
+  cluster_id = "${var.project_name}-alloydb-cluster"
+  location   = var.region
+
+  network_config {
+    network = google_compute_network.default[each.key].id
+  }
+
+  depends_on = [
+    google_service_networking_connection.vpc_connection
+  ]
+}
+
+# AlloyDB Instance
+resource "google_alloydb_instance" "session_db_instance" {
+  for_each = local.deploy_project_ids
+  
+  cluster       = google_alloydb_cluster.session_db_cluster[each.key].name
+  instance_id   = "${var.project_name}-alloydb-instance"
+  instance_type = "PRIMARY"
+
+  availability_type = "REGIONAL" # Regional redundancy
+
+  machine_config {
+    cpu_count = 2
+  }
+}
+
+# Generate a random password for the database user
+resource "random_password" "db_password" {
+  for_each = local.deploy_project_ids
+  
+  length           = 16
+  special          = true
+  override_special = "!#$%&*()-_=+[]{}<>:?"
+}
+
+# Store the password in Secret Manager
+resource "google_secret_manager_secret" "db_password" {
+  for_each = local.deploy_project_ids
+  
+  project   = local.deploy_project_ids[each.key]
+  secret_id = "${var.project_name}-db-password"
+
+  replication {
+    auto {}
+  }
+
+  depends_on = [google_project_service.deploy_project_services]
+}
+
+resource "google_secret_manager_secret_version" "db_password" {
+  for_each = local.deploy_project_ids
+  
+  secret      = google_secret_manager_secret.db_password[each.key].id
+  secret_data = random_password.db_password[each.key].result
+}
+
+resource "google_alloydb_user" "db_user" {
+  for_each = local.deploy_project_ids
+  
+  cluster        = google_alloydb_cluster.session_db_cluster[each.key].name
+  user_id        = "postgres"
+  user_type      = "ALLOYDB_BUILT_IN"
+  password       = random_password.db_password[each.key].result
+  database_roles = ["alloydbsuperuser"]
+
+  depends_on = [google_alloydb_instance.session_db_instance]
+}
+
+{%- endif %}
+
+resource "google_cloud_run_v2_service" "app_staging" {  
+  name                = var.project_name
+  location            = var.region
+  project             = var.staging_project_id
+  deletion_protection = false
+  ingress             = "INGRESS_TRAFFIC_ALL"
+
+  template {
+    containers {
+      # Placeholder, will be replaced by the CI/CD pipeline
+      image = "us-docker.pkg.dev/cloudrun/container/hello"
+
+      resources {
+        limits = {
+          cpu    = "4"
+          memory = "8Gi"
+        }
+        cpu_idle = false
+      }
+{%- if cookiecutter.data_ingestion %}
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
+
+      env {
+        name  = "DATA_STORE_ID"
+        value = resource.google_discovery_engine_data_store.data_store_staging.data_store_id
+      }
+
+      env {
+        name  = "DATA_STORE_REGION"
+        value = var.data_store_region
+      }
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+      env {
+        name  = "VECTOR_SEARCH_INDEX"
+        value = resource.google_vertex_ai_index.vector_search_index_staging.id
+      }
+
+      env {
+        name  = "VECTOR_SEARCH_INDEX_ENDPOINT"
+        value = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_staging.id
+      }
+
+      env {
+        name  = "VECTOR_SEARCH_BUCKET"
+        value = resource.google_storage_bucket.vector_search_data_bucket["staging"].url
+      }
+{%- endif %}
+{%- endif %}
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+
+      env {
+        name  = "DB_HOST"
+        value = google_alloydb_instance.session_db_instance["staging"].ip_address
+      }
+
+      env {
+        name = "DB_PASS"
+        value_source {
+          secret_key_ref {
+            secret  = google_secret_manager_secret.db_password["staging"].secret_id
+            version = "latest"
+          }
+        }
+      }
+{%- endif %}
+    }
+
+    service_account                = google_service_account.cloud_run_app_sa["staging"].email
+    max_instance_request_concurrency = 40
+
+    scaling {
+      min_instance_count = 1
+      max_instance_count = 10
+    }
+
+    session_affinity = true
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+    # VPC access for AlloyDB connectivity
+    vpc_access {
+      network_interfaces {
+        network    = google_compute_network.default["staging"].id
+        subnetwork = google_compute_subnetwork.default["staging"].id
+      }
+    }
+{%- endif %}
+  }
+
+  traffic {
+    type    = "TRAFFIC_TARGET_ALLOCATION_TYPE_LATEST"
+    percent = 100
+  }
+
+  # This lifecycle block prevents Terraform from overwriting the container image when it's
+  # updated by Cloud Run deployments outside of Terraform (e.g., via CI/CD pipelines)
+  lifecycle {
+    ignore_changes = [
+      template[0].containers[0].image,
+    ]
+  }
+
+  # Make dependencies conditional to avoid errors.
+  depends_on = [google_project_service.deploy_project_services]
+}
+
+resource "google_cloud_run_v2_service" "app_prod" {  
+  name                = var.project_name
+  location            = var.region
+  project             = var.prod_project_id
+  deletion_protection = false
+  ingress             = "INGRESS_TRAFFIC_ALL"
+
+  template {
+    containers {
+      # Placeholder, will be replaced by the CI/CD pipeline
+      image = "us-docker.pkg.dev/cloudrun/container/hello"
+
+      resources {
+        limits = {
+          cpu    = "4"
+          memory = "8Gi"
+        }
+        cpu_idle = false
+      }
+{%- if cookiecutter.data_ingestion %}
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
+
+      env {
+        name  = "DATA_STORE_ID"
+        value = resource.google_discovery_engine_data_store.data_store_prod.data_store_id
+      }
+
+      env {
+        name  = "DATA_STORE_REGION"
+        value = var.data_store_region
+      }
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+      env {
+        name  = "VECTOR_SEARCH_INDEX"
+        value = resource.google_vertex_ai_index.vector_search_index_prod.id
+      }
+
+      env {
+        name  = "VECTOR_SEARCH_INDEX_ENDPOINT"
+        value = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_prod.id
+      }
+
+      env {
+        name  = "VECTOR_SEARCH_BUCKET"
+        value = resource.google_storage_bucket.vector_search_data_bucket["prod"].url
+      }
+{%- endif %}
+{%- endif %}
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+
+      env {
+        name  = "DB_HOST"
+        value = google_alloydb_instance.session_db_instance["prod"].ip_address
+      }
+
+      env {
+        name = "DB_PASS"
+        value_source {
+          secret_key_ref {
+            secret  = google_secret_manager_secret.db_password["prod"].secret_id
+            version = "latest"
+          }
+        }
+      }
+{%- endif %}
+    }
+
+    service_account                = google_service_account.cloud_run_app_sa["prod"].email
+    max_instance_request_concurrency = 40
+
+    scaling {
+      min_instance_count = 1
+      max_instance_count = 10
+    }
+
+    session_affinity = true
+
+{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+    # VPC access for AlloyDB connectivity
+    vpc_access {
+      network_interfaces {
+        network    = google_compute_network.default["prod"].id
+        subnetwork = google_compute_subnetwork.default["prod"].id
+      }
+    }
+{%- endif %}
+  }
+
+  traffic {
+    type    = "TRAFFIC_TARGET_ALLOCATION_TYPE_LATEST"
+    percent = 100
+  }
+
+  # This lifecycle block prevents Terraform from overwriting the container image when it's
+  # updated by Cloud Run deployments outside of Terraform (e.g., via CI/CD pipelines)
+  lifecycle {
+    ignore_changes = [
+      template[0].containers[0].image,
+    ]
+  }
+
+  # Make dependencies conditional to avoid errors.
+  depends_on = [google_project_service.deploy_project_services]
+}

src/deployment_targets/cloud_run/tests/integration/test_server_e2e.py

@@ -122,16 +122,19 @@ def test_chat_stream(server_fixture: subprocess.Popen[str]) -> None:
     logger.info("Starting chat stream test")
 {% if "adk" in cookiecutter.tags %}
     # Create session first
-    user_id = "user_123"
-    session_id = "session_abc"
-    session_data = {"state": {"preferred_language": "English", "visit_count": 5}}
+    user_id = "test_user_123"
+    session_data = {"state": {"preferred_language": "English", "visit_count": 1}}
+
+    session_url = f"{BASE_URL}/apps/app/users/{user_id}/sessions"
     session_response = requests.post(
-        f"{BASE_URL}/apps/app/users/{user_id}/sessions/{session_id}",
+        session_url,
         headers=HEADERS,
         json=session_data,
-        timeout=10,
+        timeout=60,
     )
     assert session_response.status_code == 200
+    logger.info(f"Session creation response: {session_response.json()}")
+    session_id = session_response.json()["id"]
 
     # Then send chat message
     data = {

src/deployment_targets/cloud_run/tests/load_test/README.md

@@ -18,7 +18,7 @@ uv run uvicorn app.server:app --host 0.0.0.0 --port 8000 --reload
 Using another terminal tab, This is suggested to avoid conflicts with the existing application python environment.
 
 ```bash
-python3 -m venv .locust_env && source locust_env/bin/activate && pip install locust==2.31.1
+python3 -m venv .locust_env && source .locust_env/bin/activate && pip install locust==2.31.1
 ```
 
 **3. Execute the Load Test:**
@@ -69,7 +69,7 @@ export _ID_TOKEN=$(gcloud auth print-identity-token -q)
 **3. Execute the Load Test:**
 Create virtual environment with Locust:
 ```bash
-python3 -m venv .locust_env && source locust_env/bin/activate && pip install locust==2.31.1
+python3 -m venv .locust_env && source .locust_env/bin/activate && pip install locust==2.31.1
 ```
 
 Execute load tests. The following command executes the same load test parameters as the local test but targets your remote Cloud Run instance.