Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into fix/refactor_kill

Author: JulienChampagnol

mypy.ini

@@ -1,3 +1,4 @@
 [mypy]
 strict = True
-files = src/
+files = src/
+disallow_untyped_decorators = False

requirements.txt

@@ -12,7 +12,7 @@ click==8.*,>=8.3.0
     # via flask
 fastjsonschema==2.*,>=2.21.1
     # via opengeodeweb-microservice
-flask[async]==3.0.3
+flask[async]==3.*,>=3.0.3
     # via
     #   -r requirements.in
     #   flask
@@ -36,7 +36,7 @@ itsdangerous==2.*,>=2.2.0
     # via flask
 jinja2==3.*,>=3.1.6
     # via flask
-markupsafe==3.*,>=3.0.2
+markupsafe==3.*,>=3.0.3
     # via
     #   jinja2
     #   werkzeug

src/opengeodeweb_back/utils_functions.py

@@ -5,6 +5,7 @@
 import zipfile
 from collections.abc import Callable
 from typing import Any
+from concurrent.futures import ThreadPoolExecutor
 
 # Third party imports
 import flask
@@ -175,38 +176,47 @@ def save_all_viewables_and_return_info(
         additional_files=additional_files,
     )
     data_path = create_data_folder_from_id(data_entry.id)
-    saved_native_file_path = geode_functions.save(
-        geode_object,
-        data,
-        data_path,
-        "native." + data.native_extension(),
-    )
-    saved_viewable_file_path = geode_functions.save_viewable(
-        geode_object, data, data_path, "viewable"
-    )
-    saved_light_viewable_file_path = geode_functions.save_light_viewable(
-        geode_object, data, data_path, "light_viewable"
-    )
-    with open(saved_light_viewable_file_path, "rb") as f:
-        binary_light_viewable = f.read()
-    data_entry.native_file_name = os.path.basename(saved_native_file_path[0])
-    data_entry.viewable_file_name = os.path.basename(saved_viewable_file_path)
-    data_entry.light_viewable = os.path.basename(saved_light_viewable_file_path)
-
-    session = get_session()
-    if session:
-        session.commit()
-
-    return {
-        "native_file_name": data_entry.native_file_name,
-        "viewable_file_name": data_entry.viewable_file_name,
-        "id": data_entry.id,
-        "object_type": geode_functions.get_object_type(geode_object),
-        "binary_light_viewable": binary_light_viewable.decode("utf-8"),
-        "geode_object": data_entry.geode_object,
-        "input_files": data_entry.input_file,
-        "additional_files": data_entry.additional_files,
-    }
+    with ThreadPoolExecutor() as executor:
+        native_future = executor.submit(
+            geode_functions.save,
+            geode_object,
+            data,
+            data_path,
+            "native." + data.native_extension(),
+        )
+        viewable_future = executor.submit(
+            geode_functions.save_viewable, geode_object, data, data_path, "viewable"
+        )
+        light_viewable_future = executor.submit(
+            geode_functions.save_light_viewable,
+            geode_object,
+            data,
+            data_path,
+            "light_viewable",
+        )
+        saved_light_viewable_file_path = light_viewable_future.result()
+        with open(saved_light_viewable_file_path, "rb") as f:
+            binary_light_viewable = f.read()
+        saved_native_file_path = native_future.result()
+        saved_viewable_file_path = viewable_future.result()
+        data_entry.native_file_name = os.path.basename(saved_native_file_path[0])
+        data_entry.viewable_file_name = os.path.basename(saved_viewable_file_path)
+        data_entry.light_viewable = os.path.basename(saved_light_viewable_file_path)
+
+        session = get_session()
+        if session:
+            session.commit()
+
+        return {
+            "native_file_name": data_entry.native_file_name,
+            "viewable_file_name": data_entry.viewable_file_name,
+            "id": data_entry.id,
+            "object_type": geode_functions.get_object_type(geode_object),
+            "binary_light_viewable": binary_light_viewable.decode("utf-8"),
+            "geode_object": data_entry.geode_object,
+            "input_files": data_entry.input_file,
+            "additional_files": data_entry.additional_files,
+        }
 
 
 def generate_native_viewable_and_light_viewable_from_object(