removed try/catch

removed request_json in geode_functions

Author: MaxNumerique

src/opengeodeweb_back/geode_functions.py

@@ -40,17 +40,17 @@ def load(geode_object: str, file_absolute_path: str):
     return geode_object_value(geode_object)["load"](file_absolute_path)
 
 
-def data_file_path(request_json, filename):
+def data_file_path(data_id: str, filename: str) -> str:
     data_folder_path = flask.current_app.config["DATA_FOLDER_PATH"]
     return os.path.join(
         data_folder_path,
-        request_json["id"],
+        data_id,
         werkzeug.utils.secure_filename(filename),
     )
 
 
-def load_data(geode_object: str, request_json: dict):
-    file_absolute_path = data_file_path(request_json, request_json["filename"])
+def load_data(geode_object: str, data_id: str, filename: str):
+    file_absolute_path = data_file_path(data_id, filename)
     return load(geode_object, file_absolute_path)
 
 

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -286,7 +286,8 @@ def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
     data = geode_functions.load_data(
         flask.request.json["input_geode_object"],
-        flask.request.json,
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
 
     texture_coordinates = data.texture_manager().texture_names()
@@ -309,7 +310,8 @@ def vertex_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
     data = geode_functions.load_data(
         flask.request.json["input_geode_object"],
-        flask.request.json,
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
 
     vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
@@ -337,7 +339,8 @@ def polygon_attribute_names():
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
     data = geode_functions.load_data(
         flask.request.json["input_geode_object"],
-        flask.request.json,
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
 
     polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
@@ -365,7 +368,8 @@ def polyhedron_attribute_names():
     utils_functions.validate_request(flask.request, polyhedron_attribute_names_json)
     data = geode_functions.load_data(
         flask.request.json["input_geode_object"],
-        flask.request.json,
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
 
     polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -18,14 +18,11 @@
 )
 def uuid_to_flat_index():
     utils_functions.validate_request(flask.request, vtm_component_indices_json)
-    try:
-        vtm_file_path = geode_functions.data_file_path(
-            flask.request.json,
-            "viewable.vtm",
-        )
-        tree = ET.parse(vtm_file_path)
-    except FileNotFoundError:
-        return flask.make_response({"error": "VTM file not found"}, 404)
+
+    vtm_file_path = geode_functions.data_file_path(
+        flask.request.json["id"], "viewable.vtm"
+    )
+    tree = ET.parse(vtm_file_path)
     root = tree.find("vtkMultiBlockDataSet")
     uuid_to_flat_index = {}
     current_index = 0
@@ -52,12 +49,12 @@ def extract_model_uuids(model):
 @routes.route(mesh_components_json["route"], methods=mesh_components_json["methods"])
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
-    try:
-        model = geode_functions.load_data(
-            flask.request.json["geode_object"],
-            flask.request.json,
-        )
-    except FileNotFoundError:
-        return flask.make_response({"error": "File not found"}, 404)
+
+    model = geode_functions.load_data(
+        flask.request.json["geode_object"],
+        flask.request.json["id"],
+        flask.request.json["filename"],
+    )
+
     uuid_dict = extract_model_uuids(model)
     return flask.make_response({"uuid_dict": uuid_dict}, 200)

tests/test_models_routes.py

@@ -9,7 +9,7 @@ def test_model_mesh_components(client, test_id):
     route = f"/models/vtm_component_indices"
 
     with client.application.app_context():
-        data_path = geode_functions.data_file_path({"id": test_id}, "viewable.vtm")
+        data_path = geode_functions.data_file_path(test_id, "viewable.vtm")
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy("./tests/data/cube.vtm", data_path)
 
@@ -33,7 +33,7 @@ def test_extract_brep_uuids(client, test_id):
     json_data = {"id": test_id, "geode_object": "BRep", "filename": brep_filename}
 
     with client.application.app_context():
-        data_path = geode_functions.data_file_path(json_data, brep_filename)
+        data_path = geode_functions.data_file_path(json_data["id"], brep_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy(f"./tests/data/{brep_filename}", data_path)
     response = client.post(route, json=json_data)

tests/test_routes.py

@@ -174,7 +174,7 @@ def get_full_data():
 def test_texture_coordinates(client, test_id):
     with client.application.app_context():
         data_path = geode_functions.data_file_path(
-            {"id": test_id, "filename": "hat.vtp"}, "hat.vtp"
+        test_id, "hat.vtp"
         )
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy("./tests/vertex_attribute.vtp", data_path)