Move routes to folder

Author: Patrick Kuehn

autofocus/predict/app/app.py

@@ -1,60 +1,14 @@
-import time
+from flask import Flask
 
-from flask import Flask, jsonify, request
+from .routes.predict import predict_route
+from .routes.predict_zip import predict_zip_route
 
-from .models.File import File
-from .models.ZipArchive import ZipArchive
-from .validation.predict import validate_predict_request
-from .validation.predict_zip import validate_predict_zip_request
-from .validation.validation import abort_with_errors
-from .prediction.prediction import predict, predict_multiple
-
-
-# We are going to upload the files to the server as part of the request, so set tmp folder here.
-UPLOAD_FOLDER = "/tmp/"
 
 app = Flask(__name__)
 app.config.from_object(__name__)
-app.config["UPLOAD_FOLDER"] = UPLOAD_FOLDER
-
-
-@app.route("/predict", methods=["POST"])
-def classify_single():
-    """Classify a single image"""
-    # Validate request
-    validate_predict_request(request)
-
-    # Get File object
-    file = File(request.files["file"], app.config["UPLOAD_FOLDER"])
-
-    # Return ziped probabilities
-    return jsonify(predict(file))
-
-
-@app.route("/predict_zip", methods=["POST"])
-def classify_zip():
-    """Classify all images from a zip file"""
-    # Validate request
-    validate_predict_zip_request(request)
-
-    file = ZipArchive(request.files["file"], app.config["UPLOAD_FOLDER"])
-    if not file.hasImages():
-        error = {
-            "file": "No image files detected in the zip file."
-        }
-        abort_with_errors(error)
-
-    # Extract files
-    files = file.extractAll(app.config["UPLOAD_FOLDER"], file.listAllImages())
-
-    # Make prediction
-    return jsonify(predict_multiple(files))
-
 
-@app.route("/hello")
-def hello():
-    """Just a test endpoint to make sure server is running"""
-    return "Hey there!\n"
+app.register_blueprint(predict_route)
+app.register_blueprint(predict_zip_route)
 
 
 if __name__ == "__main__":

autofocus/predict/app/models/File.py

@@ -3,6 +3,8 @@
 from werkzeug import secure_filename
 
 
+UPLOAD_FOLDER = "/tmp/"
+
 class File:
     """
     Store a file and remove it upon destruction
@@ -12,7 +14,7 @@ class File:
         name: Secured filename (Can be empty)
     """
 
-    def __init__(self, file=None, upload_path=None):
+    def __init__(self, file=None, upload_path=UPLOAD_FOLDER):
         """
         Constructor of File
 
@@ -22,6 +24,7 @@ def __init__(self, file=None, upload_path=None):
             file: Uploaded file object from flask
             upload_path: The path to upload the file
         """
+        self.upload_folder = upload_path
         if file:
             self.setFromUploadedFile(file, upload_path)
 

autofocus/predict/app/models/ZipArchive.py

@@ -1,7 +1,7 @@
 import os
 from zipfile import ZipFile
 
-from .File import File
+from .File import File, UPLOAD_FOLDER
 from ..validation.validation import allowed_file, ALLOWED_IMAGE_FILES
 
 
@@ -16,7 +16,7 @@ class ZipArchive:
         zip: Opened zip file
     """
 
-    def __init__(self, file, upload_folder=None):
+    def __init__(self, file):
         """
         Constructor of ZipFile
 
@@ -26,7 +26,7 @@ def __init__(self, file, upload_folder=None):
             file: Uploaded file from flask
             upload_folder: The folder to save the zip file
         """
-        self.file = File(file, upload_folder)
+        self.file = File(file)
         self.zip = ZipFile(self.file.getPath())
 
     def listFiles(self):
@@ -64,7 +64,7 @@ def hasImages(self, extensions=ALLOWED_IMAGE_FILES):
         """
         return len(self.listAllImages(extensions)) > 0
 
-    def extractAll(self, path=None, members=None):
+    def extractAll(self, path=UPLOAD_FOLDER, members=None):
         """
         Extract all the given files
 

autofocus/predict/app/routes/__init__.py

@@ -0,0 +1,25 @@
+import time
+
+from flask import Blueprint, jsonify, request
+
+from ..models.File import File
+from ..models.ZipArchive import ZipArchive
+from ..validation.predict import validate_predict_request
+from ..validation.predict_zip import validate_predict_zip_request
+from ..validation.validation import abort_with_errors
+from ..prediction.prediction import predict, predict_multiple
+
+
+predict_route = Blueprint("predict", __name__)
+
+@predict_route.route("/predict", methods=["POST"])
+def classify_single():
+    """Classify a single image"""
+    # Validate request
+    validate_predict_request(request)
+
+    # Get File object
+    file = File(request.files["file"])
+
+    # Return ziped probabilities
+    return jsonify(predict(file))

autofocus/predict/app/routes/predict.py

@@ -0,0 +1,32 @@
+import time
+
+from flask import Blueprint, jsonify, request
+
+from ..models.File import File
+from ..models.ZipArchive import ZipArchive
+from ..validation.predict import validate_predict_request
+from ..validation.predict_zip import validate_predict_zip_request
+from ..validation.validation import abort_with_errors
+from ..prediction.prediction import predict, predict_multiple
+
+
+predict_zip_route = Blueprint("predict_zip", __name__)
+
+@predict_zip_route.route("/predict_zip", methods=["POST"])
+def classify_zip():
+    """Classify all images from a zip file"""
+    # Validate request
+    validate_predict_zip_request(request)
+
+    file = ZipArchive(request.files["file"])
+    if not file.hasImages():
+        error = {
+            "file": "No image files detected in the zip file."
+        }
+        abort_with_errors(error)
+
+    # Extract files
+    files = file.extractAll(members=file.listAllImages())
+
+    # Make prediction
+    return jsonify(predict_multiple(files))