OpenGeodeWeb-Back 1.2.2__tar.gz → 1.3.0rc2__tar.gz

{OpenGeodeWeb-Back-1.2.2/src/OpenGeodeWeb_Back.egg-info → OpenGeodeWeb-Back-1.3.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 1.2.2
+Version: 1.3.0rc2
 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
@@ -13,10 +13,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: geode-common==26.3.0
 Requires-Dist: geode-viewables==2.1.0
-Requires-Dist: opengeode-core==14.8.0
+Requires-Dist: opengeode-core==14.9.0
 Requires-Dist: opengeode-geosciences==7.2.0
 Requires-Dist: opengeode-geosciencesio==4.5.0
-Requires-Dist: opengeode-inspector==3.1.0
+Requires-Dist: opengeode-inspector==4.0.0
 Requires-Dist: opengeode-io==6.2.0
 
 

{OpenGeodeWeb-Back-1.2.2 → OpenGeodeWeb-Back-1.3.0rc2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "1.2.2"
+version = "1.3.0-rc.2"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="team-web@geode-solutions.com" },

{OpenGeodeWeb-Back-1.2.2 → OpenGeodeWeb-Back-1.3.0rc2}/requirements.txt

@@ -2,15 +2,16 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile --resolver=backtracking requirements.in
 #
 geode-common==26.3.0
     # via geode-viewables
 geode-viewables==2.1.0
     # via -r requirements.in
-opengeode-core==14.8.0
+opengeode-core==14.9.0
     # via
     #   -r requirements.in
+    #   geode-common
     #   geode-viewables
     #   opengeode-geosciences
     #   opengeode-geosciencesio
@@ -26,7 +27,7 @@ opengeode-geosciencesio==4.5.0
     # via
     #   -r requirements.in
     #   opengeode-inspector
-opengeode-inspector==3.1.0
+opengeode-inspector==4.0.0
     # via -r requirements.in
 opengeode-io==6.2.0
     # via

{OpenGeodeWeb-Back-1.2.2 → OpenGeodeWeb-Back-1.3.0rc2/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 1.2.2
+Version: 1.3.0rc2
 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
@@ -13,10 +13,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: geode-common==26.3.0
 Requires-Dist: geode-viewables==2.1.0
-Requires-Dist: opengeode-core==14.8.0
+Requires-Dist: opengeode-core==14.9.0
 Requires-Dist: opengeode-geosciences==7.2.0
 Requires-Dist: opengeode-geosciencesio==4.5.0
-Requires-Dist: opengeode-inspector==3.1.0
+Requires-Dist: opengeode-inspector==4.0.0
 Requires-Dist: opengeode-io==6.2.0
 
 

{OpenGeodeWeb-Back-1.2.2 → OpenGeodeWeb-Back-1.3.0rc2}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -1,7 +1,7 @@
 geode-common==26.3.0
 geode-viewables==2.1.0
-opengeode-core==14.8.0
+opengeode-core==14.9.0
 opengeode-geosciences==7.2.0
 opengeode-geosciencesio==4.5.0
-opengeode-inspector==3.1.0
+opengeode-inspector==4.0.0
 opengeode-io==6.2.0

{OpenGeodeWeb-Back-1.2.2 → OpenGeodeWeb-Back-1.3.0rc2}/src/opengeodeweb_back/geode_functions.py

@@ -24,6 +24,10 @@ def get_output_factory(geode_object: str):
     return objects_list()[geode_object]["output_factory"]
 
 
+def missing_files(geode_object: str, file_absolute_path: str):
+    return objects_list()[geode_object]["missing_files"](file_absolute_path)
+
+
 def load(geode_object: str, file_absolute_path: str):
     return objects_list()[geode_object]["load"](file_absolute_path)
 
@@ -106,55 +110,49 @@ def get_geode_object_output_extensions(geode_object: str):
     return output_list
 
 
-def list_input_extensions(
-    keys: list = [],
-):
-    """
-    Purpose:
-        Function that returns a list of all input extensions
-    Args:
-        keys -- Tells the function if we want the geode_objects that have a crs
-    Returns:
-        An ordered list of input file extensions
-    """
+def list_input_extensions(key: str = None):
     extensions_list = []
-
     for geode_object, value in objects_list().items():
-        if keys:
-            for key in keys:
-                if key in value:
-                    if type(value[key]) == bool and value[key] == True:
-                        pass
-                    else:
-                        continue
+        if key != None:
+            if key in value:
+                if type(value[key]) == bool:
+                    if value[key] == True:
+                        extensions_list += get_geode_object_input_extensions(
+                            geode_object
+                        )
                 else:
-                    continue
-
-        geode_object_input_extensions = get_geode_object_input_extensions(geode_object)
-        extensions_list = extensions_list + geode_object_input_extensions
+                    extensions_list += get_geode_object_input_extensions(geode_object)
+        else:
+            extensions_list += get_geode_object_input_extensions(geode_object)
 
     extensions_list = list(set(extensions_list))
     extensions_list.sort()
     return extensions_list
 
 
-def list_geode_objects(extension: str, keys: list = []):
-    """
-    Purpose:
-        Function that returns a list of objects that can handle a file, given his extension
-    Args:
-        extension -- The extension of the file
-    Returns:
-        An ordered list of object's names
-    """
-    geode_objects_list = []
+def has_creator(geode_object: str, extension: str):
+    geode_object_input_factory = get_input_factory(geode_object)
+    for input in geode_object_input_factory:
+        if input.has_creator(extension):
+            return True
+    return False
+
 
+def list_geode_objects(extension: str, key: str = None):
+    geode_objects_list = []
     for geode_object, value in objects_list().items():
-        input_factory = get_input_factory(geode_object)
-        for input in input_factory:
-            if input.has_creator(extension):
-                if geode_object not in geode_objects_list:
+        if key != None:
+            if key in value:
+                if type(value[key]) == bool:
+                    if value[key] == True:
+                        if has_creator(geode_object, extension):
+                            geode_objects_list.append(geode_object)
+                elif has_creator(geode_object, extension):
                     geode_objects_list.append(geode_object)
+        else:
+            if has_creator(geode_object, extension):
+                geode_objects_list.append(geode_object)
+
     geode_objects_list.sort()
     return geode_objects_list
 

{OpenGeodeWeb-Back-1.2.2 → OpenGeodeWeb-Back-1.3.0rc2}/src/opengeodeweb_back/geode_objects.py

@@ -11,6 +11,7 @@ def objects_list():
         "BRep": {
             "input_factory": [og.BRepInputFactory],
             "output_factory": [og.BRepOutputFactory],
+            "missing_files": og.check_brep_missing_files,
             "load": og.load_brep,
             "save": og.save_brep,
             "builder": og.BRepBuilder,
@@ -31,6 +32,7 @@ def objects_list():
                 og.SectionOutputFactory,
                 og_gs.CrossSectionOutputFactory,
             ],
+            "missing_files": og_gs.check_cross_section_missing_files,
             "load": og_gs.load_cross_section,
             "save": og_gs.save_cross_section,
             "builder": og_gs.CrossSectionBuilder,
@@ -48,6 +50,7 @@ def objects_list():
         "EdgedCurve2D": {
             "input_factory": [og.EdgedCurveInputFactory2D],
             "output_factory": [og.EdgedCurveOutputFactory2D],
+            "missing_files": og.check_edged_curve_missing_files2D,
             "load": og.load_edged_curve2D,
             "save": og.save_edged_curve2D,
             "builder": og.EdgedCurveBuilder2D.create,
@@ -65,6 +68,7 @@ def objects_list():
         "EdgedCurve3D": {
             "input_factory": [og.EdgedCurveInputFactory3D],
             "output_factory": [og.EdgedCurveOutputFactory3D],
+            "missing_files": og.check_edged_curve_missing_files3D,
             "load": og.load_edged_curve3D,
             "save": og.save_edged_curve3D,
             "builder": og.EdgedCurveBuilder3D.create,
@@ -82,6 +86,7 @@ def objects_list():
         "Graph": {
             "input_factory": [og.GraphInputFactory],
             "output_factory": [og.GraphOutputFactory],
+            "missing_files": og.check_graph_missing_files,
             "load": og.load_graph,
             "save": og.save_graph,
             "builder": og.GraphBuilder.create,
@@ -92,6 +97,7 @@ def objects_list():
         "HybridSolid3D": {
             "input_factory": [og.HybridSolidInputFactory3D],
             "output_factory": [og.HybridSolidOutputFactory3D],
+            "missing_files": og.check_hybrid_solid_missing_files3D,
             "load": og.load_hybrid_solid3D,
             "save": og.save_hybrid_solid3D,
             "builder": og.HybridSolidBuilder3D.create,
@@ -109,6 +115,7 @@ def objects_list():
         "PointSet2D": {
             "input_factory": [og.PointSetInputFactory2D],
             "output_factory": [og.PointSetOutputFactory2D],
+            "missing_files": og.check_point_set_missing_files2D,
             "load": og.load_point_set2D,
             "save": og.save_point_set2D,
             "builder": og.PointSetBuilder2D.create,
@@ -126,6 +133,7 @@ def objects_list():
         "PointSet3D": {
             "input_factory": [og.PointSetInputFactory3D],
             "output_factory": [og.PointSetOutputFactory3D],
+            "missing_files": og.check_point_set_missing_files3D,
             "load": og.load_point_set3D,
             "save": og.save_point_set3D,
             "builder": og.PointSetBuilder3D.create,
@@ -143,6 +151,7 @@ def objects_list():
         "PolygonalSurface2D": {
             "input_factory": [og.PolygonalSurfaceInputFactory2D],
             "output_factory": [og.PolygonalSurfaceOutputFactory2D],
+            "missing_files": og.check_polygonal_surface_missing_files2D,
             "load": og.load_polygonal_surface2D,
             "save": og.save_polygonal_surface2D,
             "builder": og.PolygonalSurfaceBuilder2D.create,
@@ -160,6 +169,7 @@ def objects_list():
         "PolygonalSurface3D": {
             "input_factory": [og.PolygonalSurfaceInputFactory3D],
             "output_factory": [og.PolygonalSurfaceOutputFactory3D],
+            "missing_files": og.check_polygonal_surface_missing_files3D,
             "load": og.load_polygonal_surface3D,
             "save": og.save_polygonal_surface3D,
             "builder": og.PolygonalSurfaceBuilder3D.create,
@@ -177,6 +187,7 @@ def objects_list():
         "PolyhedralSolid3D": {
             "input_factory": [og.PolyhedralSolidInputFactory3D],
             "output_factory": [og.PolyhedralSolidOutputFactory3D],
+            "missing_files": og.check_polyhedral_solid_missing_files3D,
             "load": og.load_polyhedral_solid3D,
             "save": og.save_polyhedral_solid3D,
             "builder": og.PolyhedralSolidBuilder3D.create,
@@ -194,6 +205,7 @@ def objects_list():
         "RasterImage2D": {
             "input_factory": [og.RasterImageInputFactory2D],
             "output_factory": [og.RasterImageOutputFactory2D],
+            "missing_files": og.check_raster_image_missing_files2D,
             "load": og.load_raster_image2D,
             "save": og.save_raster_image2D,
             "is_model": False,
@@ -204,6 +216,7 @@ def objects_list():
         "RasterImage3D": {
             "input_factory": [og.RasterImageInputFactory3D],
             "output_factory": [og.RasterImageOutputFactory3D],
+            "missing_files": og.check_raster_image_missing_files3D,
             "load": og.load_raster_image3D,
             "save": og.save_raster_image3D,
             "is_model": False,
@@ -214,6 +227,7 @@ def objects_list():
         "RegularGrid2D": {
             "input_factory": [og.RegularGridInputFactory2D],
             "output_factory": [og.RegularGridOutputFactory2D],
+            "missing_files": og.check_regular_grid_missing_files2D,
             "load": og.load_regular_grid2D,
             "save": og.save_regular_grid2D,
             "builder": og.RegularGridBuilder2D.create,
@@ -230,6 +244,7 @@ def objects_list():
         "RegularGrid3D": {
             "input_factory": [og.RegularGridInputFactory3D],
             "output_factory": [og.RegularGridOutputFactory3D],
+            "missing_files": og.check_regular_grid_missing_files3D,
             "load": og.load_regular_grid3D,
             "save": og.save_regular_grid3D,
             "builder": og.RegularGridBuilder3D.create,
@@ -246,6 +261,7 @@ def objects_list():
         "Section": {
             "input_factory": [og.SectionInputFactory],
             "output_factory": [og.SectionOutputFactory],
+            "missing_files": og.check_section_missing_files,
             "load": og.load_section,
             "save": og.save_section,
             "builder": og.SectionBuilder,
@@ -266,6 +282,7 @@ def objects_list():
                 og.BRepOutputFactory,
                 og_gs.StructuralModelOutputFactory,
             ],
+            "missing_files": og_gs.check_structural_model_missing_files,
             "load": og_gs.load_structural_model,
             "save": og_gs.save_structural_model,
             "builder": og_gs.StructuralModelBuilder,
@@ -284,6 +301,7 @@ def objects_list():
             "input_factory": [og.TetrahedralSolidInputFactory3D],
             "output_factory": [og.TetrahedralSolidOutputFactory3D],
             "load": og.load_tetrahedral_solid3D,
+            "missing_files": og.check_tetrahedral_solid_missing_files3D,
             "save": og.save_tetrahedral_solid3D,
             "builder": og.TetrahedralSolidBuilder3D.create,
             "crs": {
@@ -300,6 +318,7 @@ def objects_list():
         "TriangulatedSurface2D": {
             "input_factory": [og.TriangulatedSurfaceInputFactory2D],
             "output_factory": [og.TriangulatedSurfaceOutputFactory2D],
+            "missing_files": og.check_triangulated_surface_missing_files2D,
             "load": og.load_triangulated_surface2D,
             "save": og.save_triangulated_surface2D,
             "builder": og.TriangulatedSurfaceBuilder2D.create,
@@ -317,6 +336,7 @@ def objects_list():
         "TriangulatedSurface3D": {
             "input_factory": [og.TriangulatedSurfaceInputFactory3D],
             "output_factory": [og.TriangulatedSurfaceOutputFactory3D],
+            "missing_files": og.check_triangulated_surface_missing_files3D,
             "load": og.load_triangulated_surface3D,
             "save": og.save_triangulated_surface3D,
             "builder": og.TriangulatedSurfaceBuilder3D.create,
@@ -334,6 +354,7 @@ def objects_list():
         "VertexSet": {
             "input_factory": [og.VertexSetInputFactory],
             "output_factory": [og.VertexSetOutputFactory],
+            "missing_files": og.check_vertex_set_missing_files,
             "load": og.load_vertex_set,
             "save": og.save_vertex_set,
             "builder": og.VertexSetBuilder.create,

{OpenGeodeWeb-Back-1.2.2 → OpenGeodeWeb-Back-1.3.0rc2}/tests/test_functions.py

@@ -14,6 +14,24 @@ def test_get_output_factory():
         assert type(geode_object_input) is list
 
 
+def test_missing_files():
+    for geode_object, value in geode_objects.objects_list().items():
+        input_extensions = geode_functions.get_geode_object_input_extensions(
+            geode_object
+        )
+        for input_extension in input_extensions:
+            file_absolute_path = os.path.abspath(f"tests/data/test.{input_extension}")
+            missing_files = geode_functions.missing_files(
+                geode_object, file_absolute_path
+            )
+            has_missing_files = missing_files.has_missing_files()
+            assert type(has_missing_files) is bool
+            mandatory_files = missing_files.mandatory_files
+            assert type(mandatory_files) is list
+            additional_files = missing_files.additional_files
+            assert type(additional_files) is list
+
+
 def test_is_model():
     for geode_object, value in geode_objects.objects_list().items():
         is_model = geode_functions.is_model(geode_object)
@@ -53,7 +71,7 @@ def test_get_geode_object_output_extensions():
 
 
 def test_list_input_extensions():
-    keys_array = [["crs"], ["inspector"]]
+    keys_array = ["crs", "inspector", None]
     for geode_object, value in geode_objects.objects_list().items():
         for keys in keys_array:
             input_extensions = geode_functions.list_input_extensions(keys)
@@ -61,18 +79,51 @@ def test_list_input_extensions():
 
 
 def test_list_geode_objects():
-    keys_array = [["crs"], ["inspector"]]
-    input_extensions = geode_functions.list_input_extensions()
-    for geode_object, value in geode_objects.objects_list().items():
-        for input_extension in input_extensions:
-            for keys in keys_array:
-                print(f"{input_extension=}")
-                print(f"{keys=}")
+    test_list = [
+        {
+            "key": "crs",
+            "invalid_geode_objects": [
+                "Graph",
+                "RasterImage2D",
+                "RasterImage3D",
+                "VertexSet",
+            ],
+        },
+        {
+            "key": "inspector",
+            "invalid_geode_objects": [
+                "Graph",
+                "RasterImage2D",
+                "RasterImage3D",
+                "RasterImage2D",
+                "RasterImage3D",
+                "VertexSet",
+            ],
+        },
+        {
+            "key": None,
+            "invalid_geode_objects": [],
+        },
+    ]
+    for test in test_list:
+        key = test["key"]
+        invalid_geode_objects = test["invalid_geode_objects"]
+
+        input_extensions = geode_functions.list_input_extensions(key)
+        for geode_object, value in geode_objects.objects_list().items():
+            for input_extension in input_extensions:
                 geode_objects_list = geode_functions.list_geode_objects(
-                    input_extension, keys
+                    input_extension, key
                 )
                 assert type(geode_objects_list) is list
 
+                if key != None:
+                    assert len(geode_objects_list) > 0
+                    for invalid_geode_object in invalid_geode_objects:
+                        assert invalid_geode_object not in geode_objects_list
+                else:
+                    assert len(geode_objects_list) >= 1
+
 
 def test_get_versions():
     list_packages = [
@@ -89,7 +140,5 @@ def test_get_versions():
 
 def test_get_extension_from_filename():
     extension = geode_functions.get_extension_from_filename("test.toto")
-    print(extension)
     assert type(extension) is str
-    print()
     assert extension.count(".") == 0