Apply prepare changes

Author: SpliiT

requirements.txt

@@ -60,4 +60,3 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.11rc1

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -37,6 +37,7 @@
 
 schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
 
+
 @routes.route(
     schemas_dict["allowed_files"]["route"],
     methods=schemas_dict["allowed_files"]["methods"],
@@ -49,6 +50,7 @@ def allowed_files() -> flask.Response:
             extensions.add(extension)
     return flask.make_response({"extensions": list(extensions)}, 200)
 
+
 @routes.route(
     schemas_dict["upload_file"]["route"],
     methods=schemas_dict["upload_file"]["methods"],
@@ -63,6 +65,7 @@ def upload_file() -> flask.Response:
     file.save(os.path.join(UPLOAD_FOLDER, filename))
     return flask.make_response({"message": "File uploaded"}, 201)
 
+
 @routes.route(
     schemas_dict["allowed_objects"]["route"],
     methods=schemas_dict["allowed_objects"]["methods"],
@@ -88,6 +91,7 @@ def allowed_objects() -> flask.Response:
         }
     return flask.make_response({"allowed_objects": allowed_objects}, 200)
 
+
 @routes.route(
     schemas_dict["missing_files"]["route"],
     methods=schemas_dict["missing_files"]["methods"],
@@ -126,6 +130,7 @@ def missing_files() -> flask.Response:
         200,
     )
 
+
 @routes.route(
     schemas_dict["geographic_coordinate_systems"]["route"],
     methods=schemas_dict["geographic_coordinate_systems"]["methods"],
@@ -150,6 +155,7 @@ def crs_converter_geographic_coordinate_systems() -> flask.Response:
         crs_list.append(crs)
     return flask.make_response({"crs_list": crs_list}, 200)
 
+
 @routes.route(
     schemas_dict["inspect_file"]["route"],
     methods=schemas_dict["inspect_file"]["methods"],
@@ -167,6 +173,7 @@ def inspect_file() -> flask.Response:
     inspection_result = extract_inspector_result(inspection_data)
     return flask.make_response({"inspection_result": inspection_result}, 200)
 
+
 def extract_inspector_result(inspection_data: Any) -> object:
     new_object = {}
 
@@ -194,6 +201,7 @@ def extract_inspector_result(inspection_data: Any) -> object:
             new_object["issues"] = issues
     return new_object
 
+
 @routes.route(
     schemas_dict["geode_objects_and_output_extensions"]["route"],
     methods=schemas_dict["geode_objects_and_output_extensions"]["methods"],
@@ -215,6 +223,7 @@ def geode_objects_and_output_extensions() -> flask.Response:
         200,
     )
 
+
 @routes.route(
     schemas_dict["save_viewable_file"]["route"],
     methods=schemas_dict["save_viewable_file"]["methods"],
@@ -232,6 +241,7 @@ def save_viewable_file() -> flask.Response:
         200,
     )
 
+
 @routes.route(
     schemas_dict["texture_coordinates"]["route"],
     methods=schemas_dict["texture_coordinates"]["methods"],
@@ -247,6 +257,7 @@ def texture_coordinates() -> flask.Response:
     texture_coordinates = geode_object.texture_manager().texture_names()
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
 
+
 @routes.route(
     schemas_dict["vertex_attribute_names"]["route"],
     methods=schemas_dict["vertex_attribute_names"]["methods"],
@@ -267,6 +278,7 @@ def vertex_attribute_names() -> flask.Response:
         200,
     )
 
+
 @routes.route(
     schemas_dict["cell_attribute_names"]["route"],
     methods=schemas_dict["cell_attribute_names"]["methods"],
@@ -287,6 +299,7 @@ def cell_attribute_names() -> flask.Response:
         200,
     )
 
+
 @routes.route(
     schemas_dict["polygon_attribute_names"]["route"],
     methods=schemas_dict["polygon_attribute_names"]["methods"],
@@ -307,6 +320,7 @@ def polygon_attribute_names() -> flask.Response:
         200,
     )
 
+
 @routes.route(
     schemas_dict["polyhedron_attribute_names"]["route"],
     methods=schemas_dict["polyhedron_attribute_names"]["methods"],
@@ -329,6 +343,7 @@ def polyhedron_attribute_names() -> flask.Response:
         200,
     )
 
+
 @routes.route(
     schemas_dict["ping"]["route"],
     methods=schemas_dict["ping"]["methods"],
@@ -338,12 +353,14 @@ def ping() -> flask.Response:
     flask.current_app.config.update(LAST_PING_TIME=time.time())
     return flask.make_response({"message": "Flask server is running"}, 200)
 
+
 @routes.route(schemas_dict["kill"]["route"], methods=schemas_dict["kill"]["methods"])
 def kill() -> flask.Response:
     print("Manual server kill, shutting down...", flush=True)
     os._exit(0)
     return flask.make_response({"message": "Flask server is dead"}, 200)
 
+
 @routes.route(
     schemas_dict["export_project"]["route"],
     methods=schemas_dict["export_project"]["methods"],
@@ -365,12 +382,9 @@ def export_project() -> flask.Response:
     with get_session() as session:
         session.query(Data).filter(
             (Data.input_file == None) | (Data.input_file == "")
-        ).update(
-            {Data.input_file: Data.native_file},
-            synchronize_session=False
-        )
+        ).update({Data.input_file: Data.native_file}, synchronize_session=False)
         session.commit()
-        
+
         rows = session.query(Data.id, Data.input_file, Data.additional_files).all()
 
     with zipfile.ZipFile(
@@ -400,6 +414,7 @@ def export_project() -> flask.Response:
 
     return utils_functions.send_file(project_folder, [export_vease_path], filename)
 
+
 @routes.route(
     schemas_dict["import_project"]["route"],
     methods=schemas_dict["import_project"]["methods"],

tests/test_geode_functions.py

@@ -59,6 +59,6 @@ def test_input_output() -> None:
                             geode_object,
                             os.path.join(os.path.abspath(f"./output"), filename),
                         )
-                        assert type(saved_files) is list 
+                        assert type(saved_files) is list
                         for saved_file in saved_files:
-                            os.remove(saved_file)
+                            os.remove(saved_file)

tests/test_models_routes.py

@@ -14,6 +14,7 @@
 base_dir = os.path.abspath(os.path.dirname(__file__))
 data_dir = os.path.join(base_dir, "data")
 
+
 def test_model_mesh_components(client: FlaskClient, test_id: str) -> None:
     route = "/opengeodeweb_back/models/vtm_component_indices"
 
@@ -34,6 +35,7 @@ def test_model_mesh_components(client: FlaskClient, test_id: str) -> None:
     for uuid in uuid_dict.keys():
         assert isinstance(uuid, str)
 
+
 def test_extract_brep_uuids(client: FlaskClient, test_id: str) -> None:
     route = "/opengeodeweb_back/models/mesh_components"
     brep_filename = os.path.join(data_dir, "cube.og_brep")
@@ -55,6 +57,7 @@ def test_extract_brep_uuids(client: FlaskClient, test_id: str) -> None:
         uuid_dict = response.get_json()["uuid_dict"]
         assert isinstance(uuid_dict, dict)
 
+
 def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
     route = "/opengeodeweb_back/export_project"
     snapshot = {
@@ -77,15 +80,15 @@ def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
             viewer_object="BRep",
             input_file=None,
             native_file="test_native.txt",
-            additional_files=[]
+            additional_files=[],
         )
         data2 = Data(
             id="test_data_2",
             geode_object="Section",
             viewer_object="Section",
             input_file="test_input.txt",
             native_file="test_native2.txt",
-            additional_files=[]
+            additional_files=[],
         )
         session.add(data1)
         session.add(data2)
@@ -131,6 +134,7 @@ def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
     if os.path.exists(export_path):
         os.remove(export_path)
 
+
 def test_import_project_route(client: FlaskClient, tmp_path: Path) -> None:
     route = "/opengeodeweb_back/import_project"
     snapshot = {
@@ -179,6 +183,7 @@ def test_import_project_route(client: FlaskClient, tmp_path: Path) -> None:
 
     client.application.config["DATA_FOLDER_PATH"] = original_data_folder
 
+
 def test_save_viewable_workflow_from_file(client: FlaskClient) -> None:
     file = os.path.join(data_dir, "cube.og_brep")
     upload_resp = client.put(
@@ -205,6 +210,7 @@ def test_save_viewable_workflow_from_file(client: FlaskClient) -> None:
     refreshed = Data.get(data_id)
     assert refreshed is not None
 
+
 def test_save_viewable_workflow_from_object(client: FlaskClient) -> None:
     route = "/opengeodeweb_back/create/create_aoi"
     aoi_data = {
@@ -224,4 +230,4 @@ def test_save_viewable_workflow_from_object(client: FlaskClient) -> None:
     data_id = response.get_json()["id"]
     assert isinstance(data_id, str) and len(data_id) > 0
     assert response.get_json()["geode_object_type"] == "EdgedCurve3D"
-    assert response.get_json()["viewable_file"].endswith(".vtp")
+    assert response.get_json()["viewable_file"].endswith(".vtp")