mypy

Author: MaxNumerique

src/opengeodeweb_back/geode_functions.py

@@ -6,6 +6,7 @@
 import opengeode as og  # type: ignore
 import werkzeug
 import flask
+from typing import Any
 
 # Local application imports
 from .geode_objects import geode_objects_dict
@@ -54,7 +55,7 @@ def data_file_path(data_id: str, filename: str = "") -> str:
     return os.path.join(data_folder_path, data_id)
 
 
-def load_data(data_id: str) -> og.GeodeObject:
+def load_data(data_id: str) -> Any:
     data_entry = Data.get(data_id)
     if not data_entry:
         flask.abort(404, f"Data with id {data_id} not found")

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -7,7 +7,6 @@
 import flask
 import opengeode
 import werkzeug
-from typing import Any, Dict
 
 # Local application imports
 from .. import geode_functions, utils_functions
@@ -291,8 +290,8 @@ def create_point():
 )
 def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
-    data = geode_functions.load_data(flask.request.json["id"])
-    texture_coordinates_json: Dict[str, Any] = json.load(file)
+    data = geode_functions.load_data(flask.request.json.get("id"))
+    texture_coordinates = data.texture_manager().texture_names()
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
 
 
@@ -309,8 +308,8 @@ def texture_coordinates():
 )
 def vertex_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_data(flask.request.json["id"])
-    vertex_attribute_names_json: Dict[str, Any] = json.load(file)
+    data = geode_functions.load_data(flask.request.json("id"))
+    vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
     return flask.make_response(
         {
             "vertex_attribute_names": vertex_attribute_names,
@@ -332,8 +331,8 @@ def vertex_attribute_names():
 )
 def polygon_attribute_names():
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
-    data = geode_functions.load_data(flask.request.json["id"])
-    polygon_attribute_names_json: Dict[str, Any] = json.load(file)
+    data = geode_functions.load_data(flask.request.json("id"))
+    polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
     return flask.make_response(
         {
             "polygon_attribute_names": polygon_attribute_names,
@@ -355,8 +354,8 @@ def polygon_attribute_names():
 )
 def polyhedron_attribute_names():
     utils_functions.validate_request(flask.request, polyhedron_attribute_names_json)
-    data = geode_functions.load_data(flask.request.json["id"])
-    polyhedron_attribute_names_json: Dict[str, Any] = json.load(file)
+    data = geode_functions.load_data(flask.request.json("id"))
+    polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()
     return flask.make_response(
         {
             "polyhedron_attribute_names": polyhedron_attribute_names,

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -20,7 +20,7 @@ def uuid_to_flat_index():
     utils_functions.validate_request(flask.request, vtm_component_indices_json)
 
     vtm_file_path = geode_functions.data_file_path(
-        flask.request.json["id"], "viewable.vtm"
+        flask.request.json("id"), "viewable.vtm"
     )
     tree = ET.parse(vtm_file_path)
     root = tree.find("vtkMultiBlockDataSet")
@@ -49,6 +49,6 @@ def extract_model_uuids(model):
 @routes.route(mesh_components_json["route"], methods=mesh_components_json["methods"])
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
-    model = geode_functions.load_data(flask.request.json["id"])
+    model = geode_functions.load_data(flask.request.json("id"))
     uuid_dict = extract_model_uuids(model)
     return flask.make_response({"uuid_dict": uuid_dict}, 200)

tests/test_routes.py

@@ -157,7 +157,7 @@ def get_full_data():
     assert type(native_file_name) is str
     viewable_file_name = response.json["viewable_file_name"]
     assert type(viewable_file_name) is str
-    id = response.json["id"]
+    id = response.json("id")
     assert type(id) is str
     object_type = response.json["object_type"]
     assert type(object_type) is str
@@ -261,7 +261,7 @@ def test_create_point(client):
     assert response.status_code == 200
     viewable_file_name = response.json["viewable_file_name"]
     assert type(viewable_file_name) is str
-    id = response.json["id"]
+    id = response.json("id")
     assert type(id) is str
 
     # Test all params