OpenGeodeWeb-Back 6.12.0rc2__tar.gz → 6.12.0rc4__tar.gz

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.12.0rc2
+Version: 6.12.0rc4
 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
@@ -16,19 +16,19 @@ Requires-Dist: blinker>=1
 Requires-Dist: click>=8
 Requires-Dist: flask[async]>=3
 Requires-Dist: flask-cors==6.0.2
-Requires-Dist: geode-common==33.24.2
-Requires-Dist: geode-viewables==3.4.0
+Requires-Dist: geode-common==33.25.4
+Requires-Dist: geode-viewables==3.4.1
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==17.4.4
+Requires-Dist: opengeode-core==17.4.5
 Requires-Dist: opengeode-geosciences==9.6.1
 Requires-Dist: opengeode-geosciencesio==5.9.0
-Requires-Dist: opengeode-inspector==6.11.6
-Requires-Dist: opengeode-inspector-geosciences==1.1.0
-Requires-Dist: opengeode-io==7.7.0
+Requires-Dist: opengeode-inspector==6.11.8
+Requires-Dist: opengeode-inspector-geosciences==1.1.1
+Requires-Dist: opengeode-io==7.7.2
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0rc2
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.12.0-rc.2"
+version = "6.12.0-rc.4"
 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.12.0rc2 → opengeodeweb_back-6.12.0rc4}/requirements.txt

@@ -16,11 +16,11 @@ flask[async]>=3
     #   flask-cors
 flask-cors==6.0.2
     # via -r requirements.in
-geode-common==33.24.2
+geode-common==33.25.4
     # via
     #   -r requirements.in
     #   geode-viewables
-geode-viewables==3.4.0
+geode-viewables==3.4.1
     # via -r requirements.in
 itsdangerous>=2
     # via flask
@@ -31,7 +31,7 @@ markupsafe>=3
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==17.4.4
+opengeode-core==17.4.5
     # via
     #   -r requirements.in
     #   geode-common
@@ -49,13 +49,13 @@ opengeode-geosciences==9.6.1
     #   opengeode-inspector-geosciences
 opengeode-geosciencesio==5.9.0
     # via -r requirements.in
-opengeode-inspector==6.11.6
+opengeode-inspector==6.11.8
     # via
     #   -r requirements.in
     #   opengeode-inspector-geosciences
-opengeode-inspector-geosciences==1.1.0
+opengeode-inspector-geosciences==1.1.1
     # via -r requirements.in
-opengeode-io==7.7.0
+opengeode-io==7.7.2
     # via
     #   -r requirements.in
     #   geode-viewables
@@ -66,4 +66,4 @@ werkzeug==3.1.8
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.2.0rc1
+opengeodeweb-microservice==1.*,>=1.2.0rc2

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/OpenGeodeWeb_Back.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.12.0rc2
+Version: 6.12.0rc4
 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
@@ -16,19 +16,19 @@ Requires-Dist: blinker>=1
 Requires-Dist: click>=8
 Requires-Dist: flask[async]>=3
 Requires-Dist: flask-cors==6.0.2
-Requires-Dist: geode-common==33.24.2
-Requires-Dist: geode-viewables==3.4.0
+Requires-Dist: geode-common==33.25.4
+Requires-Dist: geode-viewables==3.4.1
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==17.4.4
+Requires-Dist: opengeode-core==17.4.5
 Requires-Dist: opengeode-geosciences==9.6.1
 Requires-Dist: opengeode-geosciencesio==5.9.0
-Requires-Dist: opengeode-inspector==6.11.6
-Requires-Dist: opengeode-inspector-geosciences==1.1.0
-Requires-Dist: opengeode-io==7.7.0
+Requires-Dist: opengeode-inspector==6.11.8
+Requires-Dist: opengeode-inspector-geosciences==1.1.1
+Requires-Dist: opengeode-io==7.7.2
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.2.0rc2
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

opengeodeweb_back-6.12.0rc4/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -0,0 +1,18 @@
+asgiref>=3
+blinker>=1
+click>=8
+flask[async]>=3
+flask-cors==6.0.2
+geode-common==33.25.4
+geode-viewables==3.4.1
+itsdangerous>=2
+jinja2>=3
+markupsafe>=3
+opengeode-core==17.4.5
+opengeode-geosciences==9.6.1
+opengeode-geosciencesio==5.9.0
+opengeode-inspector==6.11.8
+opengeode-inspector-geosciences==1.1.1
+opengeode-io==7.7.2
+werkzeug==3.1.8
+opengeodeweb-microservice==1.*,>=1.2.0rc2

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -1,10 +1,10 @@
 # Standard library imports
+from opengeodeweb_back.geode_objects.geode_solid_mesh3d import GeodeSolidMesh3D
 import os
 import time
 import shutil
 import math
 from threading import Timer
-from typing import Any, Union, get_args
 
 # Third party imports
 import flask
@@ -31,9 +31,8 @@ from opengeodeweb_back.geode_objects.geode_grid2d import GeodeGrid2D
 from opengeodeweb_back.geode_objects.geode_grid3d import GeodeGrid3D
 from opengeodeweb_back.geode_objects.geode_surface_mesh2d import GeodeSurfaceMesh2D
 from opengeodeweb_back.geode_objects.geode_surface_mesh3d import GeodeSurfaceMesh3D
-from opengeodeweb_back.geode_objects.geode_solid_mesh3d import GeodeSolidMesh3D
 
-ComponentMesh = Union[
+ComponentMesh = (
     og.Corner2D,
     og.Corner3D,
     og.Line2D,
@@ -41,7 +40,10 @@ ComponentMesh = Union[
     og.Surface2D,
     og.Surface3D,
     og.Block3D,
-]
+)
+ComponentLine = (og.Line2D, og.Line3D)
+ComponentSurface = (og.Surface2D, og.Surface3D)
+ComponentBlock = og.Block3D
 
 routes = flask.Blueprint("routes", __name__, url_prefix="/opengeodeweb_back")
 
@@ -250,45 +252,55 @@ def texture_coordinates() -> flask.Response:
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
 
 
+def extract_valid_attribute_values(
+    attribute_manager: og.AttributeManager,
+    attribute_name: str,
+    item_index: int,
+) -> list[float]:
+    component_attribute = attribute_manager.find_generic_attribute(attribute_name)
+    if not component_attribute.is_genericable():
+        return []
+    valid_values: list[float] = []
+    for index in range(attribute_manager.nb_elements()):
+        value = component_attribute.generic_item_value(index, item_index)
+        if value is not None and not math.isnan(value):
+            valid_values.append(value)
+    return valid_values
+
+
 def attributes_metadata(
-    manager: og.AttributeManager,
+    manager: og.AttributeManager | list[og.AttributeManager],
 ) -> list[dict[str, str | int | float | list[float]]]:
+    attribute_managers = manager if isinstance(manager, list) else [manager]
     attributes: list[dict[str, str | int | float | list[float]]] = []
-    nb_elements = manager.nb_elements()
-    for name in manager.attribute_names():
-        attribute = manager.find_generic_attribute(name)
+    first_manager = attribute_managers[0]
+    for name in first_manager.attribute_names():
+        attribute = first_manager.find_generic_attribute(name)
         nb_items = 1
-        min_value, max_value = -1.0, -1.0
         min_values, max_values = [-1.0], [-1.0]
         if attribute.is_genericable():
             nb_items = attribute.nb_items()
             min_values, max_values = [], []
-            for item in range(nb_items):
-                values = [
-                    attribute.generic_item_value(idx, item)
-                    for idx in range(nb_elements)
-                ]
-                valid = [
-                    value
-                    for value in values
-                    if value is not None and not math.isnan(value)
-                ]
-                min_values.append(min(valid) if valid else -1.0)
-                max_values.append(max(valid) if valid else -1.0)
-            min_value, max_value = min_values[0], max_values[0]
-
+            for item_index in range(nb_items):
+                valid_values: list[float] = []
+                for attribute_manager in attribute_managers:
+                    valid_values.extend(
+                        extract_valid_attribute_values(
+                            attribute_manager, name, item_index
+                        )
+                    )
+                min_values.append(min(valid_values) if valid_values else -1.0)
+                max_values.append(max(valid_values) if valid_values else -1.0)
         attributes.append(
             {
                 "attribute_name": name,
                 "nb_items": nb_items,
-                "min_value": min_value,
-                "max_value": max_value,
+                "min_value": min_values[0],
+                "max_value": max_values[0],
                 "min_values": min_values,
                 "max_values": max_values,
             }
         )
-        print(f"[ATTRIBUTES] Number of items: {nb_items}")
-        print(f"[ATTRIBUTES] Attributes: {attributes}")
     return attributes
 
 
@@ -399,13 +411,16 @@ def model_component_vertex_attribute_names() -> flask.Response:
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeModel):
         flask.abort(400, f"{params.id} is not a GeodeModel")
-    component = geode_object.component(og.uuid(params.component_id))
-    if not isinstance(component, get_args(ComponentMesh)):
-        flask.abort(400, f"{params.component_id} is not a valid ComponentMesh")
-    mesh = component.mesh()
-    attribute_manager = mesh.vertex_attribute_manager()
+    managers = [
+        component.mesh().vertex_attribute_manager()
+        for component_id in params.component_ids
+        if isinstance(
+            (component := geode_object.component(og.uuid(component_id))),
+            ComponentMesh,
+        )
+    ]
     return flask.make_response(
-        {"attributes": attributes_metadata(attribute_manager)},
+        {"attributes": attributes_metadata(managers)},
         200,
     )
 
@@ -422,15 +437,16 @@ def model_component_edge_attribute_names() -> flask.Response:
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeModel):
         flask.abort(400, f"{params.id} is not a GeodeModel")
-    component = geode_object.component(og.uuid(params.component_id))
-    if not isinstance(component, get_args(ComponentMesh)):
-        flask.abort(400, f"{params.component_id} is not a valid ComponentMesh")
-    mesh = component.mesh()
-    if not hasattr(mesh, "edge_attribute_manager"):
-        flask.abort(400, "Component does not have edges")
-    attribute_manager = mesh.edge_attribute_manager()
+    managers = [
+        component.mesh().edge_attribute_manager()
+        for component_id in params.component_ids
+        if isinstance(
+            (component := geode_object.component(og.uuid(component_id))),
+            ComponentLine,
+        )
+    ]
     return flask.make_response(
-        {"attributes": attributes_metadata(attribute_manager)},
+        {"attributes": attributes_metadata(managers)},
         200,
     )
 
@@ -447,15 +463,16 @@ def model_component_polygon_attribute_names() -> flask.Response:
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeModel):
         flask.abort(400, f"{params.id} is not a GeodeModel")
-    component = geode_object.component(og.uuid(params.component_id))
-    if not isinstance(component, get_args(ComponentMesh)):
-        flask.abort(400, f"{params.component_id} is not a valid ComponentMesh")
-    mesh = component.mesh()
-    if not hasattr(mesh, "polygon_attribute_manager"):
-        flask.abort(400, "Component does not have polygons")
-    attribute_manager = mesh.polygon_attribute_manager()
+    managers = [
+        component.mesh().polygon_attribute_manager()
+        for component_id in params.component_ids
+        if isinstance(
+            (component := geode_object.component(og.uuid(component_id))),
+            ComponentSurface,
+        )
+    ]
     return flask.make_response(
-        {"attributes": attributes_metadata(attribute_manager)},
+        {"attributes": attributes_metadata(managers)},
         200,
     )
 
@@ -472,15 +489,16 @@ def model_component_polyhedron_attribute_names() -> flask.Response:
     geode_object = geode_functions.load_geode_object(params.id)
     if not isinstance(geode_object, GeodeModel):
         flask.abort(400, f"{params.id} is not a GeodeModel")
-    component = geode_object.component(og.uuid(params.component_id))
-    if not isinstance(component, get_args(ComponentMesh)):
-        flask.abort(400, f"{params.component_id} is not a valid ComponentMesh")
-    mesh = component.mesh()
-    if not hasattr(mesh, "polyhedron_attribute_manager"):
-        flask.abort(400, "Component does not have polyhedra")
-    attribute_manager = mesh.polyhedron_attribute_manager()
+    managers = [
+        component.mesh().polyhedron_attribute_manager()
+        for component_id in params.component_ids
+        if isinstance(
+            (component := geode_object.component(og.uuid(component_id))),
+            ComponentBlock,
+        )
+    ]
     return flask.make_response(
-        {"attributes": attributes_metadata(attribute_manager)},
+        {"attributes": attributes_metadata(managers)},
         200,
     )
 

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_edge_attribute_names.json

@@ -7,11 +7,15 @@
       "type": "string",
       "minLength": 1
     },
-    "component_id": {
-      "type": "string",
-      "minLength": 1
+    "component_ids": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "minItems": 1
     }
   },
-  "required": ["id", "component_id"],
+  "required": ["id", "component_ids"],
   "additionalProperties": false
 }

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_edge_attribute_names.py

@@ -1,5 +1,6 @@
 from dataclasses_json import DataClassJsonMixin
 from dataclasses import dataclass
+from typing import List
 
 
 @dataclass
@@ -7,5 +8,5 @@ class ModelComponentEdgeAttributeNames(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print(self, flush=True)
 
-    component_id: str
+    component_ids: List[str]
     id: str

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_polygon_attribute_names.json

@@ -7,11 +7,15 @@
       "type": "string",
       "minLength": 1
     },
-    "component_id": {
-      "type": "string",
-      "minLength": 1
+    "component_ids": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "minItems": 1
     }
   },
-  "required": ["id", "component_id"],
+  "required": ["id", "component_ids"],
   "additionalProperties": false
 }

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_polygon_attribute_names.py

@@ -1,5 +1,6 @@
 from dataclasses_json import DataClassJsonMixin
 from dataclasses import dataclass
+from typing import List
 
 
 @dataclass
@@ -7,5 +8,5 @@ class ModelComponentPolygonAttributeNames(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print(self, flush=True)
 
-    component_id: str
+    component_ids: List[str]
     id: str

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_polyhedron_attribute_names.json

@@ -7,11 +7,15 @@
       "type": "string",
       "minLength": 1
     },
-    "component_id": {
-      "type": "string",
-      "minLength": 1
+    "component_ids": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "minItems": 1
     }
   },
-  "required": ["id", "component_id"],
+  "required": ["id", "component_ids"],
   "additionalProperties": false
 }

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_polyhedron_attribute_names.py

@@ -1,5 +1,6 @@
 from dataclasses_json import DataClassJsonMixin
 from dataclasses import dataclass
+from typing import List
 
 
 @dataclass
@@ -7,5 +8,5 @@ class ModelComponentPolyhedronAttributeNames(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print(self, flush=True)
 
-    component_id: str
+    component_ids: List[str]
     id: str

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_vertex_attribute_names.json

@@ -7,11 +7,15 @@
       "type": "string",
       "minLength": 1
     },
-    "component_id": {
-      "type": "string",
-      "minLength": 1
+    "component_ids": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "minItems": 1
     }
   },
-  "required": ["id", "component_id"],
+  "required": ["id", "component_ids"],
   "additionalProperties": false
 }

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_vertex_attribute_names.py

@@ -1,5 +1,6 @@
 from dataclasses_json import DataClassJsonMixin
 from dataclasses import dataclass
+from typing import List
 
 
 @dataclass
@@ -7,5 +8,5 @@ class ModelComponentVertexAttributeNames(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print(self, flush=True)
 
-    component_id: str
+    component_ids: List[str]
     id: str

{opengeodeweb_back-6.12.0rc2 → opengeodeweb_back-6.12.0rc4}/tests/test_routes.py

@@ -676,13 +676,12 @@ def test_model_component_vertex_attribute_names(client: FlaskClient) -> None:
 
     corner_ids = by_type.get("Corner", [])
     assert len(corner_ids) > 0, "cube.og_brep should have Corner components"
-    component_id = corner_ids[0]
 
-    response = client.post(route, json={"id": model_id, "component_id": component_id})
+    response = client.post(route, json={"id": model_id, "component_ids": corner_ids})
     _assert_attributes_response(response)
 
     def get_full_data() -> test_utils.JsonData:
-        return {"id": model_id, "component_id": component_id}
+        return {"id": model_id, "component_ids": corner_ids}
 
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
@@ -693,13 +692,12 @@ def test_model_component_edge_attribute_names(client: FlaskClient) -> None:
 
     line_ids = by_type.get("Line", [])
     assert len(line_ids) > 0, "cube.og_brep should have Line components"
-    component_id = line_ids[0]
 
-    response = client.post(route, json={"id": model_id, "component_id": component_id})
+    response = client.post(route, json={"id": model_id, "component_ids": line_ids})
     _assert_attributes_response(response)
 
     def get_full_data() -> test_utils.JsonData:
-        return {"id": model_id, "component_id": component_id}
+        return {"id": model_id, "component_ids": line_ids}
 
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
@@ -710,13 +708,12 @@ def test_model_component_polygon_attribute_names(client: FlaskClient) -> None:
 
     surface_ids = by_type.get("Surface", [])
     assert len(surface_ids) > 0, "cube.og_brep should have Surface components"
-    component_id = surface_ids[0]
 
-    response = client.post(route, json={"id": model_id, "component_id": component_id})
+    response = client.post(route, json={"id": model_id, "component_ids": surface_ids})
     _assert_attributes_response(response)
 
     def get_full_data() -> test_utils.JsonData:
-        return {"id": model_id, "component_id": component_id}
+        return {"id": model_id, "component_ids": surface_ids}
 
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
@@ -727,12 +724,11 @@ def test_model_component_polyhedron_attribute_names(client: FlaskClient) -> None
 
     block_ids = by_type.get("Block", [])
     assert len(block_ids) > 0, "cube.og_brep should have Block components"
-    component_id = block_ids[0]
 
-    response = client.post(route, json={"id": model_id, "component_id": component_id})
+    response = client.post(route, json={"id": model_id, "component_ids": block_ids})
     _assert_attributes_response(response)
 
     def get_full_data() -> test_utils.JsonData:
-        return {"id": model_id, "component_id": component_id}
+        return {"id": model_id, "component_ids": block_ids}
 
     test_utils.test_route_wrong_params(client, route, get_full_data)

opengeodeweb_back-6.12.0rc2/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -1,18 +0,0 @@
-asgiref>=3
-blinker>=1
-click>=8
-flask[async]>=3
-flask-cors==6.0.2
-geode-common==33.24.2
-geode-viewables==3.4.0
-itsdangerous>=2
-jinja2>=3
-markupsafe>=3
-opengeode-core==17.4.4
-opengeode-geosciences==9.6.1
-opengeode-geosciencesio==5.9.0
-opengeode-inspector==6.11.6
-opengeode-inspector-geosciences==1.1.0
-opengeode-io==7.7.0
-werkzeug==3.1.8
-opengeodeweb-microservice==1.*,>=1.2.0rc1