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

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

@@ -14,27 +14,27 @@
 
 steps:
 {%- if cookiecutter.data_ingestion %}
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: deploy-data-ingestion-pipeline-prod
     entrypoint: bash
     args:
       - -c
       - |
-        cd data_ingestion && pip install uv==0.6.12 --user && uv sync --frozen && \
-        uv run python data_ingestion_pipeline/submit_pipeline.py
+        cd data_ingestion && pip install uv==0.8.13 --user && cd data_ingestion_pipeline && \
+        uv sync --locked && uv run python submit_pipeline.py
     env:
-      - "PIPELINE_ROOT=${_PIPELINE_GCS_ROOT}"
+      - "PIPELINE_ROOT=${_PIPELINE_GCS_ROOT_PROD}"
       - "REGION=${_REGION}"
       {%- if cookiecutter.datastore_type == "vertex_ai_search" %}
       - "DATA_STORE_REGION=${_DATA_STORE_REGION}"
-      - "DATA_STORE_ID=${_DATA_STORE_ID}"
+      - "DATA_STORE_ID=${_DATA_STORE_ID_PROD}"
       {%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
-      - "VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX}"
-      - "VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT}"
-      - "VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET}"
+      - "VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_PROD}"
+      - "VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_PROD}"
+      - "VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_PROD}"
       {%- endif %}
       - "PROJECT_ID=${_PROD_PROJECT_ID}"
-      - "SERVICE_ACCOUNT=${_PIPELINE_SA_EMAIL}"
+      - "SERVICE_ACCOUNT=${_PIPELINE_SA_EMAIL_PROD}"
       - "PIPELINE_NAME=${_PIPELINE_NAME}"
       - "CRON_SCHEDULE=${_PIPELINE_CRON_SCHEDULE}"
       - "DISABLE_CACHING=TRUE"
@@ -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:
@@ -55,41 +55,49 @@ steps:
       - "$_REGION"
       - "--project"
       - $_PROD_PROJECT_ID
-      - "--min-instances"
-      - "1"
-      - "--no-cpu-throttling"
-      - "--cpu"
-      - "4"
-      - "--memory"
-      - "4Gi"
-      - "--concurrency"
-      - "40"
-      - "--service-account"
-      - "${_CLOUD_RUN_APP_SA_EMAIL}"
-      - "--set-env-vars"
-      - "COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET}{%- endif %}{%- endif %}"
+
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
-  - name: "python:3.11-slim" 
+{%- 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
     args:
       - "-c"
       - |
-        pip install uv==0.6.12 --user && uv sync --frozen
+        pip install uv==0.8.13 --user && uv sync --locked
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: trigger-deployment
     entrypoint: /bin/bash
     args:
       - "-c"
       - |
-        uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --frozen > .requirements.txt
-        uv run app/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} \
-          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET}{%- 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 %}
@@ -98,7 +106,7 @@ substitutions:
   _PROD_PROJECT_ID: YOUR_PROD_PROJECT_ID
   _REGION: us-central1
 
-logsBucket: gs://${PROJECT_ID}-{{ cookiecutter.project_name | replace('_', '-') }}-logs-data/build-logs
+logsBucket: gs://${PROJECT_ID}-{{ cookiecutter.project_name | replace('_', '-') }}-logs/build-logs
 options:
   substitutionOption: ALLOW_LOOSE
   defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

src/base_template/deployment/ci/pr_checks.yaml → agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}.cloudbuild{% else %}unused_.cloudbuild{% endif %}/pr_checks.yaml

@@ -14,18 +14,18 @@
 
 steps:
   # Install uv package manager and sync dependencies
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: install-dependencies
     entrypoint: /bin/bash
     args:
       - "-c"
       - |
-        pip install uv==0.6.12 --user && uv sync --frozen
+        pip install uv==0.8.13 --user && uv sync --locked
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
   # Run unit tests using pytest
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: unit-tests
     entrypoint: /bin/bash
     args:
@@ -36,7 +36,7 @@ steps:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
   # Run integration tests
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: integration-tests
     entrypoint: /bin/bash
     args:
@@ -46,6 +46,6 @@ steps:
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
-logsBucket: gs://${PROJECT_ID}-{{ cookiecutter.project_name | replace('_', '-') }}-logs-data/build-logs
+logsBucket: gs://${PROJECT_ID}-{{ cookiecutter.project_name | replace('_', '-') }}-logs/build-logs
 options:
   defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}.cloudbuild{% else %}unused_.cloudbuild{% endif %}/staging.yaml

@@ -0,0 +1,322 @@
+# 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.
+
+steps:
+{%- if cookiecutter.data_ingestion %}
+  - name: "python:3.12-slim"
+    id: deploy-data-ingestion-pipeline-staging
+    entrypoint: bash
+    args:
+      - -c
+      - |
+        cd data_ingestion && pip install uv==0.8.13 --user && cd data_ingestion_pipeline && \
+        uv sync --locked && uv run python submit_pipeline.py
+    env:
+      - "PIPELINE_ROOT=${_PIPELINE_GCS_ROOT_STAGING}"
+      - "REGION=${_REGION}"
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
+      - "DATA_STORE_REGION=${_DATA_STORE_REGION}"
+      - "DATA_STORE_ID=${_DATA_STORE_ID_STAGING}"
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+      - "VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_STAGING}"
+      - "VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_STAGING}"
+      - "VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_STAGING}"
+{%- endif %}
+      - "PROJECT_ID=${_STAGING_PROJECT_ID}"
+      - "SERVICE_ACCOUNT=${_PIPELINE_SA_EMAIL_STAGING}"
+      - "PIPELINE_NAME=${_PIPELINE_NAME}"
+      - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
+{%- endif %}
+{%- if cookiecutter.deployment_target == 'cloud_run' %}
+{%- 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 %}
+  # Build and Push
+  - name: "gcr.io/cloud-builders/docker"
+    args:
+      [
+        "build",
+        "-t",
+        "$_REGION-docker.pkg.dev/$PROJECT_ID/$_ARTIFACT_REGISTRY_REPO_NAME/$_CONTAINER_NAME",
+        "--build-arg",
+        "COMMIT_SHA=$COMMIT_SHA",
+{%- if cookiecutter.is_a2a %}
+        "--build-arg",
+        "AGENT_VERSION=$(cat /workspace/agent_version.txt || echo '0.0.0')",
+{%- endif %}
+        ".",
+      ]
+  - name: "gcr.io/cloud-builders/docker"
+    args:
+      [
+        "push",
+        "$_REGION-docker.pkg.dev/$PROJECT_ID/$_ARTIFACT_REGISTRY_REPO_NAME/$_CONTAINER_NAME",
+      ]
+
+  # Deploy to Staging
+  - name: "gcr.io/cloud-builders/gcloud"
+    id: deploy-staging
+    entrypoint: gcloud
+    args:
+      - "run"
+      - "deploy"
+      - "{{cookiecutter.project_name}}"
+      - "--image"
+      - "$_REGION-docker.pkg.dev/$PROJECT_ID/$_ARTIFACT_REGISTRY_REPO_NAME/$_CONTAINER_NAME"
+      - "--region"
+      - "${_REGION}"
+      - "--project"
+      - "${_STAGING_PROJECT_ID}"
+
+  # Fetch Staging Service URL
+  - name: "gcr.io/cloud-builders/gcloud"
+    id: fetch-staging-url
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        echo $(gcloud run services describe {{cookiecutter.project_name}} \
+        --region ${_REGION} --project ${_STAGING_PROJECT_ID} --format="value(status.url)") > staging_url.txt
+
+  # Fetch ID Token
+  - name: gcr.io/cloud-builders/gcloud
+    id: fetch-id-token
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        echo $(gcloud auth print-identity-token -q) > id_token.txt
+{%- 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
+    args:
+      - "-c"
+      - |
+        pip install uv==0.8.13 --user && uv sync --locked
+    env:
+      - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
+
+  - name: "python:3.12-slim"
+    id: deploy-staging
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+{%- 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 ${_STAGING_PROJECT_ID} \
+          --location ${_REGION} \
+          --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_STAGING} \
+          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.is_a2a %},AGENT_VERSION=$${AGENT_VERSION}{%- endif %},LOGS_BUCKET_NAME=${_LOGS_BUCKET_NAME_STAGING}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID_STAGING},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_STAGING},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_STAGING},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_STAGING}{%- endif %}{%- endif %}"
+    env:
+      - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
+
+
+  - name: gcr.io/cloud-builders/gcloud
+    id: fetch-auth-token
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        echo $(gcloud auth print-access-token -q) > auth_token.txt
+{%- endif %}
+
+  # Load Testing
+{%- if cookiecutter.deployment_target == 'cloud_run' and cookiecutter.agent_name == 'adk_live' %}
+  - name: "europe-west4-docker.pkg.dev/production-ai-template/starter-pack/e2e-tests"
+    id: load_test
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        # Install load test dependencies
+        pip install locust==2.31.1 websockets
+
+        # Install Cloud Run proxy component
+        apt-get update && apt-get install -y google-cloud-cli-cloud-run-proxy
+
+        # Start Cloud Run proxy in background
+        gcloud run services proxy {{cookiecutter.project_name}} \
+        --port=8080 \
+        --region ${_REGION} \
+        --project ${_STAGING_PROJECT_ID} \
+        --quiet &
+        _PROXY_PID=$$!
+
+        # Wait for proxy to be ready
+        echo "Waiting for proxy to start..."
+        sleep 10
+
+        # Run load test and capture exit code
+        locust -f tests/load_test/load_test.py \
+        --headless \
+        -H http://127.0.0.1:8080 \
+        -t 30s -u 2 -r 2 \
+        --csv=tests/load_test/.results/results \
+        --html=tests/load_test/.results/report.html
+        _LOAD_TEST_EXIT_CODE=$$?
+
+        # Clean up proxy
+        kill $$_PROXY_PID || true
+
+        # Exit with load test result to fail build if tests failed
+        exit $$_LOAD_TEST_EXIT_CODE
+{%- elif cookiecutter.deployment_target == 'cloud_run' %}
+  - name: "python:3.12-slim"
+    id: load_test
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        export _ID_TOKEN=$(cat id_token.txt)
+        export _STAGING_URL=$(cat staging_url.txt)
+        pip install locust==2.31.1{%- if cookiecutter.is_a2a %} a2a-sdk~=0.3.9{%- endif %} --user
+        locust -f tests/load_test/load_test.py \
+        --headless \
+        -H $$_STAGING_URL \
+        -t 30s -u 10 -r 0.5 \
+        --csv=tests/load_test/.results/results \
+        --html=tests/load_test/.results/report.html
+    env:
+      - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
+{%- elif cookiecutter.deployment_target == 'agent_engine' and cookiecutter.is_adk_live %}
+  - name: "python:3.12-slim"
+    id: load_test
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        # Start expose app in remote mode (uses deployment_metadata.json by default)
+        uv run python -m {{cookiecutter.agent_directory}}.app_utils.expose_app --mode remote &
+        EXPOSE_PID=$$!
+
+        # Wait for expose app to be ready
+        sleep 10
+
+        # Run load test against local expose app
+        uv run --with locust==2.31.1 --with websockets locust -f tests/load_test/load_test.py \
+        -H http://127.0.0.1:8000 \
+        --headless \
+        -t 30s -u 2 -r 1 \
+        --csv=tests/load_test/.results/results \
+        --html=tests/load_test/.results/report.html
+        LOCUST_EXIT_CODE=$$?
+
+        # Stop expose app
+        kill $$EXPOSE_PID
+
+        # Exit with error if locust test failed
+        if [ $$LOCUST_EXIT_CODE -ne 0 ]; then
+          echo "Load test failed with exit code $$LOCUST_EXIT_CODE"
+          exit $$LOCUST_EXIT_CODE
+        fi
+    env:
+      - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
+{%- elif cookiecutter.deployment_target == 'agent_engine' %}
+  - name: "python:3.12-slim"
+    id: load_test
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        export _AUTH_TOKEN=$(cat auth_token.txt)
+        pip install locust==2.31.1 --user
+        locust -f tests/load_test/load_test.py \
+        --headless \
+        -t 30s -u 2 -r 0.5 \
+        --csv=tests/load_test/.results/results \
+        --html=tests/load_test/.results/report.html
+    env:
+      - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
+{%- endif %}
+
+  # Export Load Test Results to GCS
+  - name: gcr.io/cloud-builders/gcloud
+    id: export-results-to-gcs
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        export _TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+        gsutil -m cp -r tests/load_test/.results gs://${_LOGS_BUCKET_NAME_STAGING}/load-test-results/results-$${_TIMESTAMP}
+        echo "_________________________________________________________________________"
+        echo "Load test results copied to gs://${_LOGS_BUCKET_NAME_STAGING}/load-test-results/results-$${_TIMESTAMP}"
+        echo "HTTP link: https://console.cloud.google.com/storage/browser/${_LOGS_BUCKET_NAME_STAGING}/load-test-results/results-$${_TIMESTAMP}"
+        echo "_________________________________________________________________________"
+
+  # Trigger Prod Deployment
+  - name: gcr.io/cloud-builders/gcloud
+    id: trigger-prod-deployment
+    entrypoint: gcloud
+    args:
+      - "beta"
+      - "builds"
+      - "triggers"
+      - "run"
+      - "deploy-{{cookiecutter.project_name}}"
+      - "--region"
+      - "$LOCATION"
+      - "--project"
+      - "$PROJECT_ID"
+      - "--sha"
+      - $COMMIT_SHA
+
+  - name: gcr.io/cloud-builders/gcloud
+    id: echo-view-build-trigger-link
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        echo "_________________________________________________________________________"
+        echo "Production deployment triggered. View progress and / or approve on the Cloud Build Console:"
+        echo "https://console.cloud.google.com/cloud-build/builds;region=$LOCATION"
+        echo "_________________________________________________________________________"
+
+substitutions:
+  _STAGING_PROJECT_ID: YOUR_STAGING_PROJECT_ID
+  _REGION: us-central1
+
+logsBucket: gs://${PROJECT_ID}-{{ cookiecutter.project_name | replace('_', '-') }}-logs/build-logs
+options:
+  substitutionOption: ALLOW_LOOSE
+  defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

agent_starter_pack/base_template/{{cookiecutter.agent_directory}}/app_utils/telemetry.py

@@ -0,0 +1,96 @@
+# 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.
+
+{%- if cookiecutter.is_adk %}
+import logging
+import os
+{%- if cookiecutter.is_adk and cookiecutter.is_a2a %}
+
+import google.auth
+from google.adk.cli.adk_web_server import _setup_instrumentation_lib_if_installed
+from google.adk.telemetry.google_cloud import get_gcp_exporters, get_gcp_resource
+from google.adk.telemetry.setup import maybe_set_otel_providers
+{%- endif %}
+
+
+def setup_telemetry() -> str | None:
+    """Configure OpenTelemetry and GenAI telemetry with GCS upload."""
+{%- if cookiecutter.deployment_target == 'agent_engine' %}
+    os.environ.setdefault("GOOGLE_CLOUD_AGENT_ENGINE_ENABLE_TELEMETRY", "true")
+{%- endif %}
+
+    bucket = os.environ.get("LOGS_BUCKET_NAME")
+    capture_content = os.environ.get(
+        "OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT", "false"
+    )
+    if bucket and capture_content != "false":
+        logging.info("Setting up GenAI telemetry with GCS upload...")
+        os.environ["OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT"] = "NO_CONTENT"
+        os.environ.setdefault("OTEL_INSTRUMENTATION_GENAI_UPLOAD_FORMAT", "jsonl")
+        os.environ.setdefault("OTEL_INSTRUMENTATION_GENAI_COMPLETION_HOOK", "upload")
+        os.environ.setdefault(
+            "OTEL_SEMCONV_STABILITY_OPT_IN", "gen_ai_latest_experimental"
+        )
+        commit_sha = os.environ.get("COMMIT_SHA", "dev")
+        os.environ.setdefault(
+            "OTEL_RESOURCE_ATTRIBUTES",
+            f"service.namespace={{cookiecutter.project_name}},service.version={commit_sha}",
+        )
+        path = os.environ.get("GENAI_TELEMETRY_PATH", "completions")
+        os.environ.setdefault(
+            "OTEL_INSTRUMENTATION_GENAI_UPLOAD_BASE_PATH",
+            f"gs://{bucket}/{path}",
+        )
+{%- if cookiecutter.is_adk and cookiecutter.is_a2a %}
+
+    # Set up OpenTelemetry exporters for Cloud Trace and Cloud Logging
+    credentials, project_id = google.auth.default()
+    otel_hooks = get_gcp_exporters(
+        enable_cloud_tracing=True,
+        enable_cloud_metrics=False,
+        enable_cloud_logging=True,
+        google_auth=(credentials, project_id),
+    )
+    otel_resource = get_gcp_resource(project_id)
+    maybe_set_otel_providers(
+        otel_hooks_to_setup=[otel_hooks],
+        otel_resource=otel_resource,
+    )
+
+    # Set up GenAI SDK instrumentation
+    _setup_instrumentation_lib_if_installed()
+{%- endif %}
+
+    return bucket
+{%- else %}
+import logging
+
+from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
+
+
+def setup_telemetry() -> None:
+    """Initialize Traceloop telemetry for LangGraph agents."""
+    try:
+        from traceloop.sdk import Instruments, Traceloop
+
+        Traceloop.init(
+            app_name="{{cookiecutter.project_name}}",
+            disable_batch=False,
+            telemetry_enabled=False,
+            exporter=CloudTraceSpanExporter(),
+            instruments={Instruments.LANGCHAIN},
+        )
+    except Exception as e:
+        logging.error("Failed to initialize Telemetry: %s", str(e))
+{%- endif %}

{src/base_template/app/utils → agent_starter_pack/base_template/{{cookiecutter.agent_directory}}/app_utils}/typing.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{%- if "adk" in cookiecutter.tags %}
+{%- if cookiecutter.is_adk %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 import uuid
 from typing import (
@@ -26,12 +26,14 @@ from pydantic import (
     Field,
 )
 {%- else %}
+import uuid
 from typing import (
     Literal,
 )
 
 from pydantic import (
     BaseModel,
+    Field,
 )
 {%- endif %}
 {%- else %}
@@ -57,7 +59,7 @@ from pydantic import (
 {%- endif %}
 
 
-{%- if "adk" in cookiecutter.tags %}
+{%- if cookiecutter.is_adk %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 
 
@@ -103,15 +105,11 @@ class Feedback(BaseModel):
 
     score: int | float
     text: str | None = ""
-{%- if "adk" in cookiecutter.tags %}
-    invocation_id: str
-{%- else %}
-    run_id: str
-{%- endif %}
     log_type: Literal["feedback"] = "feedback"
     service_name: Literal["{{cookiecutter.project_name}}"] = "{{cookiecutter.project_name}}"
-    user_id: str = ""
-{% if "adk" not in cookiecutter.tags %}
+    user_id: str = Field(default_factory=lambda: str(uuid.uuid4()))
+    session_id: str = Field(default_factory=lambda: str(uuid.uuid4()))
+{% if not cookiecutter.is_adk %}
 
 def ensure_valid_config(config: RunnableConfig | None) -> RunnableConfig:
     """Ensures a valid RunnableConfig by setting defaults for missing fields."""

agent_starter_pack/base_template/{{cookiecutter.agent_directory}}/app_utils/{% if cookiecutter.is_a2a and cookiecutter.agent_name == 'langgraph_base' %}converters{% else %}unused_converters{% endif %}/__init__.py

@@ -0,0 +1,25 @@
+# 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.
+
+"""Converters for A2A and LangChain types."""
+
+from .part_converter import (
+    convert_a2a_parts_to_langchain_content,
+    convert_langchain_content_to_a2a_parts,
+)
+
+__all__ = [
+    "convert_a2a_parts_to_langchain_content",
+    "convert_langchain_content_to_a2a_parts",
+]