agent-starter-pack 0.16.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

{agents → agent_starter_pack/agents}/adk_live/.template/templateconfig.yaml

@@ -17,6 +17,6 @@ settings:
   requires_data_ingestion: false
   frontend_type: "adk_live_react"
   deployment_targets: ["agent_engine", "cloud_run"]
-  extra_dependencies: ["google-adk>=1.15.0,<2.0.0", "click>=8.0.0,<9.0.0", "uvicorn>=0.18.0,<1.0.0", "fastapi>=0.75.0,<1.0.0", "backoff>=2.0.0,<3.0.0"]
+  extra_dependencies: ["google-adk>=1.16.0,<2.0.0", "click>=8.0.0,<9.0.0", "uvicorn>=0.18.0,<1.0.0", "fastapi>=0.75.0,<1.0.0", "backoff>=2.0.0,<3.0.0"]
   tags: ["adk", "adk_live"]
 example_question: "What's the weather in San Francisco?"

{agents → agent_starter_pack/agents}/adk_live/README.md

@@ -2,7 +2,7 @@
 
 Real-time conversational agent built with Google ADK and Gemini's live audio model. Supports audio, video, and text interactions with native tool calling.
 
-![adk_live_diagram](https://storage.googleapis.com/github-repo/generative-ai/sample-apps/e2e-gen-ai-app-starter-pack/adk_live_diagram.png)
+![live_api_diagram](https://storage.googleapis.com/github-repo/generative-ai/sample-apps/e2e-gen-ai-app-starter-pack/live_api_diagram.png)
 
 **Key components:**
 
@@ -19,6 +19,7 @@ Once running, click the play button to connect and interact with the agent. Try
 Explore these resources to learn more about the Multimodal Live API and see examples of its usage:
 
 - [Project Pastra](https://github.com/heiko-hotz/gemini-multimodal-live-dev-guide/tree/main): a comprehensive developer guide for the Gemini Multimodal Live API.
+- [ADK Samples: Realtime Conversational Agent](https://github.com/google/adk-samples/tree/main/python/agents/realtime-conversational-agent): Full-stack, reusable template using Agent Development Kit (ADK) with the Gemini Live API.
 - [Google Cloud Multimodal Live API demos and samples](https://github.com/GoogleCloudPlatform/generative-ai/tree/main/gemini/multimodal-live-api): Collection of code samples and demo applications leveraging multimodal live API in Vertex AI
 - [Gemini 2 Cookbook](https://github.com/google-gemini/cookbook/tree/main/gemini-2): Practical examples and tutorials for working with Gemini 2
 - [Multimodal Live API Web Console](https://github.com/google-gemini/multimodal-live-api-web-console): Interactive React-based web interface for testing and experimenting with Gemini Multimodal Live API.

{src → agent_starter_pack}/base_template/Makefile

@@ -38,7 +38,7 @@ playground:{%- if cookiecutter.is_adk_live %} build-frontend-if-needed{%- endif
 	@echo "==============================================================================="
 {%- if cookiecutter.is_adk_live %}
 {%- if cookiecutter.deployment_target == 'agent_engine' %}
-	uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode local
+	uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode local --local-agent {{cookiecutter.agent_directory}}.agent.root_agent
 {%- else %}
 	uv run uvicorn {{cookiecutter.agent_directory}}.server:app --host localhost --port 8000 --reload
 {%- endif %}
@@ -111,7 +111,7 @@ local-backend:
 
 # Launch local development server with hot-reload
 local-backend:
-	uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode local --port 8000
+	uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode local --port 8000  --local-agent {{cookiecutter.agent_directory}}.agent.root_agent
 
 # Connect to remote deployed agent
 playground-remote: build-frontend-if-needed

{src → agent_starter_pack}/base_template/deployment/terraform/dev/log_sinks.tf

@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-resource "google_project_iam_member" "bigquery_data_editor" {
-
-  project = var.dev_project_id
-  role    = "roles/bigquery.dataEditor"
-  member  = module.log_export_to_bigquery.writer_identity
-}
-
 resource "google_bigquery_dataset" "feedback_dataset" {
   project       = var.dev_project_id
   dataset_id    = replace("${var.project_name}_feedback", "-", "_")
@@ -35,29 +28,42 @@ resource "google_bigquery_dataset" "telemetry_logs_dataset" {
   depends_on    = [resource.google_project_service.services]
 }
 
-module "feedback_export_to_bigquery" {
-  source                 = "terraform-google-modules/log-export/google"
-  version                = "10.0.0"
-  log_sink_name          = "${var.project_name}_feedback"
-  parent_resource_type   = "project"
-  parent_resource_id     = var.dev_project_id
-  destination_uri        = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${google_bigquery_dataset.feedback_dataset.dataset_id}"
-  filter                 = var.feedback_logs_filter
-  bigquery_options       = { use_partitioned_tables = true }
+resource "google_logging_project_sink" "feedback_export_to_bigquery" {
+  name        = "${var.project_name}_feedback"
+  project     = var.dev_project_id
+  destination = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${google_bigquery_dataset.feedback_dataset.dataset_id}"
+  filter      = var.feedback_logs_filter
+
+  bigquery_options {
+    use_partitioned_tables = true
+  }
+
   unique_writer_identity = true
   depends_on             = [google_bigquery_dataset.feedback_dataset]
 }
 
-module "log_export_to_bigquery" {
-  source  = "terraform-google-modules/log-export/google"
-  version = "10.0.0"
+resource "google_logging_project_sink" "log_export_to_bigquery" {
+  name        = "${var.project_name}_telemetry"
+  project     = var.dev_project_id
+  destination = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${google_bigquery_dataset.telemetry_logs_dataset.dataset_id}"
+  filter      = var.telemetry_logs_filter
+
+  bigquery_options {
+    use_partitioned_tables = true
+  }
 
-  log_sink_name          = "${var.project_name}_telemetry"
-  parent_resource_type   = "project"
-  parent_resource_id     = var.dev_project_id
-  destination_uri        = "bigquery.googleapis.com/projects/${var.dev_project_id}/datasets/${google_bigquery_dataset.telemetry_logs_dataset.dataset_id}"
-  filter                 = var.telemetry_logs_filter
-  bigquery_options       = { use_partitioned_tables = true }
   unique_writer_identity = true
   depends_on             = [google_bigquery_dataset.telemetry_logs_dataset]
 }
+
+resource "google_project_iam_member" "bigquery_data_editor" {
+  project = var.dev_project_id
+  role    = "roles/bigquery.dataEditor"
+  member  = google_logging_project_sink.log_export_to_bigquery.writer_identity
+}
+
+resource "google_project_iam_member" "feedback_bigquery_data_editor" {
+  project = var.dev_project_id
+  role    = "roles/bigquery.dataEditor"
+  member  = google_logging_project_sink.feedback_export_to_bigquery.writer_identity
+}

{src → agent_starter_pack}/base_template/deployment/terraform/dev/providers.tf

@@ -17,7 +17,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "< 7.0.0"
+      version = "> 7.0.0"
     }
   }
 }

{src → agent_starter_pack}/base_template/deployment/terraform/github.tf

@@ -119,6 +119,20 @@ resource "github_actions_variable" "app_sa_email_prod" {
   depends_on    = [github_repository.repo]
 }
 
+resource "github_actions_variable" "logs_bucket_name_staging" {
+  repository    = var.repository_name
+  variable_name = "LOGS_BUCKET_NAME_STAGING"
+  value         = google_storage_bucket.logs_data_bucket[var.staging_project_id].url
+  depends_on    = [github_repository.repo]
+}
+
+resource "github_actions_variable" "logs_bucket_name_prod" {
+  repository    = var.repository_name
+  variable_name = "LOGS_BUCKET_NAME_PROD"
+  value         = google_storage_bucket.logs_data_bucket[var.prod_project_id].url
+  depends_on    = [github_repository.repo]
+}
+
 {% if cookiecutter.deployment_target == 'cloud_run' %}
 resource "github_actions_variable" "container_name" {
   repository    = var.repository_name

{src → agent_starter_pack}/base_template/deployment/terraform/log_sinks.tf

@@ -12,14 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-resource "google_project_iam_member" "bigquery_data_editor" {
-  for_each = local.deploy_project_ids
-
-  project = each.value
-  role    = "roles/bigquery.dataEditor"
-  member  = module.log_export_to_bigquery[each.key].writer_identity
-}
-
 resource "google_bigquery_dataset" "feedback_dataset" {
   for_each      = local.deploy_project_ids
   project       = each.value
@@ -38,33 +30,50 @@ resource "google_bigquery_dataset" "telemetry_logs_dataset" {
   depends_on    = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 
-module "log_export_to_bigquery" {
+resource "google_logging_project_sink" "feedback_export_to_bigquery" {
   for_each = local.deploy_project_ids
 
-  source  = "terraform-google-modules/log-export/google"
-  version = "10.0.0"
+  name        = "${var.project_name}_feedback"
+  project     = each.value
+  destination = "bigquery.googleapis.com/projects/${each.value}/datasets/${google_bigquery_dataset.feedback_dataset[each.key].dataset_id}"
+  filter      = var.feedback_logs_filter
+
+  bigquery_options {
+    use_partitioned_tables = true
+  }
 
-  log_sink_name          = "${var.project_name}_telemetry"
-  parent_resource_type   = "project"
-  parent_resource_id     = each.value
-  destination_uri        = "bigquery.googleapis.com/projects/${each.value}/datasets/${google_bigquery_dataset.telemetry_logs_dataset[each.key].dataset_id}"
-  filter                 = var.telemetry_logs_filter
-  bigquery_options       = { use_partitioned_tables = true }
   unique_writer_identity = true
-  depends_on             = [google_bigquery_dataset.telemetry_logs_dataset]
+  depends_on             = [google_bigquery_dataset.feedback_dataset]
 }
 
-module "feedback_export_to_bigquery" {
+resource "google_logging_project_sink" "log_export_to_bigquery" {
   for_each = local.deploy_project_ids
 
-  source                 = "terraform-google-modules/log-export/google"
-  version                = "10.0.0"
-  log_sink_name          = "${var.project_name}_feedback"
-  parent_resource_type   = "project"
-  parent_resource_id     = each.value
-  destination_uri        = "bigquery.googleapis.com/projects/${each.value}/datasets/${google_bigquery_dataset.feedback_dataset[each.key].dataset_id}"
-  filter                 = var.feedback_logs_filter
-  bigquery_options       = { use_partitioned_tables = true }
+  name        = "${var.project_name}_telemetry"
+  project     = each.value
+  destination = "bigquery.googleapis.com/projects/${each.value}/datasets/${google_bigquery_dataset.telemetry_logs_dataset[each.key].dataset_id}"
+  filter      = var.telemetry_logs_filter
+
+  bigquery_options {
+    use_partitioned_tables = true
+  }
+
   unique_writer_identity = true
-  depends_on             = [google_bigquery_dataset.feedback_dataset]
+  depends_on             = [google_bigquery_dataset.telemetry_logs_dataset]
+}
+
+resource "google_project_iam_member" "bigquery_data_editor" {
+  for_each = local.deploy_project_ids
+
+  project = each.value
+  role    = "roles/bigquery.dataEditor"
+  member  = google_logging_project_sink.log_export_to_bigquery[each.key].writer_identity
+}
+
+resource "google_project_iam_member" "feedback_bigquery_data_editor" {
+  for_each = local.deploy_project_ids
+
+  project = each.value
+  role    = "roles/bigquery.dataEditor"
+  member  = google_logging_project_sink.feedback_export_to_bigquery[each.key].writer_identity
 }

{src → agent_starter_pack}/base_template/deployment/terraform/providers.tf

@@ -18,7 +18,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "< 7.0.0"
+      version = "> 7.0.0"
     }
     github = {
       source  = "integrations/github"

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

@@ -74,12 +74,13 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
   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
     _REGION                        = var.region
 {% 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' %}
-    _APP_SA_EMAIL_STAGING          = resource.google_service_account.app_sa["staging"].email
+
 {% endif %}
 {% if cookiecutter.data_ingestion %}
     _PIPELINE_GCS_ROOT_STAGING     = "gs://${resource.google_storage_bucket.data_ingestion_pipeline_gcs_root["staging"].name}"
@@ -123,12 +124,13 @@ 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
     _REGION                      = var.region
 {% 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' %}
-    _APP_SA_EMAIL_PROD             = resource.google_service_account.app_sa["prod"].email
+
 {% endif %}
 {% if cookiecutter.data_ingestion %}
     _PIPELINE_GCS_ROOT_PROD        = "gs://${resource.google_storage_bucket.data_ingestion_pipeline_gcs_root["prod"].name}"

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

@@ -44,10 +44,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - id: 'auth'
         name: 'Authenticate to Google Cloud'
@@ -111,7 +111,7 @@ jobs:
           uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
             --project {% raw %}${{ vars.PROD_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
-            --service-account {% raw %}${{ vars.APP_SA_EMAIL_PROD }}{% 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 %}"
 {%- endif %}
 

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

@@ -48,10 +48,10 @@ jobs:
           project_id: {% raw %}${{ vars.CICD_PROJECT_ID }}{% endraw %}
 
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Install uv and dependencies
         run: |

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

@@ -36,10 +36,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - id: 'auth'
         name: 'Authenticate to Google Cloud'
@@ -122,7 +122,7 @@ jobs:
           uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
             --project {% raw %}${{ vars.STAGING_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
-            --service-account {% raw %}${{ vars.APP_SA_EMAIL_STAGING }}{% 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 %}"
 
       - name: Fetch Auth Token

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

@@ -14,7 +14,7 @@
 
 steps:
 {%- if cookiecutter.data_ingestion %}
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: deploy-data-ingestion-pipeline-prod
     entrypoint: bash
     args:
@@ -57,7 +57,7 @@ steps:
       - $_PROD_PROJECT_ID
 
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
-  - name: "python:3.11-slim" 
+  - name: "python:3.12-slim"
     id: install-dependencies
     entrypoint: /bin/bash
     args:
@@ -67,7 +67,7 @@ steps:
     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:
@@ -77,7 +77,7 @@ steps:
         uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
           --project ${_PROD_PROJECT_ID} \
           --location ${_REGION} \
-          --service-account ${_APP_SA_EMAIL_PROD} \
+          --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 %}"
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'

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

@@ -14,7 +14,7 @@
 
 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:
@@ -25,7 +25,7 @@ steps:
       - '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:

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

@@ -14,7 +14,7 @@
 
 steps:
 {%- if cookiecutter.data_ingestion %}
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: deploy-data-ingestion-pipeline-staging
     entrypoint: bash
     args:
@@ -91,7 +91,7 @@ steps:
       - |
         echo $(gcloud auth print-identity-token -q) > id_token.txt
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
-  - name: "python:3.11-slim" 
+  - name: "python:3.12-slim"
     id: install-dependencies
     entrypoint: /bin/bash
     args:
@@ -101,7 +101,7 @@ steps:
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: deploy-staging
     entrypoint: /bin/bash
     args:
@@ -111,7 +111,7 @@ steps:
         uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
           --project ${_STAGING_PROJECT_ID} \
           --location ${_REGION} \
-          --service-account ${_APP_SA_EMAIL_STAGING} \
+          --artifacts-bucket-name ${_LOGS_BUCKET_NAME_STAGING} \
           --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- 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'
@@ -167,7 +167,7 @@ steps:
         # 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.11-slim"
+  - name: "python:3.12-slim"
     id: load_test
     entrypoint: /bin/bash
     args:
@@ -185,7 +185,7 @@ steps:
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 {%- elif cookiecutter.deployment_target == 'agent_engine' and cookiecutter.is_adk_live %}
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: load_test
     entrypoint: /bin/bash
     args:
@@ -218,7 +218,7 @@ steps:
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
-  - name: "python:3.11-slim"
+  - name: "python:3.12-slim"
     id: load_test
     entrypoint: /bin/bash
     args:

{src → agent_starter_pack}/cli/commands/setup_cicd.py

@@ -24,7 +24,7 @@ import backoff
 import click
 from rich.console import Console
 
-from src.cli.utils.cicd import (
+from agent_starter_pack.cli.utils.cicd import (
     ProjectConfig,
     create_github_connection,
     handle_github_authentication,

{src → agent_starter_pack}/cli/main.py

@@ -49,8 +49,8 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     help="Show the version and exit.",
 )
 def cli() -> None:
-    # Check for updates at startup (skip if --agent-garden or -ag is used)
-    if "--agent-garden" not in sys.argv and "-ag" not in sys.argv:
+    # Check for updates at startup (skip if --agent-garden, -ag, or --locked is used)
+    if not any(flag in sys.argv for flag in ("--agent-garden", "-ag", "--locked")):
         display_update_message()
 
 

{src → agent_starter_pack}/cli/utils/gcp.py

@@ -34,7 +34,7 @@ from google.cloud.aiplatform_v1beta1.types.prediction_service import (
 from rich.console import Console
 from rich.prompt import Confirm
 
-from src.cli.utils.version import PACKAGE_NAME, get_current_version
+from agent_starter_pack.cli.utils.version import PACKAGE_NAME, get_current_version
 
 console = Console()
 

{src → agent_starter_pack}/cli/utils/remote_template.py

@@ -167,15 +167,18 @@ def check_and_execute_with_version_lock(
 
         # Add version lock specific parameters and handle remote URL replacement
         if original_agent_spec:
-            # Replace remote agent spec with local path
-            modified_args = []
-            for arg in original_args:
-                if arg == original_agent_spec:
-                    # Replace remote URL with local template directory
-                    modified_args.append(f"local@{template_dir}")
-                else:
-                    modified_args.append(arg)
-            original_args = modified_args
+            # Check if --agent flag exists in original args
+            agent_flag_exists = "--agent" in original_args or "-a" in original_args
+
+            if agent_flag_exists:
+                # Replace remote agent spec with local path
+                original_args = [
+                    f"local@{template_dir}" if arg == original_agent_spec else arg
+                    for arg in original_args
+                ]
+            else:
+                # Agent was selected interactively, add --agent flag
+                original_args.extend(["--agent", f"local@{template_dir}"])
 
         # Add version lock flags only for ASP versions 0.14.1 and above
         if pkg_version.parse(version) > pkg_version.parse("0.14.1"):

{src → agent_starter_pack}/cli/utils/template.py

@@ -26,7 +26,7 @@ from cookiecutter.main import cookiecutter
 from rich.console import Console
 from rich.prompt import IntPrompt, Prompt
 
-from src.cli.utils.version import get_current_version
+from agent_starter_pack.cli.utils.version import get_current_version
 
 from .datastores import DATASTORES
 from .remote_template import (
@@ -119,7 +119,7 @@ def get_available_agents(deployment_target: str | None = None) -> dict:
 
     agents_list = []
     priority_agents_dict = dict.fromkeys(PRIORITY_AGENTS)  # Track priority agents
-    agents_dir = pathlib.Path(__file__).parent.parent.parent.parent / "agents"
+    agents_dir = pathlib.Path(__file__).parent.parent.parent / "agents"
 
     for agent_dir in agents_dir.iterdir():
         if agent_dir.is_dir() and not agent_dir.name.startswith("__"):
@@ -191,7 +191,7 @@ def get_deployment_targets(
         config = remote_config
     else:
         template_path = (
-            pathlib.Path(__file__).parent.parent.parent.parent
+            pathlib.Path(__file__).parent.parent.parent
             / "agents"
             / agent_name
             / ".template"
@@ -309,7 +309,7 @@ def prompt_datastore_selection(
 
     # Otherwise, proceed with normal flow
     template_path = (
-        pathlib.Path(__file__).parent.parent.parent.parent
+        pathlib.Path(__file__).parent.parent.parent
         / "agents"
         / agent_name
         / ".template"
@@ -418,7 +418,7 @@ def prompt_cicd_runner_selection() -> str:
 
 def get_template_path(agent_name: str, debug: bool = False) -> pathlib.Path:
     """Get the absolute path to the agent template directory."""
-    current_dir = pathlib.Path(__file__).parent.parent.parent.parent
+    current_dir = pathlib.Path(__file__).parent.parent.parent
     template_path = current_dir / "agents" / agent_name / ".template"
     if debug:
         logging.debug(f"Looking for template in: {template_path}")
@@ -526,9 +526,7 @@ def process_template(
         # For remote templates, determine the base template
         base_template_name = get_base_template_name(remote_config or {})
         agent_path = (
-            pathlib.Path(__file__).parent.parent.parent.parent
-            / "agents"
-            / base_template_name
+            pathlib.Path(__file__).parent.parent.parent / "agents" / base_template_name
         )
         logging.debug(f"Remote template using base: {base_template_name}")
     else:
@@ -1076,8 +1074,7 @@ def process_template(
             elif deployment_target:
                 # For local templates, use the existing logic
                 lock_path = (
-                    pathlib.Path(__file__).parent.parent.parent.parent
-                    / "src"
+                    pathlib.Path(__file__).parent.parent.parent
                     / "resources"
                     / "locks"
                     / f"uv-{agent_name}-{deployment_target}.lock"