OpenGeodeWeb-Back 5.10.1__py3-none-any.whl → 5.10.3__py3-none-any.whl

opengeodeweb_back/app.py

@@ -0,0 +1,157 @@
+"""Packages"""
+
+import argparse
+import os
+import time
+from typing import Any
+
+import flask
+import flask_cors  # type: ignore
+from flask import Flask, Response
+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.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: str = app.config.get("DEFAULT_HOST") or "localhost"
+DEFAULT_PORT: int = int(app.config.get("DEFAULT_PORT") or 5000)
+DEFAULT_DATA_FOLDER_PATH: str = app.config.get("DEFAULT_DATA_FOLDER_PATH") or "./data"
+ORIGINS: Any = app.config.get("ORIGINS")
+TIMEOUT: int = int(app.config.get("MINUTES_BEFORE_TIMEOUT") or 30)
+SSL: Any = app.config.get("SSL")
+SECONDS_BETWEEN_SHUTDOWNS: float = float(
+    app.config.get("SECONDS_BETWEEN_SHUTDOWNS") or 60.0
+)
+
+
+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: HTTPException) -> tuple[dict[str, Any], int] | Response:
+    return utils_functions.handle_exception(e)
+
+
+@app.route(
+    "/error",
+    methods=["POST"],
+)
+def return_error() -> Response:
+    flask.abort(500, f"Test")
+    return flask.make_response({}, 500)
+
+
+@app.route("/", methods=["POST"])
+@cross_origin()
+def root() -> Response:
+    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() -> None:
+    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_filename: str = app.config.get("DATABASE_FILENAME") or "project.db"
+    db_path = os.path.join(args.data_folder_path, db_filename)
+    os.makedirs(os.path.dirname(db_path), exist_ok=True)
+    app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
+    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
+
+    init_database(db_path)
+    print(f"Database initialized at: {db_path}", flush=True)
+
+    app.run(debug=args.debug, host=args.host, port=args.port, ssl_context=SSL)
+
+
+# ''' Main '''
+if __name__ == "__main__":
+    run_server()

opengeodeweb_back/app_config.py

@@ -4,9 +4,6 @@ import time
 
 # 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
-        )}"

opengeodeweb_back/routes/blueprint_routes.py

@@ -381,3 +381,17 @@ def ping():
     utils_functions.validate_request(flask.request, ping_json)
     flask.current_app.config.update(LAST_PING_TIME=time.time())
     return flask.make_response({"message": "Flask server is running"}, 200)
+
+
+with open(
+    os.path.join(schemas, "kill.json"),
+    "r",
+) as file:
+    kill_json = json.load(file)
+
+
+@routes.route(kill_json["route"], methods=kill_json["methods"])
+def kill() -> flask.Response:
+    print("Manual server kill, shutting down...", flush=True)
+    os._exit(0)
+    return flask.make_response({"message": "Flask server is dead"}, 200)

opengeodeweb_back/routes/schemas/kill.json

@@ -0,0 +1,10 @@
+{
+  "route": "/kill",
+  "methods": [
+    "POST"
+  ],
+  "type": "object",
+  "properties": {},
+  "required": [],
+  "additionalProperties": false
+}

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)
@@ -164,7 +163,7 @@ def create_data_folder_from_id(data_id: str) -> str:
 def save_all_viewables_and_return_info(
     geode_object: str,
     data: Any,
-    input_file: str,
+    input_file: str | None = None,
     additional_files: list[str] | None = None,
 ) -> dict[str, Any]:
     if additional_files is None:
@@ -228,6 +227,8 @@ def generate_native_viewable_and_light_viewable_from_object(
 def generate_native_viewable_and_light_viewable_from_file(
     geode_object: str, input_filename: str
 ) -> dict[str, Any]:
+
+    session = get_session()
     temp_data_entry = Data.create(
         geode_object=geode_object,
         input_file=input_filename,
@@ -259,14 +260,10 @@ 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)
         session.flush()
+        session.commit()
 
     return save_all_viewables_and_return_info(
         geode_object,

{opengeodeweb_back-5.10.1.dist-info → opengeodeweb_back-5.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.1
+Version: 5.10.3
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back
@@ -11,28 +11,23 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: asgiref~=3.9
-Requires-Dist: blinker~=1.9
-Requires-Dist: click~=8.3
-Requires-Dist: fastjsonschema~=2.21
-Requires-Dist: flask[async]~=3.0
-Requires-Dist: flask-cors~=6.0
-Requires-Dist: flask-sqlalchemy~=3.1
+Requires-Dist: asgiref>=3
+Requires-Dist: blinker>=1
+Requires-Dist: click>=8
+Requires-Dist: flask[async]>=3
+Requires-Dist: flask-cors==6.0.1
 Requires-Dist: geode-common==33.11.0
 Requires-Dist: geode-viewables==3.3.0
-Requires-Dist: greenlet~=3.2
-Requires-Dist: itsdangerous~=2.2
-Requires-Dist: jinja2~=3.1
-Requires-Dist: markupsafe~=3.0
+Requires-Dist: itsdangerous>=2
+Requires-Dist: jinja2>=3
+Requires-Dist: markupsafe>=3
 Requires-Dist: opengeode-core==15.27.4
 Requires-Dist: opengeode-geosciences==9.4.1
 Requires-Dist: opengeode-geosciencesio==5.8.0
 Requires-Dist: opengeode-inspector==6.8.1
 Requires-Dist: opengeode-io==7.4.0
-Requires-Dist: opengeodeweb-microservice>=1.0.1,~=1.0
-Requires-Dist: sqlalchemy~=2.0
-Requires-Dist: typing-extensions~=4.15
-Requires-Dist: werkzeug==3.0.3
+Requires-Dist: werkzeug==3.1.2
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.4rc9
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-5.10.1.dist-info → opengeodeweb_back-5.10.3.dist-info}/RECORD

@@ -1,11 +1,12 @@
 opengeodeweb_back/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opengeodeweb_back/app_config.py,sha256=WH0f-J-cXgIU23wAhn-lujwqN2-htUw9nSWkrgyW5xc,1207
+opengeodeweb_back/app.py,sha256=7sacDhOn73S4SBACvwvHonS5pOeu4ttuxrg32FRHlPQ,4509
+opengeodeweb_back/app_config.py,sha256=z-omTiGj3-y0BZ1IchAM6EoTdC7vAX6B4OymEnuM0T4,843
 opengeodeweb_back/geode_functions.py,sha256=NzELy9s6AETDnm7tyA_uM2N89zrfeLdblRhzYrBONmw,10804
 opengeodeweb_back/geode_objects.py,sha256=_NclGPa024kCwUHdORkFuXYtiZBmQpgq6sO3LRkBhe8,27776
 opengeodeweb_back/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
 opengeodeweb_back/test_utils.py,sha256=18AbRW9-tfKkPcmRGilTTHXI7S3armYyV7Vdy5UvUKM,794
-opengeodeweb_back/utils_functions.py,sha256=k8FpsHruaqnqyYgfwRC2JVvzoQrV5JgY7z5JJ7dhMgs,9180
-opengeodeweb_back/routes/blueprint_routes.py,sha256=h_yfFC3ljH0KqFr5Ab_-IQYNB7VVRENwAMQk4NDsh18,11042
+opengeodeweb_back/utils_functions.py,sha256=rGxBhz_t6JJ7eEi4PZS0b3SyGBFRCohZN5e3DQscpeQ,9111
+opengeodeweb_back/routes/blueprint_routes.py,sha256=19W90mI3-jL80prgOU3aq8mBp3TM5-TO1rg244eZg2k,11394
 opengeodeweb_back/routes/models/blueprint_models.py,sha256=Jo9pUDeu1nO3_IbBiuHGk57cc4_fhwxjM0EKNyv1FT0,1874
 opengeodeweb_back/routes/models/schemas/mesh_components.json,sha256=JmQUvpy7HpGS6FlThZLx1YjHqiInRTqUZ_Ft5MfOzEE,239
 opengeodeweb_back/routes/models/schemas/vtm_component_indices.json,sha256=0XILVxhAxi0RhQFDZZoUeGcAnBMroWz3kNJS7-6_dKQ,239
@@ -15,6 +16,7 @@ opengeodeweb_back/routes/schemas/create_point.json,sha256=XjmXLMkr4jgWYHUKSwAhsx
 opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.json,sha256=tp83tPQaxTltQrdL8D3TnG8pqY_2fgAaYVeTWPXO0qI,371
 opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json,sha256=lnPqevRRlUASF4ObmpG8ChH3c2LHNB99Si292S3OsLU,279
 opengeodeweb_back/routes/schemas/inspect_file.json,sha256=WoFF2hgZCUfqSDFJRq1sLpivjCQ6TCvSHPH8pKFY6KM,348
+opengeodeweb_back/routes/schemas/kill.json,sha256=tZEv4TuTNNthet2MsxUPLV3ivW6tIGjYTfxd6Jl9zaM,144
 opengeodeweb_back/routes/schemas/missing_files.json,sha256=eOBAkiphA-2xG6e-OAy7wcJK2FeY0YFYXJlLdr8SNSc,349
 opengeodeweb_back/routes/schemas/ping.json,sha256=MhI5jtrjMsAsfIKEzdY8p1HyV9xv4O3hYfESWw6tkyE,162
 opengeodeweb_back/routes/schemas/polygon_attribute_names.json,sha256=1BrpfjcbRL1ZOL4azHIHirqXIc8tpu4xGnMRFEMEshU,241
@@ -23,8 +25,9 @@ opengeodeweb_back/routes/schemas/save_viewable_file.json,sha256=pvvEdaC7bNASPMrl
 opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=2uQueIl1jOmxFG_gIi_vJETR4IurrwuSf8GAnzphk9g,237
 opengeodeweb_back/routes/schemas/upload_file.json,sha256=LJ3U3L5ApKuQDVFIpVT_y2alq4HW_suTvZ3HUucNbhg,219
 opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=ECIflohiqPZNsflAdkfEzksL4we0JvZhIxUd84Ubctg,240
-opengeodeweb_back-5.10.1.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
-opengeodeweb_back-5.10.1.dist-info/METADATA,sha256=yd4VKIibJahRtbxyVIGR6JshB_dnmXNV-aYICaM-KHg,2846
-opengeodeweb_back-5.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengeodeweb_back-5.10.1.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
-opengeodeweb_back-5.10.1.dist-info/RECORD,,
+opengeodeweb_back-5.10.3.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
+opengeodeweb_back-5.10.3.dist-info/METADATA,sha256=278ZgWWQWo8TvvsBj2q9I9QXGuJWCKWWv0_4atiDoZc,2665
+opengeodeweb_back-5.10.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengeodeweb_back-5.10.3.dist-info/entry_points.txt,sha256=3W_t5GFc9ROHSIZ55IGvYU3DLHUFQmYOM4Bm9u3Z0cE,71
+opengeodeweb_back-5.10.3.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
+opengeodeweb_back-5.10.3.dist-info/RECORD,,

opengeodeweb_back-5.10.3.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+opengeodeweb-back = opengeodeweb_back.app:run_server