agent-starter-pack 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

{agent_starter_pack-0.2.2.dist-info → agent_starter_pack-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.2.2
+Version: 0.2.3
 Summary: CLI tool to create GCP-based AI agent projects from templates
 Author-email: Google LLC <agent-starter-pack@google.com>
 License: Apache-2.0
@@ -9,7 +9,7 @@ Requires-Python: >=3.10
 Requires-Dist: backoff>=2.2.1
 Requires-Dist: click~=8.1.7
 Requires-Dist: cookiecutter~=2.5.0
-Requires-Dist: google-cloud-aiplatform~=1.81.0
+Requires-Dist: google-cloud-aiplatform~=1.87.0
 Requires-Dist: pyyaml~=6.0.1
 Requires-Dist: rich~=13.7.0
 Provides-Extra: jupyter
@@ -33,7 +33,7 @@ It accelerates development by providing a holistic, production-ready solution, a
 
 | ⚡️ Launch | 🧪 Experiment  | ✅ Deploy | 🛠️ Customize |
 |---|---|---|---|
-| [Pre-built agent templates](./agents/) (ReAct, RAG, multi-agent, Live Multimodal API). | [Vertex AI evaluation](https://cloud.google.com/vertex-ai/generative-ai/docs/models/evaluation-overview) and an interactive playground. | Production-ready infra with [monitoring](./docs/monitoring.md), [observability](./docs/observability.md), and [CI/CD](./docs/deployment.md) on [Cloud Run](https://cloud.google.com/run) or [Agent Engine](https://cloud.google.com/vertex-ai/generative-ai/docs/agent-engine/overview). | Extend and customize templates according to your needs. |
+| [Pre-built agent templates](./agents/) (ReAct, RAG, multi-agent, Live Multimodal API). | [Vertex AI evaluation](https://cloud.google.com/vertex-ai/generative-ai/docs/models/evaluation-overview) and an interactive playground. | Production-ready infra with [monitoring, observability](./docs/observability.md), and [CI/CD](./docs/deployment.md) on [Cloud Run](https://cloud.google.com/run) or [Agent Engine](https://cloud.google.com/vertex-ai/generative-ai/docs/agent-engine/overview). | Extend and customize templates according to your needs. |
 
 ---
  
@@ -94,16 +94,6 @@ This starter pack covers all aspects of Agent development, from prototyping and
 
 ---
 
-#### From `e2e-gen-ai-app-starter-pack` to `agent-starter-pack`
-
-This project represents the next evolution of the [e2e-gen-ai-app-starter-pack](goo.gle/e2e-gen-ai-app-starter-pack).  Building on the foundation of the original, we've made significant improvements:
-
-*   **Streamlined CLI:**  A new command-line interface (`agent-starter-pack`) simplifies project creation, template selection, and deployment.
-*   **Expanded Agent Options:** Support for a wider variety of agent frameworks (LangGraph, CrewAI, and the Google GenAI SDK) and deployment targets (including Vertex AI Agent Engine).
-*   **Simplified setup**: Integrated gcloud authentication and projects and region configurations
-
----
-
 ## 🔧 Requirements
 
 - Python 3.10+
@@ -127,6 +117,10 @@ See the [documentation](docs/) for more details:
 - **March 6, 2025**: A [120 Minute livestream video demo](https://www.youtube.com/watch?v=yIRIT_EtALs&t=235s) of the new `agent-starter-pack` were we build 3 Agents under 30 minutes!
 - **Oct 29, 2024**: A [20-Minute Video Walkthrough](https://youtu.be/kwRG7cnqSu0) is available, showcasing the previous `agent-starter-pack`.
 
+## Explore More Generative AI Resources
+
+Looking for more examples and resources for Generative AI on Google Cloud? Check out the [GoogleCloudPlatform/generative-ai](https://github.com/GoogleCloudPlatform/generative-ai) repository for notebooks, code samples, and more!
+
 ## Contributing
 
 Contributions are welcome! See the [Contributing Guide](CONTRIBUTING.md).

{agent_starter_pack-0.2.2.dist-info → agent_starter_pack-0.2.3.dist-info}/RECORD

@@ -29,17 +29,17 @@ agents/live_api/tests/integration/test_server_e2e.py,sha256=D2VETDIyTD2fQyQ6DXwL
 agents/live_api/tests/load_test/load_test.py,sha256=HHZyfC4gqiQtZVF_CbbxENGgWQccMLpwMv0IdoQ6cbQ,1275
 agents/live_api/tests/unit/test_server.py,sha256=_TjlgQgNkjerIaBGnu8P8_KB8ZlSolDcivALpUOn_Rw,4786
 src/base_template/.gitignore,sha256=mJKTZIcVdAFiIUQicRfPNGUg6WvwcfTEC2xbmAaU34g,2579
-src/base_template/Makefile,sha256=1tNyhpY-6XUNr-9Kr-ApkAFZt7LlN9XbBvGLlqQfoxE,2866
-src/base_template/README.md,sha256=tA4V5-wO--vZdDImvW2OYALEaSFLr5swjHosJE90pRs,9416
-src/base_template/pyproject.toml,sha256=NyJ0L0-BofQ162fIzPO2SZGF6A8YmcwYYN7LMB3quGs,2813
+src/base_template/Makefile,sha256=-FuUonze4AtGb0t_-R3L1ckDS3dOKmpXrGUC2fnQxUo,3167
+src/base_template/README.md,sha256=lg5awHyvvii7wuNgR02fhO_gE9LCdMf_ot9Fd7KOHWo,10317
+src/base_template/pyproject.toml,sha256=-fnazs9G4-EL0Ett7bgMP8qtWxWAHB22akcP5_ZCRz8,2813
 src/base_template/app/utils/tracing.py,sha256=JA5xVmWpJqaMiNUcD5irGS7Xii1LO37Dmfmzt3kA0Ys,5715
 src/base_template/app/utils/typing.py,sha256=LXvSescgmqf5V4h5vT5bcpu-6sWqzD6WgrEBGYLg1C0,3287
-src/base_template/deployment/README.md,sha256=8AorSeF2Aj0kvPmuQLFrmAAUWVbdTzg0S-rVBbfdirQ,4835
-src/base_template/deployment/cd/deploy-to-prod.yaml,sha256=Hse5ZwJEKYrWdm8tpKmR6AfTw_4Ggjhiba3rWXOwOMI,4258
-src/base_template/deployment/cd/staging.yaml,sha256=Yh-vCZzHvGExZF1K_0CcY0Uj9A5_aOVNnM8jA2yzPSw,7878
-src/base_template/deployment/ci/pr_checks.yaml,sha256=g7UJKjGusNBVQGnfOWkfTcYKfJxJgm5cR0vHdFnv5hk,1509
+src/base_template/deployment/README.md,sha256=XjRRcEiyoobi0YEXybfvtaOi9ecNDU2bVKczv0MUBac,5255
+src/base_template/deployment/cd/deploy-to-prod.yaml,sha256=Vzt83DunPF64wVsY96KTGvhxZFHAF5Tze_88KW4O-oo,4297
+src/base_template/deployment/cd/staging.yaml,sha256=URqQPOxEv1ngYM7RoIs-iGMZsDdq6wUdmH953sipK_o,7925
+src/base_template/deployment/ci/pr_checks.yaml,sha256=7jS9HlRfistS4hhUXMF0tc-5m6g6l9s0rGhq_xP8Tnc,1517
 src/base_template/deployment/terraform/apis.tf,sha256=98vqe53RLtFwnQq_9N1widR8J0c1SGqwhCXp_GohITA,1497
-src/base_template/deployment/terraform/build_triggers.tf,sha256=TdGZNS5_2eMhHfH3k2GIsQNJ5DPZPN1EO1snRPdzEK4,6195
+src/base_template/deployment/terraform/build_triggers.tf,sha256=_XDFj6kPd21NmEKKRjpqYIa48P8VHCMVG_6thLqrS0Y,6363
 src/base_template/deployment/terraform/iam.tf,sha256=-KrOngRch4gKnPkZy0ybQQq0RW5-TI80tJ-VJLg-AdA,5597
 src/base_template/deployment/terraform/locals.tf,sha256=mrmOigExLk5g734-2VodDj8qQUTBq20e7FgQD0KUF8E,1390
 src/base_template/deployment/terraform/log_sinks.tf,sha256=PP_n3Jr-_EhMy6shVUrx7ztdQic5W3mKPjC0zQSvAjA,2955
@@ -57,8 +57,8 @@ src/base_template/deployment/terraform/dev/vars/env.tfvars,sha256=fySlaivTsrxA6s
 src/base_template/deployment/terraform/vars/env.tfvars,sha256=vasZKhOscuK0yjYrAUDHqbbYj8HV4d_rN87UJ-2ZEBM,1467
 src/base_template/tests/unit/test_utils/test_tracing_exporter.py,sha256=JAb0vIB7wNFPm_kaDaHcxtPKNReypDHjdsMQyzpuePQ,4687
 src/cli/main.py,sha256=pMsSlNwkrFqHUHHA5U-WMZ4QRquaI_F7OXQt6yxuugE,1688
-src/cli/commands/create.py,sha256=JjD1DkeSd727w9N8ept4nu287KyEbLRbijUsfe8RwvQ,22851
-src/cli/commands/setup_cicd.py,sha256=hUhhjyg3gOhDvvfqUsvl_IWeDLvCMbxeeQs3XCkTS_4,30704
+src/cli/commands/create.py,sha256=iDfA1ewmGYAtWsYjNjzDka5eEWANgX1kyBjov0H9_nE,23787
+src/cli/commands/setup_cicd.py,sha256=bZb0cSjYFFprvGK-j7Msb0tTFKMzecyyoj2EKWjHNIg,31281
 src/cli/utils/__init__.py,sha256=_cTmsXGPqOtK0q8UW5164QTltbJRJFR_Efxq_BRL1-o,1311
 src/cli/utils/cicd.py,sha256=tlz50wI0unRosRZsDpZ5Oh5haMJmNjc9dV0-TPWawKE,27443
 src/cli/utils/datastores.py,sha256=gv1V6eDcOEKx4MRNG5C3Y-VfixYq1AzQuaYMLp8QRNo,1058
@@ -66,7 +66,7 @@ src/cli/utils/gcp.py,sha256=IHTLqMCOkDwITQV_7YnNun2b6YIzTWKZCxgaDVobdeQ,4066
 src/cli/utils/logging.py,sha256=0lHe4EPi1A8sOx9xkA7gS4UNl0GsIyp2ahydkkuCzLY,1570
 src/cli/utils/template.py,sha256=kY6K7Nra2hYN1a36TUb2PoLDKwD3Np9rLTMeVBRbsNg,28730
 src/cli/utils/version.py,sha256=F4udQmzniPStqWZFIgnv3Qg3l9non4mfy2An-Oveqmc,2916
-src/data_ingestion/README.md,sha256=AF0XGNl4oKfp8--fL--rbd4i5UcOL7VnRP07vnN1wP0,4381
+src/data_ingestion/README.md,sha256=LNxSQoJW9JozK-TbyGQLj5L_MGWNwrfLk6V6RmQ2oBQ,4032
 src/data_ingestion/pyproject.toml,sha256=-1Mf2QB8K70ICQV5UPZDpf-fN3UwEQLVzQyxfakCSTY,445
 src/data_ingestion/uv.lock,sha256=HzSD6_IxS2urt49EefD9MvVxBwxW_bJ-k0XltTDT3Vc,144223
 src/data_ingestion/data_ingestion_pipeline/pipeline.py,sha256=UAS6dxV954yARP0NdDbCf5kzap3NfmoX52eZ2mZtWXs,3331
@@ -74,7 +74,7 @@ src/data_ingestion/data_ingestion_pipeline/submit_pipeline.py,sha256=tWGqL0zUB3V
 src/data_ingestion/data_ingestion_pipeline/components/ingest_data.py,sha256=s5IlAshPbf5kgBTBb-sz0zHqZnIpCzaoM2b2cs7PkJA,10640
 src/data_ingestion/data_ingestion_pipeline/components/process_data.py,sha256=3D4CaUV9pBaIU10MogJMQAR00JPVzqjFHN6eL7WM_5Y,22045
 src/deployment_targets/agent_engine/deployment_metadata.json,sha256=G_t_n-UNrFsBgH1Xrw5-ZqYzUGwZ4X6ipsIm_yiSq-w,72
-src/deployment_targets/agent_engine/app/agent_engine_app.py,sha256=aMBsmyxXwLwDaZ8KWqnpdpOSD9-upZZiTGbiJ80wI2Y,9486
+src/deployment_targets/agent_engine/app/agent_engine_app.py,sha256=RK8jsVLWWiaEK_hTE5fI3mQga0K-SrqyRbO7oAZ-N1g,9461
 src/deployment_targets/agent_engine/app/utils/gcs.py,sha256=voQNs8sbvLDH0PX3avpn8RFNTq7QWNgXfMWUKU7hBTA,1495
 src/deployment_targets/agent_engine/notebooks/intro_agent_engine.ipynb,sha256=RE6Gp-bu4bHtNBngfkt_CF5emy5YcOWQ5rMYW_Cv8_w,48809
 src/deployment_targets/agent_engine/tests/integration/test_agent_engine_app.py,sha256=maYeJgeZceMgD4TI8ZID6SKAqHPlQuW2CksT7MGile4,3938
@@ -82,7 +82,7 @@ src/deployment_targets/agent_engine/tests/load_test/README.md,sha256=ckP2eu5_HpO
 src/deployment_targets/agent_engine/tests/load_test/load_test.py,sha256=msUkkqsNinCJ8loQHsEeGkQQqQ-Zvv7oAp5ni9vOsWs,3541
 src/deployment_targets/agent_engine/tests/load_test/.results/.placeholder,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 src/deployment_targets/agent_engine/tests/unit/test_dummy.py,sha256=hL-JCmoQUJ4IgluliEo3KkYd47nmiCy3obiPuz_b0sU,712
-src/deployment_targets/cloud_run/Dockerfile,sha256=JTh6P_RXE3bkdsHS0zIgguDVVf0XyLViMcb-UNT3Da4,835
+src/deployment_targets/cloud_run/Dockerfile,sha256=vedZX0JJW2bymESqB-0LumnkKyr7hcog8NlR0DX8Q74,843
 src/deployment_targets/cloud_run/uv.lock,sha256=2RYrR89xDS1FHVb-g2JGZq8zZ-rzbm_jRvehVCYuXRQ,887957
 src/deployment_targets/cloud_run/app/server.py,sha256=h6H6xwK_VVlOOfD6sOSbxX3WqRrHHzH0IUbns5VOyoo,3999
 src/deployment_targets/cloud_run/tests/integration/test_server_e2e.py,sha256=KKtdtBTxaAfHQodm4FdyQHa7hBAwWCCda5aEF26-bjk,5978
@@ -134,25 +134,25 @@ src/frontends/streamlit/frontend/utils/chat_utils.py,sha256=Z0OYQu-14_d9tDmH9Z4V
 src/frontends/streamlit/frontend/utils/local_chat_history.py,sha256=9wc8L8j4tk10DBPQdV64kdZvqE1fHxC2esK8szid0l8,4741
 src/frontends/streamlit/frontend/utils/message_editing.py,sha256=YWoPe2KeWMuL3YVTm0am6MK3kzjEIYVmdkdwTQpmGdQ,2263
 src/frontends/streamlit/frontend/utils/multimodal_utils.py,sha256=v6YbCkz_YcnEo-9YvRjwBNt0SzU4M39bYxJGmKk69vE,7313
-src/frontends/streamlit/frontend/utils/stream_handler.py,sha256=MH_NqA0lLD1UpVRV2TAhtOMsUsar203JhR9T3a5Vgps,12050
+src/frontends/streamlit/frontend/utils/stream_handler.py,sha256=kRKv7gQDEDsVtJxUsxY5uqCCtR3nQmT1nkZyrQ6Hpsw,12030
 src/frontends/streamlit/frontend/utils/title_summary.py,sha256=B0cadS_KPW-tsbABauI4J681aqjEtuKFDa25e9R1WKc,3030
 src/resources/containers/data_processing/Dockerfile,sha256=VoB9d5yZiiWnqRfWrIq0gGNMzZg-eVy733OgP72ZgO0,950
 src/resources/containers/e2e-tests/Dockerfile,sha256=Q_aTyX_iaFY8j06XZkpMuggJnNO5daiLmmrvqaZHMxw,1611
-src/resources/locks/uv-agentic_rag-agent_engine.lock,sha256=QV639I2HNqplK5nkMZ0Xj0KqCUAZaFZf20A_R092yMA,615563
-src/resources/locks/uv-agentic_rag-cloud_run.lock,sha256=YrlqbGynBEBSCTdRHKELF0K4_RnkpquM-N3AE2rQEI8,782559
-src/resources/locks/uv-crewai_coding_crew-agent_engine.lock,sha256=kKRl9jy-ZUyZGPiZtSIzjN_jDtP-PnPnNwKwppN_pWo,712678
-src/resources/locks/uv-crewai_coding_crew-cloud_run.lock,sha256=QD11eic8XZl1f5KJFOTphllyLw0ktUItQjur0pLGogI,888102
-src/resources/locks/uv-langgraph_base_react-agent_engine.lock,sha256=jV28_KmoC2QPDnlG5Nzk6je-mj2BnNdGQIqLuGJ0WQk,595609
-src/resources/locks/uv-langgraph_base_react-cloud_run.lock,sha256=WRVTZskbmjGfzFRDiSFeGtNt1U__zPmcvhy9T75dCn8,758444
-src/resources/locks/uv-live_api-cloud_run.lock,sha256=HCgeO9Zx45Xcm5pSOxr3jHLm4mm7zG8Ogu5MLfPuBuk,761501
+src/resources/locks/uv-agentic_rag-agent_engine.lock,sha256=M4TwcVwII-qHzTE8KgLZM0B9XM_loV1nDCXBuVAG6Ac,615811
+src/resources/locks/uv-agentic_rag-cloud_run.lock,sha256=ng8RMphRb5FoxtG7S9-kEGvolpXDjM5Vx4nykd0yzEY,782807
+src/resources/locks/uv-crewai_coding_crew-agent_engine.lock,sha256=IvLBCezxo8Txr5JO9tHjawVQryWXH-dhXWg6fxtjvJI,712926
+src/resources/locks/uv-crewai_coding_crew-cloud_run.lock,sha256=efnOBWavF8OlBW5AF0WkxkOQpvcb_zt6pN-Dkk9CE94,888350
+src/resources/locks/uv-langgraph_base_react-agent_engine.lock,sha256=XqI00QN9JsplRc5f8oEMVOwIDXPk-h05ZSLurCzUfGo,595857
+src/resources/locks/uv-langgraph_base_react-cloud_run.lock,sha256=iv6yt5pSMKivd-XVjvJwEvuTGzfsMfjSvTLTelv4w5s,758692
+src/resources/locks/uv-live_api-cloud_run.lock,sha256=TeUVt--pNkPrkjb08ek62oJwKKMb70pRSKpza0C-G6M,761749
 src/resources/setup_cicd/cicd_variables.tf,sha256=PMflYe1TzQi63LORHkmeCktTYzXFplJgxffNH4DtuAQ,1244
 src/resources/setup_cicd/github.tf,sha256=scTBgeZlCM74N-pzhVKsnTN0PX9a5GboNl1HN3-LlCM,2791
 src/resources/setup_cicd/providers.tf,sha256=Km4z6IJt7x7PLaa0kyZbBrO2m3lpuIJZFD5jB7QBfF0,1122
 src/utils/generate_locks.py,sha256=xu5IAhGGBPkVQGSJX4kk7_JNDwWJUEaXAHbmaQIohbg,4386
 src/utils/lock_utils.py,sha256=_QdzQtgIbCmJ87s046_i1g966slVNmvr3bJDeHbRQSM,2419
 src/utils/watch_and_rebuild.py,sha256=vP4yIiA7E_lj5sfQdJUl8TXas6V7msDg8XWUutAC05Q,6679
-agent_starter_pack-0.2.2.dist-info/METADATA,sha256=ePaS3rw9VgvGeCoLgcQ3YX_k-efeIkBv3qKiTEfbKSg,8156
-agent_starter_pack-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agent_starter_pack-0.2.2.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
-agent_starter_pack-0.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-agent_starter_pack-0.2.2.dist-info/RECORD,,
+agent_starter_pack-0.2.3.dist-info/METADATA,sha256=54iuThzxPP5KGanSjYeJ_5S9yuPZMuO5Tn_l0i7ZK0A,7705
+agent_starter_pack-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agent_starter_pack-0.2.3.dist-info/entry_points.txt,sha256=U7uCxR7YulIhZ0L8R8Hui0Bsy6J7oyESBeDYJYMrQjA,56
+agent_starter_pack-0.2.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+agent_starter_pack-0.2.3.dist-info/RECORD,,

src/base_template/Makefile

@@ -1,5 +1,5 @@
 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; }
+	@command -v uv >/dev/null 2>&1 || { echo "uv is not installed. Installing uv..."; curl -LsSf https://astral.sh/uv/0.6.12/install.sh | sh; source ~/.bashrc; }
 	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:
@@ -19,7 +19,9 @@ backend:
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 	uv run uvicorn app.server:app --host 0.0.0.0 --port 8000 --reload
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
-	uv export --no-hashes --no-sources --no-header --no-emit-project --frozen > .requirements.txt && uv run app/agent_engine_app.py
+	# Export dependencies to requirements file using uv export (preferred method), otherwise fall back to uv pip freeze
+	uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --frozen > .requirements.txt 2>/dev/null || \
+	uv pip freeze --exclude-editable > .requirements.txt && uv run app/agent_engine_app.py
 {%- endif %}
 
 {% if cookiecutter.deployment_target == 'cloud_run' -%}
@@ -34,8 +36,7 @@ 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%}
+{% 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
@@ -48,6 +49,7 @@ data-ingestion:
 {%- 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" \
+		--vector-search-data-bucket-name="$$PROJECT_ID-{{cookiecutter.project_name}}-vs" \
 {%- endif %}
 		--service-account="{{cookiecutter.project_name}}-rag@$$PROJECT_ID.iam.gserviceaccount.com" \
 		--pipeline-root="gs://$$PROJECT_ID-{{cookiecutter.project_name}}-rag" \

src/base_template/README.md

@@ -56,6 +56,10 @@ make install && make playground
 {%- endif %}
 | `make test`          | Run unit and integration tests                                                              |
 | `make lint`          | Run code quality checks (codespell, ruff, mypy)                                             |
+| `make setup-dev-env` | Set up development environment resources using Terraform                                    |
+{%- if cookiecutter.data_ingestion %}
+| `make data-ingestion`| Run data ingestion pipeline in the Dev environment                                           |
+{%- endif %}
 | `uv run jupyter lab` | Launch Jupyter notebook                                                                     |
 
 For full command options and usage, refer to the [Makefile](Makefile).
@@ -144,12 +148,14 @@ This template follows a "bring your own agent" approach - you focus on your busi
 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 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.
+4. **Deploy:** Set up and initiate the CI/CD pipelines, customizing tests as necessary. Refer to the [deployment section](#deployment) for comprehensive instructions. For streamlined infrastructure deployment, simply run `agent-starter-pack setup-cicd`. Check out the [`agent-starter-pack setup-cicd` CLI command](https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/cli/setup_cicd.md). Currently only supporting Github.
 5. **Monitor:** Track performance and gather insights using Cloud Logging, Tracing, and the Looker Studio dashboard to iterate on your application.
 {% endif %}
 
 ## Deployment
 
+> **Note:** For a streamlined one-command deployment of the entire CI/CD pipeline and infrastructure using Terraform, you can use the [`agent-starter-pack setup-cicd` CLI command](https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/cli/setup_cicd.md). Currently only supporting Github.
+
 ### Dev Environment
 
 {%- if cookiecutter.deployment_target == 'agent_engine' %}

src/base_template/deployment/README.md

@@ -29,6 +29,8 @@ The application leverages [**Terraform**](http://terraform.io) to define and pro
 
 ## Setup
 
+> **Note:** For a streamlined one-command deployment of the entire CI/CD pipeline and infrastructure using Terraform, you can use the [`agent-starter-pack setup-cicd` CLI command](https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/cli/setup_cicd.md). Currently only supporting Github.
+
 **Prerequisites:**
 
 1. A set of Google Cloud projects:
@@ -58,6 +60,7 @@ The application leverages [**Terraform**](http://terraform.io) to define and pro
 
    | Variable               | Description                                                     | Required |
    | ---------------------- | --------------------------------------------------------------- | :------: |
+   | project_name           | Project name used as a base for resource naming                 |   Yes    |
    | prod_project_id        | **Production** Google Cloud Project ID for resource deployment. |   Yes    |
    | staging_project_id     | **Staging** Google Cloud Project ID for resource deployment.    |   Yes    |
    | cicd_runner_project_id | Google Cloud Project ID where CI/CD pipelines will execute.     |   Yes    |
@@ -65,7 +68,7 @@ The application leverages [**Terraform**](http://terraform.io) to define and pro
    | host_connection_name   | Name of the host connection you created in Cloud Build          |   Yes    |
    | repository_name        | Name of the repository you added to Cloud Build                 |   Yes    |
 
-   Other optional variables include: telemetry and feedback BigQuery dataset IDs, log filters, sink names, service account names, bucket name suffixes, artifact registry repository name, and various role assignments.
+   Other optional variables may include: telemetry and feedback log filters, service account roles, and for projects requiring data ingestion: pipeline cron schedule, pipeline roles, and datastore-specific configurations.
 
 4. **Deploy Infrastructure with Terraform**
 

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

@@ -20,7 +20,7 @@ steps:
     args:
       - -c
       - |
-        cd data_ingestion && pip install uv --user && uv sync --frozen && \
+        cd data_ingestion && pip install uv==0.6.12 --user && uv sync --frozen && \
         uv run python data_ingestion_pipeline/submit_pipeline.py
     env:
       - "PIPELINE_ROOT=${_PIPELINE_GCS_ROOT}"
@@ -75,7 +75,7 @@ steps:
     args:
       - "-c"
       - |
-        pip install uv --user && uv sync --frozen
+        pip install uv==0.6.12 --user && uv sync --frozen
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
@@ -85,7 +85,7 @@ steps:
     args:
       - "-c"
       - |
-        uv export --no-hashes --no-sources --no-header --no-emit-project --frozen > .requirements.txt
+        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 \
           --project ${_PROD_PROJECT_ID} \
           --location ${_REGION} \

src/base_template/deployment/cd/staging.yaml

@@ -20,7 +20,7 @@ steps:
     args:
       - -c
       - |
-        cd data_ingestion && pip install uv --user && uv sync --frozen && \
+        cd data_ingestion && pip install uv==0.6.12 --user && uv sync --frozen && \
         uv run python data_ingestion_pipeline/submit_pipeline.py
     env:
       - "PIPELINE_ROOT=${_PIPELINE_GCS_ROOT}"
@@ -108,7 +108,7 @@ steps:
     args:
       - "-c"
       - |
-        pip install uv --user && uv sync --frozen
+        pip install uv==0.6.12 --user && uv sync --frozen
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
@@ -118,7 +118,7 @@ steps:
     args:
       - "-c"
       - |
-        uv export --no-hashes --no-sources --no-header --no-emit-project --frozen > .requirements.txt
+        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 \
           --project ${_STAGING_PROJECT_ID} \
           --location ${_REGION} \
@@ -146,7 +146,7 @@ steps:
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
         export _ID_TOKEN=$(cat id_token.txt)
         export _STAGING_URL=$(cat staging_url.txt)
-        pip install uv --user && uv sync --frozen
+        pip install uv==0.6.12 --user && uv sync --frozen
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
         export _AUTH_TOKEN=$(cat auth_token.txt)
 {%- endif %}

src/base_template/deployment/ci/pr_checks.yaml

@@ -20,7 +20,7 @@ steps:
     args:
       - "-c"
       - |
-        pip install uv --user && uv sync --frozen
+        pip install uv==0.6.12 --user && uv sync --frozen
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 

src/base_template/deployment/terraform/build_triggers.tf

@@ -38,6 +38,7 @@ resource "google_cloudbuild_trigger" "pr_checks" {
     "data_ingestion/**",
   {% endif %}
   ]
+  include_build_logs = "INCLUDE_BUILD_LOGS_WITH_STATUS"
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.shared_services]
 }
 
@@ -64,6 +65,7 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
     "deployment/**",
     "uv.lock"
   ]
+  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
@@ -104,6 +106,7 @@ resource "google_cloudbuild_trigger" "deploy_to_prod_pipeline" {
     repository = "projects/${var.cicd_runner_project_id}/locations/${var.region}/connections/${var.host_connection_name}/repositories/${var.repository_name}"
   }
   filename = "deployment/cd/deploy-to-prod.yaml"
+  include_build_logs = "INCLUDE_BUILD_LOGS_WITH_STATUS"
   approval_config {
     approval_required = true
   }

src/base_template/pyproject.toml

@@ -14,11 +14,11 @@ dependencies = [
     "traceloop-sdk~=0.38.7",
     "google-cloud-logging~=3.11.4",
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
-    "google-cloud-aiplatform[evaluation]~=1.81.0",
+    "google-cloud-aiplatform[evaluation]~=1.87.0",
     "fastapi~=0.115.8",
     "uvicorn~=0.34.0"
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
-    "google-cloud-aiplatform[evaluation,reasoningengine]~=1.81.0"
+    "google-cloud-aiplatform[evaluation,reasoningengine]~=1.87.0"
 {%- endif %}
 ]
 {% if cookiecutter.deployment_target == 'cloud_run' %}

src/cli/commands/create.py

@@ -37,6 +37,40 @@ from ..utils.template import (
 console = Console()
 
 
+def normalize_project_name(project_name: str) -> str:
+    """Normalize project name for better compatibility with cloud resources and tools."""
+
+    needs_normalization = (
+        any(char.isupper() for char in project_name) or "_" in project_name
+    )
+
+    if needs_normalization:
+        normalized_name = project_name
+        console.print(
+            "Note: Project names are normalized (lowercase, hyphens only) for better compatibility with cloud resources and tools.",
+            style="dim",
+        )
+        if any(char.isupper() for char in normalized_name):
+            normalized_name = normalized_name.lower()
+            console.print(
+                f"Info: Converting to lowercase for compatibility: '{project_name}' -> '{normalized_name}'",
+                style="bold yellow",
+            )
+
+        if "_" in normalized_name:
+            # Capture the name state before this specific change
+            name_before_hyphenation = normalized_name
+            normalized_name = normalized_name.replace("_", "-")
+            console.print(
+                f"Info: Replacing underscores with hyphens for compatibility: '{name_before_hyphenation}' -> '{normalized_name}'",
+                style="yellow",
+            )
+
+        return normalized_name
+
+    return project_name
+
+
 @click.command()
 @click.pass_context
 @click.argument("project_name")
@@ -110,15 +144,7 @@ def create(
             )
             return
 
-        # Convert project name to lowercase
-        if any(char.isupper() for char in project_name):
-            original_name = project_name
-            project_name = project_name.lower()
-            console.print(
-                f"Warning: Project name '{original_name}' contains uppercase characters. "
-                f"Converting to lowercase: '{project_name}'",
-                style="bold yellow",
-            )
+        project_name = normalize_project_name(project_name)
 
         # Setup debug logging if enabled
         if debug:

src/cli/commands/setup_cicd.py

@@ -356,9 +356,11 @@ console = Console()
 
 @click.command()
 @click.option("--dev-project", help="Development project ID")
-@click.option("--staging-project", required=True, help="Staging project ID")
-@click.option("--prod-project", required=True, help="Production project ID")
-@click.option("--cicd-project", required=True, help="CICD project ID")
+@click.option("--staging-project", help="Staging project ID")
+@click.option("--prod-project", help="Production project ID")
+@click.option(
+    "--cicd-project", help="CICD project ID (defaults to prod project if not specified)"
+)
 @click.option("--region", default="us-central1", help="GCP region")
 @click.option("--repository-name", help="Repository name (optional)")
 @click.option(
@@ -402,9 +404,9 @@ console = Console()
 )
 def setup_cicd(
     dev_project: str | None,
-    staging_project: str,
-    prod_project: str,
-    cicd_project: str,
+    staging_project: str | None,
+    prod_project: str | None,
+    cicd_project: str | None,
     region: str,
     repository_name: str | None,
     repository_owner: str | None,
@@ -426,6 +428,20 @@ def setup_cicd(
             "Make sure you are in the folder created by agent-starter-pack."
         )
 
+    # Prompt for staging and prod projects if not provided
+    if staging_project is None:
+        staging_project = click.prompt(
+            "Enter your staging project ID (where tests will be run)", type=str
+        )
+
+    if prod_project is None:
+        prod_project = click.prompt("Enter your production project ID", type=str)
+
+    # If cicd_project is not provided, default to prod_project
+    if cicd_project is None:
+        cicd_project = prod_project
+        console.print(f"Using production project '{prod_project}' for CI/CD resources")
+
     console.print(
         "\n⚠️  WARNING: The setup-cicd command is experimental and may have unexpected behavior.",
         style="bold yellow",

src/data_ingestion/README.md

@@ -1,84 +1,71 @@
+{%- if cookiecutter.datastore_type == "vertex_ai_search" -%}
+{%- set datastore_service_name = "Vertex AI Search" -%}
+{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" -%}
+{%- set datastore_service_name = "Vertex AI Vector Search" -%}
+{%- else -%}
+{%- set datastore_service_name = "Your Configured Datastore" -%}
+{%- endif -%}
+
 # Data Ingestion Pipeline
 
-This pipeline automates the ingestion of data into Vertex AI{%- if cookiecutter.datastore_type == "vertex_ai_vector_search" %} Vector{%- endif %} Search, streamlining the process of building Retrieval Augmented Generation (RAG) applications. 
+This pipeline automates the ingestion of data into {{ datastore_service_name }}, streamlining the process of building Retrieval Augmented Generation (RAG) applications.
 
-It orchestrates the complete workflow: loading data, chunking it into manageable segments, generating embeddings using Vertex AI Embeddings, and importing the processed data into your Vertex AI{%- if cookiecutter.datastore_type == "vertex_ai_vector_search" %} Vector{%- endif %} Search datastore.
+It orchestrates the complete workflow: loading data, chunking it into manageable segments, generating embeddings using Vertex AI Embeddings, and importing the processed data into your {{ datastore_service_name }} datastore.
 
 You can trigger the pipeline for an initial data load or schedule it to run periodically, ensuring your search index remains current. Vertex AI Pipelines provides the orchestration and monitoring capabilities for this process.
 
 ## Prerequisites
 
-Before running the data ingestion pipeline, ensure you have completed the following:
+Before running any commands, ensure you have set your Google Cloud Project ID as an environment variable. This variable will be used by the subsequent `make` commands.
 
-1. **Set up Dev Terraform:** Follow the instructions in the parent [deployment/README.md - Dev Deployment section](../deployment/README.md#dev-deployment) to provision the necessary resources in your development environment using Terraform. This includes deploying a datastore and configuring the required permissions.
+```bash
+export PROJECT_ID="YOUR_PROJECT_ID"
+```
+Replace `"YOUR_PROJECT_ID"` with your actual Google Cloud Project ID.
 
-## Running the Data Ingestion Pipeline
+Now, you can set up the development environment:
 
-After setting up the Terraform infrastructure, you can test the data ingestion pipeline.
+1.  **Set up Dev Environment:** Use the following command from the root of the repository to provision the necessary resources in your development environment using Terraform. This includes deploying a datastore and configuring the required permissions.
 
-> **Note:** The initial pipeline execution might take longer as your project is configured for Vertex AI Pipelines.
+    ```bash
+    make setup-dev-env
+    ```
+    This command requires `terraform` to be installed and configured.
 
-**Steps:**
+## Running the Data Ingestion Pipeline
 
-**a. Navigate to the `data_ingestion` directory:**
+After setting up the infrastructure using `make setup-dev-env`, you can run the data ingestion pipeline.
 
-```bash
-cd data_ingestion
-```
+> **Note:** The initial pipeline execution might take longer as your project is configured for Vertex AI Pipelines.
 
-**b. Install Dependencies:**
+**Steps:**
 
-Install the required Python dependencies using uv:
+**a. Execute the Pipeline:**
+Run the following command from the root of the repository. Ensure the `PROJECT_ID` environment variable is still set in your current shell session (as configured in Prerequisites).
 
 ```bash
-uv sync --frozen
+make data-ingestion
 ```
 
-**c. Execute the Pipeline:**
-
-Run the following command to execute the data ingestion pipeline. Replace the placeholder values with your actual project details.
+This command handles installing dependencies (if needed via `make install`) and submits the pipeline job using the configuration derived from your project setup. The specific parameters passed to the underlying script depend on the `datastore_type` selected during project generation:
 {%- if cookiecutter.datastore_type == "vertex_ai_search" %}
-```bash
-PROJECT_ID="YOUR_PROJECT_ID"
-REGION="us-central1"
-DATA_STORE_REGION="us"
-uv run data_ingestion_pipeline/submit_pipeline.py \
-    --project-id=$PROJECT_ID \
-    --region=$REGION \
-    --data-store-region=$DATA_STORE_REGION \
-    --data-store-id="sample-datastore" \
-    --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"
-```
+*   It will use parameters like `--data-store-id`, `--data-store-region`.
 {%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %}
-```bash
-PROJECT_ID="YOUR_PROJECT_ID"
-REGION="us-central1"
-VECTOR_SEARCH_INDEX="YOUR_VECTOR_SEARCH_INDEX"
-VECTOR_SEARCH_INDEX_ENDPOINT="YOUR_VECTOR_SEARCH_INDEX_ENDPOINT"
-uv run data_ingestion_pipeline/submit_pipeline.py \
-    --project-id=$PROJECT_ID \
-    --region=$REGION \
-    --vector-search-index=$VECTOR_SEARCH_INDEX \
-    --vector-search-index-endpoint=$VECTOR_SEARCH_INDEX_ENDPOINT \
-    --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"
-```
+*   It will use parameters like `--vector-search-index`, `--vector-search-index-endpoint`, `--vector-search-data-bucket-name`.
 {%- endif %}
+*   Common parameters include `--project-id`, `--region`, `--service-account`, `--pipeline-root`, and `--pipeline-name`.
 
-**d. Pipeline Scheduling and Execution:**
+**b. Pipeline Scheduling:**
 
-The pipeline, by default, executes immediately. To schedule the pipeline for periodic execution without immediate initiation, use the `--schedule-only` flag in conjunction with `--cron-schedule`. If a schedule doesn't exist, it will be created. If a schedule already exists, its cron expression will be updated to the provided value.
+The `make data-ingestion` command triggers an immediate pipeline run. For production environments, the underlying `submit_pipeline.py` script also supports scheduling options with flags like `--schedule-only` and `--cron-schedule` for periodic execution.
 
-**e. Monitoring Pipeline Progress:**
+**c. Monitoring Pipeline Progress:**
 
-The pipeline's configuration and execution status will be printed to the console. For detailed monitoring, use the Vertex AI Pipelines dashboard in the Google Cloud Console. This dashboard provides real-time insights into the pipeline's progress, logs, and any potential issues.
+The pipeline's configuration and execution status link will be printed to the console upon submission. For detailed monitoring, use the Vertex AI Pipelines dashboard in the Google Cloud Console.
 
 ## Testing Your RAG Application
 
-Once the data ingestion pipeline completes successfully, you can test your RAG application with Vertex AI{%- if cookiecutter.datastore_type == "vertex_ai_vector_search" %} Vector{%- endif %} Search.
+Once the data ingestion pipeline completes successfully, you can test your RAG application with {{ datastore_service_name }}.
 {%- if cookiecutter.datastore_type == "vertex_ai_search" %}
 > **Troubleshooting:** If you encounter the error `"google.api_core.exceptions.InvalidArgument: 400 The embedding field path: embedding not found in schema"` after the initial data ingestion, wait a few minutes and try again. This delay allows Vertex AI Search to fully index the ingested data.
 {%- endif %}