Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into fix/file_system

MaxNumerique · MaxNumerique · commit 21f71e32b8b6 · 2026-02-27T10:37:02.000+01:00
diff --git a/opengeodeweb_back_schemas.json b/opengeodeweb_back_schemas.json
@@ -33,9 +33,9 @@
       }
     },
     "models": {
-      "mesh_components": {
-        "$id": "opengeodeweb_back/models/mesh_components",
-        "route": "/mesh_components",
+      "model_components": {
+        "$id": "opengeodeweb_back/models/model_components",
+        "route": "/model_components",
         "methods": [
           "POST"
         ],
diff --git a/requirements.in b/requirements.in
@@ -1,9 +1,9 @@
-opengeode-core==15.31.1
+opengeode-core==15.31.5
 opengeode-io==7.4.8
-opengeode-inspector==6.8.16
-opengeode-geosciences==9.5.8
-opengeode-geosciencesio==5.8.9
-geode-common==33.18.0
+opengeode-inspector==6.8.17
+opengeode-geosciences==9.5.9
+opengeode-geosciencesio==5.8.10
+geode-common==33.19.0
 geode-viewables==3.3.4
 flask[async]==3.1.2
 flask-cors==6.0.1
diff --git a/requirements.txt b/requirements.txt
@@ -16,7 +16,7 @@ flask[async]>=3
     #   flask-cors
 flask-cors==6.0.1
     # via -r requirements.in
-geode-common==33.18.0
+geode-common==33.19.0
     # via
     #   -r requirements.in
     #   geode-viewables
@@ -31,7 +31,7 @@ markupsafe>=3
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==15.31.1
+opengeode-core==15.31.5
     # via
     #   -r requirements.in
     #   geode-common
@@ -40,14 +40,14 @@ opengeode-core==15.31.1
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==9.5.8
+opengeode-geosciences==9.5.9
     # via
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeode-geosciencesio==5.8.9
+opengeode-geosciencesio==5.8.10
     # via -r requirements.in
-opengeode-inspector==6.8.16
+opengeode-inspector==6.8.17
     # via -r requirements.in
 opengeode-io==7.4.8
     # via
diff --git a/src/opengeodeweb_back/geode_objects/geode_brep.py b/src/opengeodeweb_back/geode_objects/geode_brep.py
@@ -76,6 +76,18 @@ def save_light_viewable(self, filename_without_extension: str) -> str:
     def mesh_components(self) -> ComponentRegistry:
         return self.brep.mesh_components()
 
+    def collection_components(self) -> ComponentRegistry:
+        return self.brep.collection_components()
+
+    def boundaries(self, id: og.uuid) -> list[og.ComponentID]:
+        return self.brep.boundaries(id)
+
+    def internals(self, id: og.uuid) -> list[og.ComponentID]:
+        return self.brep.internals(id)
+
+    def items(self, id: og.uuid) -> list[og.ComponentID]:
+        return self.brep.items(id)
+
     def inspect(self) -> og_inspector.BRepInspectionResult:
         return og_inspector.inspect_brep(self.brep)
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_model.py b/src/opengeodeweb_back/geode_objects/geode_model.py
@@ -23,3 +23,15 @@ def viewer_elements_type(cls) -> ViewerElementsType:
 
     @abstractmethod
     def mesh_components(self) -> ComponentRegistry: ...
+
+    @abstractmethod
+    def collection_components(self) -> ComponentRegistry: ...
+
+    @abstractmethod
+    def boundaries(self, id: og.uuid) -> list[og.ComponentID]: ...
+
+    @abstractmethod
+    def internals(self, id: og.uuid) -> list[og.ComponentID]: ...
+
+    @abstractmethod
+    def items(self, id: og.uuid) -> list[og.ComponentID]: ...
diff --git a/src/opengeodeweb_back/geode_objects/geode_section.py b/src/opengeodeweb_back/geode_objects/geode_section.py
@@ -78,6 +78,18 @@ def save_light_viewable(self, filename_without_extension: str) -> str:
     def mesh_components(self) -> ComponentRegistry:
         return self.section.mesh_components()
 
+    def collection_components(self) -> ComponentRegistry:
+        return self.section.collection_components()
+
+    def boundaries(self, id: og.uuid) -> list[og.ComponentID]:
+        return self.section.boundaries(id)
+
+    def internals(self, id: og.uuid) -> list[og.ComponentID]:
+        return self.section.internals(id)
+
+    def items(self, id: og.uuid) -> list[og.ComponentID]:
+        return self.section.items(id)
+
     def inspect(self) -> og_inspector.SectionInspectionResult:
         return og_inspector.inspect_section(self.section)
 
diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py
@@ -402,6 +402,7 @@ def ping() -> flask.Response:
 @routes.route(schemas_dict["kill"]["route"], methods=schemas_dict["kill"]["methods"])
 def kill() -> flask.Response:
     print("Manual server kill, shutting down...", flush=True)
+    utils_functions.teardown_request(flask.current_app)
     os._exit(0)
     return flask.make_response({"message": "Flask server is dead"}, 200)
 
diff --git a/src/opengeodeweb_back/routes/models/blueprint_models.py b/src/opengeodeweb_back/routes/models/blueprint_models.py
@@ -12,14 +12,14 @@
 
 
 @routes.route(
-    schemas_dict["mesh_components"]["route"],
-    methods=schemas_dict["mesh_components"]["methods"],
+    schemas_dict["model_components"]["route"],
+    methods=schemas_dict["model_components"]["methods"],
 )
-def mesh_components() -> flask.Response:
+def model_components() -> flask.Response:
     json_data = utils_functions.validate_request(
-        flask.request, schemas_dict["mesh_components"]
+        flask.request, schemas_dict["model_components"]
     )
-    params = schemas.MeshComponents.from_dict(json_data)
+    params = schemas.ModelComponents.from_dict(json_data)
     model = geode_functions.load_geode_object(params.id)
     if not isinstance(model, GeodeModel):
         flask.abort(400, f"{params.id} is not a GeodeModel")
@@ -44,14 +44,40 @@ def mesh_components() -> flask.Response:
             geode_id = id.string()
             component_name = geode_id
             viewer_id = uuid_to_flat_index[geode_id]
-
+            boundaries = model.boundaries(id)
+            boundaries_uuid = [boundary.id().string() for boundary in boundaries]
+            internals = model.internals(id)
+            internals_uuid = [internal.id().string() for internal in internals]
             mesh_component_object = {
-                "id": params.id,
                 "viewer_id": viewer_id,
                 "geode_id": geode_id,
                 "name": component_name,
                 "type": component_type,
+                "boundaries": boundaries_uuid,
+                "internals": internals_uuid,
             }
             mesh_components.append(mesh_component_object)
 
-    return flask.make_response({"mesh_components": mesh_components}, 200)
+    model_collection_components = model.collection_components()
+    collection_components = []
+    for collection_component, ids in model_collection_components.items():
+        component_type = collection_component.get()
+        for id in ids:
+            geode_id = id.string()
+            items = model.items(id)
+            items_uuid = [item.id().string() for item in items]
+            collection_component_object = {
+                "geode_id": geode_id,
+                "name": geode_id,
+                "type": component_type,
+                "items": items_uuid,
+            }
+            collection_components.append(collection_component_object)
+
+    return flask.make_response(
+        {
+            "mesh_components": mesh_components,
+            "collection_components": collection_components,
+        },
+        200,
+    )
diff --git a/src/opengeodeweb_back/routes/models/schemas/__init__.py b/src/opengeodeweb_back/routes/models/schemas/__init__.py
@@ -1 +1 @@
-from .mesh_components import *
+from .model_components import *
diff --git a/src/opengeodeweb_back/routes/models/schemas/model_components.json b/src/opengeodeweb_back/routes/models/schemas/model_components.json
@@ -1,5 +1,5 @@
 {
-  "route": "/mesh_components",
+  "route": "/model_components",
   "methods": [
     "POST"
   ],
diff --git a/src/opengeodeweb_back/routes/models/schemas/model_components.py b/src/opengeodeweb_back/routes/models/schemas/model_components.py
@@ -3,7 +3,7 @@
 
 
 @dataclass
-class MeshComponents(DataClassJsonMixin):
+class ModelComponents(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print(self, flush=True)
 
diff --git a/src/opengeodeweb_back/test_utils.py b/src/opengeodeweb_back/test_utils.py
@@ -10,21 +10,40 @@
 
 
 def test_route_wrong_params(
-    client: FlaskClient, route: str, get_full_data: Callable[[], JsonData]
+    client: FlaskClient,
+    route: str,
+    get_full_data: Callable[[], JsonData],
+    path: list[str | int] | None = None,
 ) -> None:
-    for key, value in get_full_data().items():
+    if path is None:
+        path = []
+
+    def get_json() -> tuple[JsonData, Any]:
         json = get_full_data()
-        json.pop(key)
+        target: Any = json
+        for sub_path in path:
+            target = target[sub_path]
+        return json, target
+
+    data = get_json()[1]
+    if isinstance(data, dict):
+        for key, value in data.items():
+            json, target = get_json()
+            target.pop(key)
+            response = client.post(route, json=json)
+            if response.status_code == 400:
+                error_description: str = response.get_json()["description"]
+                assert "must contain" in error_description
+                assert f"'{key}'" in error_description
+            if isinstance(value, (dict, list)):
+                test_route_wrong_params(client, route, get_full_data, path + [key])
+
+        json, target = get_json()
+        target["dumb_key"] = "dumb_value"
         response = client.post(route, json=json)
         assert response.status_code == 400
         error_description = response.get_json()["description"]
-        assert "data must contain" in error_description
-        assert f"'{key}'" in error_description
-
-    json = get_full_data()
-    json["dumb_key"] = "dumb_value"
-    response = client.post(route, json=json)
-    assert response.status_code == 400
-    error_description = response.get_json()["description"]
-    assert "data must not contain" in error_description
-    assert "'dumb_key'" in error_description
+        assert "must not contain" in error_description
+        assert "'dumb_key'" in error_description
+    elif isinstance(data, list) and data:
+        test_route_wrong_params(client, route, get_full_data, path + [0])
diff --git a/tests/test_models_routes.py b/tests/test_models_routes.py
@@ -18,12 +18,12 @@
 data_dir = os.path.join(base_dir, "data")
 
 
-def test_mesh_components(client: FlaskClient) -> None:
+def test_model_components(client: FlaskClient) -> None:
     geode_object_type = "BRep"
     filename = "cube.og_brep"
     response = test_save_viewable_file(client, geode_object_type, filename)
 
-    route = "/opengeodeweb_back/models/mesh_components"
+    route = "/opengeodeweb_back/models/model_components"
     brep_filename = os.path.join(data_dir, "cube.og_brep")
 
     response = client.post(route, json={"id": response.get_json()["id"]})
@@ -34,11 +34,26 @@ def test_mesh_components(client: FlaskClient) -> None:
     assert len(mesh_components) > 0
     for mesh_component in mesh_components:
         assert isinstance(mesh_component, object)
-        assert isinstance(mesh_component["id"], str)
         assert isinstance(mesh_component["geode_id"], str)
         assert isinstance(mesh_component["viewer_id"], int)
         assert isinstance(mesh_component["name"], str)
         assert isinstance(mesh_component["type"], str)
+        assert isinstance(mesh_component["boundaries"], list)
+        for boundary_uuid in mesh_component["boundaries"]:
+            assert isinstance(boundary_uuid, str)
+        assert isinstance(mesh_component["internals"], list)
+        for internal_uuid in mesh_component["internals"]:
+            assert isinstance(internal_uuid, str)
+    assert "collection_components" in response.get_json()
+    collection_components = response.get_json()["collection_components"]
+    assert isinstance(collection_components, list)
+    for collection_component in collection_components:
+        assert isinstance(collection_component, object)
+        assert isinstance(collection_component["geode_id"], str)
+        assert isinstance(collection_component["name"], str)
+        assert isinstance(collection_component["items"], list)
+        for item_uuid in collection_component["items"]:
+            assert isinstance(item_uuid, str)
 
 
 def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .mesh_components import *`
	`1`	`+from .model_components import *`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "route": "/mesh_components",`
	`2`	`+ "route": "/model_components",`
`3`	`3`	`"methods": [`
`4`	`4`	`"POST"`
`5`	`5`	`],`