cell attributes & tests

Author: JulienChampagnol

src/opengeodeweb_back/app.py

@@ -72,14 +72,14 @@ def teardown_request(exception: BaseException | None) -> None:
 
 
 @app.errorhandler(HTTPException)
-def errorhandler(e: HTTPException) -> tuple[dict[str, Any], int] | Response:
-    return utils_functions.handle_exception(e)
+def errorhandler(exception: HTTPException) -> tuple[dict[str, Any], int] | Response:
+    return utils_functions.handle_exception(exception)
 
 
 @app.errorhandler(Exception)
-def handle_generic_exception(e: Exception) -> Response:
-    print("handle_generic_exception:", str(e), flush=True)
-    return flask.make_response({"error": str(e)}, 500)
+def handle_generic_exception(exception: Exception) -> Response: 
+    print("\033[91mError:\033[0m \033[91m" + str(exception) + "\033[0m", flush=True)
+    return flask.make_response({"description": str(exception)}, 500)
 
 
 @app.route(

src/opengeodeweb_back/geode_objects/__init__.py

@@ -1,21 +1,11 @@
 # Standard library imports
 from __future__ import annotations
-from abc import ABC, abstractmethod
-from typing import Literal, Any, get_args, cast
 
 # Third party imports
-import opengeode as og
-import opengeode_io as og_io
-import opengeode_inspector as og_inspector
-import opengeode_geosciences as og_gs
-import opengeode_geosciencesio as og_gs_io
-import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeObjectType, GeodeMeshType, GeodeModelType
+from .types import GeodeObjectType
 from .geode_object import GeodeObject
-from .geode_model import GeodeModel
-from .geode_mesh import GeodeMesh
 from .geode_brep import GeodeBRep
 from .geode_vertex_set import GeodeVertexSet
 from .geode_graph import GeodeGraph
@@ -29,11 +19,11 @@
 from .geode_polygonal_surface3d import GeodePolygonalSurface3D
 from .geode_triangulated_surface2d import GeodeTriangulatedSurface2D
 from .geode_triangulated_surface3d import GeodeTriangulatedSurface3D
-from .geode_regulard_grid2d import GeodeRegularGrid2D
+from .geode_regular_grid2d import GeodeRegularGrid2D
 from .geode_polyhedral_solid3d import GeodePolyhedralSolid3D
 from .geode_tetrahedral_solid3d import GeodeTetrahedralSolid3D
 from .geode_hybrid_solid3d import GeodeHybridSolid3D
-from .geode_regulard_grid3d import GeodeRegularGrid3D
+from .geode_regular_grid3d import GeodeRegularGrid3D
 from .geode_light_regular_grid2d import GeodeLightRegularGrid2D
 from .geode_light_regular_grid3d import GeodeLightRegularGrid3D
 from .geode_section import GeodeSection

src/opengeodeweb_back/geode_objects/geode_grid2d.py

@@ -20,10 +20,10 @@ def is_3D(cls) -> bool:
     def is_viewable(cls) -> bool:
         return True
 
-    def builder(self) -> None:
+    def builder(self) -> object:
         return None
 
-    def inspect(self) -> None:
+    def inspect(self) -> object:
         return None
 
     @abstractmethod

src/opengeodeweb_back/geode_objects/geode_grid3d.py

@@ -20,10 +20,10 @@ def is_3D(cls) -> bool:
     def is_viewable(cls) -> bool:
         return True
 
-    def builder(self) -> None:
+    def builder(self) -> object:
         return None
 
-    def inspect(self) -> None:
+    def inspect(self) -> object:
         return None
 
     @abstractmethod

…k/geode_objects/geode_regulard_grid2d.py …ck/geode_objects/geode_regular_grid2d.pysrc/opengeodeweb_back/geode_objects/geode_regulard_grid2d.py renamed to src/opengeodeweb_back/geode_objects/geode_regular_grid2d.py src/opengeodeweb_back/geode_objects/geode_regulard_grid2d.py renamed to src/opengeodeweb_back/geode_objects/geode_regular_grid2d.py

@@ -12,7 +12,7 @@
 from .geode_grid2d import GeodeGrid2D
 
 
-class GeodeRegularGrid2D(GeodeSurfaceMesh2D):
+class GeodeRegularGrid2D(GeodeSurfaceMesh2D, GeodeGrid2D):
     regular_grid: og.RegularGrid2D
 
     def __init__(self, regular_grid: og.RegularGrid2D | None = None) -> None:
@@ -24,6 +24,9 @@ def __init__(self, regular_grid: og.RegularGrid2D | None = None) -> None:
     @classmethod
     def geode_object_type(cls) -> GeodeMeshType:
         return "RegularGrid2D"
+    
+    def inspect(self) -> og_inspector.SurfaceInspectionResult:
+        return super().inspect()
 
     def native_extension(self) -> str:
         return self.regular_grid.native_extension()
@@ -70,3 +73,7 @@ def save_light_viewable(self, filename_without_extension: str) -> str:
         return viewables.save_light_viewable_regular_grid2D(
             self.regular_grid, filename_without_extension
         )
+    
+    def cell_attribute_manager(self) -> og.AttributeManager:
+        return self.regular_grid.cell_attribute_manager()
+

…k/geode_objects/geode_regulard_grid3d.py …ck/geode_objects/geode_regular_grid3d.pysrc/opengeodeweb_back/geode_objects/geode_regulard_grid3d.py renamed to src/opengeodeweb_back/geode_objects/geode_regular_grid3d.py src/opengeodeweb_back/geode_objects/geode_regulard_grid3d.py renamed to src/opengeodeweb_back/geode_objects/geode_regular_grid3d.py

@@ -9,9 +9,10 @@
 # Local application imports
 from .types import GeodeMeshType
 from .geode_solid_mesh3d import GeodeSolidMesh3D
+from .geode_grid3d import GeodeGrid3D
 
 
-class GeodeRegularGrid3D(GeodeSolidMesh3D):
+class GeodeRegularGrid3D(GeodeSolidMesh3D, GeodeGrid3D):
     regular_grid: og.RegularGrid3D
 
     def __init__(self, regular_grid: og.RegularGrid3D | None = None) -> None:
@@ -69,3 +70,9 @@ def save_light_viewable(self, filename_without_extension: str) -> str:
         return viewables.save_light_viewable_regular_grid3D(
             self.regular_grid, filename_without_extension
         )
+
+    def cell_attribute_manager(self) -> og.AttributeManager:
+        return self.regular_grid.cell_attribute_manager()
+    
+    def inspect(self) -> og_inspector.SolidInspectionResult:
+        return super().inspect()

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -254,7 +254,7 @@ def texture_coordinates() -> flask.Response:
     params = schemas.TextureCoordinates.from_dict(json_data)
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeSurfaceMesh2D | GeodeSurfaceMesh3D):
-        flask.abort(500, f"{params.id} is not a GeodeSurfaceMesh")
+        flask.abort(400, f"{params.id} is not a GeodeSurfaceMesh")
     texture_coordinates = geode_object.texture_manager().texture_names()
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
 
@@ -270,7 +270,7 @@ def vertex_attribute_names() -> flask.Response:
     params = schemas.VertexAttributeNames.from_dict(json_data)
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeMesh):
-        flask.abort(500, f"{params.id} is not a GeodeMesh")
+        flask.abort(400, f"{params.id} is not a GeodeMesh")
     vertex_attribute_names = geode_object.vertex_attribute_manager().attribute_names()
     return flask.make_response(
         {
@@ -290,7 +290,7 @@ def cell_attribute_names() -> flask.Response:
     params = schemas.PolygonAttributeNames.from_dict(json_data)
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeGrid2D | GeodeGrid3D):
-        flask.abort(500, f"{params.id} is not a GeodeGrid")
+       flask.abort(400, f"{params.id} is not a GeodeGrid")
     cell_attribute_names = geode_object.cell_attribute_manager().attribute_names()
     return flask.make_response(
         {
@@ -310,7 +310,7 @@ def polygon_attribute_names() -> flask.Response:
     params = schemas.PolygonAttributeNames.from_dict(json_data)
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeSurfaceMesh2D | GeodeSurfaceMesh3D):
-        flask.abort(500, f"{params.id} is not a GeodeSurfaceMesh")
+        flask.abort(400, f"{params.id} is not a GeodeSurfaceMesh")
     polygon_attribute_names = geode_object.polygon_attribute_manager().attribute_names()
     return flask.make_response(
         {
@@ -331,7 +331,7 @@ def polyhedron_attribute_names() -> flask.Response:
     params = schemas.PolyhedronAttributeNames.from_dict(json_data)
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeSolidMesh3D):
-        flask.abort(500, f"{params.id} is not a GeodeSolidMesh")
+        flask.abort(400, f"{params.id} is not a GeodeSolidMesh")
     polyhedron_attribute_names = (
         geode_object.polyhedron_attribute_manager().attribute_names()
     )

src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -82,11 +82,11 @@ def create_voi() -> flask.Response:
 
     aoi_data = geode_functions.get_data_info(params.aoi_id)
     if not aoi_data:
-        flask.abort(500, f"AOI with id {params.aoi_id} not found")
+        flask.abort(404, f"AOI with id {params.aoi_id} not found")
 
     aoi_object = geode_functions.load_geode_object(params.aoi_id)
     if not isinstance(aoi_object, GeodeEdgedCurve3D):
-        flask.abort(500, f"AOI with id {params.aoi_id} not a GeodeEdgedCurve3D")
+        flask.abort(400, f"AOI with id {params.aoi_id} is not a GeodeEdgedCurve3D")
 
     aoi_curve = aoi_object.edged_curve
     nb_points = aoi_curve.nb_vertices()

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -24,7 +24,7 @@ def uuid_to_flat_index() -> flask.Response:
     tree = ET.parse(vtm_file_path)
     root = tree.find("vtkMultiBlockDataSet")
     if root is None:
-        raise Exception("Failed to read viewable file")
+        flask.abort(500, "Failed to read viewable file")
     uuid_to_flat_index = {}
     current_index = 0
     for elem in root.iter():
@@ -45,7 +45,7 @@ def extract_uuids_endpoint() -> flask.Response:
     params = schemas.MeshComponents.from_dict(json_data)
     model = geode_functions.load_geode_object(params.id)
     if not isinstance(model, GeodeModel):
-        flask.abort(500, f"{params.id} is not a GeodeModel")
+        flask.abort(400, f"{params.id} is not a GeodeModel")
     mesh_components = model.mesh_components()
     uuid_dict = {}
     for mesh_component, ids in mesh_components.items():

src/opengeodeweb_back/utils_functions.py

@@ -164,6 +164,7 @@ def send_file(
 
 
 def handle_exception(exception: HTTPException) -> flask.Response:
+    print("\033[91mError:\033[0m \033[91m" + str(exception) + "\033[0m", flush=True)
     response = flask.jsonify(
         {
             "code": exception.code,