issue #57: fix lint error and rework exception structure

app.py

@@ -6,6 +6,7 @@
 import io
 import magic
 import time
+import warnings
 
 import model.inference as inference
 from model import request_function
@@ -19,16 +20,36 @@
 from cryptography.fernet import Fernet
 import azure_storage.azure_storage_api as azure_storage_api
 
-from custom_exceptions import (
-    DeleteDirectoryRequestError,
-    ListDirectoriesRequestError,
-    InferenceRequestError,
-    CreateDirectoryRequestError,
-    ServerError,
-    ImageValidationError,
-    PipelineNotFoundError,
-    ConnectionStringError
-)
+class APIErrors(Exception):
+    pass
+
+
+class DeleteDirectoryRequestError(APIErrors):
+    pass
+
+
+class ListDirectoriesRequestError(APIErrors):
+    pass
+
+
+class InferenceRequestError(APIErrors):
+    pass
+
+
+class CreateDirectoryRequestError(APIErrors):
+    pass
+
+
+class ServerError(APIErrors):
+    pass
+
+
+class ImageValidationError(APIErrors):
+    pass
+
+
+class ImageWarning(UserWarning):
+    pass
 
 load_dotenv()
 connection_string_regex = r"^DefaultEndpointsProtocol=https?;.*;FileEndpoint=https://[a-zA-Z0-9]+\.file\.core\.windows\.net/;$"
@@ -50,7 +71,7 @@
     VALID_DIMENSION = {"width": 1920, "height": 1080}
     VALID_EXTENSION = {"jpeg", "jpg", "png", "gif", "bmp", "tiff", "webp"}
 
-  try:
+try:
     MAX_CONTENT_LENGTH_MEGABYTES = int(os.getenv("NACHET_MAX_CONTENT_LENGTH"))
 except (TypeError, ValueError):
     MAX_CONTENT_LENGTH_MEGABYTES = 16
@@ -232,6 +253,7 @@ async def inference_request():
         print(f"{date.today()} Entering inference request") # TODO: Transform into logging
         data = await request.get_json()
         pipeline_name = data.get("model_name")
+        validator = data.get("validator")
         folder_name = data["folder_name"]
         container_name = data["container_name"]
         imageDims = data["imageDims"]
@@ -243,6 +265,7 @@ async def inference_request():
         print(f"Requested by user: {container_name}") # TODO: Transform into logging
         pipelines_endpoints = CACHE.get("pipelines")
         blob_service_client = app.config.get("BLOB_CLIENT")
+        validators = CACHE.get("validators")
 
         if not (folder_name and container_name and imageDims and image_base64):
             raise InferenceRequestError(
@@ -251,11 +274,11 @@ async def inference_request():
         if not pipelines_endpoints.get(pipeline_name):
             raise InferenceRequestError(f"model {pipeline_name} not found")
 
-        header, encoded_data = image_base64.split(",", 1)
+        _, encoded_data = image_base64.split(",", 1)
 
-        # Validate image header #TODO with magic header
-        if not header.startswith("data:image/"):
-            raise InferenceRequestError("invalid image header")
+        if validator not in validators:
+            warnings.warn("this picture was not validate", ImageWarning)
+            # TODO: implement logic when frontend start returning validators
 
         # Keep track of every output given by the models
         # TODO: add it to CACHE variable
@@ -400,7 +423,7 @@ async def get_pipelines():
         app.config["BLOB_CLIENT"] = await azure_storage_api.get_blob_client(connection_string)
         result_json = await azure_storage_api.get_pipeline_info(app.config["BLOB_CLIENT"], PIPELINE_BLOB_NAME, PIPELINE_VERSION)
         cipher_suite = Fernet(FERNET_KEY)
-    except (ConnectionStringError, PipelineNotFoundError) as error:
+    except (azure_storage_api.AzureAPIErrors) as error:
         print(error)
         raise ServerError("server errror: could not retrieve the pipelines") from error
 

azure_storage/azure_storage_api.py

@@ -1,22 +1,3 @@
-import json
-import uuid
-import hashlib
-import datetime
-from azure.storage.blob import BlobServiceClient, ContainerClient
-from azure.core.exceptions import ResourceNotFoundError
-from custom_exceptions import (
-    ConnectionStringError,
-    MountContainerError,
-    GetBlobError,
-    UploadImageError,
-    UploadInferenceResultError,
-    GetFolderUUIDError,
-    FolderListError,
-    GenerateHashError,
-    CreateDirectoryError,
-    PipelineNotFoundError,
-)
-
 """
 ---- user-container based structure ----- - container name is user id - whenever
 a new user is created, a new container is created with the user uuid - inside
@@ -25,6 +6,56 @@
 date, in the container - inside the project folder, there is an image file and a
 json file with the image inference results
 """
+import json
+import uuid
+import hashlib
+import datetime
+from azure.storage.blob import BlobServiceClient, ContainerClient
+from azure.core.exceptions import ResourceNotFoundError
+
+
+class AzureAPIErrors(Exception):
+    pass
+
+
+class ConnectionStringError(AzureAPIErrors):
+    pass
+
+
+class MountContainerError(AzureAPIErrors):
+    pass
+
+
+class GetBlobError(AzureAPIErrors):
+    pass
+
+
+class UploadImageError(AzureAPIErrors):
+    pass
+
+
+class UploadInferenceResultError(AzureAPIErrors):
+    pass
+
+
+class GetFolderUUIDError(AzureAPIErrors):
+    pass
+
+
+class FolderListError(AzureAPIErrors):
+    pass
+
+
+class GenerateHashError(AzureAPIErrors):
+    pass
+
+
+class CreateDirectoryError(AzureAPIErrors):
+    pass
+
+
+class PipelineNotFoundError(AzureAPIErrors):
+    pass
 
 
 async def generate_hash(image):

custom_exceptions.py

@@ -1,73 +1,10 @@
-class DeleteDirectoryRequestError(Exception):
-    pass
-
-
-class ListDirectoriesRequestError(Exception):
-    pass
-
-
-class InferenceRequestError(Exception):
-    pass
-
-
-class CreateDirectoryRequestError(Exception):
-    pass
-
-
-class GenerateHashError(Exception):
-    pass
-
-
-class MountContainerError(Exception):
-    pass
-
-
 class ContainerNameError(Exception):
     pass
 
 
-class CreateDirectoryError(Exception):
-    pass
-
-
-class ConnectionStringError(Exception):
-    pass
-
-
-class GetBlobError(Exception):
-    pass
-
-
-class UploadImageError(Exception):
-    pass
-
-
-class UploadInferenceResultError(Exception):
-    pass
-
-
-class GetFolderUUIDError(Exception):
-    pass
-
-
-class FolderListError(Exception):
-    pass
-
-
 class ProcessInferenceResultError(Exception):
     pass
 
 
 class ValidateEnvVariablesError(Exception):
     pass
-
-
-class ServerError(Exception):
-    pass
-
-
-class ImageValidationError(Exception):
-    pass
-
-class PipelineNotFoundError(Exception):
-    pass

model/seed_detector.py

@@ -10,7 +10,7 @@
 from PIL import Image
 from collections import namedtuple
 from urllib.request import Request, urlopen, HTTPError
-from custom_exceptions import InferenceRequestError
+from custom_exceptions import ProcessInferenceResultError
 
 def process_image_slicing(image_bytes: bytes, result_json: dict) -> list:
     """
@@ -100,4 +100,4 @@ async def request_inference_from_seed_detector(model: namedtuple, previous_resul
             "images": process_image_slicing(previous_result, result_object)
         }
     except HTTPError as e:
-        raise InferenceRequestError(f"An error occurred while processing the request:\n {str(e)}") from None
+        raise ProcessInferenceResultError(f"An error occurred while processing the request:\n {str(e)}") from None

model/six_seeds.py

@@ -6,7 +6,7 @@
 import json
 from collections import namedtuple
 from urllib.request import Request, urlopen, HTTPError
-from custom_exceptions import InferenceRequestError
+from custom_exceptions import ProcessInferenceResultError
 
 async def request_inference_from_nachet_6seeds(model: namedtuple, previous_result: str):
     """
@@ -48,4 +48,4 @@ async def request_inference_from_nachet_6seeds(model: namedtuple, previous_resul
         return result_object
 
     except HTTPError as e:
-        raise InferenceRequestError(f"An error occurred while processing the request:\n {str(e)}") from None
+        raise ProcessInferenceResultError(f"An error occurred while processing the request:\n {str(e)}") from None

model/swin.py

@@ -7,7 +7,7 @@
 
 from collections import namedtuple
 from urllib.request import Request, urlopen, HTTPError
-from custom_exceptions import InferenceRequestError
+from custom_exceptions import ProcessInferenceResultError
 
 
 def process_swin_result(img_box:dict, results: dict) -> list:
@@ -59,4 +59,4 @@ async def request_inference_from_swin(model: namedtuple, previous_result: list[b
 
         return process_swin_result(previous_result.get("result_json"), results)
     except HTTPError as e:
-       raise InferenceRequestError(f"An error occurred while processing the request:\n {str(e)}") from None
+       raise ProcessInferenceResultError(f"An error occurred while processing the request:\n {str(e)}") from None

model/test.py

@@ -7,7 +7,7 @@
     request_inference_from_nachet_six_seed: Requests inference from the Nachet Six Seed model.
 """
 from collections import namedtuple
-from custom_exceptions import InferenceRequestError
+from custom_exceptions import ProcessInferenceResultError
 
 
 async def request_inference_from_test(model: namedtuple, previous_result: str):
@@ -53,4 +53,4 @@ async def request_inference_from_test(model: namedtuple, previous_result: str):
         ]
 
     except ValueError as error:
-        raise InferenceRequestError("An error occurred while processing the request") from error
+        raise ProcessInferenceResultError("An error occurred while processing the request") from error

tests/test_azure_storage_api.py

@@ -6,16 +6,13 @@
     mount_container,
     get_blob,
     get_pipeline_info,
-    get_blob_client
-)
-
-from azure.core.exceptions import ResourceNotFoundError
-
-from custom_exceptions import (
+    get_blob_client,
     GetBlobError,
     PipelineNotFoundError,
     ConnectionStringError
 )
+from azure.core.exceptions import ResourceNotFoundError
+
 
 class TestGetBlobServiceClient(unittest.TestCase):
     @patch("azure.storage.blob.BlobServiceClient.from_connection_string")