OpenGeodeWeb-Back 6.3.6rc1__tar.gz → 6.4.0__tar.gz

{opengeodeweb_back-6.3.6rc1/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-6.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.3.6rc1
+Version: 6.4.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
@@ -16,13 +16,13 @@ Requires-Dist: blinker>=1
 Requires-Dist: click>=8
 Requires-Dist: flask[async]>=3
 Requires-Dist: flask-cors==6.0.1
-Requires-Dist: geode-common==33.19.1
+Requires-Dist: geode-common==33.20.0
 Requires-Dist: geode-viewables==3.3.5
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==16.2.0
-Requires-Dist: opengeode-geosciences==9.5.10
+Requires-Dist: opengeode-core==16.3.0
+Requires-Dist: opengeode-geosciences==9.5.11
 Requires-Dist: opengeode-geosciencesio==5.8.11
 Requires-Dist: opengeode-inspector==6.8.18
 Requires-Dist: opengeode-io==7.4.9

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.3.6-rc.1"
+version = "6.4.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.3.6rc1 → opengeodeweb_back-6.4.0}/requirements.txt

@@ -16,7 +16,7 @@ flask[async]>=3
     #   flask-cors
 flask-cors==6.0.1
     # via -r requirements.in
-geode-common==33.19.1
+geode-common==33.20.0
     # via
     #   -r requirements.in
     #   geode-viewables
@@ -31,7 +31,7 @@ markupsafe>=3
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==16.2.0
+opengeode-core==16.3.0
     # via
     #   -r requirements.in
     #   geode-common
@@ -40,7 +40,7 @@ opengeode-core==16.2.0
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==9.5.10
+opengeode-geosciences==9.5.11
     # via
     #   -r requirements.in
     #   geode-viewables

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.3.6rc1
+Version: 6.4.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
@@ -16,13 +16,13 @@ Requires-Dist: blinker>=1
 Requires-Dist: click>=8
 Requires-Dist: flask[async]>=3
 Requires-Dist: flask-cors==6.0.1
-Requires-Dist: geode-common==33.19.1
+Requires-Dist: geode-common==33.20.0
 Requires-Dist: geode-viewables==3.3.5
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==16.2.0
-Requires-Dist: opengeode-geosciences==9.5.10
+Requires-Dist: opengeode-core==16.3.0
+Requires-Dist: opengeode-geosciences==9.5.11
 Requires-Dist: opengeode-geosciencesio==5.8.11
 Requires-Dist: opengeode-inspector==6.8.18
 Requires-Dist: opengeode-io==7.4.9

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -3,13 +3,13 @@ blinker>=1
 click>=8
 flask[async]>=3
 flask-cors==6.0.1
-geode-common==33.19.1
+geode-common==33.20.0
 geode-viewables==3.3.5
 itsdangerous>=2
 jinja2>=3
 markupsafe>=3
-opengeode-core==16.2.0
-opengeode-geosciences==9.5.10
+opengeode-core==16.3.0
+opengeode-geosciences==9.5.11
 opengeode-geosciencesio==5.8.11
 opengeode-inspector==6.8.18
 opengeode-io==7.4.9

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/src/opengeodeweb_back/geode_objects/geode_brep.py

@@ -88,6 +88,9 @@ class GeodeBRep(GeodeModel):
     def items(self, id: og.uuid) -> list[og.ComponentID]:
         return self.brep.items(id)
 
+    def component_name(self, id: og.uuid) -> str | None:
+        return self.brep.brep_component(id).name()
+
     def inspect(self) -> og_inspector.BRepInspectionResult:
         return og_inspector.inspect_brep(self.brep)
 

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/src/opengeodeweb_back/geode_objects/geode_cross_section.py

@@ -73,3 +73,6 @@ class GeodeCrossSection(GeodeSection):
         return viewables.save_light_viewable_cross_section(
             self.cross_section, filename_without_extension
         )
+
+    def component_name(self, id: og.uuid) -> str | None:
+        return self.cross_section.cross_section_component(id).name()

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/src/opengeodeweb_back/geode_objects/geode_model.py

@@ -35,3 +35,6 @@ class GeodeModel(GeodeObject):
 
     @abstractmethod
     def items(self, id: og.uuid) -> list[og.ComponentID]: ...
+
+    @abstractmethod
+    def component_name(self, id: og.uuid) -> str | None: ...

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/src/opengeodeweb_back/geode_objects/geode_section.py

@@ -90,6 +90,9 @@ class GeodeSection(GeodeModel):
     def items(self, id: og.uuid) -> list[og.ComponentID]:
         return self.section.items(id)
 
+    def component_name(self, id: og.uuid) -> str | None:
+        return self.section.section_component(id).name()
+
     def inspect(self) -> og_inspector.SectionInspectionResult:
         return og_inspector.inspect_section(self.section)
 

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/src/opengeodeweb_back/geode_objects/geode_structural_model.py

@@ -75,3 +75,6 @@ class GeodeStructuralModel(GeodeBRep):
         return viewables.save_light_viewable_structural_model(
             self.structural_model, filename_without_extension
         )
+
+    def component_name(self, id: og.uuid) -> str | None:
+        return self.structural_model.structural_model_component(id).name()

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/src/opengeodeweb_back/utils_functions.py

@@ -214,7 +214,9 @@ def model_components(
         component_type = mesh_component.get()
         for id in ids:
             geode_id = id.string()
-            component_name = geode_id
+            component_name = model.component_name(id)
+            if not component_name:
+                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]
@@ -236,11 +238,14 @@ def model_components(
         component_type = collection_component.get()
         for id in ids:
             geode_id = id.string()
+            component_name = model.component_name(id)
+            if not component_name:
+                component_name = geode_id
             items = model.items(id)
             items_uuid = [item.id().string() for item in items]
             collection_component_object = {
                 "geode_id": geode_id,
-                "name": geode_id,
+                "name": component_name,
                 "type": component_type,
                 "items": items_uuid,
             }

{opengeodeweb_back-6.3.6rc1 → opengeodeweb_back-6.4.0}/tests/test_routes.py

@@ -431,25 +431,33 @@ def test_geode_object_inheritance(client: FlaskClient) -> None:
 
 def test_model_components(client: FlaskClient) -> None:
     geode_object_type = "BRep"
-    filename = "cube.og_brep"
+    filename = "LS2.og_brep"
     response = test_save_viewable_file(client, geode_object_type, filename)
     assert response.status_code == 200
     assert "mesh_components" in response.get_json()
     mesh_components = response.get_json()["mesh_components"]
     assert isinstance(mesh_components, list)
     assert len(mesh_components) > 0
+    name_is_uuid = False
+    name_is_not_uuid = False
     for mesh_component in mesh_components:
         assert isinstance(mesh_component, object)
         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)
+        if mesh_component["name"] == mesh_component["geode_id"]:
+            name_is_uuid = True
+        else:
+            name_is_not_uuid = True
         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 name_is_uuid is True
+    assert name_is_not_uuid is True
     assert "collection_components" in response.get_json()
     collection_components = response.get_json()["collection_components"]
     assert isinstance(collection_components, list)