fix: request body does not match the expected schema

.dockerignore

@@ -1,2 +1,4 @@
 __pycache__
+env
+
 .env

.gitignore

@@ -1,2 +1,4 @@
 __pycache__
+env
+
 .env

apis/common.py

@@ -0,0 +1,42 @@
+import base64
+from datetime import datetime
+from io import BytesIO
+import os
+from typing import Union
+from PIL import Image
+
+class Common:
+    def __init__(self, is_debug=False) -> None:
+        self.is_debug = is_debug
+        self.image_color_mode = 'RGB'
+        self.image_format_png = 'PNG'
+        self.image_format_jpeg = 'JPEG'
+
+    def today(self):
+        return datetime.today().strftime('%Y%m%d%H%M%S')
+    
+    def create_dir_not_exist(self, target_dir:str):
+        if not os.path.exists(target_dir):
+            os.mkdir(target_dir) 
+    
+    def base64str_to_image(self, content:Union[bytes, None]):
+        return Image.open(BytesIO(base64.b64decode(content))).convert(self.image_color_mode)
+    
+    def base64str_to_bytes(self, content:str):
+        orig_image = Image.open(BytesIO(base64.b64decode(content))).convert('RGB')
+        
+        img_bytes = BytesIO()
+        # image.save expects a file-like as a argument
+        orig_image.save(img_bytes, format=self.image_format_jpeg)
+        # Turn the BytesIO object back into a bytes object
+        img_bytes = img_bytes.getvalue()
+        return img_bytes
+
+    def imagearray_to_image(self, image_arr):
+        return Image.fromarray(image_arr)
+    
+    def image_to_base64str(self, image:Image):
+        buffered = BytesIO()
+        image.save(buffered, format=self.image_format_png)
+        img_base64str = base64.b64encode(buffered.getvalue())
+        return img_base64str

apis/s3.py

@@ -28,7 +28,6 @@ class S3:
 
     # Function to upload file to S3
     def upload_file(self, bucket_name, file, name):
-        print(f'Uploading "{name}"...')
         return self.client.upload_fileobj(file, bucket_name, name)
 
     # Function to delete a file from S3
@@ -48,3 +47,4 @@ class S3:
     # Function to get image URLs
     def get_files_urls(self, bucket_name, file_keys):
         return [self.client.generate_presigned_url('get_object', Params={'Bucket': bucket_name, 'Key': key}) for key in file_keys]
+        

app.py

@@ -1,11 +1,11 @@
-import os
+import os, io, base64
 import uvicorn
-from typing import Annotated
+import logging
 from fastapi import FastAPI, Header
 from apis.s3 import S3
 from dotenv import load_dotenv
 from models.image_object import ImageObject
-from models.common_headers import CommonHeaders
+from apis.common import Common
 from fastapi.openapi.docs import (
     get_redoc_html,
     get_swagger_ui_html,
@@ -15,11 +15,17 @@ from fastapi.openapi.docs import (
 load_dotenv()
 IS_DEV = os.environ.get('ENV', 'DEV') != 'PROD'
 AWS_S3_BUCKET_NAME = os.getenv('AWS_S3_BUCKET_NAME', '')
-USERNAME = os.environ.get('USERNAME')
-PASSWORD = os.environ.get('PASSWORD')
+X_REQUEST_USER = os.environ.get('X_REQUEST_USER')
+X_API_KEY = os.environ.get('X_API_KEY')
 
 s3client = S3()
+common = Common()
 app = FastAPI(docs_url=None, redoc_url=None)
+logging.basicConfig(
+    level=logging.DEBUG if IS_DEV else logging.INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+    datefmt='%Y-%m-%d %H:%M:%S'
+)
 
 @app.get("/docs", include_in_schema=False)
 async def custom_swagger_ui_html():
@@ -55,26 +61,37 @@ def healthcheck():
 @app.post("/image")
 async def upload(
     o: ImageObject,
-    headers: Annotated[CommonHeaders, Header()]
+    x_request_user: str = Header(...),
+    x_api_key: str = Header(...)
 ):
     res = None
-    if headers.x_request_user == USERNAME \
-       and headers.x_api_key == PASSWORD:
+    logging.info("--------------------------------")
+    logging.info("Received request to upload image")
+    if is_valid(x_request_user, x_api_key):
         key = f'{o.key}/{o.job_no}/{o.name}'
-        res = s3client.upload_file(AWS_S3_BUCKET_NAME, o.content, key)
-    return res
+        logging.info(f'Key for S3 upload: {key}')
+        if o.content is not None:
+            try:
+                # Decode base64 content
+                decoded_content = base64.b64decode(o.content)
+                logging.info(f'Decoded content length: {len(decoded_content)} bytes')
+
+                # Wrap bytes in BytesIO to create a file-like object
+                file_obj = io.BytesIO(decoded_content)
+
+                # 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_obj, key)
+                logging.info("File uploaded successfully")
+
+            except Exception as e:
+                logging.warning(f"Error during upload: {e}")
+                return {"error": "Failed to upload content"}
+    
+    return {"result": res}
 
-# # Create a Gradio interface
-# with gr.Blocks() as demo:
-#     pass
-   
-# def auth(username, password):
-#     u = os.environ.get('USERNAME')
-#     p = os.environ.get('PASSWORD')
-#     return (username == u and password == p)
- 
-# # Launch the Gradio app
-# demo.launch(auth=auth if not IS_DEV else None)
+def is_valid(u, p):
+    return u == X_REQUEST_USER and p == X_API_KEY
 
 if __name__=='__main__':
     uvicorn.run('app:app', host='0.0.0.0', port=7860, reload=True)