chris/OSVauco
1
0
Fork 0
Code Issues 1 Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: auto-create session if not found in /run endpoint

Browse Source
This commit is contained in:
chrischristiansen-glitch 2026-05-23 20:33:39 +02:00
parent 1122af66d0
commit 7e1af38474
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
agents/core-logic/app.py
View File

@ -1,7 +1,5 @@
# agents/core-logic/app.py # agents/core-logic/app.py
# OSVauco-NMTMD-GCOS — FastAPI HTTP entrypoint for Cloud Run # OSVauco-NMTMD-GCOS — FastAPI HTTP entrypoint for Cloud Run
# Wraps the ADK root_agent with a /run endpoint and a /health check.
# Usage: uvicorn app:app --host 0.0.0.0 --port 8080
import os import os
import logging import logging
@ -14,7 +12,6 @@ from pydantic import BaseModel
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# ── ADK imports ───────────────────────────────────────────────
try: try:
from google.adk.runners import Runner from google.adk.runners import Runner
from google.adk.sessions import InMemorySessionService from google.adk.sessions import InMemorySessionService
@ -24,13 +21,10 @@ except ImportError as e:
logger.error(f"Failed to import ADK dependencies: {e}") logger.error(f"Failed to import ADK dependencies: {e}")
raise raise
# ── Session service (in-memory for stateless Cloud Run) ───────────────
session_service = InMemorySessionService() session_service = InMemorySessionService()
APP_NAME = os.environ.get("CLOUD_RUN_SERVICE", "gcp-orchestrator") APP_NAME = os.environ.get("CLOUD_RUN_SERVICE", "gcp-orchestrator")
# ── Lifespan ───────────────────────────────────────────────────
@asynccontextmanager @asynccontextmanager
async def lifespan(app: FastAPI): async def lifespan(app: FastAPI):
logger.info(f"OSVauco agent '{APP_NAME}' starting up") logger.info(f"OSVauco agent '{APP_NAME}' starting up")
@ -38,7 +32,6 @@ async def lifespan(app: FastAPI):
logger.info(f"OSVauco agent '{APP_NAME}' shutting down") logger.info(f"OSVauco agent '{APP_NAME}' shutting down")
# ── App ────────────────────────────────────────────────────────
app = FastAPI( app = FastAPI(
title="OSVauco GCP Agent", title="OSVauco GCP Agent",
description="ADK-based multi-agent orchestrator on Cloud Run", description="ADK-based multi-agent orchestrator on Cloud Run",
@ -47,7 +40,6 @@ app = FastAPI(
) )
# ── Models ─────────────────────────────────────────────────────
class RunRequest(BaseModel): class RunRequest(BaseModel):
user_id: str user_id: str
session_id: str session_id: str
@ -60,34 +52,27 @@ class RunResponse(BaseModel):
response: str response: str
# ── Routes ─────────────────────────────────────────────────────
@app.get("/health") @app.get("/health")
async def health(): async def health():
"""Cloud Run health check endpoint."""
return JSONResponse({"status": "ok", "service": APP_NAME}) return JSONResponse({"status": "ok", "service": APP_NAME})
@app.post("/run", response_model=RunResponse) @app.post("/run", response_model=RunResponse)
async def run(req: RunRequest): async def run(req: RunRequest):
"""
Run the OSVauco ADK agent for a single turn.
Creates (or reuses) a session, sends the user message,
and returns the final agent response.
"""
try: try:
# Create or reuse session # Always ensure session exists — create if missing
try: session = session_service.get_session(
session = await session_service.get_session( app_name=APP_NAME,
app_name=APP_NAME, user_id=req.user_id,
user_id=req.user_id, session_id=req.session_id,
session_id=req.session_id, )
) if session is None:
except Exception: session = session_service.create_session(
session = await session_service.create_session(
app_name=APP_NAME, app_name=APP_NAME,
user_id=req.user_id, user_id=req.user_id,
session_id=req.session_id, session_id=req.session_id,
) )
logger.info(f"Created new session: {req.session_id}")
runner = Runner( runner = Runner(
agent=root_agent, agent=root_agent,
@ -112,7 +97,7 @@ async def run(req: RunRequest):
final_response += part.text final_response += part.text
logger.info( logger.info(
f"[{req.user_id}/{req.session_id}] Agent response length: {len(final_response)}" f"[{req.user_id}/{req.session_id}] Response length: {len(final_response)}"
) )
return RunResponse( return RunResponse(
user_id=req.user_id, user_id=req.user_id,