Put app/routers/assets.py

app/routers/assets.py

@@ -1,16 +1,4 @@
-"""POST /assets — extract image/video/audio/svg-icon/font assets from a URL.
-
-Returns structured error responses for all failure modes:
-- Bad request (400) — missing/invalid url
-- SSRF block (403) — blocked host
-- Not HTML (415) — wrong content-type
-- Fetch error (502) — network or redirect failure
-- Page too large (413) — exceeds size cap
-- Server error (500) — unexpected
-
-All errors are logged at INFO+ level and returned as JSON with
-the request ID attached.
-"""
+"""POST /assets — extract image/video/audio/svg-icon/font assets from a URL."""
 
 import logging
 import uuid
@@ -19,12 +7,12 @@ from fastapi import APIRouter, HTTPException, status
 
 from app.schemas import AssetExtractRequest, AssetExtractResponse, ErrorResponse
 from app.services.asset_service import AssetExtractError, extract_assets
+from app.services.fetcher import FetchError
 
 router = APIRouter()
 
 
 def _log_request(req: AssetExtractRequest, phase: str, **extra) -> None:
-    """Log a structured request entry."""
     logger = logging.getLogger(__name__)
     logger.info("request phase=%s id=%s url=%r groups=%r enrich=%s include_data_uris=%s extra=%r",
                 phase, req._request_id or "?", req.url, req.groups, req.enrich,
@@ -32,7 +20,6 @@ def _log_request(req: AssetExtractRequest, phase: str, **extra) -> None:
 
 
 def _log_response(req: AssetExtractRequest, status_code: int, phase: str, **extra) -> None:
-    """Log a structured response entry."""
     logger = logging.getLogger(__name__)
     logger.info("response phase=%s status=%s id=%s url=%r extra=%r",
                 phase, status_code, req._request_id or "?", req.url, extra)
@@ -43,7 +30,6 @@ async def extract_assets_endpoint(req: AssetExtractRequest) -> AssetExtractRespo
     """Extract assets from a URL, grouped by category."""
     _log_request(req, "start")
     req_id = req._request_id or str(uuid.uuid4())
-    _request_id = req_id
     try:
         result = await extract_assets(
             url=req.url,
@@ -55,6 +41,9 @@ async def extract_assets_endpoint(req: AssetExtractRequest) -> AssetExtractRespo
         return result
     except AssetExtractError as exc:
         _log_response(req, 502, "asset_extract_error", detail=str(exc))
+        stages = None
+        if hasattr(exc, '__cause__') and isinstance(exc.__cause__, FetchError):
+            stages = exc.__cause__.stages
         raise HTTPException(
             status_code=status.HTTP_502_BAD_GATEWAY,
             detail=ErrorResponse(
@@ -62,7 +51,8 @@ async def extract_assets_endpoint(req: AssetExtractRequest) -> AssetExtractRespo
                 code=502,
                 detail=str(exc),
                 request_id=req_id,
-            ).model_dump_json(),
+                stages=stages,
+            ).model_dump(),
         ) from exc
     except Exception as exc:
         _log_response(req, 500, "unexpected_error", detail=str(exc))
@@ -73,10 +63,10 @@ async def extract_assets_endpoint(req: AssetExtractRequest) -> AssetExtractRespo
                 code=500,
                 detail=str(exc),
                 request_id=req_id,
-            ).model_dump_json(),
+            ).model_dump(),
         ) from exc
 
 
 @router.get("/health")
 async def health_check() -> dict[str, str]:
-    return {"status": "ok", "endpoint": "/assets"}
+    return {"status": "ok", "endpoint": "/assets"}