fix mypy & other comments

Author: SpliiT

requirements.txt

@@ -2,15 +2,15 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None requirements.in
+#    pip-compile --output-file=./requirements.txt --pre ./requirements.in
 #
-asgiref==3.10.0
+asgiref~=3.10
     # via flask
-blinker==1.9.0
+blinker~=1.9
     # via flask
-click==8.3.0
+click~=8.3
     # via flask
-flask[async]==3.1.2
+flask[async]~=3.1
     # via
     #   -r requirements.in
     #   flask-cors
@@ -25,13 +25,13 @@ geode-common==33.11.0
     #   geode-viewables
 geode-viewables==3.3.0
     # via -r requirements.in
-greenlet==3.2.4
+greenlet~=3.2
     # via sqlalchemy
-itsdangerous==2.2.0
+itsdangerous~=2.2
     # via flask
-jinja2==3.1.6
+jinja2~=3.1
     # via flask
-markupsafe==3.0.3
+markupsafe~=3.0
     # via
     #   flask
     #   jinja2
@@ -59,9 +59,9 @@ opengeode-io==7.4.0
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-sqlalchemy==2.0.43
+sqlalchemy~=2.0
     # via flask-sqlalchemy
-typing-extensions==4.15.0
+typing-extensions~=4.15
     # via sqlalchemy
 werkzeug==3.1.2
     # via

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -257,6 +257,7 @@ def save_viewable_file():
         200,
     )
 
+
 with open(os.path.join(schemas, "texture_coordinates.json"), "r") as file:
     texture_coordinates_json = json.load(file)
 

src/opengeodeweb_back/utils_functions.py

@@ -163,7 +163,7 @@ def create_data_folder_from_id(data_id: str) -> str:
 def save_all_viewables_and_return_info(
     geode_object: str,
     data: Any,
-    input_file: str | None =  None,
+    input_file: str | None = None,
     additional_files: list[str] | None = None,
 ) -> dict[str, Any]:
     if additional_files is None:

tests/test_create_routes.py

@@ -1,32 +1,17 @@
 # Standard library imports
 import os
-from typing import Dict, Any, TypedDict, cast
+import uuid
+from typing import Any, Callable, Dict, List
 
 # Third party imports
 import pytest
+from flask.testing import FlaskClient
 
 # Local application imports
 from src.opengeodeweb_back import test_utils
 
-# --- Type definitions for test data ---
-class Point(TypedDict):
-    x: float
-    y: float
-
-class PointData(TypedDict):
-    name: str
-    x: float
-    y: float
-    z: float
-
-class AOIData(TypedDict):
-    name: str
-    points: list[Point]
-    z: float
-
-# --- Fixtures ---
 @pytest.fixture
-def point_data() -> PointData:
+def point_data() -> Dict[str, Any]:
     return {
         "name": "test_point",
         "x": 1.0,
@@ -35,7 +20,7 @@ def point_data() -> PointData:
     }
 
 @pytest.fixture
-def aoi_data() -> AOIData:
+def aoi_data() -> Dict[str, Any]:
     return {
         "name": "test_aoi",
         "points": [
@@ -47,50 +32,58 @@ def aoi_data() -> AOIData:
         "z": 0.0
     }
 
-# --- Tests ---
-def test_create_point(client: Any, point_data: PointData) -> None:
+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"
+
     # Test with all required data
     response = client.post(route, json=point_data)
     assert response.status_code == 200
+
     # Verify response data
-    response_data: Dict[str, Any] = response.json
+    response_data: Any = response.json
     assert "viewable_file_name" in response_data
     assert "id" in response_data
     assert "name" in response_data
     assert "native_file_name" in response_data
     assert "object_type" in response_data
     assert "geode_object" in response_data
+
     assert response_data["name"] == point_data["name"]
     assert response_data["object_type"] == "mesh"
     assert response_data["geode_object"] == "PointSet3D"
-    # Test with missing parameters - IMPORTANT: use .copy() to avoid mutation
+
+    # Test with missing parameters
     test_utils.test_route_wrong_params(client, route, lambda: point_data.copy()) # type: ignore
 
-def test_create_aoi(client: Any, aoi_data: AOIData) -> None:
+def test_create_aoi(client: FlaskClient, aoi_data: Dict[str, Any]) -> None:
     """Test the creation of an AOI with valid data."""
     route: str = "/opengeodeweb_back/create/create_aoi"
+
     # Test with all required data
     response = client.post(route, json=aoi_data)
     assert response.status_code == 200
+
     # Verify response data
-    response_data: Dict[str, Any] = response.json
+    response_data: Any = response.json
     assert "viewable_file_name" in response_data
     assert "id" in response_data
     assert "name" in response_data
     assert "native_file_name" in response_data
     assert "object_type" in response_data
     assert "geode_object" in response_data
+
     assert response_data["name"] == aoi_data["name"]
     assert response_data["object_type"] == "mesh"
     assert response_data["geode_object"] == "EdgedCurve3D"
-    # Test with missing parameters - IMPORTANT: use .copy() to avoid mutation
-    test_utils.test_route_wrong_params(client, route, lambda: aoi_data.copy()) # type: ignore
 
-def test_create_point_with_invalid_data(client: Any) -> None:
+    # Test with missing parameters
+    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."""
     route: str = "/opengeodeweb_back/create/create_point"
+
     # Test with non-numeric coordinates
     invalid_data: Dict[str, Any] = {
         "name": "invalid_point",
@@ -100,6 +93,7 @@ def test_create_point_with_invalid_data(client: Any) -> None:
     }
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
+
     # Test with missing coordinates
     invalid_data = {
         "name": "invalid_point",
@@ -109,9 +103,10 @@ def test_create_point_with_invalid_data(client: Any) -> None:
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
-def test_create_aoi_with_invalid_data(client: Any, aoi_data: AOIData) -> 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"
+
     # Test with invalid points
     invalid_data: Dict[str, Any] = {
         **aoi_data,
@@ -124,6 +119,7 @@ def test_create_aoi_with_invalid_data(client: Any, aoi_data: AOIData) -> None:
     }
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
+
     # Test with too few points
     invalid_data = {
         **aoi_data,
@@ -134,6 +130,7 @@ def test_create_aoi_with_invalid_data(client: Any, aoi_data: AOIData) -> None:
     }
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
+
     # Test with invalid z value
     invalid_data = {
         **aoi_data,
@@ -142,58 +139,72 @@ def test_create_aoi_with_invalid_data(client: Any, aoi_data: AOIData) -> None:
     response = client.post(route, json=invalid_data)
     assert response.status_code == 400
 
-def test_create_point_file_generation(client: Any, point_data: PointData) -> 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"
+
     # Make the request
     response = client.post(route, json=point_data)
     assert response.status_code == 200
-    response_data: Dict[str, Any] = response.json
+    response_data: Any = response.json
+
     # Get the data folder path for this specific ID
     DATA_FOLDER_PATH: str = client.application.config["DATA_FOLDER_PATH"]
     data_id: str = response_data["id"]
     data_folder: str = os.path.join(DATA_FOLDER_PATH, data_id)
+
     # Check that the data folder exists
     assert os.path.exists(data_folder)
     assert os.path.isdir(data_folder)
+
     # Check native file exists
     native_file_path: str = os.path.join(data_folder, response_data["native_file_name"])
     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"])
     assert os.path.exists(viewable_file_path)
+
     # Check light viewable file exists if present
     if "binary_light_viewable" in response_data:
         light_viewable_file_path: str = os.path.join(data_folder, "light_viewable.vtp")
         assert os.path.exists(light_viewable_file_path)
+
     # Verify file extensions
     assert response_data["native_file_name"].endswith(".og_pts3d")
     assert response_data["viewable_file_name"].endswith(".vtp")
 
-def test_create_aoi_file_generation(client: Any, aoi_data: AOIData) -> 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"
+
     # Make the request
     response = client.post(route, json=aoi_data)
     assert response.status_code == 200
-    response_data: Dict[str, Any] = response.json
+    response_data: Any = response.json
+
     # Get the data folder path for this specific ID
     DATA_FOLDER_PATH: str = client.application.config["DATA_FOLDER_PATH"]
     data_id: str = response_data["id"]
     data_folder: str = os.path.join(DATA_FOLDER_PATH, data_id)
+
     # Check that the data folder exists
     assert os.path.exists(data_folder)
     assert os.path.isdir(data_folder)
+
     # Check native file exists
     native_file_path: str = os.path.join(data_folder, response_data["native_file_name"])
     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"])
     assert os.path.exists(viewable_file_path)
+
     # Check light viewable file exists if present
     if "binary_light_viewable" in response_data:
         light_viewable_file_path: str = os.path.join(data_folder, "light_viewable.vtp")
         assert os.path.exists(light_viewable_file_path)
+
     # 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")