agent-starter-pack 0.19.0__py3-none-any.whl → 0.19.2__py3-none-any.whl

agent_starter_pack/agents/adk_a2a_base/notebooks/adk_a2a_app_testing.ipynb

@@ -503,7 +503,7 @@
     "\n",
     "# Send the streaming request to the A2A endpoint\n",
     "response = requests.post(\n",
-    "    f\"{SERVICE_URL}/a2a/app/\",\n",
+    "    f\"{SERVICE_URL}/a2a/app\",\n",
     "    headers=headers,\n",
     "    json=request.model_dump(mode=\"json\", exclude_none=True),\n",
     "    stream=True,\n",
@@ -556,7 +556,7 @@
     "\n",
     "# Send the streaming request to the local A2A endpoint\n",
     "response = requests.post(\n",
-    "    \"http://127.0.0.1:8000/a2a/app/\",\n",
+    "    \"http://127.0.0.1:8000/a2a/app\",\n",
     "    headers=headers,\n",
     "    json=request.model_dump(mode=\"json\", exclude_none=True),\n",
     "    stream=True,\n",

agent_starter_pack/cli/utils/template.py

@@ -17,6 +17,7 @@ import logging
 import os
 import pathlib
 import shutil
+import sys
 import tempfile
 from dataclasses import dataclass
 from typing import Any
@@ -459,6 +460,72 @@ def copy_data_ingestion_files(
         )
 
 
+def _extract_agent_garden_labels(
+    agent_garden: bool,
+    remote_spec: Any | None,
+    remote_template_path: pathlib.Path | None,
+) -> tuple[str | None, str | None]:
+    """Extract agent sample ID and publisher for Agent Garden labeling.
+
+    This function supports two mechanisms for extracting label information:
+    1. From remote_spec metadata (for ADK samples)
+    2. Fallback to pyproject.toml parsing (for version-locked templates)
+
+    Args:
+        agent_garden: Whether this deployment is from Agent Garden
+        remote_spec: Remote template spec with ADK samples metadata
+        remote_template_path: Path to remote template directory
+
+    Returns:
+        Tuple of (agent_sample_id, agent_sample_publisher) or (None, None) if no labels found
+    """
+    if not agent_garden:
+        return None, None
+
+    agent_sample_id = None
+    agent_sample_publisher = None
+
+    # Handle remote specs with ADK samples metadata
+    if (
+        remote_spec
+        and hasattr(remote_spec, "is_adk_samples")
+        and remote_spec.is_adk_samples
+    ):
+        # For ADK samples, template_path is like "python/agents/sample-name"
+        agent_sample_id = pathlib.Path(remote_spec.template_path).name
+        # For ADK samples, publisher is always "google"
+        agent_sample_publisher = "google"
+        logging.debug(f"Detected ADK sample from remote_spec: {agent_sample_id}")
+        return agent_sample_id, agent_sample_publisher
+
+    # Fallback: Detect ADK samples from pyproject.toml (for version-locked templates)
+    if remote_template_path:
+        pyproject_path = remote_template_path / "pyproject.toml"
+        if pyproject_path.exists():
+            try:
+                if sys.version_info >= (3, 11):
+                    import tomllib
+                else:
+                    import tomli as tomllib
+
+                with open(pyproject_path, "rb") as toml_file:
+                    pyproject_data = tomllib.load(toml_file)
+
+                # Extract project name from pyproject.toml
+                project_name_from_toml = pyproject_data.get("project", {}).get("name")
+
+                if project_name_from_toml:
+                    agent_sample_id = project_name_from_toml
+                    agent_sample_publisher = "google"  # ADK samples are from Google
+                    logging.debug(
+                        f"Detected ADK sample from pyproject.toml: {agent_sample_id}"
+                    )
+            except Exception as e:
+                logging.debug(f"Failed to read pyproject.toml: {e}")
+
+    return agent_sample_id, agent_sample_publisher
+
+
 def process_template(
     agent_name: str,
     template_dir: pathlib.Path,
@@ -560,13 +627,9 @@ def process_template(
             os.chdir(temp_path)  # Change to temp directory
 
             # Extract agent sample info for labeling when using agent garden with remote templates
-            agent_sample_id = None
-            agent_sample_publisher = None
-            if agent_garden and remote_spec and remote_spec.is_adk_samples:
-                # For ADK samples, template_path is like "python/agents/sample-name"
-                agent_sample_id = pathlib.Path(remote_spec.template_path).name
-                # For ADK samples, publisher is always "google"
-                agent_sample_publisher = "google"
+            agent_sample_id, agent_sample_publisher = _extract_agent_garden_labels(
+                agent_garden, remote_spec, remote_template_path
+            )
 
             # Create the cookiecutter template structure
             cookiecutter_template = temp_path / "template"
@@ -718,14 +781,14 @@ def process_template(
                 / "docs"
                 / "adk-cheatsheet.md"
             )
-            with open(adk_cheatsheet_path, encoding="utf-8") as f:
-                adk_cheatsheet_content = f.read()
+            with open(adk_cheatsheet_path, encoding="utf-8") as md_file:
+                adk_cheatsheet_content = md_file.read()
 
             llm_txt_path = (
                 pathlib.Path(__file__).parent.parent.parent.parent / "llm.txt"
             )
-            with open(llm_txt_path, encoding="utf-8") as f:
-                llm_txt_content = f.read()
+            with open(llm_txt_path, encoding="utf-8") as txt_file:
+                llm_txt_content = txt_file.read()
 
             cookiecutter_config = {
                 "project_name": project_name,
@@ -779,8 +842,8 @@ def process_template(
 
             with open(
                 cookiecutter_template / "cookiecutter.json", "w", encoding="utf-8"
-            ) as f:
-                json.dump(cookiecutter_config, f, indent=4)
+            ) as json_file:
+                json.dump(cookiecutter_config, json_file, indent=4)
 
             logging.debug(f"Template structure created at {cookiecutter_template}")
             logging.debug(
@@ -929,8 +992,12 @@ def process_template(
                                             file_template_dir / "cookiecutter.json",
                                             "w",
                                             encoding="utf-8",
-                                        ) as f:
-                                            json.dump(cookiecutter_config, f, indent=4)
+                                        ) as config_file:
+                                            json.dump(
+                                                cookiecutter_config,
+                                                config_file,
+                                                indent=4,
+                                            )
 
                                         # Process the file template
                                         cookiecutter(
@@ -1091,13 +1158,13 @@ def process_template(
 
                 # Replace cookiecutter project name with actual project name in lock file
                 lock_file_path = final_destination / "uv.lock"
-                with open(lock_file_path, "r+", encoding="utf-8") as f:
-                    content = f.read()
-                    f.seek(0)
-                    f.write(
+                with open(lock_file_path, "r+", encoding="utf-8") as lock_file:
+                    content = lock_file.read()
+                    lock_file.seek(0)
+                    lock_file.write(
                         content.replace("{{cookiecutter.project_name}}", project_name)
                     )
-                    f.truncate()
+                    lock_file.truncate()
                 logging.debug(f"Updated project name in lock file at {lock_file_path}")
 
         except Exception as e:

agent_starter_pack/deployment_targets/cloud_run/tests/load_test/load_test.py

@@ -163,7 +163,7 @@ from locust import HttpUser, between, task
 {%- endif %}
 {%- if cookiecutter.is_adk_a2a %}
 
-ENDPOINT = "/a2a/{{cookiecutter.agent_directory}}/"
+ENDPOINT = "/a2a/{{cookiecutter.agent_directory}}"
 {%- elif cookiecutter.is_adk %}
 
 ENDPOINT = "/run_sse"

agent_starter_pack/deployment_targets/cloud_run/{{cookiecutter.agent_directory}}/server.py

@@ -302,6 +302,10 @@ from a2a.server.apps import A2AFastAPIApplication
 from a2a.server.request_handlers import DefaultRequestHandler
 from a2a.server.tasks import InMemoryTaskStore
 from a2a.types import AgentCapabilities, AgentCard
+from a2a.utils.constants import (
+    AGENT_CARD_WELL_KNOWN_PATH,
+    EXTENDED_AGENT_CARD_PATH,
+)
 {%- endif %}
 from fastapi import FastAPI
 {%- if cookiecutter.is_adk_a2a %}
@@ -358,13 +362,15 @@ request_handler = DefaultRequestHandler(
     agent_executor=A2aAgentExecutor(runner=runner), task_store=InMemoryTaskStore()
 )
 
+A2A_RPC_PATH = f"/a2a/{adk_app.name}"
+
 
 async def build_dynamic_agent_card() -> AgentCard:
     """Builds the Agent Card dynamically from the root_agent."""
     agent_card_builder = AgentCardBuilder(
         agent=adk_app.root_agent,
         capabilities=AgentCapabilities(streaming=True),
-        rpc_url=f"{os.getenv('APP_URL', 'http://0.0.0.0:8000')}/a2a/{adk_app.name}/",
+        rpc_url=f"{os.getenv('APP_URL', 'http://0.0.0.0:8000')}{A2A_RPC_PATH}",
         agent_version=os.getenv("AGENT_VERSION", "0.1.0"),
     )
     agent_card = await agent_card_builder.build()
@@ -374,10 +380,13 @@ async def build_dynamic_agent_card() -> AgentCard:
 @asynccontextmanager
 async def lifespan(app_instance: FastAPI) -> AsyncIterator[None]:
     agent_card = await build_dynamic_agent_card()
-    a2a_app = A2AFastAPIApplication(
-        agent_card=agent_card, http_handler=request_handler
-    ).build()
-    app_instance.mount(f"/a2a/{adk_app.name}", a2a_app)
+    a2a_app = A2AFastAPIApplication(agent_card=agent_card, http_handler=request_handler)
+    a2a_app.add_routes_to_app(
+        app_instance,
+        agent_card_url=f"{A2A_RPC_PATH}{AGENT_CARD_WELL_KNOWN_PATH}",
+        rpc_url=A2A_RPC_PATH,
+        extended_agent_card_url=f"{A2A_RPC_PATH}{EXTENDED_AGENT_CARD_PATH}",
+    )
     yield
 
 

{agent_starter_pack-0.19.0.dist-info → agent_starter_pack-0.19.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.19.0
+Version: 0.19.2
 Summary: CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates.
 Author-email: Google LLC <agent-starter-pack@google.com>
 License: Apache-2.0

{agent_starter_pack-0.19.0.dist-info → agent_starter_pack-0.19.2.dist-info}/RECORD

@@ -3,7 +3,7 @@ agent_starter_pack/agents/adk_a2a_base/README.md,sha256=4uIeI_TCrbdK-EzONz83SuEI
 agent_starter_pack/agents/adk_a2a_base/.template/templateconfig.yaml,sha256=x7ec9o78qFCwYCpUf_5sHHTTvCIxL3SxWSX6hsazQuo,971
 agent_starter_pack/agents/adk_a2a_base/app/__init__.py,sha256=GVTYZcCQCi2t5dxcet777hEKD_MDzQ-8n_ht7xSbXYM,617
 agent_starter_pack/agents/adk_a2a_base/app/agent.py,sha256=GWR_rxZuLlxml-1eytF_8BXlp6xPUM6Emv0u5kClMpg,2349
-agent_starter_pack/agents/adk_a2a_base/notebooks/adk_a2a_app_testing.ipynb,sha256=36-l686vb8U6Gav6snzVo-eOO-KEJ2m_rfBA8mUL08E,17138
+agent_starter_pack/agents/adk_a2a_base/notebooks/adk_a2a_app_testing.ipynb,sha256=oMl0COo8XT5OA5DNjVSPEJ1ZUtk_PmebZD5QhC9o_Nc,17136
 agent_starter_pack/agents/adk_a2a_base/notebooks/evaluating_adk_agent.ipynb,sha256=SdZC1htgXtXw3oyi8d70dNVpDgUmV9T5hqiwGxM9plk,57034
 agent_starter_pack/agents/adk_a2a_base/tests/integration/test_agent.py,sha256=_zb3GMWMtMRq2rOyYC-uL1eNhpg2XBkm8Noj0O_UOng,1998
 agent_starter_pack/agents/adk_base/README.md,sha256=_rnoIkHupZ4afDZEAtrDZzeYSS4WqtJWnvtX2H-RrCM,894
@@ -87,7 +87,7 @@ agent_starter_pack/cli/utils/gcp.py,sha256=N6pvNU9gT6DpS7Peipfs57ckvqcUWU7OK1zdq
 agent_starter_pack/cli/utils/logging.py,sha256=61ulUY1hUrpxHDFi0szqsjPlrpxdBvwzfYEEV0o97GA,3530
 agent_starter_pack/cli/utils/register_gemini_enterprise.py,sha256=g-oDKt6DtxRx1DvhRxVDLqhLlrwfjm56zv65qjNiuXA,14570
 agent_starter_pack/cli/utils/remote_template.py,sha256=lWfC1_Vx_m4SD-wVHb8tiGfobOH1-o_eWaM1264rwGs,24128
-agent_starter_pack/cli/utils/template.py,sha256=dIEYlyI8AjZPcDFfiTLJrgbMdPKLQM-f1kdmxWmONKY,52528
+agent_starter_pack/cli/utils/template.py,sha256=xSeebJOXVuGklPqF_3p20r7kr1PHXQLhINvYlIuTH58,55152
 agent_starter_pack/cli/utils/version.py,sha256=F4udQmzniPStqWZFIgnv3Qg3l9non4mfy2An-Oveqmc,2916
 agent_starter_pack/data_ingestion/README.md,sha256=LNxSQoJW9JozK-TbyGQLj5L_MGWNwrfLk6V6RmQ2oBQ,4032
 agent_starter_pack/data_ingestion/pyproject.toml,sha256=w2yypeMM6uA7OWHrLU3SY9NlRgltRA57_NIDyJi8Dfg,467
@@ -112,9 +112,9 @@ agent_starter_pack/deployment_targets/cloud_run/deployment/terraform/service.tf,
 agent_starter_pack/deployment_targets/cloud_run/deployment/terraform/dev/service.tf,sha256=gK8Nl8nzkaHbw9ecdp9TgeVUfS1HT68Cf_zpd_F3kXg,7165
 agent_starter_pack/deployment_targets/cloud_run/tests/integration/test_server_e2e.py,sha256=4vGhX97gluPtF7Vv31rHiQRzbYW_N31eKETUsj4Ip-Y,22589
 agent_starter_pack/deployment_targets/cloud_run/tests/load_test/README.md,sha256=_1TzCOk-tkyCsLDNs9n7PmCmvjenPtvFFWssTluukmc,5584
-agent_starter_pack/deployment_targets/cloud_run/tests/load_test/load_test.py,sha256=xHvlV-sjx4a2g0_Nae78OGyLAE5jt4v4Go1-gq8y_NM,9980
+agent_starter_pack/deployment_targets/cloud_run/tests/load_test/load_test.py,sha256=AaKh7rpsZuD2CrxtsD5YS76iLatnfrwx-RA-pL7smRY,9979
 agent_starter_pack/deployment_targets/cloud_run/tests/load_test/.results/.placeholder,sha256=ZbWpSgDo8bT33PstD_73aQSeN_0oo0F104NMUGuZ8lE,14903
-agent_starter_pack/deployment_targets/cloud_run/{{cookiecutter.agent_directory}}/server.py,sha256=bmZYuChpr1fR1tmybek8JbF76_ycYhfQtrqSexlBqUQ,18950
+agent_starter_pack/deployment_targets/cloud_run/{{cookiecutter.agent_directory}}/server.py,sha256=9qRo04sIj-B8a2HaBWAsZLsthxteMr_AppI5Ws6oYbQ,19239
 agent_starter_pack/frontends/adk_live_react/frontend/package-lock.json,sha256=fenwkrOYhrFnJIUN6p9soaWYRg7uUPGLsMG27D45iuI,697250
 agent_starter_pack/frontends/adk_live_react/frontend/package.json,sha256=KL24gqAKmsNf7CGe39ZqIIp2nD7rYBt4kdupO0QdK80,1137
 agent_starter_pack/frontends/adk_live_react/frontend/tsconfig.json,sha256=cyqEhf7-Yydz-PX8_cuF8JpsyC363NDTNkrmCk0sKAo,595
@@ -178,8 +178,8 @@ agent_starter_pack/utils/generate_locks.py,sha256=LwR46w25CV0_ySF_MS9W2vp7S1Nf17
 agent_starter_pack/utils/lock_utils.py,sha256=vqFHTN7lju9to74MKOmLvz80BA47G0CVkxrd1MyLWYQ,2309
 agent_starter_pack/utils/watch_and_rebuild.py,sha256=1hMn29eLpVblfvixV9FEo46u8efmnLuRIn-bPrfdW3g,6694
 llm.txt,sha256=t04sKZwOwuhQegfeayZKJufyHD_SbA3Zv_KWJYJNO5Y,15378
-agent_starter_pack-0.19.0.dist-info/METADATA,sha256=4lHrYhPGmOW3x0Bs6R-yg3EMyxkOs0vijljlyp-Aw3w,11422
-agent_starter_pack-0.19.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agent_starter_pack-0.19.0.dist-info/entry_points.txt,sha256=LO_oGmY1IdlFJRF9s7oIL3qdewC8Q9UtmTV6jWVZq3U,180
-agent_starter_pack-0.19.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-agent_starter_pack-0.19.0.dist-info/RECORD,,
+agent_starter_pack-0.19.2.dist-info/METADATA,sha256=avi83ORun8LdQp_KnDVf0U3mV8lXX8phr724DHMi9VI,11422
+agent_starter_pack-0.19.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agent_starter_pack-0.19.2.dist-info/entry_points.txt,sha256=LO_oGmY1IdlFJRF9s7oIL3qdewC8Q9UtmTV6jWVZq3U,180
+agent_starter_pack-0.19.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+agent_starter_pack-0.19.2.dist-info/RECORD,,