feat: fastapi app mit lifespan, webhook handler und /health
This commit is contained in:
41
app/main.py
Normal file
41
app/main.py
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import logging
|
||||||
|
from contextlib import asynccontextmanager
|
||||||
|
|
||||||
|
from fastapi import FastAPI
|
||||||
|
from qdrant_client import QdrantClient
|
||||||
|
|
||||||
|
from app.config import get_settings
|
||||||
|
from app.ingest.embedder import embedding_dimension
|
||||||
|
from app.logging_setup import setup_logging
|
||||||
|
from app.qdrant_store import ensure_collection
|
||||||
|
from app.webhook.handler import router as webhook_router
|
||||||
|
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
async def _startup_ensure_collection() -> None:
|
||||||
|
settings = get_settings()
|
||||||
|
dim = await embedding_dimension(settings.ollama_embed_model)
|
||||||
|
client = QdrantClient(url=settings.qdrant_url)
|
||||||
|
ensure_collection(client, settings.qdrant_collection, vector_size=dim)
|
||||||
|
logger.info(
|
||||||
|
"qdrant collection ready",
|
||||||
|
extra={"event": "startup", "collection": settings.qdrant_collection, "dim": dim},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@asynccontextmanager
|
||||||
|
async def lifespan(app: FastAPI):
|
||||||
|
setup_logging(get_settings().log_level)
|
||||||
|
await _startup_ensure_collection()
|
||||||
|
yield
|
||||||
|
|
||||||
|
|
||||||
|
app = FastAPI(title="rag-ingestor", lifespan=lifespan)
|
||||||
|
app.include_router(webhook_router)
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/health")
|
||||||
|
async def health():
|
||||||
|
return {"status": "ok"}
|
||||||
20
app/webhook/handler.py
Normal file
20
app/webhook/handler.py
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
from fastapi import APIRouter, BackgroundTasks, Header, status
|
||||||
|
|
||||||
|
from app.config import get_settings
|
||||||
|
from app.ingest.pipeline import process_file
|
||||||
|
from app.webhook.auth import verify_secret
|
||||||
|
from app.webhook.models import NextcloudEvent
|
||||||
|
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/webhook", status_code=status.HTTP_202_ACCEPTED)
|
||||||
|
async def webhook(
|
||||||
|
event: NextcloudEvent,
|
||||||
|
background: BackgroundTasks,
|
||||||
|
x_webhook_secret: str | None = Header(default=None),
|
||||||
|
):
|
||||||
|
verify_secret(x_webhook_secret, get_settings().webhook_secret)
|
||||||
|
background.add_task(process_file, event.file_path, event.event_type)
|
||||||
|
return {"status": "accepted"}
|
||||||
@@ -38,3 +38,82 @@ def test_verify_secret_missing_fail():
|
|||||||
with pytest.raises(HTTPException) as exc_info:
|
with pytest.raises(HTTPException) as exc_info:
|
||||||
verify_secret(provided=None, expected="abc")
|
verify_secret(provided=None, expected="abc")
|
||||||
assert exc_info.value.status_code == 401
|
assert exc_info.value.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
from unittest.mock import AsyncMock, MagicMock, patch
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
|
||||||
|
def _make_app(monkeypatch):
|
||||||
|
"""Build the FastAPI app with all external clients stubbed."""
|
||||||
|
monkeypatch.setenv("NEXTCLOUD_WEBDAV_URL", "http://nc")
|
||||||
|
monkeypatch.setenv("NEXTCLOUD_USER", "u")
|
||||||
|
monkeypatch.setenv("NEXTCLOUD_APP_PASSWORD", "p")
|
||||||
|
monkeypatch.setenv("OLLAMA_URL", "http://ollama")
|
||||||
|
monkeypatch.setenv("OLLAMA_EMBED_MODEL", "m")
|
||||||
|
monkeypatch.setenv("QDRANT_URL", "http://qdrant")
|
||||||
|
monkeypatch.setenv("QDRANT_COLLECTION", "rag_test")
|
||||||
|
monkeypatch.setenv("WEBHOOK_SECRET", "abc")
|
||||||
|
|
||||||
|
# Reset cached settings/clients
|
||||||
|
from app.config import get_settings
|
||||||
|
get_settings.cache_clear()
|
||||||
|
import app.ingest.pipeline as pipe
|
||||||
|
pipe._qdrant_client.cache_clear()
|
||||||
|
|
||||||
|
# Stub the lifespan startup so it doesn't try to talk to real services
|
||||||
|
monkeypatch.setattr("app.main._startup_ensure_collection", AsyncMock())
|
||||||
|
|
||||||
|
from app.main import app
|
||||||
|
return app
|
||||||
|
|
||||||
|
|
||||||
|
def test_health_endpoint_no_auth(monkeypatch):
|
||||||
|
app = _make_app(monkeypatch)
|
||||||
|
with TestClient(app) as client:
|
||||||
|
r = client.get("/health")
|
||||||
|
assert r.status_code == 200
|
||||||
|
assert r.json() == {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
def test_webhook_rejects_missing_secret(monkeypatch):
|
||||||
|
app = _make_app(monkeypatch)
|
||||||
|
with TestClient(app) as client:
|
||||||
|
r = client.post("/webhook", json={
|
||||||
|
"event_type": "created",
|
||||||
|
"file_path": "a/b.pdf",
|
||||||
|
"file_name": "b.pdf",
|
||||||
|
})
|
||||||
|
assert r.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
def test_webhook_rejects_wrong_secret(monkeypatch):
|
||||||
|
app = _make_app(monkeypatch)
|
||||||
|
with TestClient(app) as client:
|
||||||
|
r = client.post(
|
||||||
|
"/webhook",
|
||||||
|
json={"event_type": "created", "file_path": "a/b.pdf", "file_name": "b.pdf"},
|
||||||
|
headers={"X-Webhook-Secret": "wrong"},
|
||||||
|
)
|
||||||
|
assert r.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
def test_webhook_dispatches_background_task(monkeypatch):
|
||||||
|
app = _make_app(monkeypatch)
|
||||||
|
|
||||||
|
process_mock = AsyncMock()
|
||||||
|
monkeypatch.setattr("app.webhook.handler.process_file", process_mock)
|
||||||
|
|
||||||
|
with TestClient(app) as client:
|
||||||
|
r = client.post(
|
||||||
|
"/webhook",
|
||||||
|
json={
|
||||||
|
"event_type": "created",
|
||||||
|
"file_path": "Documents/THB/Studium/2.Semester/Databases/x.pdf",
|
||||||
|
"file_name": "x.pdf",
|
||||||
|
},
|
||||||
|
headers={"X-Webhook-Secret": "abc"},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert r.status_code == 202
|
||||||
|
process_mock.assert_awaited_once()
|
||||||
|
|||||||
Reference in New Issue
Block a user