finished moving tests, better app.py

Author: MaxNumerique

requirements.in

@@ -7,5 +7,5 @@ geode-common==33.11.0
 geode-viewables==3.3.0
 flask[async]==3.1.2
 flask-cors==6.0.1
-werkzeug==3.1.3
+werkzeug==3.1.2
 flask-sqlalchemy==3.1.1

src/opengeodeweb_back/app.py

@@ -35,13 +35,6 @@
 SECONDS_BETWEEN_SHUTDOWNS = float(app.config.get("SECONDS_BETWEEN_SHUTDOWNS"))
 
 
-def get_db_path_from_config():
-    database_uri = f"{os.path.abspath(
-        os.path.join(app.config.get('DATA_FOLDER_PATH'), app.config.get('DATABASE_FILENAME'))
-    )}"
-    return database_uri
-
-
 app.register_blueprint(
     blueprint_routes.routes,
     url_prefix="/opengeodeweb_back",
@@ -142,14 +135,10 @@ def run_server():
         flush=True,
     )
 
-    db_path = get_db_path_from_config()
-    print("db_path", db_path, flush=True)
-    if db_path:
-        db_dir = os.path.dirname(db_path)
-        if db_dir and not os.path.exists(db_dir):
-            os.makedirs(db_dir, exist_ok=True)
-        init_database(db_path)
-        print(f"Database initialized at: {db_path}")
+    db_path = os.path.join(args.data_folder_path, app.config.get("DATABASE_FILENAME"))
+    os.makedirs(os.path.dirname(db_path), exist_ok=True)
+    init_database(db_path)
+    print(f"Database initialized at: {db_path}", flush=True)
 
     app.run(debug=args.debug, host=args.host, port=args.port, ssl_context=SSL)
 

tests/conftest.py

@@ -28,7 +28,7 @@ def configure_test_environment() -> Generator[None, None, None]:
     app.config["TESTING"] = True
     app.config["SERVER_NAME"] = "TEST"
     app.config["DATA_FOLDER_PATH"] = "./data/"
-    app.config["UPLOAD_FOLDER"] = "./src/tests/data/"
+    app.config["UPLOAD_FOLDER"] = "./tests/data/"
 
     db_path = os.path.join(base_path, "data", "project.db")
     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"

tests/test_models_routes.py

@@ -13,7 +13,7 @@ def test_model_mesh_components(client, test_id):
     with client.application.app_context():
         data_path = geode_functions.data_file_path(test_id, "viewable.vtm")
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./src/tests/data/cube.vtm", data_path)
+        shutil.copy("./tests/data/cube.vtm", data_path)
 
     response = client.post(route, json={"id": test_id})
     assert response.status_code == 200
@@ -42,7 +42,7 @@ def test_extract_brep_uuids(client, test_id):
         if session:
             session.commit()
 
-        src_path = os.path.join("src", "tests", "data", brep_filename)
+        src_path = os.path.join("tests", "data", brep_filename)
         dest_path = os.path.join(
             flask.current_app.config["DATA_FOLDER_PATH"], data_entry.id, brep_filename
         )

tests/test_routes.py

@@ -50,7 +50,7 @@ def get_full_data():
 def test_upload_file(client, filename="test.og_brep"):
     response = client.put(
         f"/opengeodeweb_back/upload_file",
-        data={"file": FileStorage(open(f"./src/tests/data/{filename}", "rb"))},
+        data={"file": FileStorage(open(f"./tests/data/{filename}", "rb"))},
     )
     assert response.status_code == 201
 
@@ -179,7 +179,7 @@ def test_texture_coordinates(client, test_id):
 
         data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./src/tests/data/hat.vtp", data_path)
+        shutil.copy("./tests/data/hat.vtp", data_path)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(
         "/opengeodeweb_back/texture_coordinates", json={"id": data.id}
@@ -203,7 +203,7 @@ def test_vertex_attribute_names(client, test_id):
 
         data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./src/tests/data/test.vtp", data_path)
+        shutil.copy("./tests/data/test.vtp", data_path)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
     assert response.status_code == 200
@@ -225,7 +225,7 @@ def test_polygon_attribute_names(client, test_id):
 
         data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./src/tests/data/test.vtp", data_path)
+        shutil.copy("./tests/data/test.vtp", data_path)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
     assert response.status_code == 200
@@ -247,7 +247,7 @@ def test_polyhedron_attribute_names(client, test_id):
 
         data_path = geode_functions.data_file_path(data.id, data.native_file_name)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./src/tests/data/test.vtu", data_path)
+        shutil.copy("./tests/data/test.vtu", data_path)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
     print(response.json)

tests/test_utils_functions.py

@@ -99,7 +99,7 @@ def test_save_all_viewables_and_return_info(client):
         assert os.path.exists(expected_db_path)
 
         geode_object = "BRep"
-        data = geode_functions.load(geode_object, "./src/tests/data/test.og_brep")
+        data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
         input_file = "test.og_brep"
         additional_files = ["additional_file.txt"]
 
@@ -134,7 +134,7 @@ def test_save_all_viewables_commits_to_db(client):
     app = client.application
     with app.app_context():
         geode_object = "BRep"
-        data = geode_functions.load(geode_object, "./src/tests/data/test.og_brep")
+        data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
         input_file = "test.og_brep"
         result = utils_functions.save_all_viewables_and_return_info(
             geode_object, data, input_file
@@ -156,7 +156,7 @@ def test_generate_native_viewable_and_light_viewable_from_object(client):
     app = client.application
     with app.app_context():
         geode_object = "BRep"
-        data = geode_functions.load(geode_object, "./src/tests/data/test.og_brep")
+        data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
 
         result = (
             utils_functions.generate_native_viewable_and_light_viewable_from_object(