Moved handlers to its own module, updated errors so they can propagate upstream if necessary

src/main.py

@@ -4,13 +4,11 @@ from contextlib import asynccontextmanager
 
 import uvicorn
 from fastapi import APIRouter, Depends, FastAPI, HTTPException, Request
-from fastapi.exceptions import RequestValidationError
-from fastapi.responses import JSONResponse
 from requests.exceptions import RequestException
 
 from auth_config import Caller, auth
 from db_module import close_connection_pool, create_connection_pool, get_db, start_healthcheck_thread
-from feed_errors import FeedCheckFailedError, FeedError
+from feed_errors import FeedCheckFailedError
 from feed_handler import (
 	build_gitea_runner,
 	ensure_feed_exists,
@@ -18,7 +16,8 @@ from feed_handler import (
 	grab_gitea_release_information,
 	grab_royal_road_chapter_information,
 )
-from metrics_server import REQUEST_COUNTER, metrics_api
+from handlers import register_handlers
+from metrics_server import metrics_api
 from models import FeedEntry
 from secret_manager import cleanup_secret_files, get_secret
 from send_notifications import NotificationClient, NotificationError, NotificationUnavailableError
@@ -60,48 +59,7 @@ api = FastAPI(
 		dependencies=[Depends(auth.authenticate)],
 )
 
-@api.exception_handler(FeedError)
-async def feed_error_handler(request: Request, exc: FeedError):
-	return JSONResponse(status_code=exc.status_code, content={"detail":str(exc)})
-
-@api.exception_handler(RequestValidationError)
-async def validation_error_handler(request: Request, exc: RequestValidationError):
-	errors = exc.errors()
-
-	# 1) If one of our own FeedErrors caused it, use its message as is
-	for err in errors:
-		original = (err.get("ctx") or {}).get("error")
-		if isinstance(original, FeedError):
-			return JSONResponse(
-				status_code=original.status_code,
-				content={"detail": str(original)},
-			)
-
-	# 2) Anything else (missing field, bad enum value, bad header): flatten to one string
-	messages = []
-	for err in errors:
-		field = ".".join(str(p) for p in err["loc"] if p != "body")
-		msg = err["msg"].removeprefix("Value error, ")
-		messages.append(f"{field}: {msg}" if field else msg)
-	return JSONResponse(status_code=422, content={"detail": "; ".join(messages)})
-
-@api.middleware("http")
-async def prometheus_middleware(request: Request, call_next):
-	logger.debug(f"[FastAPI] Incoming request: {request.method} {request.url.path}")
-	status = 500
-	try:
-		response = await call_next(request)
-		status = response.status_code
-		logger.debug(f"[FastAPI] Request processed with status {status}")
-	except Exception as e:
-		logger.error(f"[FastAPI] Exception occurred: {e}", exc_info=True)
-		raise
-	finally:
-		REQUEST_COUNTER.labels(request.method, request.url.path, status).inc()
-		logger.debug(f"[FastAPI] Counter incremented for {request.method} {request.url.path} [{status}]")
-	return response
-
-
+register_handlers(api)
 user_router = APIRouter(dependencies=[Depends(auth.require(Caller.GATEWAY))])
 scheduler_router = APIRouter(dependencies=[Depends(auth.require(Caller.SCHEDULER))])