llama-deploy-appserver 0.3.0a21__tar.gz → 0.3.0a22__tar.gz

{llama_deploy_appserver-0.3.0a21 → llama_deploy_appserver-0.3.0a22}/PKG-INFO

@@ -1,21 +1,22 @@
 Metadata-Version: 2.3
 Name: llama-deploy-appserver
-Version: 0.3.0a21
+Version: 0.3.0a22
 Summary: Application server components for LlamaDeploy
 Author: Massimiliano Pippi
 Author-email: Massimiliano Pippi <mpippi@gmail.com>
 License: MIT
-Requires-Dist: llama-index-workflows[server]>=1.3.0
+Requires-Dist: llama-index-workflows[server]>=2.0.1
 Requires-Dist: pydantic-settings>=2.10.1
 Requires-Dist: uvicorn>=0.24.0
 Requires-Dist: fastapi>=0.100.0
 Requires-Dist: websockets>=12.0
-Requires-Dist: llama-deploy-core>=0.3.0a21,<0.4.0
+Requires-Dist: llama-deploy-core>=0.3.0a22,<0.4.0
 Requires-Dist: httpx>=0.24.0,<1.0.0
 Requires-Dist: prometheus-fastapi-instrumentator>=7.1.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: structlog>=25.4.0
 Requires-Dist: rich>=14.1.0
+Requires-Dist: pyyaml>=6.0.2
 Requires-Python: >=3.11, <4
 Description-Content-Type: text/markdown
 

{llama_deploy_appserver-0.3.0a21 → llama_deploy_appserver-0.3.0a22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llama-deploy-appserver"
-version = "0.3.0a21"
+version = "0.3.0a22"
 description = "Application server components for LlamaDeploy"
 readme = "README.md"
 license = { text = "MIT" }
@@ -9,17 +9,18 @@ authors = [
 ]
 requires-python = ">=3.11, <4"
 dependencies = [
-    "llama-index-workflows[server]>=1.3.0",
+    "llama-index-workflows[server]>=2.0.1",
     "pydantic-settings>=2.10.1",
     "uvicorn>=0.24.0",
     "fastapi>=0.100.0",
     "websockets>=12.0",
-    "llama-deploy-core>=0.3.0a21,<0.4.0",
+    "llama-deploy-core>=0.3.0a22,<0.4.0",
     "httpx>=0.24.0,<1.0.0",
     "prometheus-fastapi-instrumentator>=7.1.0",
     "packaging>=25.0",
     "structlog>=25.4.0",
     "rich>=14.1.0",
+    "pyyaml>=6.0.2",
 ]
 
 [build-system]

{llama_deploy_appserver-0.3.0a21 → llama_deploy_appserver-0.3.0a22}/src/llama_deploy/appserver/app.py

@@ -7,12 +7,11 @@ import webbrowser
 from contextlib import asynccontextmanager
 from importlib.metadata import version
 from pathlib import Path
-from typing import Any, AsyncGenerator
+from typing import Any, AsyncGenerator, cast
 
 import uvicorn
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.openapi.utils import get_openapi
 from fastapi.responses import RedirectResponse
 from llama_deploy.appserver.configure_logging import (
     add_log_middleware,
@@ -42,7 +41,6 @@ from llama_deploy.appserver.workflow_loader import (
 from llama_deploy.core.config import DEFAULT_DEPLOYMENT_FILE_PATH
 from prometheus_fastapi_instrumentator import Instrumentator
 from starlette.routing import Route
-from starlette.schemas import SchemaGenerator
 from workflows.server import WorkflowServer
 
 from .deployment import Deployment
@@ -95,15 +93,15 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None, Any]:
             # otherwise serve the pre-built if available
             mount_static_files(app, config, settings)
 
-        @app.get(f"/deployments/{config.name}")
-        @app.get(f"/deployments/{config.name}/")
-        @app.get(f"/deployments/{config.name}/ui")
+        @app.get(f"/deployments/{config.name}", include_in_schema=False)
+        @app.get(f"/deployments/{config.name}/", include_in_schema=False)
+        @app.get(f"/deployments/{config.name}/ui", include_in_schema=False)
         def redirect_to_ui() -> RedirectResponse:
             return RedirectResponse(f"/deployments/{config.name}/ui/")
     else:
 
-        @app.get(f"/deployments/{config.name}")
-        @app.get(f"/deployments/{config.name}/")
+        @app.get(f"/deployments/{config.name}", include_in_schema=False)
+        @app.get(f"/deployments/{config.name}/", include_in_schema=False)
         def redirect_to_docs() -> RedirectResponse:
             return RedirectResponse(f"/deployments/{config.name}/docs")
 
@@ -121,38 +119,21 @@ def _setup_openapi(name: str, app: FastAPI, server: WorkflowServer) -> None:
     app_version = version("llama-deploy-appserver")
 
     prefix = f"/deployments/{name}"
-    workflow_routes = [x for x in server.app.routes if isinstance(x, Route)]
-    server_app_routes = []
-    for route in workflow_routes:
-        server_app_routes.append(
-            Route(
-                path=prefix + route.path,
-                endpoint=route.endpoint,
-                methods=route.methods,
-                name=route.name,
-                include_in_schema=route.include_in_schema,
-            )
-        )
 
-    schemas = SchemaGenerator(
-        {"openapi": "3.0.0", "info": {"title": schema_title, "version": app_version}}
-    )
-    starlette_schema = schemas.get_schema(server_app_routes)
+    schema = server.openapi_schema()
+    schema["info"]["title"] = schema_title
+    schema["info"]["version"] = app_version
+    paths = cast(dict, schema["paths"])
+    new_paths = {}
+    for path, methods in list(paths.items()):
+        if "head" in methods:
+            methods.pop("head")
+        new_paths[prefix + path] = methods
+
+    schema["paths"] = new_paths
 
     def custom_openapi():
-        if app.openapi_schema:
-            return app.openapi_schema
-        openapi_schema = get_openapi(
-            title=schema_title,
-            version=app_version,
-            routes=app.routes + server_app_routes,
-        )
-        openapi_schema["paths"] = {
-            **openapi_schema["paths"],
-            **starlette_schema["paths"],
-        }
-        app.openapi_schema = openapi_schema
-        return app.openapi_schema
+        return schema
 
     app.openapi = custom_openapi  # ty: ignore[invalid-assignment] - doesn't like us overwriting the method
 
@@ -165,7 +146,7 @@ app = FastAPI(
     redoc_url=_prefix + "/redoc",
     openapi_url=_prefix + "/openapi.json",
 )
-Instrumentator().instrument(app).expose(app)
+Instrumentator().instrument(app).expose(app, include_in_schema=False)
 
 
 # Configure CORS middleware if the environment variable is set

{llama_deploy_appserver-0.3.0a21 → llama_deploy_appserver-0.3.0a22}/src/llama_deploy/appserver/routers/deployments.py

@@ -26,7 +26,7 @@ def create_base_router(name: str) -> APIRouter:
         prefix="",
     )
 
-    @base_router.get("/", response_model=None)
+    @base_router.get("/", response_model=None, include_in_schema=False)
     async def root() -> RedirectResponse:
         return RedirectResponse(f"/deployments/{name}/")
 
@@ -38,7 +38,7 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
         prefix="/deployments",
     )
 
-    @deployments_router.post(f"/{name}/tasks/run")
+    @deployments_router.post(f"/{name}/tasks/run", include_in_schema=False)
     async def create_deployment_task(
         task_definition: TaskDefinition,
         session_id: str | None = None,
@@ -63,7 +63,7 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
         )
         return JSONResponse(result)
 
-    @deployments_router.post(f"/{name}/tasks/create")
+    @deployments_router.post(f"/{name}/tasks/create", include_in_schema=False)
     async def create_deployment_task_nowait(
         task_definition: TaskDefinition,
         session_id: str | None = None,
@@ -90,7 +90,9 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
 
         return task_definition
 
-    @deployments_router.post(f"/{name}/tasks/{{task_id}}/events")
+    @deployments_router.post(
+        f"/{name}/tasks/{{task_id}}/events", include_in_schema=False
+    )
     async def send_event(
         task_id: str,
         session_id: str,
@@ -104,7 +106,9 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
 
         return event_def
 
-    @deployments_router.get(f"/{name}/tasks/{{task_id}}/events")
+    @deployments_router.get(
+        f"/{name}/tasks/{{task_id}}/events", include_in_schema=False
+    )
     async def get_events(
         session_id: str,
         task_id: str,
@@ -141,7 +145,9 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
             media_type="application/x-ndjson",
         )
 
-    @deployments_router.get(f"/{name}/tasks/{{task_id}}/results")
+    @deployments_router.get(
+        f"/{name}/tasks/{{task_id}}/results", include_in_schema=False
+    )
     async def get_task_result(
         session_id: str,
         task_id: str,
@@ -151,7 +157,7 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
         handler = deployment._handlers[task_id]
         return TaskResult(task_id=task_id, history=[], result=await handler)
 
-    @deployments_router.get(f"/{name}/tasks")
+    @deployments_router.get(f"/{name}/tasks", include_in_schema=False)
     async def get_tasks() -> list[TaskDefinition]:
         """Get all the tasks from all the sessions in a given deployment."""
 
@@ -168,13 +174,13 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
 
         return tasks
 
-    @deployments_router.get(f"/{name}/sessions")
+    @deployments_router.get(f"/{name}/sessions", include_in_schema=False)
     async def get_sessions() -> 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(f"/{name}/sessions/{{session_id}}")
+    @deployments_router.get(f"/{name}/sessions/{{session_id}}", include_in_schema=False)
     async def get_session(
         session_id: str,
     ) -> SessionDefinition:
@@ -182,7 +188,7 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
 
         return SessionDefinition(session_id=session_id)
 
-    @deployments_router.post(f"/{name}/sessions/create")
+    @deployments_router.post(f"/{name}/sessions/create", include_in_schema=False)
     async def create_session() -> SessionDefinition:
         """Create a new session for a deployment."""
 
@@ -197,7 +203,7 @@ def create_deployments_router(name: str, deployment: Deployment) -> APIRouter:
 
         return SessionDefinition(session_id=session_id)
 
-    @deployments_router.post(f"/{name}/sessions/delete")
+    @deployments_router.post(f"/{name}/sessions/delete", include_in_schema=False)
     async def delete_session(
         session_id: str,
     ) -> None:

{llama_deploy_appserver-0.3.0a21 → llama_deploy_appserver-0.3.0a22}/src/llama_deploy/appserver/routers/status.py

@@ -6,7 +6,7 @@ health_router = APIRouter(
 )
 
 
-@health_router.get("")
+@health_router.get("", include_in_schema=False)
 async def health() -> Status:
     return Status(
         status=StatusEnum.HEALTHY,