agent-starter-pack 0.1.6__py3-none-any.whl → 0.2.0__py3-none-any.whl

agents/{multimodal_live_api → live_api}/README.md

@@ -28,3 +28,10 @@ Explore these resources to learn more about the Multimodal Live API and see exam
 - [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.
+
+## Current Status & Future Work
+
+This pattern is under active development. Key areas planned for future enhancement include:
+
+*   **Observability:** Implementing comprehensive monitoring and tracing features.
+*   **Load Testing:** Integrating load testing capabilities.

agents/{multimodal_live_api → live_api}/app/agent.py

@@ -19,9 +19,7 @@ import vertexai
 from google import genai
 from google.genai.types import (
     Content,
-    FunctionDeclaration,
     LiveConnectConfig,
-    Tool,
 )
 from langchain_google_vertexai import VertexAIEmbeddings
 
@@ -32,7 +30,7 @@ from app.vector_store import get_vector_store
 VERTEXAI = os.getenv("VERTEXAI", "true").lower() == "true"
 LOCATION = "us-central1"
 EMBEDDING_MODEL = "text-embedding-004"
-MODEL_ID = "gemini-2.0-flash-001"
+MODEL_ID = "gemini-2.0-flash-exp"
 URLS = [
     "https://cloud.google.com/architecture/deploy-operate-generative-ai-applications"
 ]
@@ -70,17 +68,11 @@ def retrieve_docs(query: str) -> dict[str, str]:
     return {"output": formatted_docs}
 
 
-# Configure tools and live connection
-retrieve_docs_tool = Tool(
-    function_declarations=[
-        FunctionDeclaration.from_callable(client=genai_client, callable=retrieve_docs)
-    ]
-)
-
+# Configure tools available to the agent and live connection
 tool_functions = {"retrieve_docs": retrieve_docs}
 
 live_connect_config = LiveConnectConfig(
     response_modalities=["AUDIO"],
-    tools=[retrieve_docs_tool],
+    tools=[retrieve_docs],
     system_instruction=Content(parts=[{"text": SYSTEM_INSTRUCTION}]),
 )

agents/{multimodal_live_api → live_api}/app/server.py

@@ -121,8 +121,9 @@ class GeminiSession:
         """
         while result := await self.session._ws.recv(decode=False):
             await self.websocket.send_bytes(result)
-            message = types.LiveServerMessage.model_validate(json.loads(result))
-            if message.tool_call:
+            raw_message = json.loads(result)
+            if "toolCall" in raw_message:
+                message = types.LiveServerMessage.model_validate(raw_message)
                 tool_call = LiveServerToolCall.model_validate(message.tool_call)
                 await self._handle_tool_call(self.session, tool_call)
 

agents/{multimodal_live_api → live_api}/template/.templateconfig.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-description: "A real-time multimodal RAG agent powered by Gemini, supporting audio/video/text chat with vector DB-backed responses"
+description: "A real-time multimodal RAG agent powered by Gemini Live API, supporting audio/video/text chat with vector DB-backed responses"
 settings:
   requires_data_ingestion: false
   frontend_type: "live_api_react"
@@ -20,7 +20,7 @@ settings:
   extra_dependencies: [
     "backoff~=2.2.1",
     "beautifulsoup4~=4.12.3",
-    "google-genai~=1.2.0",
+    "google-genai~=1.8.0",
     "jinja2~=3.1.4",
     "langchain~=0.3.13",
     "langchain-community~=0.3.13",

src/base_template/Makefile

@@ -1,6 +1,6 @@
 install:
 	@command -v uv >/dev/null 2>&1 || { echo "uv is not installed. Installing uv..."; curl -LsSf https://astral.sh/uv/install.sh | sh; source ~/.bashrc; }
-	uv sync --dev {% if cookiecutter.agent_name != 'multimodal_live_api' %}--extra streamlit{%- endif %} --extra jupyter --frozen{% if cookiecutter.agent_name == 'multimodal_live_api' %} && npm --prefix frontend install{%- endif %}
+	uv sync --dev {% if cookiecutter.agent_name != 'live_api' %}--extra streamlit{%- endif %} --extra jupyter --frozen{% if cookiecutter.agent_name == 'live_api' %} && npm --prefix frontend install{%- endif %}
 
 test:
 	uv run pytest tests/unit && uv run pytest tests/integration
@@ -9,7 +9,7 @@ playground:
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 	uv run uvicorn app.server:app --host 0.0.0.0 --port 8000 --reload &
 {%- endif %}
-{%- if cookiecutter.agent_name == 'multimodal_live_api' %}
+{%- if cookiecutter.agent_name == 'live_api' %}
 	npm --prefix frontend start
 {%- else %}
 	{% if cookiecutter.deployment_target == 'agent_engine' %}PYTHONPATH=. {% endif %}uv run streamlit run frontend/streamlit_app.py --browser.serverAddress=localhost --server.enableCORS=false --server.enableXsrfProtection=false
@@ -24,7 +24,7 @@ backend:
 
 {% if cookiecutter.deployment_target == 'cloud_run' -%}
 ui:
-{%- if cookiecutter.agent_name == 'multimodal_live_api' %}
+{%- if cookiecutter.agent_name == 'live_api' %}
 	npm --prefix frontend start
 {%- else %}
 	uv run streamlit run streamlit/streamlit_app.py --browser.serverAddress=localhost --server.enableCORS=false --server.enableXsrfProtection=false
@@ -34,18 +34,23 @@ ui:
 setup-dev-env:
 	@if [ -z "$$PROJECT_ID" ]; then echo "Error: PROJECT_ID environment variable is not set"; exit 1; fi
 	(cd deployment/terraform/dev && terraform init && terraform apply --var-file vars/env.tfvars --var dev_project_id=$$PROJECT_ID --auto-approve)
-
+	
 {%- if cookiecutter.data_ingestion%}
 data-ingestion:
 	@if [ -z "$$PROJECT_ID" ]; then echo "Error: PROJECT_ID environment variable is not set"; exit 1; fi
 	$(MAKE) install
 	(cd data_ingestion && uv run data_ingestion_pipeline/submit_pipeline.py \
 		--project-id=$$PROJECT_ID \
-		--data-store-id="sample-datastore" \
 		--region="us-central1" \
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
+		--data-store-id="{{cookiecutter.project_name}}-datastore" \
 		--data-store-region="us" \
-		--service-account="vertexai-pipelines-sa@$$PROJECT_ID.iam.gserviceaccount.com" \
-		--pipeline-root="gs://$$PROJECT_ID-pipeline-artifacts" \
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+		--vector-search-index="{{cookiecutter.project_name}}-vector-search" \
+		--vector-search-index-endpoint="{{cookiecutter.project_name}}-vector-search-endpoint" \
+{%- endif %}
+		--service-account="{{cookiecutter.project_name}}-rag@$$PROJECT_ID.iam.gserviceaccount.com" \
+		--pipeline-root="gs://$$PROJECT_ID-{{cookiecutter.project_name}}-rag" \
 		--pipeline-name="data-ingestion-pipeline")
 {%- endif %}
 

src/base_template/README.md

@@ -1,8 +1,7 @@
 # {{cookiecutter.project_name}}
 
 {{cookiecutter.agent_description}}
-
-Agent generated with [`googleCloudPlatform/agent-starter-pack`](https://github.com/GoogleCloudPlatform/agent-starter-pack)
+Agent generated with [`googleCloudPlatform/agent-starter-pack`](https://github.com/GoogleCloudPlatform/agent-starter-pack) version `{{ cookiecutter.package_version }}`
 
 ## Project Structure
 
@@ -34,24 +33,12 @@ Before you begin, ensure you have:
 - **make**: Build automation tool - [Install](https://www.gnu.org/software/make/) (pre-installed on most Unix-based systems)
 
 
-### Installation
-
-Install required packages using uv:
-
-```bash
-make install
-```
-
-### Setup
+## Quick Start (Local Testing)
 
-If not done during the initialization, set your default Google Cloud project and Location:
+Install required packages and launch the local development environment:
 
 ```bash
-export PROJECT_ID="YOUR_PROJECT_ID"
-export LOCATION="us-central1"
-gcloud config set project $PROJECT_ID
-gcloud auth application-default login
-gcloud auth application-default set-quota-project $PROJECT_ID
+make install && make playground
 ```
 
 ## Commands
@@ -73,104 +60,90 @@ gcloud auth application-default set-quota-project $PROJECT_ID
 
 For full command options and usage, refer to the [Makefile](Makefile).
 
-{% if cookiecutter.agent_name == 'multimodal_live_api' %}
+{% if cookiecutter.agent_name == 'live_api' %}
 ## Usage
 
-1.  **Install Dependencies:**
+This template follows a "bring your own agent" approach - you focus on your business logic in `app/agent.py`, and the template handles the surrounding components (UI, infrastructure, deployment, monitoring).
+
+Here’s the recommended workflow for local development:
 
+1.  **Install Dependencies (if needed):**
     ```bash
     make install
     ```
 
-2.  **Start the Backend and Frontend:**
-
-    **Backend:**
+2.  **Start the Backend Server:**
+    Open a terminal and run:
     ```bash
     make backend
     ```
-    
-    The backend will be ready when you see `INFO:     Application startup complete.` in the console.
+    The backend is ready when you see `INFO:     Application startup complete.` Wait for this message before starting the frontend.
 
     <details>
-    <summary><b>Click here if you want to use AI Studio and API Key instead of Vertex AI:</b></summary>
+    <summary><b>Optional: Use AI Studio / API Key instead of Vertex AI</b></summary>
+
+    By default, the backend uses Vertex AI and Application Default Credentials. If you prefer to use Google AI Studio and an API key:
 
     ```bash
     export VERTEXAI=false
-    export GOOGLE_API_KEY=your-google-api-key
+    export GOOGLE_API_KEY="your-google-api-key" # Replace with your actual key
+    make backend
     ```
-
+    Ensure `GOOGLE_API_KEY` is set correctly in your environment.
     </details>
     <br>
-    
-    **Frontend:**
+
+3.  **Start the Frontend UI:**
+    Open *another* terminal and run:
     ```bash
-    # In a different shell
     make ui
     ```
+    This launches the Streamlit application, which connects to the backend server (by default at `http://localhost:8000`).
 
-    This is the suggested mode for development as it allows you to see changes in real-time.
-
-3.  **Interact with the Agent**
-    Once both the backend and frontend are running, click the play button in the frontend UI to establish a connection with the backend. You can now interact with the Multimodal Live Agent! You can try asking questions such as "Using the tool you have, define Governance in the context MLOPs" to allow the agent to use the documentation it was provided to.
-
-**Remote access**:
-Use [Cloud Run proxy](https://cloud.google.com/sdk/gcloud/reference/run/services/proxy) for local access. The backend will be accessible at `http://localhost:8000`:
-
-   ```bash
-   gcloud run services proxy genai-app-sample --port 8000 --project $PROJECT_ID --region $REGION
-   ```
-
-   You can then use the same frontend setup described above to interact with your Cloud Run deployment.
+4.  **Interact and Iterate:**
+    *   Open the Streamlit UI in your browser (usually `http://localhost:3000` or `http://localhost:3001`).
+    *   Click the play button in the UI to connect to the backend.
+    *   Interact with the agent! Try prompts like: *"Using the tool you have, define Governance in the context MLOPs"*
+    *   Modify the agent logic in `app/agent.py`. The backend server (FastAPI with `uvicorn --reload`) should automatically restart when you save changes. Refresh the frontend if needed to see behavioral changes.
 
 <details>
-<summary><b>Cloud Shell usage</b></summary>
+<summary><b>Cloud Shell Usage</b></summary>
 
-To use the `multimodal_live_api` agent in Cloud Shell, follow these steps:
+To run the agent using Google Cloud Shell:
 
 1.  **Start the Frontend:**
-
+    In a Cloud Shell tab, run:
     ```bash
     make ui
     ```
-
-    You may be prompted to run the app on a different port if port 3000 is in use. Accept by pressing Enter. You'll see a message similar to:
-
-    ```
-    You can now view multimodal-live-api-web-console in the browser.
-
-      Local:            http://localhost:3001
-      On Your Network:  http://10.88.0.4:3001
-    ```
-
-    Click the `localhost` link to open a web preview in Cloud Shell.
+    Accept prompts to use a different port if 3000 is busy. Click the `localhost:PORT` link for the web preview.
 
 2.  **Start the Backend:**
-
-    Open a *new* Cloud Shell terminal tab. Remember to set your Cloud Platform project in this new session using `gcloud config set project [PROJECT_ID]`. Then from the root of the repository, run:
-
+    Open a *new* Cloud Shell tab. Set your project: `gcloud config set project [PROJECT_ID]`. Then run:
     ```bash
     make backend
     ```
 
-3.  **Configure Web Preview for the Backend:**
-
-    Trigger a web preview for port 8000 - you'll need to change the default port which is `8080`.  See [Cloud Shell Web Preview documentation](https://cloud.google.com/shell/docs/using-web-preview#preview_the_application) for details.
+3.  **Configure Backend Web Preview:**
+    Use the Cloud Shell Web Preview feature to expose port 8000. Change the default port from 8080 to 8000. See [Cloud Shell Web Preview documentation](https://cloud.google.com/shell/docs/using-web-preview#preview_the_application).
 
 4.  **Connect Frontend to Backend:**
+    *   Copy the URL generated by the backend web preview (e.g., `https://8000-cs-....cloudshell.dev/`).
+    *   Paste this URL into the "Server URL" field in the frontend UI settings (in the first tab).
+    *   Click the "Play button" to connect.
 
-    *   The web preview will open a new tab in your browser. Copy the URL from the address bar (e.g., `https://8000-cs-8a3189b8-5295-4085-9893-c318f1724456.ql-europe-west1-ojep.cloudshell.dev/?authuser=0`).
-    *   Return to the frontend preview tab (from step 1).
-    *   Paste the copied URL into the frontend's "Server URL" connection settings.
-    *   Click the "Play button" to connect. Start interacting with it!
+*   **Note:** The feedback feature in the frontend might not work reliably in Cloud Shell due to cross-origin issues between the preview URLs.
+</details>
 
-*   When using Cloud Shell there is a known limitation when using the feedback feature in the Frontend. Feedback submission might fail due to different origins between the frontend and backend in the Cloud Shell environment.
 </details>
 {%- else %}
 ## Usage
 
+This template follows a "bring your own agent" approach - you focus on your business logic, and the template handles everything else (UI, infrastructure, deployment, monitoring).
+
 1. **Prototype:** Build your Generative AI Agent using the intro notebooks in `notebooks/` for guidance. Use Vertex AI Evaluation to assess performance.
-2. **Integrate:** Import your chain into the app by editing `app/agent.py`.
-3. **Test:** Explore your chain's functionality using the Streamlit playground with `make playground`. The playground offers features like chat history, user feedback, and various input types, and automatically reloads your agent on code changes.
+2. **Integrate:** Import your agent into the app by editing `app/agent.py`.
+3. **Test:** Explore your agent functionality using the Streamlit playground with `make playground`. The playground offers features like chat history, user feedback, and various input types, and automatically reloads your agent on code changes.
 4. **Deploy:** Configure and trigger the CI/CD pipelines, editing tests if needed. See the [deployment section](#deployment) for details.
 5. **Monitor:** Track performance and gather insights using Cloud Logging, Tracing, and the Looker Studio dashboard to iterate on your application.
 {% endif %}
@@ -186,6 +159,31 @@ You can test deployment towards a Dev Environment using the following command:
 gcloud config set project <your-dev-project-id>
 make backend
 ```
+{%- elif cookiecutter.deployment_target == 'cloud_run' %}
+Deploy the application directly to Cloud Run from your source code using the following `gcloud` command:
+
+```bash
+gcloud run deploy genai-app-sample \
+  --source . \
+  --project YOUR_PROJECT_ID \
+  --region YOUR_GCP_REGION \
+  --memory "4Gi" \
+```
+Replace `YOUR_PROJECT_ID` with your Google Cloud project ID and `YOUR_GCP_REGION` with the desired region (e.g., `us-central1`). Adjust memory and other flags as needed for your environment.
+{% if cookiecutter.agent_name == 'live_api' %}
+**Accessing the Deployed Backend Locally:**
+
+To connect your local frontend (`make ui`) to the backend deployed on Cloud Run, use the `gcloud` proxy:
+
+1.  **Start the proxy:**
+    ```bash
+    # Replace with your actual service name, project, and region
+    gcloud run services proxy gemini-agent-service --port 8000 --project $PROJECT_ID --region $REGION
+    ```
+    Keep this terminal running.
+
+2.  **Connect Frontend:** Your deployed backend is now accessible locally at `http://localhost:8000`. Point your Streamlit UI to this address.
+{%- endif %}
 {%- endif %}
 
 The repository includes a Terraform configuration for the setup of the Dev Google Cloud project.
@@ -195,8 +193,10 @@ See [deployment/README.md](deployment/README.md) for instructions.
 
 The repository includes a Terraform configuration for the setup of a production Google Cloud project. Refer to [deployment/README.md](deployment/README.md) for detailed instructions on how to deploy the infrastructure and application.
 
+{% if cookiecutter.agent_name != 'live_api' %}
 ## Monitoring and Observability
 
->> You can use [this Looker Studio dashboard](https://lookerstudio.google.com/c/reporting/fa742264-4b4b-4c56-81e6-a667dd0f853f/page/tEnnC) template for visualizing events being logged in BigQuery. See the "Setup Instructions" tab to getting started.
+> You can use [this Looker Studio dashboard](https://lookerstudio.google.com/c/reporting/fa742264-4b4b-4c56-81e6-a667dd0f853f/page/tEnnC) template for visualizing events being logged in BigQuery. See the "Setup Instructions" tab to getting started.
 
 The application uses OpenTelemetry for comprehensive observability with all events being sent to Google Cloud Trace and Logging for monitoring and to BigQuery for long term storage. 
+{%- endif %}

src/base_template/app/utils/tracing.py

@@ -57,7 +57,9 @@ class CloudTraceLoggingSpanExporter(CloudTraceSpanExporter):
         )
         self.logger = self.logging_client.logger(__name__)
         self.storage_client = storage_client or storage.Client(project=self.project_id)
-        self.bucket_name = bucket_name or f"{self.project_id}-logs-data"
+        self.bucket_name = (
+            bucket_name or f"{self.project_id}-{{cookiecutter.project_name}}-logs-data"
+        )
         self.bucket = self.storage_client.bucket(self.bucket_name)
 
     def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:

src/base_template/app/utils/typing.py

@@ -62,6 +62,7 @@ class Feedback(BaseModel):
     text: str | None = ""
     run_id: str
     log_type: Literal["feedback"] = "feedback"
+    service_name: Literal["{{cookiecutter.project_name}}"] = "{{cookiecutter.project_name}}"
 
 
 def ensure_valid_config(config: RunnableConfig | None) -> RunnableConfig:

src/base_template/deployment/cd/deploy-to-prod.yaml

@@ -25,8 +25,14 @@ steps:
     env:
       - "PIPELINE_ROOT=${_PIPELINE_GCS_ROOT}"
       - "REGION=${_REGION}"
+      {%- if cookiecutter.datastore_type == "vertex_ai_search" %}
       - "DATA_STORE_REGION=${_DATA_STORE_REGION}"
       - "DATA_STORE_ID=${_DATA_STORE_ID}"
+      {%- 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 %}
       - "PROJECT_ID=${_PROD_PROJECT_ID}"
       - "SERVICE_ACCOUNT=${_PIPELINE_SA_EMAIL}"
       - "PIPELINE_NAME=${_PIPELINE_NAME}"
@@ -59,9 +65,9 @@ steps:
       - "--concurrency"
       - "40"
       - "--service-account"
-      - "${_CLOUD_RUN_APP_SA_NAME}@${_PROD_PROJECT_ID}.iam.gserviceaccount.com"
+      - "${_CLOUD_RUN_APP_SA_EMAIL}"
       - "--set-env-vars"
-      - "COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- endif %}"
+      - "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" 
     id: install-dependencies
@@ -83,7 +89,7 @@ steps:
         uv run app/agent_engine_app.py \
           --project ${_PROD_PROJECT_ID} \
           --location ${_REGION} \
-          --set-env-vars COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- endif %}
+          --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 %}"
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 {%- endif %}
@@ -92,7 +98,7 @@ substitutions:
   _PROD_PROJECT_ID: YOUR_PROD_PROJECT_ID
   _REGION: us-central1
 
-logsBucket: gs://${PROJECT_ID}-logs-data/build-logs
+logsBucket: gs://${PROJECT_ID}-{{cookiecutter.project_name}}-logs-data/build-logs
 options:
   substitutionOption: ALLOW_LOOSE
   defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

src/base_template/deployment/cd/staging.yaml

@@ -25,8 +25,14 @@ steps:
     env:
       - "PIPELINE_ROOT=${_PIPELINE_GCS_ROOT}"
       - "REGION=${_REGION}"
+{%- if cookiecutter.datastore_type == "vertex_ai_search" %}
       - "DATA_STORE_REGION=${_DATA_STORE_REGION}"
       - "DATA_STORE_ID=${_DATA_STORE_ID}"
+{%- 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 %}
       - "PROJECT_ID=${_STAGING_PROJECT_ID}"
       - "SERVICE_ACCOUNT=${_PIPELINE_SA_EMAIL}"
       - "PIPELINE_NAME=${_PIPELINE_NAME}"
@@ -73,9 +79,9 @@ steps:
       - "--concurrency"
       - "40"
       - "--service-account"
-      - "${_CLOUD_RUN_APP_SA_NAME}@${_STAGING_PROJECT_ID}.iam.gserviceaccount.com"
+      - "${_CLOUD_RUN_APP_SA_EMAIL}"
       - "--set-env-vars"
-      - "COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- endif %}"
+      - "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 %}"
 
   # Fetch Staging Service URL
   - name: "gcr.io/cloud-builders/gcloud"
@@ -116,7 +122,7 @@ steps:
         uv run app/agent_engine_app.py \
           --project ${_STAGING_PROJECT_ID} \
           --location ${_REGION} \
-          --set-env-vars COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %},DATA_STORE_ID=${_DATA_STORE_ID},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- endif %}
+          --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 %}"
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
@@ -181,7 +187,7 @@ steps:
       - "builds"
       - "triggers"
       - "run"
-      - "deploy-to-prod-pipeline"
+      - "deploy-{{cookiecutter.project_name}}"
       - "--region"
       - "$LOCATION"
       - "--project"
@@ -202,14 +208,9 @@ steps:
 
 substitutions:
   _STAGING_PROJECT_ID: YOUR_STAGING_PROJECT_ID
-  _BUCKET_NAME_LOAD_TEST_RESULTS: ${PROJECT_ID}-cicd-load-test-results
   _REGION: us-central1
-{%- if cookiecutter.data_ingestion %}
-  _DATA_STORE_REGION: us
-  _PIPELINE_NAME: genai_sample_data_ingestion
-{%- endif %}
 
-logsBucket: gs://${PROJECT_ID}-logs-data/build-logs
+logsBucket: gs://${PROJECT_ID}-{{cookiecutter.project_name}}-logs-data/build-logs
 options:
   substitutionOption: ALLOW_LOOSE
   defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

src/base_template/deployment/ci/pr_checks.yaml

@@ -46,6 +46,6 @@ steps:
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
-logsBucket: gs://${PROJECT_ID}-logs-data/build-logs
+logsBucket: gs://${PROJECT_ID}-{{cookiecutter.project_name}}-logs-data/build-logs
 options:
   defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

src/base_template/deployment/terraform/apis.tf

@@ -32,3 +32,9 @@ resource "google_project_service" "shared_services" {
   disable_on_destroy = false
 }
 
+# Enable Cloud Resource Manager API for the CICD runner project
+resource "google_project_service" "cicd_cloud_resource_manager_api" {
+  project            = var.cicd_runner_project_id
+  service            = "cloudresourcemanager.googleapis.com"
+  disable_on_destroy = false
+}

src/base_template/deployment/terraform/build_triggers.tf

@@ -14,7 +14,7 @@
 
 # a. Create PR checks trigger
 resource "google_cloudbuild_trigger" "pr_checks" {
-  name            = "pr-checks"
+  name            = "pr-${var.project_name}"
   project         = var.cicd_runner_project_id
   location        = var.region
   description     = "Trigger for PR checks"
@@ -34,16 +34,16 @@ resource "google_cloudbuild_trigger" "pr_checks" {
     "tests/**",
     "deployment/**",
     "uv.lock",
-  {%- if cookiecutter.data_ingestion %}
+  {% if cookiecutter.data_ingestion %}
     "data_ingestion/**",
-  {%- endif %}
+  {% endif %}
   ]
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
 }
 
 # b. Create CD pipeline trigger
 resource "google_cloudbuild_trigger" "cd_pipeline" {
-  name            = "cd-pipeline"
+  name            = "cd-${var.project_name}"
   project         = var.cicd_runner_project_id
   location        = var.region
   service_account = resource.google_service_account.cicd_runner_sa.id
@@ -68,18 +68,25 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
     _STAGING_PROJECT_ID            = var.staging_project_id
     _BUCKET_NAME_LOAD_TEST_RESULTS = resource.google_storage_bucket.bucket_load_test_results.name
     _REGION                        = var.region
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
-    _CONTAINER_NAME                = var.cloud_run_app_sa_name
-    _ARTIFACT_REGISTRY_REPO_NAME   = var.artifact_registry_repo_name
-    _CLOUD_RUN_APP_SA_NAME         = var.cloud_run_app_sa_name
-{%- endif %}
-{%- if cookiecutter.data_ingestion %}
+{% 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
+    _CLOUD_RUN_APP_SA_EMAIL         = resource.google_service_account.cloud_run_app_sa["staging"].email
+{% endif %}
+{% if cookiecutter.data_ingestion %}
     _PIPELINE_GCS_ROOT             = "gs://${resource.google_storage_bucket.data_ingestion_pipeline_gcs_root["staging"].name}"
-    _PIPELINE_SA_EMAIL             = "${var.vertexai_pipeline_sa_name}@${var.staging_project_id}.iam.gserviceaccount.com"
+    _PIPELINE_SA_EMAIL             = resource.google_service_account.vertexai_pipeline_app_sa["staging"].email
     _PIPELINE_CRON_SCHEDULE        = var.pipeline_cron_schedule
+{% if cookiecutter.datastore_type == "vertex_ai_search" %}
     _DATA_STORE_ID                 = resource.google_discovery_engine_data_store.data_store_staging.data_store_id
     _DATA_STORE_REGION             = var.data_store_region
-{%- endif %}
+{% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+    _VECTOR_SEARCH_INDEX           = resource.google_vertex_ai_index.vector_search_index_staging.id
+    _VECTOR_SEARCH_INDEX_ENDPOINT  = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_staging.id
+    _VECTOR_SEARCH_BUCKET          = "gs://${resource.google_storage_bucket.vector_search_data_bucket["staging"].name}"
+
+{% endif %}
+{% endif %}
     # Your other CD Pipeline substitutions
   }
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
@@ -88,7 +95,7 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
 
 # c. Create Deploy to production trigger
 resource "google_cloudbuild_trigger" "deploy_to_prod_pipeline" {
-  name            = "deploy-to-prod-pipeline"
+  name            = "deploy-${var.project_name}"
   project         = var.cicd_runner_project_id
   location        = var.region
   description     = "Trigger for deployment to production"
@@ -103,18 +110,24 @@ resource "google_cloudbuild_trigger" "deploy_to_prod_pipeline" {
   substitutions = {
     _PROD_PROJECT_ID             = var.prod_project_id
     _REGION                      = var.region
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
-    _CONTAINER_NAME              = var.cloud_run_app_sa_name
-    _ARTIFACT_REGISTRY_REPO_NAME = var.artifact_registry_repo_name
-    _CLOUD_RUN_APP_SA_NAME       = var.cloud_run_app_sa_name
-{%- endif %}
-{%- if cookiecutter.data_ingestion %}
+{% 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
+    _CLOUD_RUN_APP_SA_EMAIL       = resource.google_service_account.cloud_run_app_sa["prod"].email
+{% endif %}
+{% if cookiecutter.data_ingestion %}
     _PIPELINE_GCS_ROOT             = "gs://${resource.google_storage_bucket.data_ingestion_pipeline_gcs_root["prod"].name}"
-    _PIPELINE_SA_EMAIL             = "${var.vertexai_pipeline_sa_name}@${var.prod_project_id}.iam.gserviceaccount.com"
+    _PIPELINE_SA_EMAIL             = resource.google_service_account.vertexai_pipeline_app_sa["prod"].email
     _PIPELINE_CRON_SCHEDULE        = var.pipeline_cron_schedule
+{% if cookiecutter.datastore_type == "vertex_ai_search" %}
     _DATA_STORE_ID                 = resource.google_discovery_engine_data_store.data_store_prod.data_store_id
     _DATA_STORE_REGION             = var.data_store_region
-{%- endif %}
+{% elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
+    _VECTOR_SEARCH_INDEX           = resource.google_vertex_ai_index.vector_search_index_prod.id
+    _VECTOR_SEARCH_INDEX_ENDPOINT  = resource.google_vertex_ai_index_endpoint.vector_search_index_endpoint_prod.id
+    _VECTOR_SEARCH_BUCKET          = "gs://${resource.google_storage_bucket.vector_search_data_bucket["prod"].name}"
+{% endif %}
+{% endif %}
     # Your other Deploy to Prod Pipeline substitutions
   }
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]