Merge branch 'feat/folder_path' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/folder_path

Author: MaxNumerique

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -19,7 +19,9 @@
 def uuid_to_flat_index():
     utils_functions.validate_request(flask.request, vtm_component_indices_json)
     vtm_file_path = os.path.join(
-        flask.current_app.config["DATA_FOLDER_PATH"], flask.request.json["id"] , "viewable.vtm"
+        flask.current_app.config["DATA_FOLDER_PATH"],
+        flask.request.json["id"],
+        "viewable.vtm",
     )
     tree = ET.parse(vtm_file_path)
     root = tree.find("vtkMultiBlockDataSet")
@@ -59,7 +61,9 @@ def extract_model_uuids(geode_object, file_path):
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
     file_path = os.path.join(
-        flask.current_app.config["DATA_FOLDER_PATH"], flask.request.json["id"], flask.request.json["filename"]
+        flask.current_app.config["DATA_FOLDER_PATH"],
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
     if not os.path.exists(file_path):
         return flask.make_response({"error": "File not found"}, 404)

src/opengeodeweb_back/utils_functions.py

@@ -143,9 +143,7 @@ def handle_exception(e):
     return response
 
 
-def generate_native_viewable_and_light_viewable(
-    geode_object, data
-):
+def generate_native_viewable_and_light_viewable(geode_object, data):
     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)
@@ -159,7 +157,7 @@ def generate_native_viewable_and_light_viewable(
         "native." + data.native_extension(),
     )
     saved_viewable_file_path = geode_functions.save_viewable(
-    geode_object, data, data_path, "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(
@@ -172,7 +170,7 @@ def generate_native_viewable_and_light_viewable(
     return {
         "name": name,
         "native_file_name": os.path.basename(saved_native_file_path[0]),
-        "viewable_file_name":viewable_file_name,
+        "viewable_file_name": viewable_file_name,
         "id": generated_id,
         "object_type": object_type,
         "binary_light_viewable": str(binary_light_viewable, "utf-8"),

tests/conftest.py

@@ -34,6 +34,7 @@ def app_context():
     with app.app_context():
         yield
 
+
 @pytest.fixture
 def uuid_project_structure():
     uuid_project = uuid.uuid4().hex

tests/test_models_routes.py

@@ -1,6 +1,7 @@
 import shutil
 import os
 
+
 def test_model_mesh_components(client, uuid_project_structure):
     route = "/models/vtm_component_indices"
     uuid_data = uuid_project_structure["uuid_data"]
@@ -26,7 +27,6 @@ def test_model_mesh_components(client, uuid_project_structure):
         client.application.config["DATA_FOLDER_PATH"] = original_path
 
 
-
 def test_extract_brep_uuids(client, uuid_project_structure):
     route = "/models/mesh_components"
     uuid_data = uuid_project_structure["uuid_data"]
@@ -41,7 +41,7 @@ def test_extract_brep_uuids(client, uuid_project_structure):
         json_data = {
             "filename": "cube.og_brep",
             "geode_object": "BRep",
-            "id": uuid_data
+            "id": uuid_data,
         }
         response = client.post(route, json=json_data)
         assert response.status_code == 200
@@ -55,4 +55,3 @@ def test_extract_brep_uuids(client, uuid_project_structure):
             assert all(isinstance(v, str) for v in value)
     finally:
         client.application.config["DATA_FOLDER_PATH"] = original_path
-