Moved flask app out of global space, moved routes to a class, updated…

backend/api/app.py

@@ -4,9 +4,25 @@
 
 from flask import Flask
 from flask_cors import CORS
-import config
 
-app = Flask(__name__)
-CORS(app)
+from typing import Callable, Optional
 
-from api import routes
+
+class FlaskApp:
+
+    _flask_app = None
+
+    def get_flask_app(self) -> Flask:
+        if self._flask_app is None:
+            self._flask_app = Flask(__name__)
+            CORS(self._flask_app)
+
+        return self._flask_app
+
+    def add_api_route(self, rule: str, endpoint_function: Callable, methods: Optional[list[str]] = None):
+        flask_app = self.get_flask_app()
+
+        if methods:
+            flask_app.add_url_rule(rule, view_func=endpoint_function, methods=methods)
+        else:
+            flask_app.add_url_rule(rule, view_func=endpoint_function)

backend/api/core.py

@@ -4,18 +4,26 @@
 """
 import logging
 
-import api.routes
-from config import microlabConfig as config
-from api.app import app
+from api.routes import RouteManager
+from api.server import WaitressAPIServer
+from api.app import FlaskApp
 from microlab.interface import MicrolabInterface
 
 
-def runFlask(in_queue, out_queue):
+def run_flask(in_queue, out_queue):
 
     logging.info("### STARTING API ###")
     werkzeugLogger = logging.getLogger("werkzeug")
     # suppresses logging of individual requests to endpoints. Prevents log spam
     werkzeugLogger.setLevel(logging.WARNING)
 
-    api.routes.microlabInterface = MicrolabInterface(in_queue, out_queue)
-    app.run(host="0.0.0.0", port=config.apiPort)
+    microlab_interface = MicrolabInterface(in_queue, out_queue)
+
+    flask_app = FlaskApp()
+
+    # This handles the routes and registering them to the flask_app instance
+    RouteManager(flask_app, microlab_interface)
+
+    server = WaitressAPIServer(flask_app.get_flask_app())
+    server.set_microlab_interface(microlab_interface)
+    server.run()