feat(input_file): added unique path for files from input file

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -251,7 +251,6 @@ def save_viewable_file():
         utils_functions.generate_native_viewable_and_light_viewable_from_file(
             geode_object=flask.request.json["input_geode_object"],
             input_filename=flask.request.json["filename"],
-            data_id=flask.request.json["data_id"],
         ),
         200,
     )

src/opengeodeweb_back/routes/schemas/save_viewable_file.json

@@ -12,16 +12,11 @@
         "filename": {
             "type": "string",
             "minLength": 1
-        },
-        "data_id": {
-            "type": "string",
-            "minLength": 1
         }
     },
     "required": [
         "input_geode_object",
-        "filename",
-        "data_id"
+        "filename"
     ],
     "additionalProperties": false
 }

src/opengeodeweb_back/utils_functions.py

@@ -10,6 +10,7 @@
 import fastjsonschema
 import importlib.metadata as metadata
 import shutil
+import werkzeug
 
 # Local application imports
 from . import geode_functions
@@ -144,44 +145,14 @@ def handle_exception(e):
     return response
 
 
-def generate_native_viewable_and_light_viewable_from_object(geode_object, data):
-    return generate_native_viewable_and_light_viewable(geode_object, data)
-
-
-def generate_native_viewable_and_light_viewable_from_file(
-    geode_object, input_filename, data_id
-):
-    data = geode_functions.load_data(geode_object, data_id, input_filename)
-    full_input_filename = geode_functions.data_file_path(data_id, input_filename)
-    return generate_native_viewable_and_light_viewable(
-        geode_object, data, full_input_filename
-    )
-
-
-def generate_native_viewable_and_light_viewable(
-    geode_object, data, input_filename=None
-):
+def create_unique_data_folder(base_data_folder: str) -> tuple[str, str]:
     generated_id = str(uuid.uuid4()).replace("-", "")
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
-    data_path = os.path.join(DATA_FOLDER_PATH, generated_id)
+    data_path = os.path.join(base_data_folder, generated_id)
     os.makedirs(data_path, exist_ok=True)
+    return generated_id, data_path
 
-    additional_files_copied = []
-    if input_filename:
-        additional = geode_functions.additional_files(geode_object, input_filename)
-        for additional_file in additional.mandatory_files + additional.optional_files:
-            if additional_file.is_missing:
-                continue
-            source_path = os.path.join(
-                os.path.dirname(input_filename), additional_file.filename
-            )
-            if not os.path.exists(source_path):
-                continue
-            dest_path = os.path.join(data_path, additional_file.filename)
-            os.makedirs(os.path.dirname(dest_path), exist_ok=True)
-            shutil.copy2(source_path, dest_path)
-            additional_files_copied.append(additional_file.filename)
 
+def save_all_viewables_and_return_info(geode_object, data, generated_id, data_path, additional_files=None):
     saved_native_file_path = geode_functions.save(
         geode_object,
         data,
@@ -191,7 +162,6 @@ def generate_native_viewable_and_light_viewable(
     saved_viewable_file_path = geode_functions.save_viewable(
         geode_object, data, data_path, "viewable"
     )
-    viewable_file_name = os.path.basename(saved_viewable_file_path)
     saved_light_viewable_file_path = geode_functions.save_light_viewable(
         geode_object, data, data_path, "light_viewable"
     )
@@ -201,10 +171,48 @@ def generate_native_viewable_and_light_viewable(
     return {
         "name": data.name(),
         "native_file_name": os.path.basename(saved_native_file_path[0]),
-        "viewable_file_name": viewable_file_name,
+        "viewable_file_name": os.path.basename(saved_viewable_file_path),
         "id": generated_id,
         "object_type": geode_functions.get_object_type(geode_object),
         "binary_light_viewable": binary_light_viewable.decode("utf-8"),
         "geode_object": geode_object,
-        "input_files": additional_files_copied,
+        "input_files": additional_files or [],
     }
+
+def generate_native_viewable_and_light_viewable_from_object(geode_object, data):
+    base_data_folder = flask.current_app.config["DATA_FOLDER_PATH"]
+    generated_id, data_path = create_unique_data_folder(base_data_folder)
+
+    return save_all_viewables_and_return_info(geode_object, data, generated_id, data_path)
+
+
+def generate_native_viewable_and_light_viewable_from_file(geode_object, input_filename):
+    base_data_folder = flask.current_app.config["DATA_FOLDER_PATH"]
+    generated_id, data_path = create_unique_data_folder(base_data_folder)
+
+    full_input_filename = geode_functions.upload_file_path(input_filename)
+    copied_full_path = os.path.join(data_path, werkzeug.utils.secure_filename(input_filename))
+    shutil.copy2(full_input_filename, copied_full_path)
+
+    additional_files_copied = []
+    additional = geode_functions.additional_files(geode_object, full_input_filename)
+    for additional_file in additional.mandatory_files + additional.optional_files:
+        if additional_file.is_missing:
+            continue
+        source_path = os.path.join(os.path.dirname(full_input_filename), additional_file.filename)
+        if not os.path.exists(source_path):
+            continue
+        dest_path = os.path.join(data_path, additional_file.filename)
+        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+        shutil.copy2(source_path, dest_path)
+        additional_files_copied.append(additional_file.filename)
+
+    data = geode_functions.load_data(geode_object, generated_id, input_filename)
+
+    return save_all_viewables_and_return_info(
+        geode_object,
+        data,
+        generated_id,
+        data_path,
+        additional_files=additional_files_copied,
+    )

tests/test_routes.py

@@ -138,15 +138,14 @@ def get_full_data():
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
 
-def test_save_viewable_file(client, test_id):
+def test_save_viewable_file(client):
     test_upload_file(client, filename="corbi.og_brep")
     route = f"/save_viewable_file"
 
     def get_full_data():
         return {
             "input_geode_object": "BRep",
             "filename": "corbi.og_brep",
-            "data_id": test_id,
         }
 
     # Normal test with filename 'corbi.og_brep'
@@ -174,7 +173,7 @@ def test_texture_coordinates(client, test_id):
     with client.application.app_context():
         data_path = geode_functions.data_file_path(test_id, "hat.vtp")
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./tests/data/hat.vtp", data_path)  # Utiliser hat.vtp qui existe
+        shutil.copy("./tests/data/hat.vtp", data_path)
 
     response = client.post(
         "/texture_coordinates",

tests/test_utils_functions.py

@@ -96,15 +96,14 @@ def test_generate_native_viewable_and_light_viewable_from_object(client):
     assert result["input_files"] == []
 
 
-def test_generate_native_viewable_and_light_viewable_from_file(client, test_id):
+def test_generate_native_viewable_and_light_viewable_from_file(client):
     app = client.application
     with app.app_context():
         geode_object = "BRep"
         input_filename = "test.og_brep"
-        data_id = test_id
 
         result = utils_functions.generate_native_viewable_and_light_viewable_from_file(
-            geode_object, input_filename, data_id
+            geode_object, input_filename
         )
 
     assert isinstance(result, dict)
@@ -118,24 +117,3 @@ def test_generate_native_viewable_and_light_viewable_from_file(client, test_id):
     assert isinstance(result["object_type"], str)
     assert isinstance(result["binary_light_viewable"], str)
     assert isinstance(result["input_files"], list)
-
-
-def test_native_viewable_and_light_viewable(client):
-    app = client.application
-    with app.app_context():
-        geode_object = "BRep"
-        data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
-        result = utils_functions.generate_native_viewable_and_light_viewable(
-            geode_object, data
-        )
-
-    assert isinstance(result, dict)
-    assert isinstance(result["name"], str)
-    assert isinstance(result["native_file_name"], str)
-    assert result["native_file_name"].startswith("native.")
-    assert isinstance(result["viewable_file_name"], str)
-    assert result["viewable_file_name"].endswith(".vtm")
-    assert isinstance(result["id"], str)
-    assert re.match(r"[0-9a-f]{32}", result["id"])
-    assert isinstance(result["object_type"], str)
-    assert isinstance(result["binary_light_viewable"], str)