Feat/refacto web server

pyproject.toml

@@ -2,7 +2,6 @@
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
-
 [project]
 name = "OpenGeodeWeb-Back"
 version = "0.0.0"
@@ -21,6 +20,9 @@ classifiers = [
 "Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Back"
 "Bug Tracker" = "https://github.com/Geode-solutions/OpenGeodeWeb-Back/issues"
 
+[project.scripts]
+opengeodeweb-back = "opengeodeweb_back.app:run_server"
+
 [tool.setuptools.dynamic]
 dependencies = { file = ["requirements.txt"] }
 

requirements.in

@@ -7,4 +7,5 @@ geode-common==33.11.0
 geode-viewables==3.3.0
 flask[async]==3.1.2
 flask-cors==6.0.1
+werkzeug==3.1.3
 flask-sqlalchemy==3.1.1

requirements.txt

@@ -2,55 +2,39 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=./requirements.txt ./requirements-internal.in ./requirements.in
+#    pip-compile --output-file=./requirements.txt --pre ./requirements.in
 #
-asgiref~=3.9
+asgiref~=3.10
     # via flask
 blinker~=1.9
-    # via
-    #   flask
-    #   opengeodeweb-microservice
+    # via flask
 click~=8.3
-    # via
-    #   flask
-    #   opengeodeweb-microservice
-fastjsonschema~=2.21
-    # via opengeodeweb-microservice
+    # via flask
 flask[async]~=3.1
     # via
     #   -r requirements.in
     #   flask-cors
     #   flask-sqlalchemy
-    #   opengeodeweb-microservice
 flask-cors==6.0.1
     # via -r requirements.in
 flask-sqlalchemy==3.1.1
-    # via
-    #   -r requirements.in
-    #   opengeodeweb-microservice
+    # via -r requirements.in
 geode-common==33.11.0
     # via
     #   -r requirements.in
     #   geode-viewables
 geode-viewables==3.3.0
     # via -r requirements.in
 greenlet~=3.2
-    # via
-    #   opengeodeweb-microservice
-    #   sqlalchemy
+    # via sqlalchemy
 itsdangerous~=2.2
-    # via
-    #   flask
-    #   opengeodeweb-microservice
+    # via flask
 jinja2~=3.1
-    # via
-    #   flask
-    #   opengeodeweb-microservice
+    # via flask
 markupsafe~=3.0
     # via
     #   flask
     #   jinja2
-    #   opengeodeweb-microservice
     #   werkzeug
 opengeode-core==15.27.4
     # via
@@ -75,18 +59,12 @@ opengeode-io==7.4.0
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeodeweb-microservice~=1.0,>=1.0.3
-    # via -r requirements-internal.in
 sqlalchemy~=2.0
-    # via
-    #   flask-sqlalchemy
-    #   opengeodeweb-microservice
+    # via flask-sqlalchemy
 typing-extensions~=4.15
+    # via sqlalchemy
+werkzeug==3.1.3
     # via
-    #   opengeodeweb-microservice
-    #   sqlalchemy
-werkzeug~=3.1
-    # via
+    #   -r requirements.in
     #   flask
     #   flask-cors
-    #   opengeodeweb-microservice

src/opengeodeweb_back/app.py

@@ -0,0 +1,159 @@
+"""Packages"""
+
+import argparse
+import os
+import time
+
+import flask
+import flask_cors
+from flask_cors import cross_origin
+from werkzeug.exceptions import HTTPException
+
+from opengeodeweb_back import utils_functions, app_config
+from opengeodeweb_back.routes import blueprint_routes
+from opengeodeweb_back.routes.models import blueprint_models
+from opengeodeweb_microservice.database.connection import init_database
+
+
+""" Global config """
+app = flask.Flask(__name__)
+
+""" Config variables """
+FLASK_DEBUG = True if os.environ.get("FLASK_DEBUG", default=None) == "True" else False
+
+if FLASK_DEBUG == False:
+    app.config.from_object(app_config.ProdConfig)
+else:
+    app.config.from_object(app_config.DevConfig)
+
+DEFAULT_HOST = app.config.get("DEFAULT_HOST")
+DEFAULT_PORT = int(app.config.get("DEFAULT_PORT"))
+DEFAULT_DATA_FOLDER_PATH = app.config.get("DEFAULT_DATA_FOLDER_PATH")
+ORIGINS = app.config.get("ORIGINS")
+TIMEOUT = int(app.config.get("MINUTES_BEFORE_TIMEOUT"))
+SSL = app.config.get("SSL")
+SECONDS_BETWEEN_SHUTDOWNS = float(app.config.get("SECONDS_BETWEEN_SHUTDOWNS"))
+
+
+def get_db_path_from_config():
+    database_uri = f"{os.path.abspath(
+        os.path.join(app.config.get('DATA_FOLDER_PATH'), app.config.get('DATABASE_FILENAME'))
+    )}"
+    return database_uri
+
+
+app.register_blueprint(
+    blueprint_routes.routes,
+    url_prefix="/opengeodeweb_back",
+    name="opengeodeweb_back",
+)
+
+app.register_blueprint(
+    blueprint_models.routes,
+    url_prefix="/opengeodeweb_back/models",
+    name="opengeodeweb_models",
+)
+
+if FLASK_DEBUG == False:
+    utils_functions.set_interval(
+        utils_functions.kill_task, SECONDS_BETWEEN_SHUTDOWNS, app
+    )
+
+
+@app.errorhandler(HTTPException)
+def errorhandler(e):
+    return utils_functions.handle_exception(e)
+
+
+@app.route(
+    "/error",
+    methods=["POST"],
+)
+def return_error():
+    flask.abort(500, f"Test")
+
+
+@app.route("/", methods=["POST"])
+@cross_origin()
+def root():
+    return flask.make_response({}, 200)
+
+
+@app.route("/kill", methods=["POST"])
+@cross_origin()
+def kill() -> None:
+    print("Manual server kill, shutting down...", flush=True)
+    os._exit(0)
+
+
+def run_server():
+    parser = argparse.ArgumentParser(
+        prog="OpenGeodeWeb-Back", description="Backend server for OpenGeodeWeb"
+    )
+    parser.add_argument("--host", type=str, default=DEFAULT_HOST, help="Host to run on")
+    parser.add_argument(
+        "-p", "--port", type=int, default=DEFAULT_PORT, help="Port to listen on"
+    )
+    parser.add_argument(
+        "-d",
+        "--debug",
+        default=FLASK_DEBUG,
+        help="Whether to run in debug mode",
+        action="store_true",
+    )
+    parser.add_argument(
+        "-dfp",
+        "--data_folder_path",
+        type=str,
+        default=DEFAULT_DATA_FOLDER_PATH,
+        help="Path to the folder where data is stored",
+    )
+    parser.add_argument(
+        "-ufp",
+        "--upload_folder_path",
+        type=str,
+        default=DEFAULT_DATA_FOLDER_PATH,
+        help="Path to the folder where uploads are stored",
+    )
+    parser.add_argument(
+        "-origins",
+        "--allowed_origins",
+        default=ORIGINS,
+        help="Origins that are allowed to connect to the server",
+    )
+    parser.add_argument(
+        "-t",
+        "--timeout",
+        default=TIMEOUT,
+        help="Number of minutes before the server times out",
+    )
+    args = parser.parse_args()
+
+    app.config.update(DATA_FOLDER_PATH=args.data_folder_path)
+    app.config.update(UPLOAD_FOLDER=args.upload_folder_path)
+    app.config.update(MINUTES_BEFORE_TIMEOUT=args.timeout)
+
+    flask_cors.CORS(app, origins=args.allowed_origins)
+
+    print(
+        f"Host: {args.host}, Port: {args.port}, Debug: {args.debug}, "
+        f"Data folder path: {args.data_folder_path}, Timeout: {args.timeout}, "
+        f"Origins: {args.allowed_origins}",
+        flush=True,
+    )
+
+    db_path = get_db_path_from_config()
+    print("db_path", db_path, flush=True)
+    if db_path:
+        db_dir = os.path.dirname(db_path)
+        if db_dir and not os.path.exists(db_dir):
+            os.makedirs(db_dir, exist_ok=True)
+        init_database(db_path)
+        print(f"Database initialized at: {db_path}")
+
+    app.run(debug=args.debug, host=args.host, port=args.port, ssl_context=SSL)
+
+
+# ''' Main '''
+if __name__ == "__main__":
+    run_server()

src/opengeodeweb_back/app_config.py

@@ -4,9 +4,6 @@
 
 # Third party imports
 # Local application imports
-from opengeodeweb_microservice.database.connection import get_database
-
-DATABASE_FILENAME = "project.db"
 
 
 class Config(object):
@@ -18,7 +15,7 @@ class Config(object):
     REQUEST_COUNTER = 0
     LAST_REQUEST_TIME = time.time()
     LAST_PING_TIME = time.time()
-    SQLALCHEMY_TRACK_MODIFICATIONS = False
+    DATABASE_FILENAME = "project.db"
 
 
 class ProdConfig(Config):
@@ -27,9 +24,6 @@ class ProdConfig(Config):
     MINUTES_BEFORE_TIMEOUT = "1"
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     DATA_FOLDER_PATH = "/data"
-    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.abspath(
-        os.path.join(DATA_FOLDER_PATH, DATABASE_FILENAME)
-        )}"
 
 
 class DevConfig(Config):
@@ -39,6 +33,3 @@ class DevConfig(Config):
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     BASE_DIR = os.path.dirname(os.path.abspath(__file__))
     DATA_FOLDER_PATH = os.path.join(BASE_DIR, "data")
-    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.join(
-        BASE_DIR, DATA_FOLDER_PATH, DATABASE_FILENAME
-        )}"

src/opengeodeweb_back/utils_functions.py

@@ -88,7 +88,6 @@ def validate_request(request: flask.Request, schema: dict[str, str]) -> None:
 
     if json_data is None:
         json_data = {}
-
     try:
         validate = fastjsonschema.compile(schema)
         validate(json_data)
@@ -259,10 +258,6 @@ def generate_native_viewable_and_light_viewable_from_file(
 
     data = geode_functions.load(geode_object, copied_full_path)
 
-    # Remplacer :
-    # database.session.delete(temp_data_entry)
-    # database.session.flush()
-    # Par :
     session = get_session()
     if session:
         session.delete(temp_data_entry)