Apply prepare changes

Author: SpliiT

requirements.txt

@@ -36,7 +36,7 @@ markupsafe==3.0.3
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==15.29.0
+opengeode-core==15.27.4
     # via
     #   -r requirements.in
     #   geode-common
@@ -59,7 +59,7 @@ opengeode-io==7.4.0
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-sqlalchemy==2.0.43
+sqlalchemy==2.0.44
     # via flask-sqlalchemy
 typing-extensions==4.15.0
     # via sqlalchemy
@@ -69,4 +69,3 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice~=1.0

src/opengeodeweb_back/app.py

@@ -1,4 +1,5 @@
 """Packages"""
+
 import argparse
 import os
 import time
@@ -54,14 +55,17 @@
         utils_functions.kill_task, SECONDS_BETWEEN_SHUTDOWNS, app
     )
 
+
 @app.errorhandler(HTTPException)
 def errorhandler(e: HTTPException) -> tuple[dict[str, Any], int] | Response:
     return utils_functions.handle_exception(e)
 
+
 @app.errorhandler(Exception)
 def handle_generic_exception(e: Exception) -> Response:
     return flask.make_response({"error": str(e)}, 500)
 
+
 @app.route(
     "/error",
     methods=["POST"],
@@ -70,17 +74,20 @@ def return_error() -> Response:
     flask.abort(500, f"Test")
     return flask.make_response({}, 500)
 
+
 @app.route("/", methods=["POST"])
 @cross_origin()
 def root() -> Response:
     return flask.make_response({}, 200)
 
+
 @app.route("/kill", methods=["POST"])
 @cross_origin()
 def kill() -> None:
     print("Manual server kill, shutting down...", flush=True)
     os._exit(0)
 
+
 def run_server() -> None:
     parser = argparse.ArgumentParser(
         prog="OpenGeodeWeb-Back", description="Backend server for OpenGeodeWeb"
@@ -142,6 +149,7 @@ def run_server() -> None:
     print(f"Database initialized at: {db_path}", flush=True)
     app.run(debug=args.debug, host=args.host, port=args.port, ssl_context=SSL)
 
+
 # ''' Main '''
 if __name__ == "__main__":
     run_server()

src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -2,9 +2,11 @@
 import json
 import os
 from typing import Any, TypedDict
+
 # Third party imports
 import flask
 import opengeode
+
 # Local application imports
 from opengeodeweb_back import geode_functions, utils_functions
 from opengeodeweb_back.utils_functions import save_all_viewables_and_return_info
@@ -15,29 +17,31 @@
 # --- Type definitions ---
 type SchemaDict = dict[str, Any]
 
+
 class PointDict(TypedDict):
     x: float
     y: float
 
+
 class CreatePointParams(TypedDict):
     name: str
     x: float
     y: float
     z: float
 
+
 class CreateAOIParams(TypedDict):
     name: str
     points: list[PointDict]
     z: float
 
+
 # Load schemas
 with open(os.path.join(schemas, "create_point.json"), "r") as file:
     create_point_json: SchemaDict = json.load(file)
 
-@routes.route(
-    create_point_json["route"],
-    methods=create_point_json["methods"]
-)
+
+@routes.route(create_point_json["route"], methods=create_point_json["methods"])
 def create_point() -> flask.Response:
     """Endpoint to create a single point in 3D space."""
     print(f"create_point : {flask.request=}", flush=True)
@@ -67,14 +71,13 @@ def create_point() -> flask.Response:
         raise ValueError("binary_light_viewable is missing in the result")
     return flask.make_response(result, 200)
 
+
 # Load schema for AOI creation
 with open(os.path.join(schemas, "create_aoi.json"), "r") as file:
     create_aoi_json: SchemaDict = json.load(file)
 
-@routes.route(
-    create_aoi_json["route"],
-    methods=create_aoi_json["methods"]
-)
+
+@routes.route(create_aoi_json["route"], methods=create_aoi_json["methods"])
 def create_aoi() -> flask.Response:
     """Endpoint to create an Area of Interest (AOI) as an EdgedCurve3D."""
     print(f"create_aoi : {flask.request=}", flush=True)
@@ -104,8 +107,10 @@ def create_aoi() -> flask.Response:
         next_i = (i + 1) % num_vertices
         edge_id = builder.create_edge()
         builder.set_edge_vertex(opengeode.EdgeVertex(edge_id, 0), vertex_indices[i])
-        builder.set_edge_vertex(opengeode.EdgeVertex(edge_id, 1), vertex_indices[next_i])
-        
+        builder.set_edge_vertex(
+            opengeode.EdgeVertex(edge_id, 1), vertex_indices[next_i]
+        )
+
     # Save and get info
     result = save_all_viewables_and_return_info(
         geode_object="EdgedCurve3D",

tests/test_create_routes.py

@@ -10,14 +10,11 @@
 # Local application imports
 from src.opengeodeweb_back import test_utils
 
+
 @pytest.fixture
 def point_data() -> Dict[str, Any]:
-    return {
-        "name": "test_point",
-        "x": 1.0,
-        "y": 2.0,
-        "z": 3.0
-    }
+    return {"name": "test_point", "x": 1.0, "y": 2.0, "z": 3.0}
+
 
 @pytest.fixture
 def aoi_data() -> Dict[str, Any]:
@@ -27,11 +24,12 @@ def aoi_data() -> Dict[str, Any]:
             {"x": 0.0, "y": 0.0},
             {"x": 1.0, "y": 0.0},
             {"x": 1.0, "y": 1.0},
-            {"x": 0.0, "y": 1.0}
+            {"x": 0.0, "y": 1.0},
         ],
-        "z": 0.0
+        "z": 0.0,
     }
 
+
 def test_create_point(client: FlaskClient, point_data: Dict[str, Any]) -> None:
     """Test the creation of a point with valid data."""
     route: str = "/opengeodeweb_back/create/create_point"
@@ -54,7 +52,8 @@ def test_create_point(client: FlaskClient, point_data: Dict[str, Any]) -> None:
     assert response_data["geode_object"] == "PointSet3D"
 
     # Test with missing parameters
-    test_utils.test_route_wrong_params(client, route, lambda: point_data.copy()) # type: ignore
+    test_utils.test_route_wrong_params(client, route, lambda: point_data.copy())  # type: ignore
+
 
 def test_create_aoi(client: FlaskClient, aoi_data: Dict[str, Any]) -> None:
     """Test the creation of an AOI with valid data."""
@@ -78,7 +77,8 @@ def test_create_aoi(client: FlaskClient, aoi_data: Dict[str, Any]) -> None:
     assert response_data["geode_object"] == "EdgedCurve3D"
 
     # Test with missing parameters
-    test_utils.test_route_wrong_params(client, route, lambda: aoi_data.copy())# type: ignore
+    test_utils.test_route_wrong_params(client, route, lambda: aoi_data.copy())  # type: ignore
+
 
 def test_create_point_with_invalid_data(client: FlaskClient) -> None:
     """Test the point creation endpoint with invalid data."""
@@ -89,21 +89,20 @@ def test_create_point_with_invalid_data(client: FlaskClient) -> None:
         "name": "invalid_point",
         "x": "not_a_number",
         "y": 2.0,
-        "z": 3.0
+        "z": 3.0,
     }
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
     # Test with missing coordinates
-    invalid_data = {
-        "name": "invalid_point",
-        "y": 2.0,
-        "z": 3.0
-    }
+    invalid_data = {"name": "invalid_point", "y": 2.0, "z": 3.0}
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
-def test_create_aoi_with_invalid_data(client: FlaskClient, aoi_data: Dict[str, Any]) -> None:
+
+def test_create_aoi_with_invalid_data(
+    client: FlaskClient, aoi_data: Dict[str, Any]
+) -> None:
     """Test the AOI creation endpoint with invalid data."""
     route: str = "/opengeodeweb_back/create/create_aoi"
 
@@ -114,32 +113,26 @@ def test_create_aoi_with_invalid_data(client: FlaskClient, aoi_data: Dict[str, A
             {"x": "not_a_number", "y": 0.0},
             {"x": 1.0, "y": 0.0},
             {"x": 1.0, "y": 1.0},
-            {"x": 0.0, "y": 1.0}
-        ]
+            {"x": 0.0, "y": 1.0},
+        ],
     }
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
     # Test with too few points
-    invalid_data = {
-        **aoi_data,
-        "points": [
-            {"x": 0.0, "y": 0.0},
-            {"x": 1.0, "y": 0.0}
-        ]
-    }
+    invalid_data = {**aoi_data, "points": [{"x": 0.0, "y": 0.0}, {"x": 1.0, "y": 0.0}]}
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
     # Test with invalid z value
-    invalid_data = {
-        **aoi_data,
-        "z": "not_a_number"
-    }
+    invalid_data = {**aoi_data, "z": "not_a_number"}
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
-def test_create_point_file_generation(client: FlaskClient, point_data: Dict[str, Any]) -> None:
+
+def test_create_point_file_generation(
+    client: FlaskClient, point_data: Dict[str, Any]
+) -> None:
     """Test that the point creation generates the correct files."""
     route: str = "/opengeodeweb_back/create/create_point"
 
@@ -162,7 +155,9 @@ def test_create_point_file_generation(client: FlaskClient, point_data: Dict[str,
     assert os.path.exists(native_file_path)
 
     # Check viewable file exists
-    viewable_file_path: str = os.path.join(data_folder, response_data["viewable_file_name"])
+    viewable_file_path: str = os.path.join(
+        data_folder, response_data["viewable_file_name"]
+    )
     assert os.path.exists(viewable_file_path)
 
     # Check light viewable file exists if present
@@ -174,7 +169,10 @@ def test_create_point_file_generation(client: FlaskClient, point_data: Dict[str,
     assert response_data["native_file_name"].endswith(".og_pts3d")
     assert response_data["viewable_file_name"].endswith(".vtp")
 
-def test_create_aoi_file_generation(client: FlaskClient, aoi_data: Dict[str, Any]) -> None:
+
+def test_create_aoi_file_generation(
+    client: FlaskClient, aoi_data: Dict[str, Any]
+) -> None:
     """Test that the AOI creation generates the correct files."""
     route: str = "/opengeodeweb_back/create/create_aoi"
 
@@ -197,7 +195,9 @@ def test_create_aoi_file_generation(client: FlaskClient, aoi_data: Dict[str, Any
     assert os.path.exists(native_file_path)
 
     # Check viewable file exists
-    viewable_file_path: str = os.path.join(data_folder, response_data["viewable_file_name"])
+    viewable_file_path: str = os.path.join(
+        data_folder, response_data["viewable_file_name"]
+    )
     assert os.path.exists(viewable_file_path)
 
     # Check light viewable file exists if present
@@ -207,4 +207,4 @@ def test_create_aoi_file_generation(client: FlaskClient, aoi_data: Dict[str, Any
 
     # Verify file extensions
     assert response_data["native_file_name"].endswith(".og_edc3d")
-    assert response_data["viewable_file_name"].endswith(".vtp")
+    assert response_data["viewable_file_name"].endswith(".vtp")