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

Author: JulienChampagnol

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"
         ],
@@ -294,6 +294,24 @@
       ],
       "additionalProperties": false
     },
+    "geode_object_inheritance": {
+      "$id": "opengeodeweb_back/geode_object_inheritance",
+      "route": "/geode_object_inheritance",
+      "methods": [
+        "POST"
+      ],
+      "type": "object",
+      "properties": {
+        "geode_object_type": {
+          "type": "string",
+          "minLength": 1
+        }
+      },
+      "required": [
+        "geode_object_type"
+      ],
+      "additionalProperties": false
+    },
     "export_project": {
       "$id": "opengeodeweb_back/export_project",
       "route": "/export_project",

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

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
@@ -60,4 +60,4 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.14
+opengeodeweb-microservice==1.*,>=1.0.15rc1

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)
 

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]: ...

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)
 

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)
 
@@ -425,7 +426,7 @@ def export_project() -> flask.Response:
     export_vease_path = os.path.join(project_folder, filename)
 
     with get_session() as session:
-        rows = session.query(Data.id, Data.input_file, Data.additional_files).all()
+        rows = session.query(Data.id, Data.native_file).all()
 
     with zipfile.ZipFile(
         export_vease_path, "w", compression=zipfile.ZIP_DEFLATED
@@ -434,21 +435,12 @@ def export_project() -> flask.Response:
         if os.path.isfile(database_root_path):
             zip_file.write(database_root_path, "project.db")
 
-        for data_id, input_file, additional_files in rows:
+        for data_id, native_file in rows:
             base_dir = os.path.join(project_folder, data_id)
 
-            input_path = os.path.join(base_dir, str(input_file))
-            if os.path.isfile(input_path):
-                zip_file.write(input_path, os.path.join(data_id, str(input_file)))
-
-            for relative_path in (
-                additional_files if isinstance(additional_files, list) else []
-            ):
-                additional_path = os.path.join(base_dir, relative_path)
-                if os.path.isfile(additional_path):
-                    zip_file.write(
-                        additional_path, os.path.join(data_id, relative_path)
-                    )
+            native_path = os.path.join(base_dir, str(native_file))
+            if os.path.isfile(native_path):
+                zip_file.write(native_path, os.path.join(data_id, str(native_file)))
 
         zip_file.writestr("snapshot.json", flask.json.dumps(params.snapshot))
 
@@ -523,17 +515,17 @@ def import_project() -> flask.Response:
                     if os.path.isfile(vpath):
                         continue
 
-                input_file = str(data.input_file or "")
-                if not input_file:
+                native_file = str(data.native_file or "")
+                if not native_file:
                     continue
 
-                input_full = geode_functions.data_file_path(data.id, input_file)
-                if not os.path.isfile(input_full):
+                native_full = geode_functions.data_file_path(data.id, native_file)
+                if not os.path.isfile(native_full):
                     continue
 
                 geode_object = geode_functions.geode_object_from_string(
                     data.geode_object
-                ).load(input_full)
+                ).load(native_full)
                 utils_functions.save_all_viewables_and_return_info(
                     geode_object, data, data_path
                 )
@@ -546,3 +538,48 @@ def import_project() -> flask.Response:
         except KeyError:
             snapshot = {}
     return flask.make_response({"snapshot": snapshot}, 200)
+
+
+@routes.route(
+    schemas_dict["geode_object_inheritance"]["route"],
+    methods=schemas_dict["geode_object_inheritance"]["methods"],
+)
+def geode_object_inheritance() -> flask.Response:
+    json_data = utils_functions.validate_request(
+        flask.request, schemas_dict["geode_object_inheritance"]
+    )
+    params = schemas.GeodeObjectInheritance.from_dict(json_data)
+    geode_object_type = params.geode_object_type
+    target_class = geode_functions.geode_object_from_string(geode_object_type)
+
+    def get_all_bases(geode_class: type) -> set[type]:
+        bases = set()
+        for base_class in geode_class.__bases__:
+            if base_class is not object:
+                bases.add(base_class)
+                bases.update(get_all_bases(base_class))
+        return bases
+
+    def get_all_subclasses(geode_class: type) -> set[type]:
+        subclasses = set()
+        for subclass_class in geode_class.__subclasses__():
+            subclasses.add(subclass_class)
+            subclasses.update(get_all_subclasses(subclass_class))
+        return subclasses
+
+    # Extract all related Geode classes (parents and children)
+    base_classes = get_all_bases(target_class)
+    subclass_classes = get_all_subclasses(target_class)
+
+    # Filter GeodeObjectType to only include registered related objects, excluding target
+    parents = []
+    children = []
+    for geode_object_type_str, geode_class in geode_objects.items():
+        if geode_class == target_class:
+            continue
+        if geode_class in base_classes:
+            parents.append(geode_object_type_str)
+        if geode_class in subclass_classes:
+            children.append(geode_object_type_str)
+
+    return flask.make_response({"parents": parents, "children": children}, 200)

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,
+    )

src/opengeodeweb_back/routes/models/schemas/__init__.py

@@ -1 +1 @@
-from .mesh_components import *
+from .model_components import *

…utes/models/schemas/mesh_components.json …tes/models/schemas/model_components.jsonsrc/opengeodeweb_back/routes/models/schemas/mesh_components.json renamed to src/opengeodeweb_back/routes/models/schemas/model_components.json src/opengeodeweb_back/routes/models/schemas/mesh_components.json renamed to src/opengeodeweb_back/routes/models/schemas/model_components.json

@@ -1,5 +1,5 @@
 {
-  "route": "/mesh_components",
+  "route": "/model_components",
   "methods": [
     "POST"
   ],