Apply prepare changes

Author: MaxNumerique

src/opengeodeweb_back/app_config.py

@@ -32,4 +32,5 @@ class DevConfig(Config):
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     DATA_FOLDER_PATH = "./data/"
 
-TEST_ID = "1"
+
+TEST_ID = "1"

src/opengeodeweb_back/geode_functions.py

@@ -39,6 +39,7 @@ def is_loadable(geode_object: str, file_absolute_path: str):
 def load(geode_object: str, file_absolute_path: str):
     return geode_object_value(geode_object)["load"](file_absolute_path)
 
+
 def load_from_request(geode_object: str, data_folder_path: str, request_json: dict):
     file_absolute_path = os.path.join(
         data_folder_path,
@@ -47,17 +48,18 @@ def load_from_request(geode_object: str, data_folder_path: str, request_json: di
     )
     return load(geode_object, file_absolute_path)
 
+
 def build_data_path(data_folder_path, request_json, filename):
     return os.path.join(
         data_folder_path,
         request_json["id"],
         werkzeug.utils.secure_filename(filename),
     )
 
+
 def build_upload_file_path(upload_folder, filename):
     secure_filename = werkzeug.utils.secure_filename(filename)
-    return os.path.abspath(os.path.join(upload_folder, secure_filename)
-    )
+    return os.path.abspath(os.path.join(upload_folder, secure_filename))
 
 
 def is_saveable(geode_object: str, data, filename: str):

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -100,7 +100,8 @@ def allowed_objects():
     UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(flask.request, allowed_objects_json)
     file_absolute_path = geode_functions.build_upload_file_path(
-    UPLOAD_FOLDER, flask.request.json["filename"])
+        UPLOAD_FOLDER, flask.request.json["filename"]
+    )
     allowed_objects = geode_functions.list_geode_objects(
         file_absolute_path, flask.request.json["supported_feature"]
     )
@@ -125,7 +126,8 @@ def missing_files():
     missing_files = geode_functions.missing_files(
         flask.request.json["input_geode_object"],
         geode_functions.build_upload_file_path(
-    UPLOAD_FOLDER, flask.request.json["filename"]),
+            UPLOAD_FOLDER, flask.request.json["filename"]
+        ),
     )
     has_missing_files = missing_files.has_missing_files()
 
@@ -218,7 +220,8 @@ def geode_objects_and_output_extensions():
     data = geode_functions.load(
         flask.request.json["input_geode_object"],
         geode_functions.build_upload_file_path(
-    UPLOAD_FOLDER, flask.request.json["filename"]),
+            UPLOAD_FOLDER, flask.request.json["filename"]
+        ),
     )
     geode_objects_and_output_extensions = (
         geode_functions.geode_objects_output_extensions(
@@ -291,10 +294,10 @@ def create_point():
 def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
     data = geode_functions.load_from_request(
-    flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
-    flask.request.json,
-)
+        flask.request.json["input_geode_object"],
+        DATA_FOLDER_PATH,
+        flask.request.json,
+    )
 
     texture_coordinates = data.texture_manager().texture_names()
 
@@ -315,9 +318,9 @@ def texture_coordinates():
 def vertex_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
     data = geode_functions.load_from_request(
-    flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
-    flask.request.json,
+        flask.request.json["input_geode_object"],
+        DATA_FOLDER_PATH,
+        flask.request.json,
     )
 
     vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
@@ -344,9 +347,9 @@ def vertex_attribute_names():
 def polygon_attribute_names():
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
     data = geode_functions.load_from_request(
-    flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
-    flask.request.json,
+        flask.request.json["input_geode_object"],
+        DATA_FOLDER_PATH,
+        flask.request.json,
     )
 
     polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
@@ -373,9 +376,9 @@ def polygon_attribute_names():
 def polyhedron_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
     data = geode_functions.load_from_request(
-    flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
-    flask.request.json,
+        flask.request.json["input_geode_object"],
+        DATA_FOLDER_PATH,
+        flask.request.json,
     )
 
     polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -35,6 +35,7 @@ def uuid_to_flat_index():
         current_index += 1
     return flask.make_response({"uuid_to_flat_index": uuid_to_flat_index}, 200)
 
+
 def extract_model_uuids(model):
     mesh_components = model.mesh_components()
     uuid_dict = {}

tests/test_models_routes.py

@@ -1,12 +1,11 @@
 import os
 import shutil
+
+
 def test_model_mesh_components(client, test_id):
     route = "/models/vtm_component_indices"
 
-    data_path = geode_functions.data_file_path(
-        {"id": test_id},
-        "viewable.vtm"
-    )
+    data_path = geode_functions.data_file_path({"id": test_id}, "viewable.vtm")
     os.makedirs(os.path.dirname(data_path), exist_ok=True)
     shutil.copy("./tests/data/cube.vtm", data_path)
 
@@ -28,10 +27,7 @@ def test_extract_brep_uuids(client, test_id):
     brep_filename = "cube.og_brep"
     json_data = {"id": test_id, "geode_object": "BRep", "filename": brep_filename}
 
-    data_path = geode_functions.data_file_path(
-        json_data,
-        brep_filename
-    )
+    data_path = geode_functions.data_file_path(json_data, brep_filename)
     os.makedirs(os.path.dirname(data_path), exist_ok=True)
     shutil.copy(f"./tests/data/{brep_filename}", data_path)