OpenGeodeWeb-Back 4.3.1__tar.gz → 5.0.0__tar.gz

{opengeodeweb_back-4.3.1/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-5.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 4.3.1
+Version: 5.0.0
 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
@@ -12,31 +12,32 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: asgiref==3.8.1
-Requires-Dist: attrs==23.2.0
+Requires-Dist: attrs==24.2.0
 Requires-Dist: blinker==1.8.2
 Requires-Dist: click==8.1.7
 Requires-Dist: flask[async]==3.0.3
 Requires-Dist: flask-cors==4.0.1
-Requires-Dist: geode-background==7.12.0
-Requires-Dist: geode-common==31.2.1
-Requires-Dist: geode-conversion==5.4.1
-Requires-Dist: geode-explicit==4.8.3
-Requires-Dist: geode-implicit==2.8.7
-Requires-Dist: geode-numerics==4.4.0
-Requires-Dist: geode-simplex==6.8.3
-Requires-Dist: geode-viewables==2.2.3
+Requires-Dist: geode-background==8.1.1
+Requires-Dist: geode-common==32.0.8
+Requires-Dist: geode-conversion==6.0.3
+Requires-Dist: geode-explicit==6.0.1
+Requires-Dist: geode-implicit==3.1.1
+Requires-Dist: geode-numerics==5.0.2
+Requires-Dist: geode-simplex==8.2.1
+Requires-Dist: geode-viewables==3.0.0
 Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: jinja2==3.1.4
-Requires-Dist: jsonschema==4.22.0
+Requires-Dist: jsonschema==4.23.0
 Requires-Dist: jsonschema-specifications==2023.12.1
 Requires-Dist: markupsafe==2.1.5
-Requires-Dist: opengeode-core==14.21.3
-Requires-Dist: opengeode-geosciences==7.7.0
-Requires-Dist: opengeode-geosciencesio==4.7.7
-Requires-Dist: opengeode-inspector==5.1.4
-Requires-Dist: opengeode-io==6.5.1
+Requires-Dist: opengeode-core==15.2.1
+Requires-Dist: opengeode-geosciences==8.0.0
+Requires-Dist: opengeode-geosciencesio==5.0.1
+Requires-Dist: opengeode-inspector==6.0.0
+Requires-Dist: opengeode-io==7.0.1
 Requires-Dist: referencing==0.35.1
-Requires-Dist: rpds-py==0.18.1
+Requires-Dist: rpds-py==0.20.0
+Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: werkzeug==3.0.3
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-4.3.1 → opengeodeweb_back-5.0.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "4.3.1"
+version = "5.0.0"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="team-web@geode-solutions.com" },

{opengeodeweb_back-4.3.1 → opengeodeweb_back-5.0.0}/requirements.txt

@@ -1,12 +1,12 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile requirements.in
 #
 asgiref==3.8.1
     # via flask
-attrs==23.2.0
+attrs==24.2.0
     # via
     #   jsonschema
     #   referencing
@@ -20,44 +20,47 @@ flask[async]==3.0.3
     #   flask-cors
 flask-cors==4.0.1
     # via -r requirements.in
-geode-background==7.12.0
+geode-background==8.1.1
     # via
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
-geode-common==31.2.1
+geode-common==32.0.8
     # via
     #   -r requirements.in
     #   geode-background
+    #   geode-conversion
     #   geode-explicit
     #   geode-implicit
     #   geode-numerics
     #   geode-simplex
     #   geode-viewables
-geode-conversion==5.4.1
+geode-conversion==6.0.3
     # via
     #   geode-explicit
     #   geode-implicit
-geode-explicit==4.8.3
+geode-explicit==6.0.1
     # via
     #   -r requirements.in
     #   geode-implicit
-geode-implicit==2.8.7
+geode-implicit==3.1.1
     # via -r requirements.in
-geode-numerics==4.4.0
+geode-numerics==5.0.2
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-simplex
-geode-simplex==6.8.3
-    # via -r requirements.in
-geode-viewables==2.2.3
+geode-simplex==8.2.1
+    # via
+    #   -r requirements.in
+    #   geode-implicit
+geode-viewables==3.0.0
     # via -r requirements.in
 itsdangerous==2.2.0
     # via flask
 jinja2==3.1.4
     # via flask
-jsonschema==4.22.0
+jsonschema==4.23.0
     # via -r requirements.in
 jsonschema-specifications==2023.12.1
     # via jsonschema
@@ -65,7 +68,7 @@ markupsafe==2.1.5
     # via
     #   jinja2
     #   werkzeug
-opengeode-core==14.21.3
+opengeode-core==15.2.1
     # via
     #   -r requirements.in
     #   geode-background
@@ -80,23 +83,23 @@ opengeode-core==14.21.3
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==7.7.0
+opengeode-geosciences==8.0.0
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeode-geosciencesio==4.7.7
+opengeode-geosciencesio==5.0.1
     # via
     #   -r requirements.in
     #   geode-implicit
-opengeode-inspector==5.1.4
+opengeode-inspector==6.0.0
     # via
     #   -r requirements.in
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
-opengeode-io==6.5.1
+opengeode-io==7.0.1
     # via
     #   -r requirements.in
     #   geode-implicit
@@ -106,10 +109,12 @@ referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-rpds-py==0.18.1
+rpds-py==0.20.0
     # via
     #   jsonschema
     #   referencing
+typing-extensions==4.12.2
+    # via asgiref
 werkzeug==3.0.3
     # via
     #   -r requirements.in

{opengeodeweb_back-4.3.1 → opengeodeweb_back-5.0.0/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 4.3.1
+Version: 5.0.0
 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
@@ -12,31 +12,32 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: asgiref==3.8.1
-Requires-Dist: attrs==23.2.0
+Requires-Dist: attrs==24.2.0
 Requires-Dist: blinker==1.8.2
 Requires-Dist: click==8.1.7
 Requires-Dist: flask[async]==3.0.3
 Requires-Dist: flask-cors==4.0.1
-Requires-Dist: geode-background==7.12.0
-Requires-Dist: geode-common==31.2.1
-Requires-Dist: geode-conversion==5.4.1
-Requires-Dist: geode-explicit==4.8.3
-Requires-Dist: geode-implicit==2.8.7
-Requires-Dist: geode-numerics==4.4.0
-Requires-Dist: geode-simplex==6.8.3
-Requires-Dist: geode-viewables==2.2.3
+Requires-Dist: geode-background==8.1.1
+Requires-Dist: geode-common==32.0.8
+Requires-Dist: geode-conversion==6.0.3
+Requires-Dist: geode-explicit==6.0.1
+Requires-Dist: geode-implicit==3.1.1
+Requires-Dist: geode-numerics==5.0.2
+Requires-Dist: geode-simplex==8.2.1
+Requires-Dist: geode-viewables==3.0.0
 Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: jinja2==3.1.4
-Requires-Dist: jsonschema==4.22.0
+Requires-Dist: jsonschema==4.23.0
 Requires-Dist: jsonschema-specifications==2023.12.1
 Requires-Dist: markupsafe==2.1.5
-Requires-Dist: opengeode-core==14.21.3
-Requires-Dist: opengeode-geosciences==7.7.0
-Requires-Dist: opengeode-geosciencesio==4.7.7
-Requires-Dist: opengeode-inspector==5.1.4
-Requires-Dist: opengeode-io==6.5.1
+Requires-Dist: opengeode-core==15.2.1
+Requires-Dist: opengeode-geosciences==8.0.0
+Requires-Dist: opengeode-geosciencesio==5.0.1
+Requires-Dist: opengeode-inspector==6.0.0
+Requires-Dist: opengeode-io==7.0.1
 Requires-Dist: referencing==0.35.1
-Requires-Dist: rpds-py==0.18.1
+Requires-Dist: rpds-py==0.20.0
+Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: werkzeug==3.0.3
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-4.3.1 → opengeodeweb_back-5.0.0}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -8,8 +8,10 @@ src/OpenGeodeWeb_Back.egg-info/dependency_links.txt
 src/OpenGeodeWeb_Back.egg-info/requires.txt
 src/OpenGeodeWeb_Back.egg-info/top_level.txt
 src/opengeodeweb_back/__init__.py
+src/opengeodeweb_back/app_config.py
 src/opengeodeweb_back/geode_functions.py
 src/opengeodeweb_back/geode_objects.py
+src/opengeodeweb_back/utils_functions.py
 src/opengeodeweb_back/routes/blueprint_routes.py
 src/opengeodeweb_back/routes/schemas/allowed_files.json
 src/opengeodeweb_back/routes/schemas/allowed_objects.json
@@ -17,7 +19,9 @@ src/opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.json
 src/opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json
 src/opengeodeweb_back/routes/schemas/inspect_file.json
 src/opengeodeweb_back/routes/schemas/missing_files.json
+src/opengeodeweb_back/routes/schemas/ping.json
 src/opengeodeweb_back/routes/schemas/save_viewable_file.json
 src/opengeodeweb_back/routes/schemas/upload_file.json
-tests/test_functions.py
-tests/test_routes.py
+tests/test_geode_functions.py
+tests/test_routes.py
+tests/test_utils_functions.py

opengeodeweb_back-5.0.0/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -0,0 +1,28 @@
+asgiref==3.8.1
+attrs==24.2.0
+blinker==1.8.2
+click==8.1.7
+flask[async]==3.0.3
+flask-cors==4.0.1
+geode-background==8.1.1
+geode-common==32.0.8
+geode-conversion==6.0.3
+geode-explicit==6.0.1
+geode-implicit==3.1.1
+geode-numerics==5.0.2
+geode-simplex==8.2.1
+geode-viewables==3.0.0
+itsdangerous==2.2.0
+jinja2==3.1.4
+jsonschema==4.23.0
+jsonschema-specifications==2023.12.1
+markupsafe==2.1.5
+opengeode-core==15.2.1
+opengeode-geosciences==8.0.0
+opengeode-geosciencesio==5.0.1
+opengeode-inspector==6.0.0
+opengeode-io==7.0.1
+referencing==0.35.1
+rpds-py==0.20.0
+typing-extensions==4.12.2
+werkzeug==3.0.3

opengeodeweb_back-5.0.0/src/opengeodeweb_back/app_config.py

@@ -0,0 +1,33 @@
+# Standard library imports
+import os
+import time
+
+# Third party imports
+# Local application imports
+
+
+class Config(object):
+    FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
+    DEFAULT_PORT = "5000"
+    CORS_HEADERS = "Content-Type"
+    UPLOAD_FOLDER = "./uploads"
+    DESKTOP_APP = False
+    REQUEST_COUNTER = 0
+    LAST_REQUEST_TIME = time.time()
+    LAST_PING_TIME = time.time()
+
+
+class ProdConfig(Config):
+    SSL = None
+    ORIGINS = ""
+    MINUTES_BEFORE_TIMEOUT = "1"
+    SECONDS_BETWEEN_SHUTDOWNS = "10"
+    DATA_FOLDER_PATH = "/data/"
+
+
+class DevConfig(Config):
+    SSL = None
+    ORIGINS = "*"
+    MINUTES_BEFORE_TIMEOUT = "1"
+    SECONDS_BETWEEN_SHUTDOWNS = "10"
+    DATA_FOLDER_PATH = "./data/"

{opengeodeweb_back-4.3.1 → opengeodeweb_back-5.0.0}/src/opengeodeweb_back/geode_functions.py

@@ -1,20 +1,14 @@
 # Standard library imports
 import os
-import time
-import threading
-import uuid
-import zipfile
 
 # Third party imports
 import flask
 import opengeode_geosciences as og_gs
 import opengeode as og
-import pkg_resources
-from jsonschema import validate
-from jsonschema.exceptions import ValidationError
 
 # Local application imports
 from .geode_objects import geode_objects_dict
+from . import utils_functions
 
 
 def geode_object_value(geode_object: str):
@@ -147,7 +141,9 @@ def list_geode_objects(
     key: str = None,
 ):
     return_dict = {}
-    file_extension = extension_from_filename(os.path.basename(file_absolute_path))
+    file_extension = utils_functions.extension_from_filename(
+        os.path.basename(file_absolute_path)
+    )
     geode_objects_filtered_list = filter_geode_objects(key)
 
     for geode_object in geode_objects_filtered_list:
@@ -200,75 +196,6 @@ def get_inspector_children(obj):
     return new_object
 
 
-def versions(list_packages: list):
-    list_with_versions = []
-    for package in list_packages:
-        list_with_versions.append(
-            {
-                "package": package,
-                "version": pkg_resources.get_distribution(package).version,
-            }
-        )
-    return list_with_versions
-
-
-def create_lock_file(
-    folder_absolute_path,
-):
-    if not os.path.exists(folder_absolute_path):
-        os.mkdir(folder_absolute_path)
-    id = uuid.uuid4()
-    file_absolute_path = f"{folder_absolute_path}/{str(id)}.txt"
-    f = open(file_absolute_path, "a")
-    f.close()
-    flask.g.UUID = id
-
-
-def create_time_file(folder_absolute_path):
-    if not os.path.exists(folder_absolute_path):
-        os.mkdir(folder_absolute_path)
-    file_path = f"{folder_absolute_path}/time.txt"
-    if not os.path.isfile(file_path):
-        f = open(file_path, "w")
-        f.close()
-
-    f = open(folder_absolute_path + "/time.txt", "w")
-    f.write(str(time.time()))
-    f.close()
-
-
-def remove_lock_file(folder_absolute_path):
-    id = flask.g.UUID
-    os.remove(f"{folder_absolute_path}/{str(id)}.txt")
-
-
-def set_interval(func, sec):
-    def func_wrapper():
-        set_interval(func, sec)
-        func()
-
-    t = threading.Timer(sec, func_wrapper)
-    t.daemon = True
-    t.start()
-    return t
-
-
-def extension_from_filename(filename):
-    return os.path.splitext(filename)[1][1:]
-
-
-def validate_request(request, schema):
-    json_data = request.get_json(force=True, silent=True)
-
-    if json_data is None:
-        json_data = {}
-
-    try:
-        validate(instance=json_data, schema=schema)
-    except ValidationError as e:
-        flask.abort(400, f"Validation error: {e.message}")
-
-
 def geographic_coordinate_systems(geode_object: str):
     if is_3D(geode_object):
         return og_gs.GeographicCoordinateSystem3D.geographic_coordinate_systems()
@@ -329,41 +256,3 @@ def create_coordinate_system(
     create_crs(
         geode_object, data, name, input_coordiante_system, output_coordiante_system
     )
-
-
-def send_file(upload_folder, saved_files, new_file_name):
-    if len(saved_files) == 1:
-        mimetype = "application/octet-binary"
-    else:
-        mimetype = "application/zip"
-        new_file_name = os.path.splitext(new_file_name)[0] + ".zip"
-        with zipfile.ZipFile(os.path.join(upload_folder, new_file_name), "w") as zipObj:
-            for saved_file_path in saved_files:
-                zipObj.write(
-                    saved_file_path,
-                    os.path.basename(saved_file_path),
-                )
-
-    response = flask.send_from_directory(
-        directory=upload_folder,
-        path=new_file_name,
-        as_attachment=True,
-        mimetype=mimetype,
-    )
-    response.headers["new-file-name"] = new_file_name
-    response.headers["Access-Control-Expose-Headers"] = "new-file-name"
-
-    return response
-
-
-def handle_exception(e):
-    response = e.get_response()
-    response.data = flask.json.dumps(
-        {
-            "code": e.code,
-            "name": e.name,
-            "description": e.description,
-        }
-    )
-    response.content_type = "application/json"
-    return response

{opengeodeweb_back-4.3.1 → opengeodeweb_back-5.0.0}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -1,17 +1,28 @@
 # Standard library imports
 import json
 import os
+import time
 
 # Third party imports
 import flask
-import flask_cors
-from .. import geode_functions
+from .. import geode_functions, utils_functions
 import werkzeug
 import uuid
 
-
 routes = flask.Blueprint("routes", __name__)
-flask_cors.CORS(routes)
+
+
+@routes.before_request
+def before_request():
+    if "ping" not in flask.request.path:
+        utils_functions.increment_request_counter(flask.current_app)
+
+
+@routes.teardown_request
+def teardown_request(exception):
+    if "ping" not in flask.request.path:
+        utils_functions.decrement_request_counter(flask.current_app)
+        utils_functions.update_last_request_time(flask.current_app)
 
 
 schemas = os.path.join(os.path.dirname(__file__), "schemas")
@@ -28,7 +39,7 @@ with open(
     methods=allowed_files_json["methods"],
 )
 def allowed_files():
-    geode_functions.validate_request(flask.request, allowed_files_json)
+    utils_functions.validate_request(flask.request, allowed_files_json)
     extensions = geode_functions.list_input_extensions(
         flask.request.json["supported_feature"]
     )
@@ -75,7 +86,7 @@ def allowed_objects():
         return flask.make_response({}, 200)
 
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(flask.request, allowed_objects_json)
+    utils_functions.validate_request(flask.request, allowed_objects_json)
     file_absolute_path = os.path.join(UPLOAD_FOLDER, flask.request.json["filename"])
     allowed_objects = geode_functions.list_geode_objects(
         file_absolute_path, flask.request.json["supported_feature"]
@@ -96,7 +107,7 @@ with open(
 )
 def missing_files():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(flask.request, missing_files_json)
+    utils_functions.validate_request(flask.request, missing_files_json)
 
     missing_files = geode_functions.missing_files(
         flask.request.json["input_geode_object"],
@@ -134,13 +145,11 @@ with open(
     methods=geographic_coordinate_systems_json["methods"],
 )
 def crs_converter_geographic_coordinate_systems():
-    geode_functions.validate_request(flask.request, geographic_coordinate_systems_json)
+    utils_functions.validate_request(flask.request, geographic_coordinate_systems_json)
     infos = geode_functions.geographic_coordinate_systems(
         flask.request.json["input_geode_object"]
     )
     crs_list = []
-    print(infos)
-    print(flask.request.json["input_geode_object"])
     for info in infos:
         crs = {}
         crs["name"] = info.name
@@ -164,7 +173,7 @@ with open(
 )
 def inspect_file():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(flask.request, inspect_file_json)
+    utils_functions.validate_request(flask.request, inspect_file_json)
 
     secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
     file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
@@ -189,7 +198,7 @@ with open(
 )
 def geode_objects_and_output_extensions():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    geode_functions.validate_request(
+    utils_functions.validate_request(
         flask.request, geode_objects_and_output_extensions_json
     )
     data = geode_functions.load(
@@ -221,7 +230,7 @@ with open(
 def save_viewable_file():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
-    geode_functions.validate_request(flask.request, save_viewable_file_json)
+    utils_functions.validate_request(flask.request, save_viewable_file_json)
 
     secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
     file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
@@ -260,3 +269,20 @@ def save_viewable_file():
         },
         200,
     )
+
+
+with open(
+    os.path.join(schemas, "ping.json"),
+    "r",
+) as file:
+    ping_json = json.load(file)
+
+
+@routes.route(
+    ping_json["route"],
+    methods=ping_json["methods"],
+)
+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)

opengeodeweb_back-5.0.0/src/opengeodeweb_back/routes/schemas/ping.json

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

opengeodeweb_back-5.0.0/src/opengeodeweb_back/utils_functions.py

@@ -0,0 +1,131 @@
+# Standard library imports
+import os
+import threading
+import time
+import zipfile
+
+# Third party imports
+import flask
+from jsonschema import validate
+from jsonschema.exceptions import ValidationError
+import pkg_resources
+
+# Local application imports
+
+
+def increment_request_counter(current_app):
+    if "REQUEST_COUNTER" in current_app.config:
+        REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
+        REQUEST_COUNTER += 1
+        current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
+
+
+def decrement_request_counter(current_app):
+    if "REQUEST_COUNTER" in current_app.config:
+        REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
+        REQUEST_COUNTER -= 1
+        current_app.config.update(REQUEST_COUNTER=REQUEST_COUNTER)
+
+
+def update_last_request_time(current_app):
+    if "LAST_REQUEST_TIME" in current_app.config:
+        LAST_REQUEST_TIME = time.time()
+        current_app.config.update(LAST_REQUEST_TIME=LAST_REQUEST_TIME)
+
+
+def kill_task(current_app):
+    DESKTOP_APP = bool(current_app.config.get("DESKTOP_APP"))
+    REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER"))
+    LAST_PING_TIME = float(current_app.config.get("LAST_PING_TIME"))
+    LAST_REQUEST_TIME = float(current_app.config.get("LAST_REQUEST_TIME"))
+    MINUTES_BEFORE_TIMEOUT = float(current_app.config.get("MINUTES_BEFORE_TIMEOUT"))
+    current_time = time.time()
+    minutes_since_last_request = (current_time - LAST_REQUEST_TIME) / 60
+    minutes_since_last_ping = (current_time - LAST_PING_TIME) / 60
+
+    if (
+        (
+            (minutes_since_last_request > MINUTES_BEFORE_TIMEOUT)
+            and (DESKTOP_APP == False)
+        )
+        or (minutes_since_last_ping > MINUTES_BEFORE_TIMEOUT)
+    ) and (REQUEST_COUNTER == 0):
+        print("Server timed out due to inactivity, shutting down...", flush=True)
+        os._exit(0)
+
+
+def versions(list_packages: list):
+    list_with_versions = []
+    for package in list_packages:
+        list_with_versions.append(
+            {
+                "package": package,
+                "version": pkg_resources.get_distribution(package).version,
+            }
+        )
+    return list_with_versions
+
+
+def validate_request(request, schema):
+    json_data = request.get_json(force=True, silent=True)
+
+    if json_data is None:
+        json_data = {}
+
+    try:
+        validate(instance=json_data, schema=schema)
+    except ValidationError as e:
+        flask.abort(400, f"Validation error: {e.message}")
+
+
+def set_interval(func, sec, args=None):
+    def func_wrapper():
+        set_interval(func, sec, args)
+        func(args)
+
+    t = threading.Timer(sec, func_wrapper)
+    t.daemon = True
+    t.start()
+    return t
+
+
+def extension_from_filename(filename):
+    return os.path.splitext(filename)[1][1:]
+
+
+def send_file(upload_folder, saved_files, new_file_name):
+    if len(saved_files) == 1:
+        mimetype = "application/octet-binary"
+    else:
+        mimetype = "application/zip"
+        new_file_name = os.path.splitext(new_file_name)[0] + ".zip"
+        with zipfile.ZipFile(os.path.join(upload_folder, new_file_name), "w") as zipObj:
+            for saved_file_path in saved_files:
+                zipObj.write(
+                    saved_file_path,
+                    os.path.basename(saved_file_path),
+                )
+
+    response = flask.send_from_directory(
+        directory=upload_folder,
+        path=new_file_name,
+        as_attachment=True,
+        mimetype=mimetype,
+    )
+    response.headers["new-file-name"] = new_file_name
+    response.headers["Access-Control-Expose-Headers"] = "new-file-name"
+
+    return response
+
+
+def handle_exception(e):
+    response = e.get_response()
+    response.data = flask.json.dumps(
+        {
+            "code": e.code,
+            "name": e.name,
+            "description": e.description,
+        }
+    )
+    response.content_type = "application/json"
+    return response

opengeodeweb_back-4.3.1/tests/test_functions.py → opengeodeweb_back-5.0.0/tests/test_geode_functions.py

@@ -310,33 +310,3 @@ def test_geode_objects_output_extensions():
                         output_extension_value,
                     ) in output_geode_object_value.items():
                         assert type(output_extension_value["is_saveable"]) is bool
-
-
-def test_versions():
-    list_packages = [
-        "OpenGeode-core",
-        "OpenGeode-IO",
-        "OpenGeode-Geosciences",
-        "OpenGeode-GeosciencesIO",
-    ]
-    versions = geode_functions.versions(list_packages)
-    assert type(versions) is list
-    for version in versions:
-        assert type(version) is dict
-
-
-def test_extension_from_filename():
-    extension = geode_functions.extension_from_filename("test.toto")
-    assert type(extension) is str
-    assert extension.count(".") == 0
-
-
-def test_handle_exception(client):
-    route = "/error"
-    response = client.post(route)
-    assert response.status_code == 500
-    data = response.get_json()
-    assert type(data) is dict
-    assert type(data["description"]) is str
-    assert type(data["name"]) is str
-    assert type(data["code"]) is int

opengeodeweb_back-5.0.0/tests/test_utils_functions.py

@@ -0,0 +1,50 @@
+import flask
+from src.opengeodeweb_back import utils_functions
+
+
+def test_increment_request_counter(app_context):
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+    utils_functions.increment_request_counter(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+
+
+def test_decrement_request_counter(app_context):
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+    utils_functions.decrement_request_counter(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+
+
+def test_update_last_request_time(app_context):
+    LAST_REQUEST_TIME = flask.current_app.config.get("LAST_REQUEST_TIME")
+    utils_functions.update_last_request_time(flask.current_app)
+    assert flask.current_app.config.get("LAST_REQUEST_TIME") >= LAST_REQUEST_TIME
+
+
+def test_versions():
+    list_packages = [
+        "OpenGeode-core",
+        "OpenGeode-IO",
+        "OpenGeode-Geosciences",
+        "OpenGeode-GeosciencesIO",
+    ]
+    versions = utils_functions.versions(list_packages)
+    assert type(versions) is list
+    for version in versions:
+        assert type(version) is dict
+
+
+def test_extension_from_filename():
+    extension = utils_functions.extension_from_filename("test.toto")
+    assert type(extension) is str
+    assert extension.count(".") == 0
+
+
+def test_handle_exception(client):
+    route = "/error"
+    response = client.post(route)
+    assert response.status_code == 500
+    data = response.get_json()
+    assert type(data) is dict
+    assert type(data["description"]) is str
+    assert type(data["name"]) is str
+    assert type(data["code"]) is int

opengeodeweb_back-4.3.1/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -1,27 +0,0 @@
-asgiref==3.8.1
-attrs==23.2.0
-blinker==1.8.2
-click==8.1.7
-flask[async]==3.0.3
-flask-cors==4.0.1
-geode-background==7.12.0
-geode-common==31.2.1
-geode-conversion==5.4.1
-geode-explicit==4.8.3
-geode-implicit==2.8.7
-geode-numerics==4.4.0
-geode-simplex==6.8.3
-geode-viewables==2.2.3
-itsdangerous==2.2.0
-jinja2==3.1.4
-jsonschema==4.22.0
-jsonschema-specifications==2023.12.1
-markupsafe==2.1.5
-opengeode-core==14.21.3
-opengeode-geosciences==7.7.0
-opengeode-geosciencesio==4.7.7
-opengeode-inspector==5.1.4
-opengeode-io==6.5.1
-referencing==0.35.1
-rpds-py==0.18.1
-werkzeug==3.0.3