llama-deploy-appserver 0.2.7a1__py3-none-any.whl → 0.3.0a1__py3-none-any.whl

llama_deploy/appserver/routers/deployments.py

@@ -1,433 +1,210 @@
 import asyncio
 import json
-import logging
-from typing import Annotated, AsyncGenerator, List, Optional
+from typing import AsyncGenerator
 
-import httpx
-import websockets
 from fastapi import (
     APIRouter,
-    Depends,
-    File,
     HTTPException,
-    Request,
-    UploadFile,
-    WebSocket,
 )
-from fastapi.responses import JSONResponse, StreamingResponse
+from fastapi.responses import JSONResponse, RedirectResponse, StreamingResponse
 from llama_deploy.appserver.deployment import Deployment
-from llama_deploy.appserver.deployment_config_parser import DeploymentConfig
-from llama_deploy.appserver.server import manager
 from llama_deploy.appserver.types import (
-    DeploymentDefinition,
     EventDefinition,
     SessionDefinition,
     TaskDefinition,
     TaskResult,
     generate_id,
 )
-from starlette.background import BackgroundTask
+from llama_deploy.appserver.workflow_loader import DEFAULT_SERVICE_ID
 from workflows import Context
 from workflows.context import JsonSerializer
 from workflows.handler import WorkflowHandler
 
-deployments_router = APIRouter(
-    prefix="/deployments",
-)
-logger = logging.getLogger(__name__)
-
-
-def deployment(deployment_name: str) -> Deployment:
-    """FastAPI dependency to retrieve a Deployment instance"""
-    deployment = manager.get_deployment(deployment_name)
-    if deployment is None:
-        raise HTTPException(status_code=404, detail="Deployment not found")
-    return deployment
-
-
-@deployments_router.get("/")
-async def read_deployments() -> list[DeploymentDefinition]:
-    """Returns a list of active deployments."""
-    return [DeploymentDefinition(name=k) for k in manager._deployments.keys()]
-
-
-@deployments_router.get("/{deployment_name}")
-async def read_deployment(
-    deployment: Annotated[Deployment, Depends(deployment)],
-) -> DeploymentDefinition:
-    """Returns the details of a specific deployment."""
-
-    return DeploymentDefinition(name=deployment.name)
-
 
-@deployments_router.post("/create")
-async def create_deployment(
-    base_path: str = ".",
-    config_file: UploadFile = File(...),
-    reload: bool = False,
-    local: bool = False,
-) -> DeploymentDefinition:
-    """Creates a new deployment by uploading a configuration file."""
-    config = DeploymentConfig.from_yaml_bytes(await config_file.read())
-    await manager.deploy(config, base_path, reload, local)
+def create_base_router(name: str) -> APIRouter:
+    base_router = APIRouter(
+        prefix="",
+    )
 
-    return DeploymentDefinition(name=config.name)
+    @base_router.get("/", response_model=None)
+    async def root() -> RedirectResponse:
+        return RedirectResponse(f"/deployments/{name}/ui")
 
+    return base_router
 
-@deployments_router.post("/{deployment_name}/tasks/run")
-async def create_deployment_task(
-    deployment: Annotated[Deployment, Depends(deployment)],
-    task_definition: TaskDefinition,
-    session_id: str | None = None,
-) -> JSONResponse:
-    """Create a task for the deployment, wait for result and delete associated session."""
 
-    service_id = task_definition.service_id or deployment.default_service
-    if service_id is None:
-        raise HTTPException(
-            status_code=400,
-            detail="Service is None and deployment has no default service",
-        )
+def create_deployments_router(
+    name: str, deployment: Deployment, serve_static: bool = False
+) -> APIRouter:
+    deployments_router = APIRouter(
+        prefix="/deployments",
+    )
 
-    if service_id not in deployment.service_names:
-        raise HTTPException(
-            status_code=404,
-            detail=f"Service '{task_definition.service_id}' not found in deployment 'deployment_name'",
-        )
+    @deployments_router.post(f"/{name}/tasks/run")
+    async def create_deployment_task(
+        task_definition: TaskDefinition,
+        session_id: str | None = None,
+    ) -> JSONResponse:
+        """Create a task for the deployment, wait for result and delete associated session."""
+
+        service_id = task_definition.service_id or DEFAULT_SERVICE_ID
+
+        if service_id not in deployment.service_names:
+            raise HTTPException(
+                status_code=404,
+                detail=(
+                    "There is no default service for this deployment. service_id is required"
+                    if not task_definition.service_id
+                    else f"Service '{service_id}' not found in deployment 'deployment_name'"
+                ),
+            )
 
-    run_kwargs = json.loads(task_definition.input) if task_definition.input else {}
-    result = await deployment.run_workflow(
-        service_id=service_id, session_id=session_id, **run_kwargs
-    )
-    return JSONResponse(result)
-
-
-@deployments_router.post("/{deployment_name}/tasks/create")
-async def create_deployment_task_nowait(
-    deployment: Annotated[Deployment, Depends(deployment)],
-    task_definition: TaskDefinition,
-    session_id: str | None = None,
-) -> TaskDefinition:
-    """Create a task for the deployment but don't wait for result."""
-    service_id = task_definition.service_id or deployment.default_service
-    if service_id is None:
-        raise HTTPException(
-            status_code=400,
-            detail="Service is None and deployment has no default service",
+        run_kwargs = json.loads(task_definition.input) if task_definition.input else {}
+        result = await deployment.run_workflow(
+            service_id=service_id, session_id=session_id, **run_kwargs
         )
+        return JSONResponse(result)
+
+    @deployments_router.post(f"/{name}/tasks/create")
+    async def create_deployment_task_nowait(
+        task_definition: TaskDefinition,
+        session_id: str | None = None,
+    ) -> TaskDefinition:
+        """Create a task for the deployment but don't wait for result."""
+        service_id = task_definition.service_id or DEFAULT_SERVICE_ID
+        if service_id not in deployment.service_names:
+            raise HTTPException(
+                status_code=404,
+                detail=(
+                    "There is no default service for this deployment. service_id is required"
+                    if not task_definition.service_id
+                    else f"Service '{service_id}' not found in deployment 'deployment_name'"
+                ),
+            )
 
-    if service_id not in deployment.service_names:
-        raise HTTPException(
-            status_code=404,
-            detail=f"Service '{task_definition.service_id}' not found in deployment 'deployment_name'",
+        run_kwargs = json.loads(task_definition.input) if task_definition.input else {}
+        handler_id, session_id = deployment.run_workflow_no_wait(
+            service_id=service_id, session_id=session_id, **run_kwargs
         )
 
-    run_kwargs = json.loads(task_definition.input) if task_definition.input else {}
-    handler_id, session_id = deployment.run_workflow_no_wait(
-        service_id=service_id, session_id=session_id, **run_kwargs
-    )
-
-    task_definition.session_id = session_id
-    task_definition.task_id = handler_id
+        task_definition.session_id = session_id
+        task_definition.task_id = handler_id
 
-    return task_definition
+        return task_definition
 
-
-@deployments_router.post("/{deployment_name}/tasks/{task_id}/events")
-async def send_event(
-    deployment: Annotated[Deployment, Depends(deployment)],
-    task_id: str,
-    session_id: str,
-    event_def: EventDefinition,
-) -> EventDefinition:
-    """Send a human response event to a service for a specific task and session."""
-    ctx = deployment._contexts[session_id]
-    serializer = JsonSerializer()
-    event = serializer.deserialize(event_def.event_obj_str)
-    ctx.send_event(event)
-
-    return event_def
-
-
-@deployments_router.get("/{deployment_name}/tasks/{task_id}/events")
-async def get_events(
-    deployment: Annotated[Deployment, Depends(deployment)],
-    session_id: str,
-    task_id: str,
-    raw_event: bool = False,
-) -> StreamingResponse:
-    """
-    Get the stream of events from a given task and session.
-
-    Args:
-        raw_event (bool, default=False): Whether to return the raw event object
-            or just the event data.
-    """
-
-    async def event_stream(handler: WorkflowHandler) -> AsyncGenerator[str, None]:
+    @deployments_router.post(f"/{name}/tasks/{{task_id}}/events")
+    async def send_event(
+        task_id: str,
+        session_id: str,
+        event_def: EventDefinition,
+    ) -> EventDefinition:
+        """Send a human response event to a service for a specific task and session."""
+        ctx = deployment._contexts[session_id]
         serializer = JsonSerializer()
-        # this will hang indefinitely if done and queue is empty. Bail
-        if (
-            handler.is_done()
-            and handler.ctx is not None
-            and handler.ctx.streaming_queue.empty()
-        ):
-            return
-        async for event in handler.stream_events():
-            data = json.loads(serializer.serialize(event))
-            if raw_event:
-                yield json.dumps(data) + "\n"
-            else:
-                yield json.dumps(data.get("value")) + "\n"
-            await asyncio.sleep(0.01)
-        await handler
-
-    return StreamingResponse(
-        event_stream(deployment._handlers[task_id]),
-        media_type="application/x-ndjson",
-    )
+        event = serializer.deserialize(event_def.event_obj_str)
+        ctx.send_event(event)
+
+        return event_def
+
+    @deployments_router.get(f"/{name}/tasks/{{task_id}}/events")
+    async def get_events(
+        session_id: str,
+        task_id: str,
+        raw_event: bool = False,
+    ) -> StreamingResponse:
+        """
+        Get the stream of events from a given task and session.
+
+        Args:
+            raw_event (bool, default=False): Whether to return the raw event object
+                or just the event data.
+        """
+
+        async def event_stream(handler: WorkflowHandler) -> AsyncGenerator[str, None]:
+            serializer = JsonSerializer()
+            # this will hang indefinitely if done and queue is empty. Bail
+            if (
+                handler.is_done()
+                and handler.ctx is not None
+                and handler.ctx.streaming_queue.empty()
+            ):
+                return
+            async for event in handler.stream_events():
+                data = json.loads(serializer.serialize(event))
+                if raw_event:
+                    yield json.dumps(data) + "\n"
+                else:
+                    yield json.dumps(data.get("value")) + "\n"
+                await asyncio.sleep(0.01)
+            await handler
 
-
-@deployments_router.get("/{deployment_name}/tasks/{task_id}/results")
-async def get_task_result(
-    deployment: Annotated[Deployment, Depends(deployment)],
-    session_id: str,
-    task_id: str,
-) -> TaskResult | None:
-    """Get the task result associated with a task and session."""
-
-    handler = deployment._handlers[task_id]
-    return TaskResult(task_id=task_id, history=[], result=await handler)
-
-
-@deployments_router.get("/{deployment_name}/tasks")
-async def get_tasks(
-    deployment: Annotated[Deployment, Depends(deployment)],
-) -> list[TaskDefinition]:
-    """Get all the tasks from all the sessions in a given deployment."""
-
-    tasks: list[TaskDefinition] = []
-    for task_id, handler in deployment._handlers.items():
-        if handler.is_done():
-            continue
-        tasks.append(
-            TaskDefinition(
-                task_id=task_id,
-                input=deployment._handler_inputs[task_id],
-            )
+        return StreamingResponse(
+            event_stream(deployment._handlers[task_id]),
+            media_type="application/x-ndjson",
         )
 
-    return tasks
-
-
-@deployments_router.get("/{deployment_name}/sessions")
-async def get_sessions(
-    deployment: Annotated[Deployment, Depends(deployment)],
-) -> list[SessionDefinition]:
-    """Get the active sessions in a deployment and service."""
-
-    return [SessionDefinition(session_id=k) for k in deployment._contexts.keys()]
-
-
-@deployments_router.get("/{deployment_name}/sessions/{session_id}")
-async def get_session(
-    deployment: Annotated[Deployment, Depends(deployment)], session_id: str
-) -> SessionDefinition:
-    """Get the definition of a session by ID."""
-
-    return SessionDefinition(session_id=session_id)
-
-
-@deployments_router.post("/{deployment_name}/sessions/create")
-async def create_session(
-    deployment: Annotated[Deployment, Depends(deployment)],
-) -> SessionDefinition:
-    """Create a new session for a deployment."""
-
-    workflow = deployment._workflow_services[deployment.default_service]
-    session_id = generate_id()
-    deployment._contexts[session_id] = Context(workflow)
-
-    return SessionDefinition(session_id=session_id)
-
-
-@deployments_router.post("/{deployment_name}/sessions/delete")
-async def delete_session(
-    deployment: Annotated[Deployment, Depends(deployment)], session_id: str
-) -> None:
-    """Get the active sessions in a deployment and service."""
-
-    deployment._contexts.pop(session_id)
-
-
-async def _ws_proxy(ws: WebSocket, upstream_url: str) -> None:
-    """Proxy WebSocket connection to upstream server."""
-    await ws.accept()
-
-    # Forward most headers except WebSocket-specific ones
-    header_blacklist = {
-        "host",
-        "connection",
-        "upgrade",
-        "sec-websocket-key",
-        "sec-websocket-version",
-        "sec-websocket-extensions",
-    }
-    hdrs = [(k, v) for k, v in ws.headers.items() if k.lower() not in header_blacklist]
-
-    try:
-        # Parse subprotocols if present
-        subprotocols: Optional[List[websockets.Subprotocol]] = None
-        if "sec-websocket-protocol" in ws.headers:
-            # Parse comma-separated subprotocols
-            subprotocols = [
-                websockets.Subprotocol(p.strip())
-                for p in ws.headers["sec-websocket-protocol"].split(",")
-            ]
-
-        # Open upstream WebSocket connection
-        async with websockets.connect(
-            upstream_url,
-            additional_headers=hdrs,
-            subprotocols=subprotocols,
-            open_timeout=None,
-            ping_interval=None,
-        ) as upstream:
-
-            async def client_to_upstream() -> None:
-                try:
-                    while True:
-                        msg = await ws.receive()
-                        if msg["type"] == "websocket.receive":
-                            if "text" in msg:
-                                await upstream.send(msg["text"])
-                            elif "bytes" in msg:
-                                await upstream.send(msg["bytes"])
-                        elif msg["type"] == "websocket.disconnect":
-                            break
-                except Exception as e:
-                    logger.debug(f"Client to upstream connection ended: {e}")
-
-            async def upstream_to_client() -> None:
-                try:
-                    async for message in upstream:
-                        if isinstance(message, str):
-                            await ws.send_text(message)
-                        else:
-                            await ws.send_bytes(message)
-                except Exception as e:
-                    logger.debug(f"Upstream to client connection ended: {e}")
-
-            # Pump both directions concurrently
-            await asyncio.gather(
-                client_to_upstream(), upstream_to_client(), return_exceptions=True
+    @deployments_router.get(f"/{name}/tasks/{{task_id}}/results")
+    async def get_task_result(
+        session_id: str,
+        task_id: str,
+    ) -> TaskResult | None:
+        """Get the task result associated with a task and session."""
+
+        handler = deployment._handlers[task_id]
+        return TaskResult(task_id=task_id, history=[], result=await handler)
+
+    @deployments_router.get(f"/{name}/tasks")
+    async def get_tasks() -> list[TaskDefinition]:
+        """Get all the tasks from all the sessions in a given deployment."""
+
+        tasks: list[TaskDefinition] = []
+        for task_id, handler in deployment._handlers.items():
+            if handler.is_done():
+                continue
+            tasks.append(
+                TaskDefinition(
+                    task_id=task_id,
+                    input=deployment._handler_inputs[task_id],
+                )
             )
 
-    except Exception as e:
-        logger.error(f"WebSocket proxy error: {e}")
-    finally:
-        try:
-            await ws.close()
-        except Exception as e:
-            logger.debug(f"Error closing client connection: {e}")
-
-
-@deployments_router.websocket("/{deployment_name}/ui/{path:path}")
-@deployments_router.websocket("/{deployment_name}/ui")
-async def websocket_proxy(
-    websocket: WebSocket,
-    deployment: Annotated[Deployment, Depends(deployment)],
-    path: str | None = None,
-) -> None:
-    if deployment._config.ui is None:
-        raise HTTPException(status_code=404, detail="Deployment has no ui configured")
+        return tasks
 
-    # Build the upstream WebSocket URL using FastAPI's extracted path parameter
-    slash_path = f"/{path}" if path else ""
-    upstream_path = f"/deployments/{deployment.name}/ui{slash_path}"
+    @deployments_router.get(f"/{name}/sessions")
+    async def get_sessions() -> list[SessionDefinition]:
+        """Get the active sessions in a deployment and service."""
 
-    # Convert to WebSocket URL
-    upstream_url = f"ws://localhost:{deployment._config.ui.port}{upstream_path}"
-    if websocket.url.query:
-        upstream_url += f"?{websocket.url.query}"
+        return [SessionDefinition(session_id=k) for k in deployment._contexts.keys()]
 
-    logger.debug(f"Proxying WebSocket {websocket.url} -> {upstream_url}")
+    @deployments_router.get(f"/{name}/sessions/{{session_id}}")
+    async def get_session(
+        session_id: str,
+    ) -> SessionDefinition:
+        """Get the definition of a session by ID."""
 
-    await _ws_proxy(websocket, upstream_url)
+        return SessionDefinition(session_id=session_id)
 
+    @deployments_router.post(f"/{name}/sessions/create")
+    async def create_session() -> SessionDefinition:
+        """Create a new session for a deployment."""
 
-@deployments_router.api_route(
-    "/{deployment_name}/ui/{path:path}",
-    methods=["GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD", "PATCH"],
-)
-@deployments_router.api_route(
-    "/{deployment_name}/ui",
-    methods=["GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD", "PATCH"],
-)
-async def proxy(
-    request: Request,
-    deployment: Annotated[Deployment, Depends(deployment)],
-    path: str | None = None,
-) -> StreamingResponse:
-    if deployment._config.ui is None:
-        raise HTTPException(status_code=404, detail="Deployment has no ui configured")
-
-    # Build the upstream URL using FastAPI's extracted path parameter
-    slash_path = f"/{path}" if path else ""
-    upstream_path = f"/deployments/{deployment.name}/ui{slash_path}"
-
-    upstream_url = httpx.URL(
-        f"http://localhost:{deployment._config.ui.port}{upstream_path}"
-    ).copy_with(params=request.query_params)
-
-    # Debug logging
-    logger.debug(f"Proxying {request.method} {request.url} -> {upstream_url}")
-
-    # Strip hop-by-hop headers + host
-    hop_by_hop = {
-        "connection",
-        "keep-alive",
-        "proxy-authenticate",
-        "proxy-authorization",
-        "te",  # codespell:ignore
-        "trailers",
-        "transfer-encoding",
-        "upgrade",
-        "host",
-    }
-    headers = {k: v for k, v in request.headers.items() if k.lower() not in hop_by_hop}
-
-    try:
-        client = httpx.AsyncClient(timeout=None)
-
-        req = client.build_request(
-            request.method,
-            upstream_url,
-            headers=headers,
-            content=request.stream(),  # stream uploads
-        )
-        upstream = await client.send(req, stream=True)
+        workflow = deployment.default_service
+        if workflow is None:
+            raise HTTPException(
+                status_code=400,
+                detail="There is no default service for this deployment",
+            )
+        session_id = generate_id()
+        deployment._contexts[session_id] = Context(workflow)
 
-        resp_headers = {
-            k: v for k, v in upstream.headers.items() if k.lower() not in hop_by_hop
-        }
+        return SessionDefinition(session_id=session_id)
 
-        # Close client when upstream response is done
-        async def cleanup() -> None:
-            await upstream.aclose()
-            await client.aclose()
+    @deployments_router.post(f"/{name}/sessions/delete")
+    async def delete_session(
+        session_id: str,
+    ) -> None:
+        """Get the active sessions in a deployment and service."""
 
-        return StreamingResponse(
-            upstream.aiter_raw(),  # stream downloads
-            status_code=upstream.status_code,
-            headers=resp_headers,
-            background=BackgroundTask(cleanup),  # tidy up when finished
-        )
+        deployment._contexts.pop(session_id)
 
-    except httpx.ConnectError:
-        raise HTTPException(status_code=502, detail="Upstream server unavailable")
-    except httpx.TimeoutException:
-        raise HTTPException(status_code=504, detail="Upstream server timeout")
-    except Exception as e:
-        logger.error(f"Proxy error: {e}")
-        raise HTTPException(status_code=502, detail="Proxy error")
+    return deployments_router

llama_deploy/appserver/routers/status.py

@@ -1,40 +1,13 @@
-import httpx
 from fastapi import APIRouter
-from fastapi.exceptions import HTTPException
-from fastapi.responses import PlainTextResponse
-from llama_deploy.appserver.server import manager
-from llama_deploy.appserver.settings import settings
 from llama_deploy.appserver.types import Status, StatusEnum
 
-status_router = APIRouter(
-    prefix="/status",
+health_router = APIRouter(
+    prefix="/health",
 )
 
 
-@status_router.get("/")
-async def status() -> Status:
+@health_router.get("")
+async def health() -> Status:
     return Status(
         status=StatusEnum.HEALTHY,
-        max_deployments=manager._max_deployments,
-        deployments=list(manager._deployments.keys()),
-        status_message="",
     )
-
-
-@status_router.get("/metrics")
-async def metrics() -> PlainTextResponse:
-    """Proxies the Prometheus metrics endpoint through the API Server.
-
-    This endpoint is mostly used in serverless environments where the LlamaDeploy
-    container cannot expose more than one port (e.g. Knative, Google Cloud Run).
-    If Prometheus is not enabled, this endpoint returns an empty HTTP-204 response.
-    """
-    if not settings.prometheus_enabled:
-        return PlainTextResponse(status_code=204)
-
-    try:
-        async with httpx.AsyncClient() as client:
-            response = await client.get(f"http://127.0.0.1:{settings.prometheus_port}/")
-            return PlainTextResponse(content=response.text)
-    except httpx.RequestError as exc:
-        raise HTTPException(status_code=500, detail=str(exc))