agent-starter-pack 0.18.2__py3-none-any.whl → 0.21.0__py3-none-any.whl

agent_starter_pack/base_template/deployment/terraform/variables.tf

@@ -50,35 +50,21 @@ variable "repository_name" {
   type        = string
 }
 
-variable "telemetry_logs_filter" {
-  type        = string
-  description = "Log Sink filter for capturing telemetry data. Captures logs with the `traceloop.association.properties.log_type` attribute set to `tracing`."
-{%- if cookiecutter.is_adk %}
-  default     = "labels.service_name=\"{{cookiecutter.project_name}}\" labels.type=\"agent_telemetry\""
-{%- else %}
-  default     = "jsonPayload.attributes.\"traceloop.association.properties.log_type\"=\"tracing\" jsonPayload.resource.attributes.\"service.name\"=\"{{cookiecutter.project_name}}\""
-{%- endif %}
-}
-
-variable "feedback_logs_filter" {
-  type        = string
-  description = "Log Sink filter for capturing feedback data. Captures logs where the `log_type` field is `feedback`."
-  default     = "jsonPayload.log_type=\"feedback\""
-}
-
 variable "app_sa_roles" {
   description = "List of roles to assign to the application service account"
   type        = list(string)
   default = [
-{%- 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/serviceusage.serviceUsageConsumer",
+{%- if cookiecutter.session_type == "cloud_sql" %}
+    "roles/cloudsql.client",
+    "roles/secretmanager.secretAccessor",
+{%- endif %}
   ]
 }
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
@@ -186,6 +172,7 @@ variable "repository_owner" {
   description = "Owner of the Git repository - username or organization"
   type        = string
 }
+
 {% if cookiecutter.cicd_runner == "github_actions" %}
 
 
@@ -220,3 +207,12 @@ variable "create_repository" {
   default     = false
 }
 {% endif %}
+{% if cookiecutter.is_adk %}
+
+variable "feedback_logs_filter" {
+  type        = string
+  description = "Log Sink filter for capturing feedback data. Captures logs where the `log_type` field is `feedback`."
+  default     = "jsonPayload.log_type=\"feedback\" jsonPayload.service_name=\"{{cookiecutter.project_name}}\""
+}
+{% endif %}
+

agent_starter_pack/base_template/deployment/terraform/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}build_triggers.tf{% else %}unused_build_triggers.tf{% endif %}

@@ -73,29 +73,27 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
   include_build_logs = "INCLUDE_BUILD_LOGS_WITH_STATUS"
   substitutions = {
     _STAGING_PROJECT_ID            = var.staging_project_id
-    _BUCKET_NAME_LOAD_TEST_RESULTS = resource.google_storage_bucket.bucket_load_test_results.name
-    _LOGS_BUCKET_NAME_STAGING      = resource.google_storage_bucket.logs_data_bucket[var.staging_project_id].url
+    _LOGS_BUCKET_NAME_STAGING      = resource.google_storage_bucket.logs_data_bucket[var.staging_project_id].name
+    _APP_SERVICE_ACCOUNT_STAGING   = google_service_account.app_sa["staging"].email
     _REGION                        = var.region
-{% if cookiecutter.deployment_target == 'cloud_run' %}
+{%- if cookiecutter.deployment_target == 'cloud_run' %}
     _CONTAINER_NAME                = var.project_name
     _ARTIFACT_REGISTRY_REPO_NAME   = resource.google_artifact_registry_repository.repo-artifacts-genai.repository_id
-{% elif cookiecutter.deployment_target == 'agent_engine' %}
-
-{% endif %}
-{% if cookiecutter.data_ingestion %}
+{%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{%- endif %}
+{%- if cookiecutter.data_ingestion %}
     _PIPELINE_GCS_ROOT_STAGING     = "gs://${resource.google_storage_bucket.data_ingestion_pipeline_gcs_root["staging"].name}"
     _PIPELINE_SA_EMAIL_STAGING             = resource.google_service_account.vertexai_pipeline_app_sa["staging"].email
     _PIPELINE_CRON_SCHEDULE        = var.pipeline_cron_schedule
-{% if cookiecutter.datastore_type == "vertex_ai_search" %}
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
     _DATA_STORE_ID_STAGING         = resource.google_discovery_engine_data_store.data_store_staging.data_store_id
     _DATA_STORE_REGION             = var.data_store_region
-{% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
     _VECTOR_SEARCH_INDEX_STAGING   = resource.google_vertex_ai_index.vector_search_index_staging.id
     _VECTOR_SEARCH_INDEX_ENDPOINT_STAGING = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_staging.id
     _VECTOR_SEARCH_BUCKET_STAGING  = resource.google_storage_bucket.vector_search_data_bucket["staging"].url
-
-{% endif %}
-{% endif %}
+{%- endif %}
+{%- endif %}
     # Your other CD Pipeline substitutions
   }
   depends_on = [
@@ -124,27 +122,27 @@ resource "google_cloudbuild_trigger" "deploy_to_prod_pipeline" {
   }
   substitutions = {
     _PROD_PROJECT_ID             = var.prod_project_id
-    _LOGS_BUCKET_NAME_PROD       = resource.google_storage_bucket.logs_data_bucket[var.prod_project_id].url
+    _LOGS_BUCKET_NAME_PROD       = resource.google_storage_bucket.logs_data_bucket[var.prod_project_id].name
+    _APP_SERVICE_ACCOUNT_PROD    = google_service_account.app_sa["prod"].email
     _REGION                      = var.region
-{% if cookiecutter.deployment_target == 'cloud_run' %}
+{%- if cookiecutter.deployment_target == 'cloud_run' %}
     _CONTAINER_NAME              = var.project_name
     _ARTIFACT_REGISTRY_REPO_NAME = resource.google_artifact_registry_repository.repo-artifacts-genai.repository_id
-{% elif cookiecutter.deployment_target == 'agent_engine' %}
-
-{% endif %}
-{% if cookiecutter.data_ingestion %}
+{%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{%- endif %}
+{%- if cookiecutter.data_ingestion %}
     _PIPELINE_GCS_ROOT_PROD        = "gs://${resource.google_storage_bucket.data_ingestion_pipeline_gcs_root["prod"].name}"
     _PIPELINE_SA_EMAIL_PROD             = resource.google_service_account.vertexai_pipeline_app_sa["prod"].email
     _PIPELINE_CRON_SCHEDULE        = var.pipeline_cron_schedule
-{% if cookiecutter.datastore_type == "vertex_ai_search" %}
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
     _DATA_STORE_ID_PROD            = resource.google_discovery_engine_data_store.data_store_prod.data_store_id
     _DATA_STORE_REGION             = var.data_store_region
-{% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
     _VECTOR_SEARCH_INDEX_PROD      = resource.google_vertex_ai_index.vector_search_index_prod.id
     _VECTOR_SEARCH_INDEX_ENDPOINT_PROD = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_prod.id
     _VECTOR_SEARCH_BUCKET_PROD     = resource.google_storage_bucket.vector_search_data_bucket["prod"].url
-{% endif %}
-{% endif %}
+{%- endif %}
+{%- endif %}
     # Your other Deploy to Prod Pipeline substitutions
   }
   depends_on = [

agent_starter_pack/base_template/deployment/terraform/{% if cookiecutter.is_adk %}telemetry.tf{% else %}unused_telemetry.tf{% endif %}

@@ -0,0 +1,206 @@
+# 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.
+
+# BigQuery dataset for telemetry external tables
+resource "google_bigquery_dataset" "telemetry_dataset" {
+  for_each      = local.deploy_project_ids
+  project       = each.value
+  dataset_id    = replace("${var.project_name}_telemetry", "-", "_")
+  friendly_name = "${var.project_name} Telemetry"
+  location      = var.region
+  description   = "Dataset for GenAI telemetry data stored in GCS"
+  depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
+}
+
+# BigQuery connection for accessing GCS telemetry data
+resource "google_bigquery_connection" "genai_telemetry_connection" {
+  for_each      = local.deploy_project_ids
+  project       = each.value
+  location      = var.region
+  connection_id = "${var.project_name}-genai-telemetry"
+  friendly_name = "${var.project_name} GenAI Telemetry Connection"
+
+  cloud_resource {}
+
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
+}
+
+# Wait for the BigQuery connection service account to propagate in IAM
+resource "time_sleep" "wait_for_bq_connection_sa" {
+  for_each = local.deploy_project_ids
+
+  create_duration = "10s"
+
+  depends_on = [google_bigquery_connection.genai_telemetry_connection]
+}
+
+# Grant the BigQuery connection service account access to read from the logs bucket
+resource "google_storage_bucket_iam_member" "telemetry_connection_access" {
+  for_each = local.deploy_project_ids
+  bucket   = google_storage_bucket.logs_data_bucket[each.value].name
+  role     = "roles/storage.objectViewer"
+  member   = "serviceAccount:${google_bigquery_connection.genai_telemetry_connection[each.key].cloud_resource[0].service_account_id}"
+
+  depends_on = [time_sleep.wait_for_bq_connection_sa]
+}
+
+# ====================================================================
+# Dedicated Cloud Logging Bucket for GenAI Telemetry
+# ====================================================================
+
+# Create a custom Cloud Logging bucket for GenAI telemetry logs with long-term retention
+resource "google_logging_project_bucket_config" "genai_telemetry_bucket" {
+  for_each         = local.deploy_project_ids
+  project          = each.value
+  location         = var.region
+  bucket_id        = "${var.project_name}-genai-telemetry"
+  retention_days   = 3650  # 10 years retention (maximum allowed)
+  enable_analytics = true  # Required for linked datasets
+  description      = "Dedicated Cloud Logging bucket for ${var.project_name} GenAI telemetry with 10 year retention"
+
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
+}
+
+# Log sink to route only GenAI telemetry logs to the dedicated bucket
+# Filter by bucket name in the GCS path (which includes project_name) to isolate this agent's logs
+resource "google_logging_project_sink" "genai_logs_to_bucket" {
+  for_each    = local.deploy_project_ids
+  name        = "${var.project_name}-genai-logs"
+  project     = each.value
+  destination = "logging.googleapis.com/projects/${each.value}/locations/${var.region}/buckets/${google_logging_project_bucket_config.genai_telemetry_bucket[each.key].bucket_id}"
+  filter      = "log_name=\"projects/${each.value}/logs/gen_ai.client.inference.operation.details\" AND (labels.\"gen_ai.input.messages_ref\" =~ \".*${var.project_name}.*\" OR labels.\"gen_ai.output.messages_ref\" =~ \".*${var.project_name}.*\")"
+
+  unique_writer_identity = true
+  depends_on             = [google_logging_project_bucket_config.genai_telemetry_bucket]
+}
+
+# Create a linked dataset to the GenAI telemetry logs bucket for querying via BigQuery
+resource "google_logging_linked_dataset" "genai_logs_linked_dataset" {
+  for_each    = local.deploy_project_ids
+  link_id     = replace("${var.project_name}_genai_telemetry_logs", "-", "_")
+  bucket      = google_logging_project_bucket_config.genai_telemetry_bucket[each.key].bucket_id
+  description = "Linked dataset for ${var.project_name} GenAI telemetry Cloud Logging bucket"
+  location    = var.region
+  parent      = "projects/${each.value}"
+
+  depends_on = [
+    google_logging_project_bucket_config.genai_telemetry_bucket,
+    google_logging_project_sink.genai_logs_to_bucket
+  ]
+}
+
+# Wait for linked dataset to fully propagate
+resource "time_sleep" "wait_for_linked_dataset" {
+  for_each = local.deploy_project_ids
+
+  create_duration = "10s"
+
+  depends_on = [google_logging_linked_dataset.genai_logs_linked_dataset]
+}
+
+# ====================================================================
+# Feedback Logs to Cloud Logging Bucket
+# ====================================================================
+
+# Log sink for user feedback logs - routes to the same Cloud Logging bucket
+resource "google_logging_project_sink" "feedback_logs_to_bucket" {
+  for_each    = local.deploy_project_ids
+  name        = "${var.project_name}-feedback"
+  project     = each.value
+  destination = "logging.googleapis.com/projects/${each.value}/locations/${var.region}/buckets/${google_logging_project_bucket_config.genai_telemetry_bucket[each.key].bucket_id}"
+  filter      = var.feedback_logs_filter
+
+  unique_writer_identity = true
+  depends_on             = [google_logging_project_bucket_config.genai_telemetry_bucket]
+}
+
+# ====================================================================
+# Completions External Table (GCS-based)
+# ====================================================================
+
+# External table for completions data (messages/parts) stored in GCS
+resource "google_bigquery_table" "completions_external_table" {
+  for_each            = local.deploy_project_ids
+  project             = each.value
+  dataset_id          = google_bigquery_dataset.telemetry_dataset[each.key].dataset_id
+  table_id            = "completions"
+  deletion_protection = false
+
+  external_data_configuration {
+    autodetect            = false
+    source_format         = "NEWLINE_DELIMITED_JSON"
+    source_uris           = ["gs://${google_storage_bucket.logs_data_bucket[each.value].name}/completions/*"]
+    connection_id         = google_bigquery_connection.genai_telemetry_connection[each.key].name
+    ignore_unknown_values = true
+    max_bad_records       = 1000
+  }
+
+  # Schema matching the ADK completions format
+  schema = jsonencode([
+    {
+      name = "parts"
+      type = "RECORD"
+      mode = "REPEATED"
+      fields = [
+        { name = "type", type = "STRING", mode = "NULLABLE" },
+        { name = "content", type = "STRING", mode = "NULLABLE" },
+        { name = "mime_type", type = "STRING", mode = "NULLABLE" },
+        { name = "uri", type = "STRING", mode = "NULLABLE" },
+        { name = "data", type = "BYTES", mode = "NULLABLE" },
+        { name = "id", type = "STRING", mode = "NULLABLE" },
+        { name = "name", type = "STRING", mode = "NULLABLE" },
+        { name = "arguments", type = "JSON", mode = "NULLABLE" },
+        { name = "response", type = "JSON", mode = "NULLABLE" }
+      ]
+    },
+    { name = "role", type = "STRING", mode = "NULLABLE" },
+    { name = "index", type = "INTEGER", mode = "NULLABLE" }
+  ])
+
+  depends_on = [
+    google_storage_bucket.logs_data_bucket,
+    google_bigquery_connection.genai_telemetry_connection,
+    google_storage_bucket_iam_member.telemetry_connection_access
+  ]
+}
+
+# ====================================================================
+# Completions View (Joins Logs with GCS Data)
+# ====================================================================
+
+# View that joins Cloud Logging data with GCS-stored completions data
+resource "google_bigquery_table" "completions_view" {
+  for_each            = local.deploy_project_ids
+  project             = each.value
+  dataset_id          = google_bigquery_dataset.telemetry_dataset[each.key].dataset_id
+  table_id            = "completions_view"
+  description         = "View of GenAI completion logs joined with the GCS prompt/response external table"
+  deletion_protection = false
+
+  view {
+    query = templatefile("${path.module}/sql/completions.sql", {
+      project_id                 = each.value
+      dataset_id                 = google_bigquery_dataset.telemetry_dataset[each.key].dataset_id
+      completions_external_table = google_bigquery_table.completions_external_table[each.key].table_id
+      logs_link_id               = google_logging_linked_dataset.genai_logs_linked_dataset[each.key].link_id
+    })
+    use_legacy_sql = false
+  }
+
+  depends_on = [
+    google_logging_linked_dataset.genai_logs_linked_dataset,
+    google_bigquery_table.completions_external_table,
+    time_sleep.wait_for_linked_dataset
+  ]
+}

agent_starter_pack/base_template/pyproject.toml

@@ -9,10 +9,9 @@ dependencies = [
 {%- for dep in cookiecutter.extra_dependencies %}
     "{{ dep }}",
 {%- endfor %}
-    "opentelemetry-exporter-gcp-trace>=1.9.0,<2.0.0",
-{%- if not cookiecutter.is_adk %}
-    "langchain-core~=0.3.9",
-    "traceloop-sdk~=0.38.7",
+{%- if cookiecutter.is_adk %}
+    "opentelemetry-instrumentation-google-genai>=0.1.0,<1.0.0",
+    "gcsfs>=2024.11.0",
 {%- endif %}
     "google-cloud-logging>=3.12.0,<4.0.0",
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
@@ -22,14 +21,11 @@ dependencies = [
     "psycopg2-binary>=2.9.10,<3.0.0",
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
     "google-cloud-aiplatform[evaluation,agent-engines]>=1.118.0,<2.0.0",
-    "protobuf>=6.31.1,<7.0.0"
+    "protobuf>=6.31.1,<7.0.0",
 {%- endif %}
 ]
-{% if cookiecutter.deployment_target == 'cloud_run' %}
 requires-python = ">=3.10,<3.14"
-{% elif cookiecutter.deployment_target == 'agent_engine' %}
-requires-python = ">=3.10,<3.13"
-{%- endif %}
+
 
 [dependency-groups]
 dev = [
@@ -39,14 +35,6 @@ dev = [
 ]
 
 [project.optional-dependencies]
-{% if not cookiecutter.is_adk %}
-streamlit = [
-    "streamlit>=1.42.0,<2.0.0",
-    "streamlit-extras>=0.4.3,<1.0.0",
-    "extra-streamlit-components>=0.1.71,<1.0.0",
-    "streamlit-feedback>=0.1.3,<1.0.0",
-]
-{% endif %}
 jupyter = [
     "jupyter>=1.0.0,<2.0.0",
 ]

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'github_actions' %}.github{% else %}unused_github{% endif %}/workflows/deploy-to-prod.yaml

@@ -69,6 +69,14 @@ jobs:
         run: |
           pip install uv==0.8.13
           uv sync --locked
+{%- if cookiecutter.is_a2a %}
+
+      - name: Extract version from pyproject.toml
+        id: extract-version
+        run: |
+          VERSION=$(awk -F'"' '/^version = / {print $2}' pyproject.toml || echo '0.0.0')
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+{%- endif %}
 {%- endif %}
 
 {%- if cookiecutter.data_ingestion %}
@@ -107,11 +115,18 @@ jobs:
 
       - name: Deploy to Production (Agent Engine)
         run: |
-          uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-          uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
+{%- if cookiecutter.is_a2a %}
+          AGENT_VERSION={% raw %}${{ steps.extract-version.outputs.version }}{% endraw %}
+{%- endif %}
+          uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > {{cookiecutter.agent_directory}}/app_utils/.requirements.txt
+          uv run python -m {{cookiecutter.agent_directory}}.app_utils.deploy \
             --project {% raw %}${{ vars.PROD_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
-            --artifacts-bucket-name {% raw %}${{ vars.LOGS_BUCKET_NAME_PROD }}{% endraw %} \
-            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_PROD }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_PROD }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_PROD }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_PROD }}{% endraw %}{%- endif %}{%- endif %}"
+            --source-packages=./{{cookiecutter.agent_directory}} \
+            --entrypoint-module={{cookiecutter.agent_directory}}.agent_engine_app \
+            --entrypoint-object=agent_engine \
+            --requirements-file={{cookiecutter.agent_directory}}/app_utils/.requirements.txt \
+            --service-account={% raw %}${{ vars.APP_SERVICE_ACCOUNT_PROD }}{% endraw %} \
+            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.is_a2a %},AGENT_VERSION=$AGENT_VERSION{%- endif %},LOGS_BUCKET_NAME={% raw %}${{ vars.LOGS_BUCKET_NAME_PROD }}{% endraw %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_PROD }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_PROD }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_PROD }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_PROD }}{% endraw %}{%- endif %}{%- endif %}"
 {%- endif %}
 

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'github_actions' %}.github{% else %}unused_github{% endif %}/workflows/staging.yaml

@@ -81,11 +81,23 @@ jobs:
       - name: Configure Docker for Artifact Registry
         run: |
           gcloud auth configure-docker {% raw %}${{ vars.REGION }}{% endraw %}-docker.pkg.dev --quiet
-          
+{%- if cookiecutter.is_a2a %}
+
+      - name: Extract version from pyproject.toml
+        id: extract-version
+        run: |
+          VERSION=$(awk -F'"' '/^version = / {print $2}' pyproject.toml || echo '0.0.0')
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+{%- endif %}
+
       - name: Build and Push Docker Image
         run: |
           docker build -t {% raw %}${{ vars.REGION }}{% endraw %}-docker.pkg.dev/{% raw %}${{ vars.CICD_PROJECT_ID }}{% endraw %}/{% raw %}${{ vars.ARTIFACT_REGISTRY_REPO_NAME }}{% endraw %}/{% raw %}${{ vars.CONTAINER_NAME }}{% endraw %} \
-            --build-arg COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %} .
+            --build-arg COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %} \
+{%- if cookiecutter.is_a2a %}
+            --build-arg AGENT_VERSION={% raw %}${{ steps.extract-version.outputs.version }}{% endraw %} \
+{%- endif %}
+            .
           docker push {% raw %}${{ vars.REGION }}{% endraw %}-docker.pkg.dev/{% raw %}${{ vars.CICD_PROJECT_ID }}{% endraw %}/{% raw %}${{ vars.ARTIFACT_REGISTRY_REPO_NAME }}{% endraw %}/{% raw %}${{ vars.CONTAINER_NAME }}{% endraw %}
 
       - name: Deploy to Staging (Cloud Run)
@@ -115,15 +127,28 @@ jobs:
         run: |
           pip install uv==0.8.13
           uv sync --locked
+{%- if cookiecutter.is_a2a %}
+
+      - name: Extract version from pyproject.toml
+        id: extract-version
+        run: |
+          VERSION=$(awk -F'"' '/^version = / {print $2}' pyproject.toml || echo '0.0.0')
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "Extracted version: ${VERSION}"
+{%- endif %}
 
       - name: Deploy to Staging (Agent Engine)
         run: |
-          uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-          uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
+          uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > {{cookiecutter.agent_directory}}/app_utils/.requirements.txt
+          uv run python -m {{cookiecutter.agent_directory}}.app_utils.deploy \
             --project {% raw %}${{ vars.STAGING_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
-            --artifacts-bucket-name {% raw %}${{ vars.LOGS_BUCKET_NAME_STAGING }}{% endraw %} \
-            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_STAGING }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_STAGING }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_STAGING }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_STAGING }}{% endraw %}{%- endif %}{%- endif %}"
+            --source-packages=./{{cookiecutter.agent_directory}} \
+            --entrypoint-module={{cookiecutter.agent_directory}}.agent_engine_app \
+            --entrypoint-object=agent_engine \
+            --requirements-file={{cookiecutter.agent_directory}}/app_utils/.requirements.txt \
+            --service-account={% raw %}${{ vars.APP_SERVICE_ACCOUNT_STAGING }}{% endraw %} \
+            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.is_a2a %},AGENT_VERSION={% raw %}${{ steps.extract-version.outputs.version }}{% endraw %}{%- endif %},LOGS_BUCKET_NAME={% raw %}${{ vars.LOGS_BUCKET_NAME_STAGING }}{% endraw %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_STAGING }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_STAGING }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_STAGING }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_STAGING }}{% endraw %}{%- endif %}{%- endif %}"
 
       - name: Fetch Auth Token
         id: fetch-token
@@ -174,7 +199,7 @@ jobs:
 {%- elif cookiecutter.deployment_target == 'cloud_run' %}
           export _ID_TOKEN="{% raw %}${{ steps.fetch-token.outputs._id_token }}{% endraw %}"
           export _STAGING_URL="{% raw %}${{ steps.fetch-url.outputs._staging_url }}{% endraw %}"
-          pip install locust==2.31.1
+          pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.9{%- endif %}
           locust -f tests/load_test/load_test.py \
           --headless \
           -H ${_STAGING_URL} \
@@ -183,7 +208,7 @@ jobs:
           --html=tests/load_test/.results/report.html
 {%- elif cookiecutter.deployment_target == 'agent_engine' and cookiecutter.is_adk_live %}
           # Start expose app in remote mode (uses deployment_metadata.json by default)
-          uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode remote &
+          uv run python -m {{cookiecutter.agent_directory}}.app_utils.expose_app --mode remote &
           EXPOSE_PID=$!
 
           # Wait for expose app to be ready
@@ -219,10 +244,10 @@ jobs:
       - name: Export Load Test Results to GCS
         run: |
           TIMESTAMP=$(date +%Y%m%d-%H%M%S)
-          gcloud storage cp --recursive tests/load_test/.results gs://{% raw %}${{ vars.BUCKET_NAME_LOAD_TEST_RESULTS }}{% endraw %}/results-${TIMESTAMP} --quiet
+          gcloud storage cp --recursive tests/load_test/.results gs://{% raw %}${{ vars.LOGS_BUCKET_NAME_STAGING }}{% endraw %}/load-test-results/results-${TIMESTAMP} --quiet
           echo "_________________________________________________________________________"
-          echo "Load test results copied to gs://{% raw %}${{ vars.BUCKET_NAME_LOAD_TEST_RESULTS }}{% endraw %}/results-${TIMESTAMP}"
-          echo "HTTP link: https://console.cloud.google.com/storage/browser/{% raw %}${{ vars.BUCKET_NAME_LOAD_TEST_RESULTS }}{% endraw %}/results-${TIMESTAMP}"
+          echo "Load test results copied to gs://{% raw %}${{ vars.LOGS_BUCKET_NAME_STAGING }}{% endraw %}/load-test-results/results-${TIMESTAMP}"
+          echo "HTTP link: https://console.cloud.google.com/storage/browser/{% raw %}${{ vars.LOGS_BUCKET_NAME_STAGING }}{% endraw %}/load-test-results/results-${TIMESTAMP}"
           echo "_________________________________________________________________________"
 
   call_production_workflow:

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}.cloudbuild{% else %}unused_.cloudbuild{% endif %}/deploy-to-prod.yaml

@@ -42,7 +42,7 @@ steps:
 {%- endif %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
    
-  - name: "gcr.io/cloud-builders/gcloud"
+  - name: "gcr.io/cloud-builders/gcloud-slim"
     id: trigger-deployment
     entrypoint: gcloud
     args:
@@ -57,6 +57,18 @@ steps:
       - $_PROD_PROJECT_ID
 
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{%- if cookiecutter.is_a2a %}
+  # Extract version from pyproject.toml
+  - name: "gcr.io/cloud-builders/gcloud-slim"
+    id: extract-version
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        VERSION=$(awk -F'"' '/^version = / {print $$2}' pyproject.toml || echo '0.0.0')
+        echo "$${VERSION}" > /workspace/agent_version.txt
+
+{%- endif %}
   - name: "python:3.12-slim"
     id: install-dependencies
     entrypoint: /bin/bash
@@ -73,12 +85,19 @@ steps:
     args:
       - "-c"
       - |
-        uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-        uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
+{%- if cookiecutter.is_a2a %}
+        AGENT_VERSION=$(cat /workspace/agent_version.txt || echo '0.0.0')
+{%- endif %}
+        uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > {{cookiecutter.agent_directory}}/app_utils/.requirements.txt
+        uv run python -m {{cookiecutter.agent_directory}}.app_utils.deploy \
           --project ${_PROD_PROJECT_ID} \
           --location ${_REGION} \
-          --artifacts-bucket-name ${_LOGS_BUCKET_NAME_PROD} \
-          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID_PROD},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_PROD},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_PROD},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_PROD}{%- endif %}{%- endif %}"
+          --source-packages=./{{cookiecutter.agent_directory}} \
+          --entrypoint-module={{cookiecutter.agent_directory}}.agent_engine_app \
+          --entrypoint-object=agent_engine \
+          --requirements-file={{cookiecutter.agent_directory}}/app_utils/.requirements.txt \
+          --service-account=${_APP_SERVICE_ACCOUNT_PROD} \
+          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.is_a2a %},AGENT_VERSION=$${AGENT_VERSION}{%- endif %},LOGS_BUCKET_NAME=${_LOGS_BUCKET_NAME_PROD}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID_PROD},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_PROD},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_PROD},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_PROD}{%- endif %}{%- endif %}"
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 {%- endif %}