agent-starter-pack 0.11.2__py3-none-any.whl → 0.12.1__py3-none-any.whl

src/deployment_targets/agent_engine/{app → {{cookiecutter.agent_directory}}}/agent_engine_app.py

@@ -30,10 +30,10 @@ from opentelemetry.sdk.trace import TracerProvider, export
 from vertexai import agent_engines
 from vertexai.preview.reasoning_engines import AdkApp
 
-from app.agent import root_agent
-from app.utils.gcs import create_bucket_if_not_exists
-from app.utils.tracing import CloudTraceLoggingSpanExporter
-from app.utils.typing import Feedback
+from {{cookiecutter.agent_directory}}.agent import root_agent
+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
 
 
 class AgentEngineApp(AdkApp):
@@ -95,9 +95,9 @@ from langchain_core.runnables import RunnableConfig
 from traceloop.sdk import Instruments, Traceloop
 from vertexai import agent_engines
 
-from app.utils.gcs import create_bucket_if_not_exists
-from app.utils.tracing import CloudTraceLoggingSpanExporter
-from app.utils.typing import Feedback, InputChat, dumpd, ensure_valid_config
+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, InputChat, dumpd, ensure_valid_config
 
 
 class AgentEngineApp:
@@ -110,7 +110,7 @@ class AgentEngineApp:
     def set_up(self) -> None:
         """The set_up method is used to define application initialization logic"""
         # Lazy import agent at setup time to avoid deployment dependencies
-        from app.agent import agent
+        from {{cookiecutter.agent_directory}}.agent import agent
 
         logging_client = google_cloud_logging.Client(project=self.project_id)
         self.logger = logging_client.logger(__name__)
@@ -206,7 +206,7 @@ def deploy_agent_engine_app(
     location: str,
     agent_name: str | None = None,
     requirements_file: str = ".requirements.txt",
-    extra_packages: list[str] = ["./app"],
+    extra_packages: list[str] = ["./{{cookiecutter.agent_directory}}"],
     env_vars: dict[str, str] = {},
     service_account: str | None = None,
 ) -> agent_engines.AgentEngine:
@@ -305,7 +305,7 @@ if __name__ == "__main__":
     parser.add_argument(
         "--extra-packages",
         nargs="+",
-        default=["./app"],
+        default=["./{{cookiecutter.agent_directory}}"],
         help="Additional packages to include",
     )
     parser.add_argument(

src/deployment_targets/cloud_run/Dockerfile

@@ -20,7 +20,7 @@ WORKDIR /code
 
 COPY ./pyproject.toml ./README.md ./uv.lock* ./
 
-COPY ./app ./app
+COPY ./{{cookiecutter.agent_directory}} ./{{cookiecutter.agent_directory}}
 
 RUN uv sync --frozen
 
@@ -29,4 +29,4 @@ ENV COMMIT_SHA=${COMMIT_SHA}
 
 EXPOSE 8080
 
-CMD ["uv", "run", "uvicorn", "app.server:app", "--host", "0.0.0.0", "--port", "8080"]
+CMD ["uv", "run", "uvicorn", "{{cookiecutter.agent_directory}}.server:app", "--host", "0.0.0.0", "--port", "8080"]

src/deployment_targets/cloud_run/tests/integration/test_server_e2e.py

@@ -54,7 +54,7 @@ def start_server() -> subprocess.Popen[str]:
         sys.executable,
         "-m",
         "uvicorn",
-        "app.server:app",
+        "{{cookiecutter.agent_directory}}.server:app",
         "--host",
         "0.0.0.0",
         "--port",
@@ -129,7 +129,7 @@ def test_chat_stream(server_fixture: subprocess.Popen[str]) -> None:
     user_id = "test_user_123"
     session_data = {"state": {"preferred_language": "English", "visit_count": 1}}
 
-    session_url = f"{BASE_URL}/apps/app/users/{user_id}/sessions"
+    session_url = f"{BASE_URL}/apps/{{cookiecutter.agent_directory}}/users/{user_id}/sessions"
     session_response = requests.post(
         session_url,
         headers=HEADERS,
@@ -142,7 +142,7 @@ def test_chat_stream(server_fixture: subprocess.Popen[str]) -> None:
 
     # Then send chat message
     data = {
-        "app_name": "app",
+        "app_name": "{{cookiecutter.agent_directory}}",
         "user_id": user_id,
         "session_id": session_id,
         "new_message": {

src/deployment_targets/cloud_run/tests/load_test/README.md

@@ -11,7 +11,7 @@ Follow these steps to execute load tests on your local machine:
 Launch the FastAPI server in a separate terminal:
 
 ```bash
-uv run uvicorn app.server:app --host 0.0.0.0 --port 8000 --reload
+uv run uvicorn {{cookiecutter.agent_directory}}.server:app --host 0.0.0.0 --port 8000 --reload
 ```
 
 **2. (In another tab) Create virtual environment with Locust**

src/deployment_targets/cloud_run/tests/load_test/load_test.py

@@ -45,7 +45,7 @@ class ChatStreamUser(HttpUser):
         user_id = f"user_{uuid.uuid4()}"
         session_data = {"state": {"preferred_language": "English", "visit_count": 1}}
 
-        session_url = f"{self.client.base_url}/apps/app/users/{user_id}/sessions"
+        session_url = f"{self.client.base_url}/apps/{{cookiecutter.agent_directory}}/users/{user_id}/sessions"
         session_response = requests.post(
             session_url,
             headers=headers,
@@ -58,7 +58,7 @@ class ChatStreamUser(HttpUser):
 
         # Send chat message
         data = {
-            "app_name": "app",
+            "app_name": "{{cookiecutter.agent_directory}}",
             "user_id": user_id,
             "session_id": session_id,
             "new_message": {

{agents/live_api/app → src/deployment_targets/cloud_run/{{cookiecutter.agent_directory}}}/server.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% if cookiecutter.agent_name == "live_api" %}
 import asyncio
 import json
 import logging
@@ -27,7 +27,7 @@ from google.genai.types import LiveServerToolCall
 from pydantic import BaseModel
 from websockets.exceptions import ConnectionClosedError
 
-from app.agent import MODEL_ID, genai_client, live_connect_config, tool_functions
+from .agent import MODEL_ID, genai_client, live_connect_config, tool_functions
 
 app = FastAPI()
 app.add_middleware(
@@ -197,16 +197,195 @@ class Feedback(BaseModel):
     run_id: str
     user_id: str | None
     log_type: Literal["feedback"] = "feedback"
+{% elif "adk" in cookiecutter.tags %}
+import os
+
+import google.auth
+from fastapi import FastAPI
+from google.adk.cli.fast_api import get_fast_api_app
+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" %}
+from vertexai import agent_engines
+{%- 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
 
+_, project_id = google.auth.default()
+logging_client = google_cloud_logging.Client()
+logger = logging_client.logger(__name__)
+allow_origins = (
+    os.getenv("ALLOW_ORIGINS", "").split(",") if os.getenv("ALLOW_ORIGINS") else None
+)
+
+bucket_name = f"gs://{project_id}-{{cookiecutter.project_name}}-logs-data"
+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)
+
+AGENT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+{%- if cookiecutter.session_type == "alloydb" %}
+# AlloyDB 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")
+
+# 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}"
+{%- 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}"))
+
+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
+{%- endif %}
+
+app: FastAPI = get_fast_api_app(
+    agents_dir=AGENT_DIR,
+    web=True,
+    artifact_service_uri=bucket_name,
+    allow_origins=allow_origins,
+    session_service_uri=session_service_uri,
+)
+app.title = "{{cookiecutter.project_name}}"
+app.description = "API for interacting with the Agent {{cookiecutter.project_name}}"
+{% else %}
+import logging
+import os
+from collections.abc import Generator
+
+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}}",
+)
+logging_client = google_cloud_logging.Client()
+logger = logging_client.logger(__name__)
+
+# 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))
+
+
+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"):  # type: ignore[arg-type]
+        yield dumps(data) + "\n"
+
+
+# Routes
+@app.get("/", response_class=RedirectResponse)
+def redirect_root_to_docs() -> RedirectResponse:
+    """Redirect the root URL to the API documentation."""
+    return RedirectResponse(url="/docs")
+
+
+@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
+
+    Returns:
+        Streaming response of chat events
+    """
+    return StreamingResponse(
+        stream_messages(input=request.input, config=request.config),
+        media_type="text/event-stream",
+    )
+{% endif %}
 
 @app.post("/feedback")
-async def collect_feedback(feedback_dict: Feedback) -> None:
-    """Collect and log feedback."""
-    feedback_data = feedback_dict.model_dump()
-    logger.log_struct(feedback_data, severity="INFO")
+def collect_feedback(feedback: Feedback) -> dict[str, str]:
+    """Collect and log feedback.
+
+    Args:
+        feedback: The feedback data to log
+
+    Returns:
+        Success message
+    """
+    logger.log_struct(feedback.model_dump(), severity="INFO")
+    return {"status": "success"}
 
 
+# Main execution
 if __name__ == "__main__":
     import uvicorn
 
-    uvicorn.run(app, host="0.0.0.0", port=8000, log_level="debug")
+    uvicorn.run(app, host="0.0.0.0", port=8000)

src/frontends/live_api_react/frontend/package-lock.json

@@ -5914,9 +5914,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",
@@ -9051,9 +9051,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"
@@ -16819,9 +16819,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"

src/resources/docs/adk-cheatsheet.md

@@ -1193,7 +1193,7 @@ import asyncio
 
 from google.adk.runners import Runner
 from google.adk.sessions import InMemorySessionService
-from app.agent import root_agent
+from {{cookiecutter.agent_directory}}.agent import root_agent
 from google.genai import types as genai_types
 
 
@@ -1201,10 +1201,10 @@ async def main():
     """Runs the agent with a sample query."""
     session_service = InMemorySessionService()
     await session_service.create_session(
-        app_name="app", user_id="test_user", session_id="test_session"
+        app_name="{{cookiecutter.agent_directory}}", user_id="test_user", session_id="test_session"
     )
     runner = Runner(
-        agent=root_agent, app_name="app", session_service=session_service
+        agent=root_agent, app_name="{{cookiecutter.agent_directory}}", session_service=session_service
     )
     query = "I want a recipe for pancakes"
     async for event in runner.run_async(