Mount v2 of the application

Author: Kilo59

app/__init__.py

@@ -1,27 +1,4 @@
-from flask import Flask
-from flask_cors import CORS
-
 # See PEP396.
 __version__ = '2.0'
 
-def create_app():
-    """
-    Construct the core application.
-    """
-    # Create flask app with CORS enabled.
-    app = Flask(__name__)
-    CORS(app)
-
-    # Set app config from settings.
-    app.config.from_pyfile('config/settings.py');
-
-    with app.app_context():
-        # Import routes.
-        from . import routes
-
-        # Register api endpoints.
-        app.register_blueprint(routes.api_v1)
-        app.register_blueprint(routes.api_v2)
-
-        # Return created app.
-        return app
+from .core import create_app

app/core.py

@@ -0,0 +1,24 @@
+from flask import Flask
+from flask_cors import CORS
+
+def create_app():
+    """
+    Construct the core application.
+    """
+    # Create flask app with CORS enabled.
+    app = Flask(__name__)
+    CORS(app)
+
+    # Set app config from settings.
+    app.config.from_pyfile('config/settings.py');
+
+    with app.app_context():
+        # Import routes.
+        from . import routes
+
+        # Register api endpoints.
+        app.register_blueprint(routes.api_v1)
+        app.register_blueprint(routes.api_v2)
+
+        # Return created app.
+        return app

app/main.py

@@ -10,8 +10,10 @@
 import fastapi
 import pydantic
 import uvicorn
+from fastapi.middleware.wsgi import WSGIMiddleware
 
 from .data import data_source
+from .core import create_app
 
 # #################################
 # Models
@@ -153,6 +155,8 @@ def get_all_locations(
 def get_location_by_id(request: fastapi.Request, id: int, timelines: int = 1):
     return {"location": request.state.source.get(id).serialize(timelines)}
 
+# mount the existing Flask app to /v2
+APP.mount("/v2", WSGIMiddleware(create_app()))
 
 if __name__ == "__main__":
     uvicorn.run(