OpenGeodeWeb-Back 6.9.4rc1__tar.gz → 6.10.0__tar.gz

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.9.4rc1
+Version: 6.10.0
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back
@@ -28,7 +28,7 @@ Requires-Dist: opengeode-inspector==6.11.6
 Requires-Dist: opengeode-inspector-geosciences==1.1.0
 Requires-Dist: opengeode-io==7.7.0
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.4rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.4
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.9.4-rc.1"
+version = "6.10.0"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
 description = "OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/requirements.txt

@@ -66,4 +66,4 @@ werkzeug==3.1.8
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.1.4rc1
+opengeodeweb-microservice==1.*,>=1.1.4

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/OpenGeodeWeb_Back.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.9.4rc1
+Version: 6.10.0
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back
@@ -28,7 +28,7 @@ Requires-Dist: opengeode-inspector==6.11.6
 Requires-Dist: opengeode-inspector-geosciences==1.1.0
 Requires-Dist: opengeode-io==7.7.0
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.4rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.4
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -77,8 +77,6 @@ src/opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json
 src/opengeodeweb_back/routes/schemas/geographic_coordinate_systems.py
 src/opengeodeweb_back/routes/schemas/import_project.json
 src/opengeodeweb_back/routes/schemas/import_project.py
-src/opengeodeweb_back/routes/schemas/inspect_file.json
-src/opengeodeweb_back/routes/schemas/inspect_file.py
 src/opengeodeweb_back/routes/schemas/kill.json
 src/opengeodeweb_back/routes/schemas/kill.py
 src/opengeodeweb_back/routes/schemas/missing_files.json
@@ -103,6 +101,8 @@ src/opengeodeweb_back/routes/schemas/texture_coordinates.json
 src/opengeodeweb_back/routes/schemas/texture_coordinates.py
 src/opengeodeweb_back/routes/schemas/upload_file.json
 src/opengeodeweb_back/routes/schemas/upload_file.py
+src/opengeodeweb_back/routes/schemas/validate.json
+src/opengeodeweb_back/routes/schemas/validate.py
 src/opengeodeweb_back/routes/schemas/vertex_attribute_names.json
 src/opengeodeweb_back/routes/schemas/vertex_attribute_names.py
 tests/test_create_routes.py

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -15,4 +15,4 @@ opengeode-inspector==6.11.6
 opengeode-inspector-geosciences==1.1.0
 opengeode-io==7.7.0
 werkzeug==3.1.8
-opengeodeweb-microservice==1.*,>=1.1.4rc1
+opengeodeweb-microservice==1.*,>=1.1.4

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_brep.py

@@ -94,6 +94,9 @@ class GeodeBRep(GeodeModel):
     def inspect(self) -> og_inspector.BRepInspectionResult:
         return og_inspector.inspect_brep(self.brep)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_brep_valid(self.brep)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py

@@ -82,6 +82,9 @@ class GeodeEdgedCurve2D(GeodeGraph):
     def inspect(self) -> og_inspector.EdgedCurveInspectionResult:
         return og_inspector.inspect_edged_curve2D(self.edged_curve)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_edged_curve_valid2D(self.edged_curve)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py

@@ -82,6 +82,9 @@ class GeodeEdgedCurve3D(GeodeGraph):
     def inspect(self) -> og_inspector.EdgedCurveInspectionResult:
         return og_inspector.inspect_edged_curve3D(self.edged_curve)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_edged_curve_valid3D(self.edged_curve)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_graph.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 # Third party imports
 import opengeode as og
+import opengeode_inspector as og_inspector
 from opengeodeweb_microservice.database.data_types import (
     GeodeMeshType,
     ViewerElementsType,
@@ -80,5 +81,9 @@ class GeodeGraph(GeodeVertexSet):
     def inspect(self) -> object:
         return None
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        result = og_inspector.ObjectValidity()
+        return result
+
     def edge_attribute_manager(self) -> og.AttributeManager:
         return self.graph.edge_attribute_manager()

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_grid2d.py

@@ -4,6 +4,7 @@ from abc import abstractmethod
 
 # Third party imports
 import opengeode as og
+import opengeode_inspector as og_inspector
 from opengeodeweb_microservice.database.data_types import ViewerElementsType
 
 # Local application imports
@@ -29,5 +30,9 @@ class GeodeGrid2D(GeodeMesh):
     def inspect(self) -> object:
         return None
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        result = og_inspector.ObjectValidity()
+        return result
+
     @abstractmethod
     def cell_attribute_manager(self) -> og.AttributeManager: ...

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_grid3d.py

@@ -4,6 +4,7 @@ from abc import abstractmethod
 
 # Third party imports
 import opengeode as og
+import opengeode_inspector as og_inspector
 from opengeodeweb_microservice.database.data_types import ViewerElementsType
 
 # Local application imports
@@ -29,5 +30,9 @@ class GeodeGrid3D(GeodeMesh):
     def inspect(self) -> object:
         return None
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        result = og_inspector.ObjectValidity()
+        return result
+
     @abstractmethod
     def cell_attribute_manager(self) -> og.AttributeManager: ...

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_object.py

@@ -5,6 +5,7 @@ from typing import Any
 
 # Third party imports
 import opengeode as og
+import opengeode_inspector as og_inspector
 from opengeodeweb_microservice.database.data_types import (
     GeodeObjectType,
     ViewerType,
@@ -84,3 +85,6 @@ class GeodeObject(ABC):
 
     @abstractmethod
     def inspect(self) -> Any: ...
+
+    @abstractmethod
+    def validate(self) -> og_inspector.ObjectValidity: ...

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_point_set2d.py

@@ -80,6 +80,9 @@ class GeodePointSet2D(GeodeVertexSet):
     def inspect(self) -> og_inspector.PointSetInspectionResult:
         return og_inspector.inspect_point_set2D(self.point_set)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_pointset_valid2D(self.point_set)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_point_set3d.py

@@ -80,6 +80,9 @@ class GeodePointSet3D(GeodeVertexSet):
     def inspect(self) -> og_inspector.PointSetInspectionResult:
         return og_inspector.inspect_point_set3D(self.point_set)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_pointset_valid3D(self.point_set)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 # Third party imports
 import opengeode as og
+import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 from opengeodeweb_microservice.database.data_types import (
     GeodeMeshType,
@@ -85,5 +86,9 @@ class GeodeRasterImage2D(GeodeMesh):
     def inspect(self) -> None:
         return None
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        result = og_inspector.ObjectValidity()
+        return result
+
     def vertex_attribute_manager(self) -> og.AttributeManager:
         return og.AttributeManager()

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 # Third party imports
 import opengeode as og
+import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 from opengeodeweb_microservice.database.data_types import (
     GeodeMeshType,
@@ -85,5 +86,9 @@ class GeodeRasterImage3D(GeodeMesh):
     def inspect(self) -> None:
         return None
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        result = og_inspector.ObjectValidity()
+        return result
+
     def vertex_attribute_manager(self) -> og.AttributeManager:
         return og.AttributeManager()

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_section.py

@@ -96,6 +96,9 @@ class GeodeSection(GeodeModel):
     def inspect(self) -> og_inspector.SectionInspectionResult:
         return og_inspector.inspect_section(self.section)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_section_valid(self.section)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py

@@ -36,6 +36,9 @@ class GeodeSolidMesh3D(GeodeVertexSet):
     def inspect(self) -> og_inspector.SolidInspectionResult:
         return og_inspector.inspect_solid3D(self.solid_mesh)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_solid_valid3D(self.solid_mesh)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py

@@ -38,6 +38,9 @@ class GeodeSurfaceMesh2D(GeodeVertexSet):
     def inspect(self) -> og_inspector.SurfaceInspectionResult:
         return og_inspector.inspect_surface2D(self.surface_mesh)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_surface_valid2D(self.surface_mesh)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py

@@ -38,6 +38,9 @@ class GeodeSurfaceMesh3D(GeodeVertexSet):
     def inspect(self) -> og_inspector.SurfaceInspectionResult:
         return og_inspector.inspect_surface3D(self.surface_mesh)
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        return og_inspector.is_surface_valid3D(self.surface_mesh)
+
     def assign_crs(
         self, crs_name: str, info: og_geosciences.GeographicCoordinateSystemInfo
     ) -> None:

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/geode_objects/geode_vertex_set.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 # Third party imports
 import opengeode as og
+import opengeode_inspector as og_inspector
 from opengeodeweb_microservice.database.data_types import (
     GeodeMeshType,
     ViewerElementsType,
@@ -82,5 +83,9 @@ class GeodeVertexSet(GeodeMesh):
     def inspect(self) -> object:
         return None
 
+    def validate(self) -> og_inspector.ObjectValidity:
+        result = og_inspector.ObjectValidity()
+        return result
+
     def vertex_attribute_manager(self) -> og.AttributeManager:
         return self.vertex_set.vertex_attribute_manager()

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -176,52 +176,22 @@ def crs_converter_geographic_coordinate_systems() -> flask.Response:
 
 
 @routes.route(
-    schemas_dict["inspect_file"]["route"],
-    methods=schemas_dict["inspect_file"]["methods"],
+    schemas_dict["validate"]["route"],
+    methods=schemas_dict["validate"]["methods"],
 )
-def inspect_file() -> flask.Response:
-    json_data = utils_functions.validate_request(
-        flask.request, schemas_dict["inspect_file"]
+def validate_object() -> flask.Response:
+    utils_functions.validate_request(flask.request, schemas_dict["validate"])
+    params = schemas.Validate.from_dict(flask.request.get_json())
+    geode_object = geode_functions.load_geode_object(params.id)
+    validity = geode_object.validate()
+    return flask.make_response(
+        {
+            "is_valid": validity.nb_issues() == 0,
+            "nb_issues": validity.nb_issues(),
+            "issues": validity.invalidities,
+        },
+        200,
     )
-    params = schemas.InspectFile.from_dict(json_data)
-    file_path = geode_functions.upload_file_path(params.filename)
-    geode_object = geode_functions.geode_object_from_string(
-        params.geode_object_type
-    ).load(file_path)
-    inspection_data = geode_object.inspect()
-    inspection_result = extract_inspector_result(inspection_data)
-    return flask.make_response({"inspection_result": inspection_result}, 200)
-
-
-def extract_inspector_result(inspection_data: Any) -> dict[str, Any]:
-    new_object = {}
-
-    if hasattr(inspection_data, "inspection_type"):
-        new_object["title"] = inspection_data.inspection_type()
-        new_object["nb_issues"] = 0
-        new_object["children"] = []
-        for child in dir(inspection_data):
-            if child.startswith("__") or child in [
-                "inspection_type",
-                "string",
-                "nb_issues",
-            ]:
-                continue
-            child_instance = getattr(inspection_data, child)
-            if callable(child_instance):
-                continue
-            child_object = extract_inspector_result(child_instance)
-            new_object["children"].append(child_object)
-            if "nb_issues" in child_object:
-                new_object["nb_issues"] += child_object["nb_issues"]
-    elif hasattr(inspection_data, "description"):
-        new_object["title"] = inspection_data.description()
-        nb_issues = inspection_data.nb_issues()
-        new_object["nb_issues"] = nb_issues
-        if nb_issues > 0:
-            issues = inspection_data.string().split("\n")
-            new_object["issues"] = issues
-    return new_object
 
 
 @routes.route(

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/src/opengeodeweb_back/routes/schemas/__init__.py

@@ -1,4 +1,5 @@
 from .vertex_attribute_names import *
+from .validate import *
 from .upload_file import *
 from .texture_coordinates import *
 from .save_viewable_file import *
@@ -11,7 +12,6 @@ from .model_component_polygon_attribute_names import *
 from .model_component_edge_attribute_names import *
 from .missing_files import *
 from .kill import *
-from .inspect_file import *
 from .import_project import *
 from .geographic_coordinate_systems import *
 from .geode_objects_and_output_extensions import *

opengeodeweb_back-6.10.0/src/opengeodeweb_back/routes/schemas/validate.json

@@ -0,0 +1,16 @@
+{
+  "route": "/validate",
+  "methods": [
+    "POST"
+  ],
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "id"
+  ],
+  "additionalProperties": false
+}

opengeodeweb_back-6.10.0/src/opengeodeweb_back/routes/schemas/validate.py

@@ -0,0 +1,10 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class Validate(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    id: str

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/tests/test_geode_functions.py

@@ -63,3 +63,23 @@ def test_input_output() -> None:
                         assert type(saved_files) is list
                         for saved_file in saved_files:
                             os.remove(saved_file)
+
+
+def test_validate() -> None:
+    # Test on BRep (uses is_brep_valid)
+    brep_path = os.path.join(data_folder, "cube.og_brep")
+    brep_object = geode_objects["BRep"].load(brep_path)
+    brep_validity = brep_object.validate()
+    assert type(brep_validity.nb_issues()) is int
+
+    # Test on PointSet2D (uses is_pointset_valid2D)
+    pts_path = os.path.join(data_folder, "test.og_pts2d")
+    pts_object = geode_objects["PointSet2D"].load(pts_path)
+    pts_validity = pts_object.validate()
+    assert type(pts_validity.nb_issues()) is int
+
+    # Test on CrossSection (uses is_section_valid)
+    section_path = os.path.join(data_folder, "test.og_xsctn")
+    section_object = geode_objects["CrossSection"].load(section_path)
+    section_validity = section_object.validate()
+    assert type(section_validity.nb_issues()) is int

{opengeodeweb_back-6.9.4rc1 → opengeodeweb_back-6.10.0}/tests/test_routes.py

@@ -121,25 +121,30 @@ def test_geographic_coordinate_systems(client: FlaskClient) -> None:
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
 
-def test_inspect_file(client: FlaskClient) -> None:
-    route = f"/opengeodeweb_back/inspect_file"
+def test_validate_object(client: FlaskClient) -> None:
+    response_save = test_save_viewable_file(client, "BRep", "cube.og_brep")
+    assert response_save.status_code == 200
+    model_id = response_save.get_json()["id"]
+    response = client.post("/opengeodeweb_back/validate", json={"id": model_id})
+    assert response.status_code == 200
+    json_data = response.get_json()
+    assert json_data["is_valid"] is True
+    assert json_data["nb_issues"] == 0
+    assert type(json_data["issues"]) is list
 
-    def get_full_data() -> test_utils.JsonData:
-        return {
-            "geode_object_type": "BRep",
-            "filename": "corbi.og_brep",
-        }
 
-    json = get_full_data()
-
-    # Normal test with geode_object 'BRep'
-    response = client.post(route, json=json)
+def test_validate_invalid_object(client: FlaskClient) -> None:
+    response_save = test_save_viewable_file(
+        client, "BRep", "wrong_boundary_surface_model.og_brep"
+    )
+    assert response_save.status_code == 200
+    model_id = response_save.get_json()["id"]
+    response = client.post("/opengeodeweb_back/validate", json={"id": model_id})
     assert response.status_code == 200
-    inspection_result = response.get_json()["inspection_result"]
-    assert type(inspection_result) is dict
-
-    # Test all params
-    test_utils.test_route_wrong_params(client, route, get_full_data)
+    json_data = response.get_json()
+    assert json_data["is_valid"] is False
+    assert json_data["nb_issues"] == 1
+    assert type(json_data["issues"]) is list
 
 
 def test_geode_objects_and_output_extensions(client: FlaskClient) -> None:

opengeodeweb_back-6.9.4rc1/src/opengeodeweb_back/routes/schemas/inspect_file.json

@@ -1,22 +0,0 @@
-{
-  "route": "/inspect_file",
-  "methods": [
-    "POST"
-  ],
-  "type": "object",
-  "properties": {
-    "filename": {
-      "type": "string",
-      "minLength": 1
-    },
-    "geode_object_type": {
-      "type": "string",
-      "minLength": 1
-    }
-  },
-  "required": [
-    "filename",
-    "geode_object_type"
-  ],
-  "additionalProperties": false
-}

opengeodeweb_back-6.9.4rc1/src/opengeodeweb_back/routes/schemas/inspect_file.py

@@ -1,11 +0,0 @@
-from dataclasses_json import DataClassJsonMixin
-from dataclasses import dataclass
-
-
-@dataclass
-class InspectFile(DataClassJsonMixin):
-    def __post_init__(self) -> None:
-        print(self, flush=True)
-
-    filename: str
-    geode_object_type: str