fix-tts

src/server/main.py

@@ -476,30 +476,39 @@ async def extract_text(
         logger.error(f"Invalid JSON response from external API: {str(e)}")
         raise HTTPException(status_code=500, detail="Invalid response format from external API")
 
+from fastapi import FastAPI, File, HTTPException, Request, UploadFile, Form
+from pydantic import ValidationError
+import json
+
 @app.post("/v1/visual_query", 
           response_model=VisualQueryResponse,
           summary="Visual Query with Image",
-          description="Process a visual query with a text query, image, and language codes provided in a JSON body named 'data'.",
+          description="Process a visual query with a text query, image, and language codes provided in a JSON body named 'data'. The JSON must contain 'query', 'src_lang', and 'tgt_lang' fields.",
           tags=["Chat"],
           responses={
               200: {"description": "Query response", "model": VisualQueryResponse},
               400: {"description": "Invalid query or language codes"},
-              422: {"description": "Validation error in request body"},
+              422: {"description": "Validation error in request body or invalid JSON"},
               504: {"description": "Visual query service timeout"}
           })
 async def visual_query(
     request: Request,
-    data: str = Form(..., description="JSON string containing query, src_lang, and tgt_lang"),
+    data: str = Form(..., description="JSON string containing query, src_lang, and tgt_lang (e.g., {\"query\": \"describe the image\", \"src_lang\": \"en\", \"tgt_lang\": \"en\"})"),
     file: UploadFile = File(..., description="Image file to analyze")
 ):
     # Parse and validate JSON data
     try:
-        import json
-        visual_query_request = VisualQueryRequest.parse_raw(data)
+        visual_query_request = VisualQueryRequest.model_validate_json(data)
         logger.info(f"Received visual query JSON: {data}")
+    except json.JSONDecodeError as e:
+        logger.error(f"Invalid JSON format: {str(e)}")
+        raise HTTPException(status_code=422, detail=f"Invalid JSON format: {str(e)}")
+    except ValidationError as e:
+        logger.error(f"Validation error in JSON data: {str(e)}")
+        raise HTTPException(status_code=422, detail=f"Invalid data: {str(e)}")
     except Exception as e:
-        logger.error(f"Failed to parse JSON data: {str(e)}")
-        raise HTTPException(status_code=422, detail=f"Invalid JSON data: {str(e)}")
+        logger.error(f"Unexpected error parsing JSON data: {str(e)}")
+        raise HTTPException(status_code=422, detail=f"Failed to parse JSON data: {str(e)}")
     
     if not visual_query_request.query.strip():
         raise HTTPException(status_code=400, detail="Query cannot be empty")
@@ -550,7 +559,7 @@ async def visual_query(
     except ValueError as e:
         logger.error(f"Invalid JSON response: {str(e)}")
         raise HTTPException(status_code=500, detail="Invalid response format from visual query service")
-
+    
 from enum import Enum
 
 class SupportedLanguage(str, Enum):