Refactored blueprints_routes and blueprint_models for improved organization and maintainability

Author: MaxNumerique

src/opengeodeweb_back/app_config.py

@@ -31,6 +31,3 @@ class DevConfig(Config):
     MINUTES_BEFORE_TIMEOUT = "1"
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     DATA_FOLDER_PATH = "./data/"
-
-
-TEST_ID = "1"

src/opengeodeweb_back/geode_functions.py

@@ -40,16 +40,6 @@ def load(geode_object: str, file_absolute_path: str):
     return geode_object_value(geode_object)["load"](file_absolute_path)
 
 
-def load_data(geode_object: str, request_json: dict):
-    data_folder_path = flask.current_app.config["DATA_FOLDER_PATH"]
-    file_absolute_path = os.path.join(
-        data_folder_path,
-        request_json["id"],
-        werkzeug.utils.secure_filename(request_json["filename"]),
-    )
-    return load(geode_object, file_absolute_path)
-
-
 def data_file_path(request_json, filename):
     data_folder_path = flask.current_app.config["DATA_FOLDER_PATH"]
     return os.path.join(
@@ -59,10 +49,14 @@ def data_file_path(request_json, filename):
     )
 
 
-def upload_file_path(upload_folder, filename):
-    secure_filename = werkzeug.utils.secure_filename(
-        filename
-    )  # filename must be grabbed from the data_file_path function
+def load_data(geode_object: str, request_json: dict):
+    file_absolute_path = data_file_path(request_json, request_json["filename"])
+    return load(geode_object, file_absolute_path)
+
+
+def upload_file_path(filename):
+    upload_folder = flask.current_app.config["UPLOAD_FOLDER"]
+    secure_filename = werkzeug.utils.secure_filename(filename)
     return os.path.abspath(os.path.join(upload_folder, secure_filename))
 
 

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -97,11 +97,8 @@ def allowed_objects():
     if flask.request.method == "OPTIONS":
         return flask.make_response({}, 200)
 
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(flask.request, allowed_objects_json)
-    file_absolute_path = geode_functions.upload_file_path(
-        UPLOAD_FOLDER, flask.request.json["filename"]
-    )
+    file_absolute_path = geode_functions.upload_file_path(flask.request.json["filename"])
     allowed_objects = geode_functions.list_geode_objects(
         file_absolute_path, flask.request.json["supported_feature"]
     )
@@ -120,12 +117,11 @@ def allowed_objects():
     methods=missing_files_json["methods"],
 )
 def missing_files():
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(flask.request, missing_files_json)
-
+    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
     missing_files = geode_functions.missing_files(
         flask.request.json["input_geode_object"],
-        geode_functions.upload_file_path(UPLOAD_FOLDER, flask.request.json["filename"]),
+        file_path,
     )
     has_missing_files = missing_files.has_missing_files()
 
@@ -186,11 +182,9 @@ def crs_converter_geographic_coordinate_systems():
     methods=inspect_file_json["methods"],
 )
 def inspect_file():
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(flask.request, inspect_file_json)
 
-    secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
-    file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
+    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
     data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
     class_inspector = geode_functions.inspect(
         flask.request.json["input_geode_object"], data
@@ -211,13 +205,13 @@ def inspect_file():
     methods=geode_objects_and_output_extensions_json["methods"],
 )
 def geode_objects_and_output_extensions():
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(
         flask.request, geode_objects_and_output_extensions_json
     )
+    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
     data = geode_functions.load(
         flask.request.json["input_geode_object"],
-        geode_functions.upload_file_path(UPLOAD_FOLDER, flask.request.json["filename"]),
+        file_path,
     )
     geode_objects_and_output_extensions = (
         geode_functions.geode_objects_output_extensions(
@@ -243,9 +237,8 @@ def geode_objects_and_output_extensions():
 )
 def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
-    file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
+
+    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
     data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable(
@@ -296,7 +289,12 @@ def texture_coordinates():
 
     texture_coordinates = data.texture_manager().texture_names()
 
-    return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
+    return flask.make_response(
+        {
+            "texture_coordinates": texture_coordinates
+            }, 
+            200
+    )
 
 
 with open(

tests/conftest.py

@@ -7,13 +7,12 @@
 
 # Local application imports
 from app import app
-from src.opengeodeweb_back.app_config import TEST_ID
 
 
 @pytest.fixture(scope="session", autouse=True)
 def copy_data():
     shutil.rmtree("./data", ignore_errors=True)
-    shutil.copytree("./tests/data/", "./data/{TEST_ID}/", dirs_exist_ok=True)
+    shutil.copytree("./tests/data/", "./data/1/", dirs_exist_ok=True)
 
 
 @pytest.fixture

tests/test_models_routes.py

@@ -2,11 +2,11 @@
 import shutil
 import flask
 
-import src.opengeodeweb_back.geode_functions as geode_functions
+from src.opengeodeweb_back import geode_functions
 
 
 def test_model_mesh_components(client, test_id):
-    route = "/models/vtm_component_indices"
+    route = f"/models/vtm_component_indices"
 
     with client.application.app_context():
         data_path = geode_functions.data_file_path({"id": test_id}, "viewable.vtm")
@@ -19,10 +19,11 @@ def test_model_mesh_components(client, test_id):
     uuid_dict = response.json["uuid_to_flat_index"]
     assert isinstance(uuid_dict, dict)
 
-    indices = sorted(uuid_dict.values())
+    indices = list(uuid_dict.values())
+    indices.sort()
     assert all(indices[i] > indices[i - 1] for i in range(1, len(indices)))
-    for key in uuid_dict:
-        assert isinstance(key, str)
+    for uuid in uuid_dict.keys():
+        assert isinstance(uuid, str)
 
 
 def test_extract_brep_uuids(client, test_id):
@@ -35,14 +36,13 @@ def test_extract_brep_uuids(client, test_id):
         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)
-
     response = client.post(route, json=json_data)
-    assert response.status_code == 200
 
+    assert response.status_code == 200
     uuid_dict = response.json["uuid_dict"]
     assert isinstance(uuid_dict, dict)
-    expected = {"Block", "Line", "Surface", "Corner"}
-    assert any(k in uuid_dict for k in expected)
-    for values in uuid_dict.values():
-        assert isinstance(values, list)
-        assert all(isinstance(v, str) for v in values)
+    expected_keys = {"Block", "Line", "Surface", "Corner"}
+    assert any(key in uuid_dict for key in expected_keys)
+    for key, value in uuid_dict.items():
+        assert isinstance(value, list)
+        assert all(isinstance(v, str) for v in value)