fix: proved request schema of fastapi

app.py

@@ -1,5 +1,7 @@
 from http import HTTPStatus
 import os, io, base64
+from typing import Optional
+from fastapi.responses import JSONResponse
 from typing_extensions import Annotated
 import uvicorn
 import logging
@@ -95,17 +97,17 @@ async def upload(
                 logging.warning(f"Error during upload: {res.error}")
     
     res.data = o.ref
-    return res
+    return res.json()
 
 
-@app.post("/image2")
+@app.post("/image-multiparts")
 async def upload2(
     x_request_user: str = Header(...),
     x_api_key: str = Header(...),
     job_no: Annotated[str, Form()] = '',
     s3key: Annotated[str, Form()] = '',
     ref: Annotated[str, Form()] = '',
-    file: UploadFile = File(...)
+    fileb: Optional[UploadFile] = File(None),
 ):
     res = Response()
     res.data = ref
@@ -117,31 +119,31 @@ async def upload2(
     if not is_valid(x_request_user, x_api_key):
         res.status = HTTPStatus.FORBIDDEN
         res.error = "Invalid credentials"
-        return res
+        return res.json()
 
-    if file is None:
+    if fileb is None:
         res.status = HTTPStatus.BAD_REQUEST
         res.error = "File not found"
-        return res
+        return res.json()
 
-    key = f'{s3key}/{job_no}/{file.filename}'
+    key = f'{s3key}/{job_no}/{fileb.filename}'
     logging.info(f'Key for S3 upload: {key}')
 
     try:
         # Read the file content directly from UploadFile
-        file_content = await file.read()
+        file_content = await fileb.read()
         logging.info(f'File content length: {len(file_content)} bytes')
 
-        # Upload file object to S3
-        # logging.info(f"Uploading file to S3 bucket '{AWS_S3_BUCKET_NAME}' with key '{key}'")
-        res = s3client.upload_file(AWS_S3_BUCKET_NAME, file, key)
-        logging.info("File uploaded successfully")
+        # # Upload file object to S3
+        # # logging.info(f"Uploading file to S3 bucket '{AWS_S3_BUCKET_NAME}' with key '{key}'")
+        # res = s3client.upload_file(AWS_S3_BUCKET_NAME, file, key)
+        # logging.info("File uploaded successfully")
 
     except Exception as e:
         res.error = str(e)
         logging.warning(f"Error during upload: {res.error}")
     
-    return res
+    return res.json()
 
 def is_valid(u, p):
     return u == X_REQUEST_USER and p == X_API_KEY

models/response.py

@@ -1,7 +1,18 @@
 from typing import Any
+from fastapi.responses import JSONResponse
 from pydantic import BaseModel
 
 class Response(BaseModel):
     status: int = 500
     data: Any = None
-    error: Any = None
+    error: Any = None
+
+    def json(self):
+        return JSONResponse(
+            content={
+                "status": self.status,
+                "data": self.data,
+                "error": self.error,
+            }, 
+            status_code=self.status
+        )