whatever

app/api/v1/media_convert.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import asyncio
 import time
-from pathlib import Path
 from typing import Annotated, Any, Dict, Optional, Tuple
 from urllib.parse import urlparse
 
@@ -14,7 +13,7 @@ from fastapi import (
     HTTPException,
     UploadFile,
 )
-from fastapi.responses import FileResponse, JSONResponse
+from fastapi.responses import JSONResponse
 from pydantic import ValidationError
 
 from app.config import get_settings
@@ -42,12 +41,6 @@ _logger = get_logger(__name__)
 _settings = get_settings()
 _MAX_UPLOAD_BYTES = _settings.max_upload_bytes
 
-_MIME_BY_EXT = {
-    ".jpg": "image/jpeg", ".jpeg": "image/jpeg",
-    ".png": "image/png", ".webp": "image/webp",
-    ".bmp": "image/bmp", ".gif": "image/gif", ".tiff": "image/tiff",
-}
-
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -279,22 +272,6 @@ async def convert_image_url(body: MediaImageUrlRequest):
     return _ok_response(start, data)
 
 
-@router.get(
-    "/media-convert/files/{job_id}/{filename}",
-    summary="Download a converted file (local mode)",
-    responses={404: {"description": "File not found"}},
-)
-async def download_file(job_id: str, filename: str):
-    root = Path(_settings.media_output_dir).resolve()
-    if job_id != Path(job_id).name or filename != Path(filename).name:
-        raise HTTPException(status_code=404, detail={"success": False, "message": "File not found."})
-    path = (root / job_id / "out" / filename).resolve()
-    if not str(path).startswith(str(root)) or not path.is_file():
-        raise HTTPException(status_code=404, detail={"success": False, "message": "File not found."})
-    media_type = _MIME_BY_EXT.get(path.suffix.lower(), "application/octet-stream")
-    return FileResponse(path, media_type=media_type, filename=filename)
-
-
 @router.get(
     "/media-convert/formats",
     response_model=MediaFormatsResponse,

app/models/schemas.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import re
 from enum import Enum
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Dict, List, Literal, Optional, Union
 
 from pydantic import BaseModel, Field, field_validator, model_validator
 
@@ -1208,8 +1208,11 @@ class GCSBaseCredentialsRequest(BaseModel):
     credentials: Optional[Dict[str, Any]] = Field(
         None, description="Service account key as an inline JSON object"
     )
-    credentials_json: Optional[str] = Field(
-        None, description="Service account key as a raw JSON string"
+    credentials_json: Optional[Union[str, Dict[str, Any]]] = Field(
+        None, description=(
+            "Service account key as a JSON object OR a raw JSON string. "
+            "Passing it as a JSON object avoids escaping newlines/quotes."
+        )
     )
     credentials_url: Optional[str] = Field(
         None, description="Publicly reachable URL that returns the service account JSON"
@@ -1560,8 +1563,7 @@ class MediaOutputFile(BaseModel):
     size_bytes: int = Field(0, description="File size in bytes")
     format: str = Field(..., description="Output format (e.g. JPEG, PNG)")
     content_type: str = Field("application/octet-stream", description="MIME type of the output")
-    url: str = Field(..., description="Download URL (Supabase signed URL or local endpoint)")
-    base64: Optional[str] = Field(None, description="Base64-encoded file bytes (local mode only)")
+    url: str = Field(..., description="Download URL: Supabase signed URL (storage mode) or data URL (local/fallback mode)")
 
 
 class MediaUploadSummary(BaseModel):

app/services/media_conversion_service.py

@@ -11,10 +11,12 @@ converter and the reference PDF-conversion service.
 
 Output files are written to a per-job directory and then either:
 
-  * exposed through local download endpoints (``SUPABASE_UPLOAD_ENABLED=false``),
+  * returned as data URLs (``SUPABASE_UPLOAD_ENABLED=false``),
     or
   * uploaded to Supabase Storage with 24-hour signed URLs
     (``SUPABASE_UPLOAD_ENABLED=true``) and a warning stating the expiry.
+
+If a Supabase upload fails, the file falls back to a data URL.
 """
 
 from __future__ import annotations
@@ -564,7 +566,7 @@ class MediaConversionService:
                 if isinstance(outcome, Exception):
                     failed += 1
                     _logger.error("storage_upload_failed job=%s file=%s error=%s", job_id, f.filename, outcome)
-                    f.url = f"/api/v1/media-convert/files/{job_id}/{f.filename}"
+                    f.url = f"data:{f.content_type};base64," + base64.b64encode((out_dir / f.filename).read_bytes()).decode("ascii")
 
             expires_at = iso_expiry(ttl)
             warning = (
@@ -585,11 +587,7 @@ class MediaConversionService:
             )
 
         for f in files:
-            f.url = f"/api/v1/media-convert/files/{job_id}/{f.filename}"
-            try:
-                f.base64 = base64.b64encode((out_dir / f.filename).read_bytes()).decode("ascii")
-            except OSError:
-                f.base64 = None
+            f.url = f"data:{f.content_type};base64," + base64.b64encode((out_dir / f.filename).read_bytes()).decode("ascii")
         return MediaUploadSummary(mode="local", total_files=len(files), failed_uploads=0), None