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

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

@@ -30,14 +30,12 @@ from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
 from google.adk.runners import Runner
 from google.adk.sessions.in_memory_session_service import InMemorySessionService
 from google.cloud import logging as google_cloud_logging
-from opentelemetry import trace
-from opentelemetry.sdk.trace import TracerProvider, export
 from vertexai.agent_engines import _utils
 from websockets.exceptions import ConnectionClosedError
 
-from .agent import root_agent
-from .utils.tracing import CloudTraceLoggingSpanExporter
-from .utils.typing import Feedback
+from .agent import app as adk_app
+from .app_utils.telemetry import setup_telemetry
+from .app_utils.typing import Feedback
 
 app = FastAPI()
 app.add_middleware(
@@ -62,13 +60,8 @@ logging_client = google_cloud_logging.Client()
 logger = logging_client.logger(__name__)
 logging.basicConfig(level=logging.INFO)
 
+setup_telemetry()
 _, project_id = google.auth.default()
-provider = TracerProvider()
-processor = export.BatchSpanProcessor(
-    CloudTraceLoggingSpanExporter(project_id=project_id)
-)
-provider.add_span_processor(processor)
-trace.set_tracer_provider(provider)
 
 
 # Initialize ADK services
@@ -78,11 +71,10 @@ memory_service = InMemoryMemoryService()
 
 # Initialize ADK runner
 runner = Runner(
-    agent=root_agent,
+    app=adk_app,
     session_service=session_service,
     artifact_service=artifact_service,
     memory_service=memory_service,
-    app_name="live-app",
 )
 
 
@@ -291,67 +283,163 @@ async def serve_frontend_spa(full_path: str) -> FileResponse:
     )
 {% elif cookiecutter.is_adk %}
 import os
+{%- if cookiecutter.is_a2a %}
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+{%- endif %}
+{%- if cookiecutter.session_type == "cloud_sql" %}
+from urllib.parse import quote
+{%- endif %}
 
 import google.auth
+{%- if cookiecutter.is_a2a %}
+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_a2a %}
+from google.adk.a2a.executor.a2a_agent_executor import A2aAgentExecutor
+from google.adk.a2a.utils.agent_card_builder import AgentCardBuilder
+from google.adk.artifacts.gcs_artifact_service import GcsArtifactService
+from google.adk.runners import Runner
+from google.adk.sessions import InMemorySessionService
+{%- else %}
 from google.adk.cli.fast_api import get_fast_api_app
+{%- endif %}
 from google.cloud import logging as google_cloud_logging
-from opentelemetry import trace
-from opentelemetry.sdk.trace import TracerProvider, export
-{%- if cookiecutter.session_type == "agent_engine" %}
+{% if cookiecutter.session_type == "agent_engine" -%}
 from vertexai import agent_engines
-{%- endif %}
+{% endif %}
 
-from {{cookiecutter.agent_directory}}.utils.gcs import create_bucket_if_not_exists
-from {{cookiecutter.agent_directory}}.utils.tracing import CloudTraceLoggingSpanExporter
-from {{cookiecutter.agent_directory}}.utils.typing import Feedback
+{%- if cookiecutter.is_a2a %}
+from {{cookiecutter.agent_directory}}.agent import app as adk_app
+{%- endif %}
+from {{cookiecutter.agent_directory}}.app_utils.gcs import create_bucket_if_not_exists
+from {{cookiecutter.agent_directory}}.app_utils.telemetry import setup_telemetry
+from {{cookiecutter.agent_directory}}.app_utils.typing import Feedback
 
+setup_telemetry()
 _, project_id = google.auth.default()
 logging_client = google_cloud_logging.Client()
 logger = logging_client.logger(__name__)
+{%- if not cookiecutter.is_a2a %}
 allow_origins = (
     os.getenv("ALLOW_ORIGINS", "").split(",") if os.getenv("ALLOW_ORIGINS") else None
 )
+{%- endif %}
 
+# Artifact bucket for ADK
 bucket_name = f"gs://{project_id}-{{cookiecutter.project_name}}-logs"
 create_bucket_if_not_exists(
     bucket_name=bucket_name, project=project_id, location="us-central1"
 )
 
-provider = TracerProvider()
-processor = export.BatchSpanProcessor(CloudTraceLoggingSpanExporter())
-provider.add_span_processor(processor)
-trace.set_tracer_provider(provider)
+{%- if cookiecutter.is_a2a %}
+
+runner = Runner(
+    app=adk_app,
+    artifact_service=GcsArtifactService(bucket_name=bucket_name),
+    session_service=InMemorySessionService(),
+)
+
+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_RPC_PATH}",
+        agent_version=os.getenv("AGENT_VERSION", "0.1.0"),
+    )
+    agent_card = await agent_card_builder.build()
+    return agent_card
+
+
+@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)
+    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
+
+
+app = FastAPI(
+    title="{{cookiecutter.project_name}}",
+    description="API for interacting with the Agent {{cookiecutter.project_name}}",
+    lifespan=lifespan,
+)
+{%- else %}
 
 AGENT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-{%- if cookiecutter.session_type == "alloydb" %}
-# AlloyDB session configuration
+{%- if cookiecutter.session_type == "cloud_sql" %}
+# Cloud SQL session configuration
 db_user = os.environ.get("DB_USER", "postgres")
 db_name = os.environ.get("DB_NAME", "postgres")
 db_pass = os.environ.get("DB_PASS")
-db_host = os.environ.get("DB_HOST")
+instance_connection_name = os.environ.get("INSTANCE_CONNECTION_NAME")
 
-# Set session_service_uri if database credentials are available
 session_service_uri = None
-if db_host and db_pass:
-    session_service_uri = f"postgresql://{db_user}:{db_pass}@{db_host}:5432/{db_name}"
+if instance_connection_name and db_pass:
+    # Use Unix socket for Cloud SQL
+    # URL-encode username and password to handle special characters (e.g., '[', '?', '#', '$')
+    # These characters can cause URL parsing errors, especially '[' which triggers IPv6 validation
+    encoded_user = quote(db_user, safe="")
+    encoded_pass = quote(db_pass, safe="")
+    # URL-encode the connection name to prevent colons from being misinterpreted
+    encoded_instance = instance_connection_name.replace(":", "%3A")
+
+    session_service_uri = (
+        f"postgresql+psycopg2://{encoded_user}:{encoded_pass}@"
+        f"/{db_name}"
+        f"?host=/cloudsql/{encoded_instance}"
+    )
 {%- elif cookiecutter.session_type == "agent_engine" %}
 # Agent Engine session configuration
-# Use environment variable for agent name, default to project name
-agent_name = os.environ.get("AGENT_ENGINE_SESSION_NAME", "{{cookiecutter.project_name}}")
-
-# Check if an agent with this name already exists
-existing_agents = list(agent_engines.list(filter=f"display_name={agent_name}"))
+# Check if we should use in-memory session for testing (set USE_IN_MEMORY_SESSION=true for E2E tests)
+use_in_memory_session = os.environ.get("USE_IN_MEMORY_SESSION", "").lower() in (
+    "true",
+    "1",
+    "yes",
+)
 
-if existing_agents:
-    # Use the existing agent
-    agent_engine = existing_agents[0]
+if use_in_memory_session:
+    # Use in-memory session for local testing
+    session_service_uri = None
 else:
-    # Create a new agent if none exists
-    agent_engine = agent_engines.create(display_name=agent_name)
+    # Use environment variable for agent name, default to project name
+    agent_name = os.environ.get(
+        "AGENT_ENGINE_SESSION_NAME", "{{cookiecutter.project_name}}"
+    )
 
-session_service_uri = f"agentengine://{agent_engine.resource_name}"
+    # Check if an agent with this name already exists
+    existing_agents = list(agent_engines.list(filter=f"display_name={agent_name}"))
+
+    if existing_agents:
+        # Use the existing agent
+        agent_engine = existing_agents[0]
+    else:
+        # Create a new agent if none exists
+        agent_engine = agent_engines.create(display_name=agent_name)
+
+    session_service_uri = f"agentengine://{agent_engine.resource_name}"
 {%- else %}
 # In-memory session configuration - no persistent storage
 session_service_uri = None
@@ -363,103 +451,88 @@ app: FastAPI = get_fast_api_app(
     artifact_service_uri=bucket_name,
     allow_origins=allow_origins,
     session_service_uri=session_service_uri,
+    otel_to_cloud=True,
 )
 app.title = "{{cookiecutter.project_name}}"
 app.description = "API for interacting with the Agent {{cookiecutter.project_name}}"
+{%- endif %}
 {% else %}
-import logging
 import os
-from collections.abc import Generator
-
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+
+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, AgentSkill
+from a2a.utils.constants import (
+    AGENT_CARD_WELL_KNOWN_PATH,
+    EXTENDED_AGENT_CARD_PATH,
+)
 from fastapi import FastAPI
-from fastapi.responses import RedirectResponse, StreamingResponse
 from google.cloud import logging as google_cloud_logging
-from langchain_core.runnables import RunnableConfig
-from traceloop.sdk import Instruments, Traceloop
-
-from {{cookiecutter.agent_directory}}.agent import agent
-from {{cookiecutter.agent_directory}}.utils.tracing import CloudTraceLoggingSpanExporter
-from {{cookiecutter.agent_directory}}.utils.typing import Feedback, InputChat, Request, dumps, ensure_valid_config
 
-# Initialize FastAPI app and logging
-app = FastAPI(
-    title="{{cookiecutter.project_name}}",
-    description="API for interacting with the Agent {{cookiecutter.project_name}}",
+from {{cookiecutter.agent_directory}}.agent import root_agent
+from {{cookiecutter.agent_directory}}.app_utils.executor.a2a_agent_executor import (
+    LangGraphAgentExecutor,
 )
-logging_client = google_cloud_logging.Client()
-logger = logging_client.logger(__name__)
+from {{cookiecutter.agent_directory}}.app_utils.telemetry import setup_telemetry
+from {{cookiecutter.agent_directory}}.app_utils.typing import Feedback
 
-# Initialize Telemetry
-try:
-    Traceloop.init(
-        app_name=app.title,
-        disable_batch=False,
-        exporter=CloudTraceLoggingSpanExporter(),
-        instruments={Instruments.LANGCHAIN, Instruments.CREW},
-    )
-except Exception as e:
-    logging.error("Failed to initialize Telemetry: %s", str(e))
+setup_telemetry()
 
+request_handler = DefaultRequestHandler(
+    agent_executor=LangGraphAgentExecutor(graph=root_agent),
+    task_store=InMemoryTaskStore(),
+)
 
-def set_tracing_properties(config: RunnableConfig) -> None:
-    """Sets tracing association properties for the current request.
-
-    Args:
-        config: Optional RunnableConfig containing request metadata
-    """
-    Traceloop.set_association_properties(
-        {
-            "log_type": "tracing",
-            "run_id": str(config.get("run_id", "None")),
-            "user_id": config["metadata"].pop("user_id", "None"),
-            "session_id": config["metadata"].pop("session_id", "None"),
-            "commit_sha": os.environ.get("COMMIT_SHA", "None"),
-        }
-    )
-
-
-def stream_messages(
-    input: InputChat,
-    config: RunnableConfig | None = None,
-) -> Generator[str, None, None]:
-    """Stream events in response to an input chat.
-
-    Args:
-        input: The input chat messages
-        config: Optional configuration for the runnable
-
-    Yields:
-        JSON serialized event data
-    """
-    config = ensure_valid_config(config=config)
-    set_tracing_properties(config)
-    input_dict = input.model_dump()
-
-    for data in agent.stream(input_dict, config=config, stream_mode="messages"):
-        yield dumps(data) + "\n"
-
+A2A_RPC_PATH = "/a2a/{{cookiecutter.agent_directory}}"
 
-# Routes
-@app.get("/", response_class=RedirectResponse)
-def redirect_root_to_docs() -> RedirectResponse:
-    """Redirect the root URL to the API documentation."""
-    return RedirectResponse(url="/docs")
 
+def build_agent_card() -> AgentCard:
+    """Builds the Agent Card for the LangGraph agent."""
+    skill = AgentSkill(
+        id="root_agent-get_weather",
+        name="get_weather",
+        description="Simulates a web search. Use it get information on weather.",
+        tags=["llm", "tools"],
+        examples=["What's the weather in San Francisco?"],
+    )
+    agent_card = AgentCard(
+        name="root_agent",
+        description="API for interacting with the Agent {{cookiecutter.project_name}}",
+        url=f"{os.getenv('APP_URL', 'http://0.0.0.0:8000')}{A2A_RPC_PATH}",
+        version=os.getenv("AGENT_VERSION", "0.1.0"),
+        default_input_modes=["text/plain"],
+        default_output_modes=["text/plain"],
+        capabilities=AgentCapabilities(streaming=True),
+        skills=[skill],
+    )
+    return agent_card
+
+
+@asynccontextmanager
+async def lifespan(app_instance: FastAPI) -> AsyncIterator[None]:
+    agent_card = build_agent_card()
+    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
 
-@app.post("/stream_messages")
-def stream_chat_events(request: Request) -> StreamingResponse:
-    """Stream chat events in response to an input request.
 
-    Args:
-        request: The chat request containing input and config
+# Initialize FastAPI app and logging
+app = FastAPI(
+    title="{{cookiecutter.project_name}}",
+    description="API for interacting with the Agent {{cookiecutter.project_name}}",
+    lifespan=lifespan,
+)
 
-    Returns:
-        Streaming response of chat events
-    """
-    return StreamingResponse(
-        stream_messages(input=request.input, config=request.config),
-        media_type="text/event-stream",
-    )
+logging_client = google_cloud_logging.Client()
+logger = logging_client.logger(__name__)
 {% endif %}
 
 @app.post("/feedback")

agent_starter_pack/frontends/adk_live_react/frontend/package-lock.json

@@ -2594,9 +2594,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -5856,9 +5856,9 @@
       "license": "ISC"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -8283,9 +8283,9 @@
       }
     },
     "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -8702,9 +8702,9 @@
       }
     },
     "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -11520,9 +11520,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
@@ -16402,9 +16402,9 @@
       }
     },
     "node_modules/sucrase/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"

agent_starter_pack/frontends/adk_live_react/frontend/src/multimodal-live-types.ts

@@ -244,7 +244,8 @@ export const isToolCallCancellation = (
 
 // ADK Event types
 export interface AdkEvent {
-  invocation_id: string;
+  user_id: string;
+  session_id: string;
   author: string;
   actions: {
     state_delta: any;
@@ -265,9 +266,10 @@ export interface AdkEvent {
 
 // ADK Event type guards
 export const isAdkEvent = (a: unknown): a is AdkEvent =>
-  typeof a === "object" && 
+  typeof a === "object" &&
   a !== null &&
-  typeof (a as any).invocation_id === "string" &&
+  typeof (a as any).user_id === "string" &&
+  typeof (a as any).session_id === "string" &&
   typeof (a as any).author === "string" &&
   typeof (a as any).actions === "object";