test

Author: MaxNumerique

.gitignore

@@ -9,5 +9,4 @@ __pycache__
 .vscode
 uploads
 node_modules
-schemas.json
-tmp
+schemas.json

src/opengeodeweb_back/app_config.py

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

src/opengeodeweb_back/geode_functions.py

@@ -5,6 +5,7 @@
 import opengeode_geosciences as og_gs
 import opengeode as og
 import werkzeug
+import flask
 
 # Local application imports
 from .geode_objects import geode_objects_dict
@@ -38,23 +39,25 @@ 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):
+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 build_data_path(data_folder_path, request_json, filename):
+def data_file_path(request_json, filename):
+    data_folder_path = flask.current_app.config["DATA_FOLDER_PATH"] # Use the load_data function to get the data folder path
     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)
+def upload_file_path(upload_folder, filename):
+    secure_filename = werkzeug.utils.secure_filename(filename) # filename must be grabbed from the data_file_path function
     return os.path.abspath(os.path.join(upload_folder, secure_filename)
     )
 

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -99,7 +99,7 @@ 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(
+    file_absolute_path = geode_functions.upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"])
     allowed_objects = geode_functions.list_geode_objects(
         file_absolute_path, flask.request.json["supported_feature"]
@@ -124,7 +124,7 @@ def missing_files():
 
     missing_files = geode_functions.missing_files(
         flask.request.json["input_geode_object"],
-        geode_functions.build_upload_file_path(
+        geode_functions.upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"]),
     )
     has_missing_files = missing_files.has_missing_files()
@@ -217,7 +217,7 @@ def geode_objects_and_output_extensions():
     )
     data = geode_functions.load(
         flask.request.json["input_geode_object"],
-        geode_functions.build_upload_file_path(
+        geode_functions.upload_file_path(
     UPLOAD_FOLDER, flask.request.json["filename"]),
     )
     geode_objects_and_output_extensions = (
@@ -289,11 +289,9 @@ def create_point():
     methods=texture_coordinates_json["methods"],
 )
 def texture_coordinates():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, texture_coordinates_json)
-    data = geode_functions.load_from_request(
+    data = geode_functions.load_data(
     flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
     flask.request.json,
 )
 
@@ -314,11 +312,9 @@ def texture_coordinates():
     methods=vertex_attribute_names_json["methods"],
 )
 def vertex_attribute_names():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_from_request(
+    data = geode_functions.load_data(
     flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
     flask.request.json,
     )
 
@@ -344,11 +340,9 @@ def vertex_attribute_names():
     methods=polygon_attribute_names_json["methods"],
 )
 def polygon_attribute_names():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
-    data = geode_functions.load_from_request(
+    data = geode_functions.load_data(
     flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
     flask.request.json,
     )
 
@@ -374,11 +368,9 @@ def polygon_attribute_names():
     methods=polyhedron_attribute_names_json["methods"],
 )
 def polyhedron_attribute_names():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_from_request(
+    data = geode_functions.load_data(
     flask.request.json["input_geode_object"],
-    DATA_FOLDER_PATH,
     flask.request.json,
     )
 

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -19,8 +19,7 @@
 def uuid_to_flat_index():
     utils_functions.validate_request(flask.request, vtm_component_indices_json)
     try:
-        vtm_file_path = geode_functions.build_data_path(
-            flask.current_app.config["DATA_FOLDER_PATH"],
+        vtm_file_path = geode_functions.data_file_path(
             flask.request.json,
             "viewable.vtm"
         )
@@ -30,14 +29,12 @@ def uuid_to_flat_index():
     root = tree.find("vtkMultiBlockDataSet")
     uuid_to_flat_index = {}
     current_index = 0
-
     for elem in root.iter():
         if "uuid" in elem.attrib and elem.tag == "DataSet":
             uuid_to_flat_index[elem.attrib["uuid"]] = current_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 = {}
@@ -55,7 +52,7 @@ def extract_model_uuids(model):
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
     try:
-        model = geode_functions.load_from_request(
+        model = geode_functions.load_data(
             flask.request.json["geode_object"],
             flask.current_app.config["DATA_FOLDER_PATH"],
             flask.request.json,

tests/conftest.py

@@ -1,5 +1,4 @@
 # Standard library imports
-import os
 import time
 import shutil
 
@@ -8,12 +7,13 @@
 
 # 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/1/", dirs_exist_ok=True)
+    shutil.copytree("./tests/data/", "./data/{TEST_ID}/", dirs_exist_ok=True)
 
 
 @pytest.fixture

tests/test_models_routes.py

@@ -1,12 +1,17 @@
 import os
 import shutil
+
+from src.opengeodeweb_back import geode_functions
+
 def test_model_mesh_components(client, test_id):
     route = "/models/vtm_component_indices"
 
-    base_path = client.application.config["DATA_FOLDER_PATH"]
-    data_path = os.path.join(base_path, test_id)
-    os.makedirs(data_path, exist_ok=True)
-    shutil.copy("./tests/data/cube.vtm", os.path.join(data_path, "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)
 
     response = client.post(route, json={"id": test_id})
     assert response.status_code == 200
@@ -23,12 +28,16 @@ def test_model_mesh_components(client, test_id):
 def test_extract_brep_uuids(client, test_id):
     route = "/models/mesh_components"
 
-    base_path = client.application.config["DATA_FOLDER_PATH"]
-    data_path = os.path.join(base_path, test_id)
-    os.makedirs(data_path, exist_ok=True)
-    shutil.copy("./tests/data/cube.og_brep", os.path.join(data_path, "cube.og_brep"))
+    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
+    )
+    os.makedirs(os.path.dirname(data_path), exist_ok=True)
+    shutil.copy(f"./tests/data/{brep_filename}", data_path)
 
-    json_data = {"id": test_id, "geode_object": "BRep", "filename": "cube.og_brep"}
     response = client.post(route, json=json_data)
     assert response.status_code == 200