OpenGeodeWeb-Back 5.9.0rc1__tar.gz → 5.9.0rc2__tar.gz

{opengeodeweb_back-5.9.0rc1/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-5.9.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.9.0rc1
+Version: 5.9.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
@@ -11,32 +11,28 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: asgiref==3.8.1
-Requires-Dist: attrs==25.3.0
+Requires-Dist: asgiref==3.9.1
 Requires-Dist: blinker==1.9.0
 Requires-Dist: click==8.2.1
 Requires-Dist: fastjsonschema==2.21.1
 Requires-Dist: flask[async]==3.1.1
 Requires-Dist: flask-cors==6.0.1
-Requires-Dist: geode-background==9.2.9
-Requires-Dist: geode-common==33.8.8
-Requires-Dist: geode-conversion==6.3.3
-Requires-Dist: geode-explicit==6.2.3
-Requires-Dist: geode-implicit==3.9.4
-Requires-Dist: geode-numerics==6.2.2
-Requires-Dist: geode-simplex==9.4.2
-Requires-Dist: geode-viewables==3.1.4
+Requires-Dist: geode-background==9.4.0
+Requires-Dist: geode-common==33.9.0
+Requires-Dist: geode-conversion==6.4.0
+Requires-Dist: geode-explicit==6.3.0
+Requires-Dist: geode-implicit==4.1.1
+Requires-Dist: geode-numerics==6.3.0
+Requires-Dist: geode-simplex==9.6.0
+Requires-Dist: geode-viewables==3.2.0
 Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: markupsafe==3.0.2
-Requires-Dist: opengeode-core==15.21.2
-Requires-Dist: opengeode-geosciences==9.0.0
-Requires-Dist: opengeode-geosciencesio==5.4.2
-Requires-Dist: opengeode-inspector==6.6.1
-Requires-Dist: opengeode-io==7.2.1
-Requires-Dist: referencing==0.36.2
-Requires-Dist: rpds-py==0.25.1
-Requires-Dist: typing-extensions==4.14.0
+Requires-Dist: opengeode-core==15.24.1
+Requires-Dist: opengeode-geosciences==9.2.1
+Requires-Dist: opengeode-geosciencesio==5.7.1
+Requires-Dist: opengeode-inspector==6.7.0
+Requires-Dist: opengeode-io==7.3.1
 Requires-Dist: werkzeug==3.1.3
 Dynamic: license-file
 

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/pyproject.toml

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

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/requirements.txt

@@ -4,30 +4,26 @@
 #
 #    pip-compile requirements.in
 #
-asgiref==3.8.1
+asgiref==3.9.1
     # via flask
-attrs==25.3.0
-    # via
-    #   jsonschema
-    #   referencing
 blinker==1.9.0
     # via flask
 click==8.2.1
     # via flask
 fastjsonschema==2.21.1
-# via -r requirements.in
+    # via -r requirements.in
 flask[async]==3.1.1
     # via
     #   -r requirements.in
     #   flask-cors
 flask-cors==6.0.1
     # via -r requirements.in
-geode-background==9.2.9
+geode-background==9.4.0
     # via
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
-geode-common==33.8.8
+geode-common==33.9.0
     # via
     #   -r requirements.in
     #   geode-background
@@ -37,26 +33,26 @@ geode-common==33.8.8
     #   geode-numerics
     #   geode-simplex
     #   geode-viewables
-geode-conversion==6.3.3
+geode-conversion==6.4.0
     # via
     #   geode-explicit
     #   geode-implicit
-geode-explicit==6.2.3
+geode-explicit==6.3.0
     # via
     #   -r requirements.in
     #   geode-implicit
-geode-implicit==3.9.4
+geode-implicit==4.1.1
     # via -r requirements.in
-geode-numerics==6.2.2
+geode-numerics==6.3.0
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-simplex
-geode-simplex==9.4.2
+geode-simplex==9.6.0
     # via
     #   -r requirements.in
     #   geode-implicit
-geode-viewables==3.1.4
+geode-viewables==3.2.0
     # via -r requirements.in
 itsdangerous==2.2.0
     # via flask
@@ -67,7 +63,7 @@ markupsafe==3.0.2
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==15.21.2
+opengeode-core==15.24.1
     # via
     #   -r requirements.in
     #   geode-background
@@ -82,40 +78,30 @@ opengeode-core==15.21.2
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==9.0.0
+opengeode-geosciences==9.2.1
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeode-geosciencesio==5.4.2
+opengeode-geosciencesio==5.7.1
     # via
     #   -r requirements.in
     #   geode-implicit
-opengeode-inspector==6.6.1
+opengeode-inspector==6.7.0
     # via
     #   -r requirements.in
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
-opengeode-io==7.2.1
+opengeode-io==7.3.1
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
-referencing==0.36.2
-    # via
-    #   jsonschema
-    #   jsonschema-specifications
-rpds-py==0.25.1
-    # via
-    #   jsonschema
-    #   referencing
-typing-extensions==4.14.0
-    # via referencing
 werkzeug==3.1.3
     # via
     #   -r requirements.in
     #   flask
-    #   flask-cors
+    #   flask-cors

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.9.0rc1
+Version: 5.9.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
@@ -11,32 +11,28 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: asgiref==3.8.1
-Requires-Dist: attrs==25.3.0
+Requires-Dist: asgiref==3.9.1
 Requires-Dist: blinker==1.9.0
 Requires-Dist: click==8.2.1
 Requires-Dist: fastjsonschema==2.21.1
 Requires-Dist: flask[async]==3.1.1
 Requires-Dist: flask-cors==6.0.1
-Requires-Dist: geode-background==9.2.9
-Requires-Dist: geode-common==33.8.8
-Requires-Dist: geode-conversion==6.3.3
-Requires-Dist: geode-explicit==6.2.3
-Requires-Dist: geode-implicit==3.9.4
-Requires-Dist: geode-numerics==6.2.2
-Requires-Dist: geode-simplex==9.4.2
-Requires-Dist: geode-viewables==3.1.4
+Requires-Dist: geode-background==9.4.0
+Requires-Dist: geode-common==33.9.0
+Requires-Dist: geode-conversion==6.4.0
+Requires-Dist: geode-explicit==6.3.0
+Requires-Dist: geode-implicit==4.1.1
+Requires-Dist: geode-numerics==6.3.0
+Requires-Dist: geode-simplex==9.6.0
+Requires-Dist: geode-viewables==3.2.0
 Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: markupsafe==3.0.2
-Requires-Dist: opengeode-core==15.21.2
-Requires-Dist: opengeode-geosciences==9.0.0
-Requires-Dist: opengeode-geosciencesio==5.4.2
-Requires-Dist: opengeode-inspector==6.6.1
-Requires-Dist: opengeode-io==7.2.1
-Requires-Dist: referencing==0.36.2
-Requires-Dist: rpds-py==0.25.1
-Requires-Dist: typing-extensions==4.14.0
+Requires-Dist: opengeode-core==15.24.1
+Requires-Dist: opengeode-geosciences==9.2.1
+Requires-Dist: opengeode-geosciencesio==5.7.1
+Requires-Dist: opengeode-inspector==6.7.0
+Requires-Dist: opengeode-io==7.3.1
 Requires-Dist: werkzeug==3.1.3
 Dynamic: license-file
 

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

@@ -0,0 +1,23 @@
+asgiref==3.9.1
+blinker==1.9.0
+click==8.2.1
+fastjsonschema==2.21.1
+flask[async]==3.1.1
+flask-cors==6.0.1
+geode-background==9.4.0
+geode-common==33.9.0
+geode-conversion==6.4.0
+geode-explicit==6.3.0
+geode-implicit==4.1.1
+geode-numerics==6.3.0
+geode-simplex==9.6.0
+geode-viewables==3.2.0
+itsdangerous==2.2.0
+jinja2==3.1.6
+markupsafe==3.0.2
+opengeode-core==15.24.1
+opengeode-geosciences==9.2.1
+opengeode-geosciencesio==5.7.1
+opengeode-inspector==6.7.0
+opengeode-io==7.3.1
+werkzeug==3.1.3

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/src/opengeodeweb_back/geode_functions.py

@@ -28,8 +28,8 @@ def output_factory(geode_object: str):
     return geode_object_value(geode_object)["output_factory"]
 
 
-def missing_files(geode_object: str, file_absolute_path: str):
-    return geode_object_value(geode_object)["missing_files"](file_absolute_path)
+def additional_files(geode_object: str, file_absolute_path: str):
+    return geode_object_value(geode_object)["additional_files"](file_absolute_path)
 
 
 def is_loadable(geode_object: str, file_absolute_path: str):

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/src/opengeodeweb_back/geode_objects.py

@@ -25,7 +25,7 @@ def geode_objects_dict():
             "class": og.BRep,
             "input_factory": og.BRepInputFactory,
             "output_factory": og.BRepOutputFactory,
-            "missing_files": og.check_brep_missing_files,
+            "additional_files": og.brep_additional_files,
             "is_loadable": og.is_brep_loadable,
             "load": og.load_brep,
             "is_saveable": og.is_brep_saveable,
@@ -48,7 +48,7 @@ def geode_objects_dict():
             "class": og_gs.CrossSection,
             "input_factory": og_gs.CrossSectionInputFactory,
             "output_factory": og_gs.CrossSectionOutputFactory,
-            "missing_files": og_gs.check_cross_section_missing_files,
+            "additional_files": og_gs.cross_section_additional_files,
             "is_loadable": og_gs.is_cross_section_loadable,
             "load": og_gs.load_cross_section,
             "is_saveable": og_gs.is_cross_section_saveable,
@@ -70,7 +70,7 @@ def geode_objects_dict():
             "class": og.EdgedCurve2D,
             "input_factory": og.EdgedCurveInputFactory2D,
             "output_factory": og.EdgedCurveOutputFactory2D,
-            "missing_files": og.check_edged_curve_missing_files2D,
+            "additional_files": og.edged_curve_additional_files2D,
             "is_loadable": og.is_edged_curve_loadable2D,
             "load": og.load_edged_curve2D,
             "is_saveable": og.is_edged_curve_saveable2D,
@@ -93,7 +93,7 @@ def geode_objects_dict():
             "class": og.EdgedCurve3D,
             "input_factory": og.EdgedCurveInputFactory3D,
             "output_factory": og.EdgedCurveOutputFactory3D,
-            "missing_files": og.check_edged_curve_missing_files3D,
+            "additional_files": og.edged_curve_additional_files3D,
             "is_loadable": og.is_edged_curve_loadable3D,
             "load": og.load_edged_curve3D,
             "is_saveable": og.is_edged_curve_saveable3D,
@@ -116,7 +116,7 @@ def geode_objects_dict():
             "class": og.Graph,
             "input_factory": og.GraphInputFactory,
             "output_factory": og.GraphOutputFactory,
-            "missing_files": og.check_graph_missing_files,
+            "additional_files": og.graph_additional_files,
             "is_loadable": og.is_graph_loadable,
             "load": og.load_graph,
             "is_saveable": og.is_graph_saveable,
@@ -130,7 +130,7 @@ def geode_objects_dict():
             "class": og.HybridSolid3D,
             "input_factory": og.HybridSolidInputFactory3D,
             "output_factory": og.HybridSolidOutputFactory3D,
-            "missing_files": og.check_hybrid_solid_missing_files3D,
+            "additional_files": og.hybrid_solid_additional_files3D,
             "is_loadable": og.is_hybrid_solid_loadable3D,
             "load": og.load_hybrid_solid3D,
             "is_saveable": og.is_hybrid_solid_saveable3D,
@@ -154,7 +154,7 @@ def geode_objects_dict():
             "class": og_gs.ImplicitCrossSection,
             "input_factory": og_gs.ImplicitCrossSectionInputFactory,
             "output_factory": og_gs.ImplicitCrossSectionOutputFactory,
-            "missing_files": og_gs.check_implicit_cross_section_missing_files,
+            "additional_files": og_gs.implicit_cross_section_additional_files,
             "is_loadable": og_gs.is_implicit_cross_section_loadable,
             "load": og_gs.load_implicit_cross_section,
             "is_saveable": og_gs.is_implicit_cross_section_saveable,
@@ -177,7 +177,7 @@ def geode_objects_dict():
             "class": og_gs.ImplicitStructuralModel,
             "input_factory": og_gs.ImplicitStructuralModelInputFactory,
             "output_factory": og_gs.ImplicitStructuralModelOutputFactory,
-            "missing_files": og_gs.check_implicit_structural_model_missing_files,
+            "additional_files": og_gs.implicit_structural_model_additional_files,
             "is_loadable": og_gs.is_implicit_structural_model_loadable,
             "load": og_gs.load_implicit_structural_model,
             "is_saveable": og_gs.is_implicit_structural_model_saveable,
@@ -199,7 +199,7 @@ def geode_objects_dict():
             "class": og.LightRegularGrid2D,
             "input_factory": og.LightRegularGridInputFactory2D,
             "output_factory": og.LightRegularGridOutputFactory2D,
-            "missing_files": og.check_light_regular_grid_missing_files2D,
+            "additional_files": og.light_regular_grid_additional_files2D,
             "is_loadable": og.is_light_regular_grid_loadable2D,
             "load": og.load_light_regular_grid2D,
             "is_saveable": og.is_light_regular_grid_saveable2D,
@@ -215,7 +215,7 @@ def geode_objects_dict():
             "class": og.LightRegularGrid3D,
             "input_factory": og.LightRegularGridInputFactory3D,
             "output_factory": og.LightRegularGridOutputFactory3D,
-            "missing_files": og.check_light_regular_grid_missing_files3D,
+            "additional_files": og.light_regular_grid_additional_files3D,
             "is_loadable": og.is_light_regular_grid_loadable3D,
             "load": og.load_light_regular_grid3D,
             "is_saveable": og.is_light_regular_grid_saveable3D,
@@ -231,7 +231,7 @@ def geode_objects_dict():
             "class": og.PointSet2D,
             "input_factory": og.PointSetInputFactory2D,
             "output_factory": og.PointSetOutputFactory2D,
-            "missing_files": og.check_point_set_missing_files2D,
+            "additional_files": og.point_set_additional_files2D,
             "is_loadable": og.is_point_set_loadable2D,
             "load": og.load_point_set2D,
             "is_saveable": og.is_point_set_saveable2D,
@@ -254,7 +254,7 @@ def geode_objects_dict():
             "class": og.PointSet3D,
             "input_factory": og.PointSetInputFactory3D,
             "output_factory": og.PointSetOutputFactory3D,
-            "missing_files": og.check_point_set_missing_files3D,
+            "additional_files": og.point_set_additional_files3D,
             "is_loadable": og.is_point_set_loadable3D,
             "load": og.load_point_set3D,
             "is_saveable": og.is_point_set_saveable3D,
@@ -277,7 +277,7 @@ def geode_objects_dict():
             "class": og.PolygonalSurface2D,
             "input_factory": og.PolygonalSurfaceInputFactory2D,
             "output_factory": og.PolygonalSurfaceOutputFactory2D,
-            "missing_files": og.check_polygonal_surface_missing_files2D,
+            "additional_files": og.polygonal_surface_additional_files2D,
             "is_loadable": og.is_polygonal_surface_loadable2D,
             "load": og.load_polygonal_surface2D,
             "is_saveable": og.is_polygonal_surface_saveable2D,
@@ -300,7 +300,7 @@ def geode_objects_dict():
             "class": og.PolygonalSurface3D,
             "input_factory": og.PolygonalSurfaceInputFactory3D,
             "output_factory": og.PolygonalSurfaceOutputFactory3D,
-            "missing_files": og.check_polygonal_surface_missing_files3D,
+            "additional_files": og.polygonal_surface_additional_files3D,
             "is_loadable": og.is_polygonal_surface_loadable3D,
             "load": og.load_polygonal_surface3D,
             "is_saveable": og.is_polygonal_surface_saveable3D,
@@ -323,7 +323,7 @@ def geode_objects_dict():
             "class": og.PolyhedralSolid3D,
             "input_factory": og.PolyhedralSolidInputFactory3D,
             "output_factory": og.PolyhedralSolidOutputFactory3D,
-            "missing_files": og.check_polyhedral_solid_missing_files3D,
+            "additional_files": og.polyhedral_solid_additional_files3D,
             "is_loadable": og.is_polyhedral_solid_loadable3D,
             "load": og.load_polyhedral_solid3D,
             "is_saveable": og.is_polyhedral_solid_saveable3D,
@@ -346,7 +346,7 @@ def geode_objects_dict():
             "class": og.RasterImage2D,
             "input_factory": og.RasterImageInputFactory2D,
             "output_factory": og.RasterImageOutputFactory2D,
-            "missing_files": og.check_raster_image_missing_files2D,
+            "additional_files": og.raster_image_additional_files2D,
             "is_loadable": og.is_raster_image_loadable2D,
             "load": og.load_raster_image2D,
             "is_saveable": og.is_raster_image_saveable2D,
@@ -360,7 +360,7 @@ def geode_objects_dict():
             "class": og.RasterImage3D,
             "input_factory": og.RasterImageInputFactory3D,
             "output_factory": og.RasterImageOutputFactory3D,
-            "missing_files": og.check_raster_image_missing_files3D,
+            "additional_files": og.raster_image_additional_files3D,
             "is_loadable": og.is_raster_image_loadable3D,
             "load": og.load_raster_image3D,
             "is_saveable": og.is_raster_image_saveable3D,
@@ -374,7 +374,7 @@ def geode_objects_dict():
             "class": og.RegularGrid2D,
             "input_factory": og.RegularGridInputFactory2D,
             "output_factory": og.RegularGridOutputFactory2D,
-            "missing_files": og.check_regular_grid_missing_files2D,
+            "additional_files": og.regular_grid_additional_files2D,
             "is_loadable": og.is_regular_grid_loadable2D,
             "load": og.load_regular_grid2D,
             "is_saveable": og.is_regular_grid_saveable2D,
@@ -396,7 +396,7 @@ def geode_objects_dict():
             "class": og.RegularGrid3D,
             "input_factory": og.RegularGridInputFactory3D,
             "output_factory": og.RegularGridOutputFactory3D,
-            "missing_files": og.check_regular_grid_missing_files3D,
+            "additional_files": og.regular_grid_additional_files3D,
             "is_loadable": og.is_regular_grid_loadable3D,
             "load": og.load_regular_grid3D,
             "is_saveable": og.is_regular_grid_saveable3D,
@@ -418,7 +418,7 @@ def geode_objects_dict():
             "class": og.Section,
             "input_factory": og.SectionInputFactory,
             "output_factory": og.SectionOutputFactory,
-            "missing_files": og.check_section_missing_files,
+            "additional_files": og.section_additional_files,
             "is_loadable": og.is_section_loadable,
             "load": og.load_section,
             "is_saveable": og.is_section_saveable,
@@ -441,7 +441,7 @@ def geode_objects_dict():
             "class": og_gs.StructuralModel,
             "input_factory": og_gs.StructuralModelInputFactory,
             "output_factory": og_gs.StructuralModelOutputFactory,
-            "missing_files": og_gs.check_structural_model_missing_files,
+            "additional_files": og_gs.structural_model_additional_files,
             "is_loadable": og_gs.is_structural_model_loadable,
             "load": og_gs.load_structural_model,
             "is_saveable": og_gs.is_structural_model_saveable,
@@ -463,7 +463,7 @@ def geode_objects_dict():
             "class": og.TetrahedralSolid3D,
             "input_factory": og.TetrahedralSolidInputFactory3D,
             "output_factory": og.TetrahedralSolidOutputFactory3D,
-            "missing_files": og.check_tetrahedral_solid_missing_files3D,
+            "additional_files": og.tetrahedral_solid_additional_files3D,
             "is_loadable": og.is_tetrahedral_solid_loadable3D,
             "load": og.load_tetrahedral_solid3D,
             "is_saveable": og.is_tetrahedral_solid_saveable3D,
@@ -486,7 +486,7 @@ def geode_objects_dict():
             "class": og.TriangulatedSurface2D,
             "input_factory": og.TriangulatedSurfaceInputFactory2D,
             "output_factory": og.TriangulatedSurfaceOutputFactory2D,
-            "missing_files": og.check_triangulated_surface_missing_files2D,
+            "additional_files": og.triangulated_surface_additional_files2D,
             "is_loadable": og.is_triangulated_surface_loadable2D,
             "load": og.load_triangulated_surface2D,
             "is_saveable": og.is_triangulated_surface_saveable2D,
@@ -509,7 +509,7 @@ def geode_objects_dict():
             "class": og.TriangulatedSurface3D,
             "input_factory": og.TriangulatedSurfaceInputFactory3D,
             "output_factory": og.TriangulatedSurfaceOutputFactory3D,
-            "missing_files": og.check_triangulated_surface_missing_files3D,
+            "additional_files": og.triangulated_surface_additional_files3D,
             "is_loadable": og.is_triangulated_surface_loadable3D,
             "load": og.load_triangulated_surface3D,
             "is_saveable": og.is_triangulated_surface_saveable3D,
@@ -532,7 +532,7 @@ def geode_objects_dict():
             "class": og.VertexSet,
             "input_factory": og.VertexSetInputFactory,
             "output_factory": og.VertexSetOutputFactory,
-            "missing_files": og.check_vertex_set_missing_files,
+            "additional_files": og.vertex_set_additional_files,
             "is_loadable": og.is_vertex_set_loadable,
             "load": og.load_vertex_set,
             "is_saveable": og.is_vertex_set_saveable,

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -121,19 +121,27 @@ with open(
 def missing_files():
     utils_functions.validate_request(flask.request, missing_files_json)
     file_path = geode_functions.upload_file_path(flask.request.json["filename"])
-    missing_files = geode_functions.missing_files(
+
+    additional_files = geode_functions.additional_files(
         flask.request.json["input_geode_object"],
         file_path,
     )
-    has_missing_files = missing_files.has_missing_files()
 
-    mandatory_files = []
-    for mandatory_file in missing_files.mandatory_files:
-        mandatory_files.append(os.path.basename(mandatory_file))
+    has_missing_files = any(
+        file.is_missing
+        for file in additional_files.mandatory_files + additional_files.optional_files
+    )
 
-    additional_files = []
-    for additional_file in missing_files.additional_files:
-        additional_files.append(os.path.basename(additional_file))
+    mandatory_files = [
+        os.path.basename(file.filename)
+        for file in additional_files.mandatory_files
+        if file.is_missing
+    ]
+    additional_files = [
+        os.path.basename(file.filename)
+        for file in additional_files.optional_files
+        if file.is_missing
+    ]
 
     return flask.make_response(
         {
@@ -239,12 +247,10 @@ with open(
 )
 def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
-
-    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
-    data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
     return flask.make_response(
-        utils_functions.generate_native_viewable_and_light_viewable(
-            flask.request.json["input_geode_object"], data
+        utils_functions.generate_native_viewable_and_light_viewable_from_file(
+            geode_object=flask.request.json["input_geode_object"],
+            input_filename=flask.request.json["filename"],
         ),
         200,
     )
@@ -267,7 +273,7 @@ def create_point():
     builder.create_point(opengeode.Point3D([x, y, z]))
     builder.set_name(title)
     return flask.make_response(
-        utils_functions.generate_native_viewable_and_light_viewable(
+        utils_functions.generate_native_viewable_and_light_viewable_from_object(
             "PointSet3D", PointSet3D
         ),
         200,

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/src/opengeodeweb_back/utils_functions.py

@@ -9,6 +9,8 @@ import zipfile
 import flask
 import fastjsonschema
 import importlib.metadata as metadata
+import shutil
+import werkzeug
 
 # Local application imports
 from . import geode_functions
@@ -143,13 +145,20 @@ def handle_exception(e):
     return response
 
 
-def generate_native_viewable_and_light_viewable(geode_object, data):
+def create_unique_data_folder() -> tuple[str, str]:
+    base_data_folder = flask.current_app.config["DATA_FOLDER_PATH"]
     generated_id = str(uuid.uuid4()).replace("-", "")
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
-    data_path = os.path.join(DATA_FOLDER_PATH, generated_id)
-    name = data.name()
-    object_type = geode_functions.get_object_type(geode_object)
+    data_path = os.path.join(base_data_folder, generated_id)
+    os.makedirs(data_path, exist_ok=True)
+    return generated_id, data_path
 
+
+def save_all_viewables_and_return_info(
+        geode_object, 
+        data, generated_id, 
+        data_path, 
+        additional_files=None
+    ):
     saved_native_file_path = geode_functions.save(
         geode_object,
         data,
@@ -159,20 +168,60 @@ def generate_native_viewable_and_light_viewable(geode_object, data):
     saved_viewable_file_path = geode_functions.save_viewable(
         geode_object, data, data_path, "viewable"
     )
-    viewable_file_name = os.path.basename(saved_viewable_file_path)
     saved_light_viewable_file_path = geode_functions.save_light_viewable(
         geode_object, data, data_path, "light_viewable"
     )
-    f = open(saved_light_viewable_file_path, "rb")
-    binary_light_viewable = f.read()
-    f.close()
+    with open(saved_light_viewable_file_path, "rb") as f:
+        binary_light_viewable = f.read()
 
     return {
-        "name": name,
+        "name": data.name(),
         "native_file_name": os.path.basename(saved_native_file_path[0]),
-        "viewable_file_name": viewable_file_name,
+        "viewable_file_name": os.path.basename(saved_viewable_file_path),
         "id": generated_id,
-        "object_type": object_type,
-        "binary_light_viewable": str(binary_light_viewable, "utf-8"),
+        "object_type": geode_functions.get_object_type(geode_object),
+        "binary_light_viewable": binary_light_viewable.decode("utf-8"),
         "geode_object": geode_object,
+        "input_files": additional_files or [],
     }
+
+def generate_native_viewable_and_light_viewable_from_object(
+        geode_object, 
+        data
+    ):
+    generated_id, data_path = create_unique_data_folder()
+    return save_all_viewables_and_return_info(geode_object, data, generated_id, data_path)
+
+
+def generate_native_viewable_and_light_viewable_from_file(
+        geode_object, 
+        input_filename
+    ):
+    generated_id, data_path = create_unique_data_folder()
+
+    full_input_filename = geode_functions.upload_file_path(input_filename)
+    copied_full_path = os.path.join(data_path, werkzeug.utils.secure_filename(input_filename))
+    shutil.copy2(full_input_filename, copied_full_path)
+
+    additional_files_copied = []
+    additional = geode_functions.additional_files(geode_object, full_input_filename)
+    for additional_file in additional.mandatory_files + additional.optional_files:
+        if additional_file.is_missing:
+            continue
+        source_path = os.path.join(os.path.dirname(full_input_filename), additional_file.filename)
+        if not os.path.exists(source_path):
+            continue
+        dest_path = os.path.join(data_path, additional_file.filename)
+        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+        shutil.copy2(source_path, dest_path)
+        additional_files_copied.append(additional_file.filename)
+
+    data = geode_functions.load_data(geode_object, generated_id, input_filename)
+
+    return save_all_viewables_and_return_info(
+        geode_object,
+        data,
+        generated_id,
+        data_path,
+        additional_files=additional_files_copied,
+    )

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/tests/test_geode_functions.py

@@ -43,20 +43,18 @@ def test_output_factory():
             assert type(output) is str
 
 
-def test_missing_files():
+def test_additional_files():
     for geode_object, value in geode_objects.geode_objects_dict().items():
         input_extensions = geode_functions.geode_object_input_extensions(geode_object)
         for input_extension in input_extensions:
             file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
-            missing_files = geode_functions.missing_files(
+            additional_files = geode_functions.additional_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
+            mandatory_files = additional_files.mandatory_files
+            optional_files = additional_files.optional_files
             assert type(mandatory_files) is list
-            additional_files = missing_files.additional_files
-            assert type(additional_files) is list
+            assert type(optional_files) is list
 
 
 def test_is_loadable():
@@ -75,19 +73,9 @@ def test_load():
         for input_extension in input_extensions:
             print(f"\t{input_extension=}")
             file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
-            missing_files = geode_functions.missing_files(
-                geode_object, file_absolute_path
-            )
-            has_missing_files = missing_files.has_missing_files()
-            if has_missing_files:
-                mandatory_files = missing_files.mandatory_files
-                print(f"\t\t{mandatory_files=}")
-                additional_files = missing_files.additional_files
-                print(f"\t\t{additional_files=}")
             if geode_functions.is_loadable(geode_object, file_absolute_path):
                 data = geode_functions.load(geode_object, file_absolute_path)
                 data_name = data.name()
-                uu_id = str(uuid.uuid4()).replace("-", "")
                 if "save_viewable" in value:
                     viewable_file_path = geode_functions.save_viewable(
                         geode_object,
@@ -169,23 +157,27 @@ def test_geode_object_output_extensions():
         for input_extension in input_extensions:
             print(f"\t{input_extension=}")
             file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
-            missing_files = geode_functions.missing_files(
+            additional = geode_functions.additional_files(
                 geode_object, file_absolute_path
             )
-            has_missing_files = missing_files.has_missing_files()
+            has_missing_files = any(
+                f.is_missing
+                for f in additional.mandatory_files + additional.optional_files
+            )
             if has_missing_files:
-                mandatory_files = missing_files.mandatory_files
-                print(f"\t\t{mandatory_files=}")
-                additional_files = missing_files.additional_files
-                print(f"\t\t{additional_files=}")
-            file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
+                print(
+                    f"\t\tMandatory files: {[f.filename for f in additional.mandatory_files]}"
+                )
+                print(
+                    f"\t\tAdditional files: {[f.filename for f in additional.optional_files]}"
+                )
             if geode_functions.is_loadable(geode_object, file_absolute_path):
                 data = geode_functions.load(geode_object, file_absolute_path)
                 geode_objets_and_output_extensions = (
                     geode_functions.geode_objects_output_extensions(geode_object, data)
                 )
                 data_name = data.name()
-                assert type(geode_objets_and_output_extensions) is dict
+                assert isinstance(geode_objets_and_output_extensions, dict)
                 for (
                     output_geode_object,
                     output_geode_object_value,
@@ -194,8 +186,8 @@ def test_geode_object_output_extensions():
                         output_extension,
                         output_extension_value,
                     ) in output_geode_object_value.items():
-                        assert type(output_extension) is str
-                        assert type(output_extension_value["is_saveable"]) is bool
+                        assert isinstance(output_extension, str)
+                        assert isinstance(output_extension_value["is_saveable"], bool)
 
 
 def test_get_inspector_children():
@@ -210,18 +202,18 @@ def test_get_inspector_children():
                 file_absolute_path = os.path.join(
                     data_folder, f"test.{input_extension}"
                 )
-                missing_files = geode_functions.missing_files(
+                additional = geode_functions.additional_files(
                     geode_object, file_absolute_path
                 )
-                has_missing_files = missing_files.has_missing_files()
+                has_missing_files = any(
+                    f.is_missing
+                    for f in additional.mandatory_files + additional.optional_files
+                )
                 if has_missing_files:
-                    mandatory_files = missing_files.mandatory_files
+                    mandatory_files = [f.filename for f in additional.mandatory_files]
                     print(f"\t\t{mandatory_files=}", flush=True)
-                    additional_files = missing_files.additional_files
+                    additional_files = [f.filename for f in additional.optional_files]
                     print(f"\t\t{additional_files=}", flush=True)
-                file_absolute_path = os.path.join(
-                    data_folder, f"test.{input_extension}"
-                )
                 if geode_functions.is_loadable(geode_object, file_absolute_path):
                     data = geode_functions.load(geode_object, file_absolute_path)
                     class_inspector = geode_functions.inspect(geode_object, data)
@@ -231,7 +223,7 @@ def test_get_inspector_children():
                     )
 
                     print(f"\t\t{inspection_result=}", flush=True)
-                    assert type(inspection_result) is dict
+                    assert isinstance(inspection_result, dict)
 
 
 def test_filter_geode_objects():

{opengeodeweb_back-5.9.0rc1 → opengeodeweb_back-5.9.0rc2}/tests/test_routes.py

@@ -45,12 +45,11 @@ def test_allowed_objects(client):
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
 
-def test_upload_file(client, filename="corbi.og_brep"):
+def test_upload_file(client, filename="test.og_brep"):
     response = client.put(
         f"/upload_file",
-        data={"file": FileStorage(open(f"./tests/{filename}", "rb"))},
+        data={"file": FileStorage(open(f"./tests/data/{filename}", "rb"))},
     )
-
     assert response.status_code == 201
 
 
@@ -60,7 +59,7 @@ def test_missing_files(client):
     def get_full_data():
         return {
             "input_geode_object": "BRep",
-            "filename": "corbi.og_brep",
+            "filename": "test.og_brep",
         }
 
     json = get_full_data()
@@ -140,7 +139,6 @@ def test_geode_objects_and_output_extensions(client):
 
 
 def test_save_viewable_file(client):
-
     test_upload_file(client, filename="corbi.og_brep")
     route = f"/save_viewable_file"
 
@@ -175,7 +173,7 @@ def test_texture_coordinates(client, test_id):
     with client.application.app_context():
         data_path = geode_functions.data_file_path(test_id, "hat.vtp")
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
-        shutil.copy("./tests/vertex_attribute.vtp", data_path)
+        shutil.copy("./tests/data/hat.vtp", data_path)
 
     response = client.post(
         "/texture_coordinates",

opengeodeweb_back-5.9.0rc2/tests/test_utils_functions.py

@@ -0,0 +1,157 @@
+# Standard library imports
+import re
+import os
+
+# Third party imports
+import flask
+import shutil
+
+# Local application imports
+from src.opengeodeweb_back import geode_functions, utils_functions
+
+
+def test_increment_request_counter(app_context):
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+    utils_functions.increment_request_counter(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+
+
+def test_decrement_request_counter(app_context):
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+    utils_functions.decrement_request_counter(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+
+
+def test_update_last_request_time(app_context):
+    LAST_REQUEST_TIME = flask.current_app.config.get("LAST_REQUEST_TIME")
+    utils_functions.update_last_request_time(flask.current_app)
+    assert flask.current_app.config.get("LAST_REQUEST_TIME") >= LAST_REQUEST_TIME
+
+
+def test_before_request(app_context):
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+    utils_functions.before_request(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+
+
+def test_teardown_request(app_context):
+    LAST_REQUEST_TIME = flask.current_app.config.get("LAST_REQUEST_TIME")
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
+    utils_functions.teardown_request(flask.current_app)
+    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
+    assert flask.current_app.config.get("LAST_REQUEST_TIME") >= LAST_REQUEST_TIME
+
+
+def test_versions():
+    list_packages = [
+        "OpenGeode-core",
+        "OpenGeode-IO",
+        "OpenGeode-Geosciences",
+        "OpenGeode-GeosciencesIO",
+    ]
+    versions = utils_functions.versions(list_packages)
+    assert type(versions) is list
+    for version in versions:
+        assert type(version) is dict
+
+
+def test_extension_from_filename():
+    extension = utils_functions.extension_from_filename("test.toto")
+    assert type(extension) is str
+    assert extension.count(".") == 0
+
+
+def test_handle_exception(client):
+    route = "/error"
+    response = client.post(route)
+    assert response.status_code == 500
+    data = response.get_json()
+    assert type(data) is dict
+    assert type(data["description"]) is str
+    assert type(data["name"]) is str
+    assert type(data["code"]) is int
+
+
+def test_create_unique_data_folder(client):
+    app = client.application
+    with app.app_context():
+        generated_id, data_path = utils_functions.create_unique_data_folder()
+        assert isinstance(generated_id, str)
+        assert re.fullmatch(r"[0-9a-f]{32}", generated_id)
+        assert os.path.exists(data_path)
+        assert data_path.startswith(flask.current_app.config["DATA_FOLDER_PATH"])
+        assert generated_id in data_path
+        shutil.rmtree(data_path, ignore_errors=True)
+        assert not os.path.exists(data_path)
+
+
+
+def test_save_all_viewables_and_return_info(client):
+    app = client.application
+    with app.app_context():
+        geode_object = "BRep"
+        data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
+        generated_id, data_path = utils_functions.create_unique_data_folder()
+        additional_files = ["additional_file.txt"]
+
+        result = utils_functions.save_all_viewables_and_return_info(
+            geode_object, data, generated_id, data_path, additional_files
+        )
+
+    assert isinstance(result, dict)
+    assert result["name"] == data.name()
+    assert result["native_file_name"].startswith("native.")
+    assert result["viewable_file_name"].endswith(".vtm")
+    assert re.match(r"[0-9a-f]{32}", result["id"])
+    assert isinstance(result["object_type"], str)
+    assert isinstance(result["binary_light_viewable"], str)
+    assert result["geode_object"] == geode_object
+    assert result["input_files"] == additional_files
+
+
+def test_generate_native_viewable_and_light_viewable_from_object(client):
+    app = client.application
+    with app.app_context():
+        geode_object = "BRep"
+        data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
+
+        result = (
+            utils_functions.generate_native_viewable_and_light_viewable_from_object(
+                geode_object, data
+            )
+        )
+
+    assert isinstance(result, dict)
+    assert isinstance(result["name"], str)
+    assert isinstance(result["native_file_name"], str)
+    assert result["native_file_name"].startswith("native.")
+    assert isinstance(result["viewable_file_name"], str)
+    assert result["viewable_file_name"].endswith(".vtm")
+    assert isinstance(result["id"], str)
+    assert re.match(r"[0-9a-f]{32}", result["id"])
+    assert isinstance(result["object_type"], str)
+    assert isinstance(result["binary_light_viewable"], str)
+    assert result["input_files"] == []
+
+
+def test_generate_native_viewable_and_light_viewable_from_file(client):
+    app = client.application
+    with app.app_context():
+        geode_object = "BRep"
+        input_filename = "test.og_brep"
+
+        result = utils_functions.generate_native_viewable_and_light_viewable_from_file(
+            geode_object, input_filename
+        )
+
+    assert isinstance(result, dict)
+    assert isinstance(result["name"], str)
+    assert isinstance(result["native_file_name"], str)
+    assert result["native_file_name"].startswith("native.")
+    assert isinstance(result["viewable_file_name"], str)
+    assert result["viewable_file_name"].endswith(".vtm")
+    assert isinstance(result["id"], str)
+    assert re.match(r"[0-9a-f]{32}", result["id"])
+    assert isinstance(result["object_type"], str)
+    assert isinstance(result["binary_light_viewable"], str)
+    assert isinstance(result["input_files"], list)

opengeodeweb_back-5.9.0rc1/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -1,27 +0,0 @@
-asgiref==3.8.1
-attrs==25.3.0
-blinker==1.9.0
-click==8.2.1
-fastjsonschema==2.21.1
-flask[async]==3.1.1
-flask-cors==6.0.1
-geode-background==9.2.9
-geode-common==33.8.8
-geode-conversion==6.3.3
-geode-explicit==6.2.3
-geode-implicit==3.9.4
-geode-numerics==6.2.2
-geode-simplex==9.4.2
-geode-viewables==3.1.4
-itsdangerous==2.2.0
-jinja2==3.1.6
-markupsafe==3.0.2
-opengeode-core==15.21.2
-opengeode-geosciences==9.0.0
-opengeode-geosciencesio==5.4.2
-opengeode-inspector==6.6.1
-opengeode-io==7.2.1
-referencing==0.36.2
-rpds-py==0.25.1
-typing-extensions==4.14.0
-werkzeug==3.1.3

opengeodeweb_back-5.9.0rc1/tests/test_utils_functions.py

@@ -1,93 +0,0 @@
-# Standard library imports
-import re
-import os
-
-# Third party imports
-import flask
-
-# Local application imports
-from src.opengeodeweb_back import geode_functions, utils_functions
-
-
-def test_increment_request_counter(app_context):
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
-    utils_functions.increment_request_counter(flask.current_app)
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
-
-
-def test_decrement_request_counter(app_context):
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
-    utils_functions.decrement_request_counter(flask.current_app)
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
-
-
-def test_update_last_request_time(app_context):
-    LAST_REQUEST_TIME = flask.current_app.config.get("LAST_REQUEST_TIME")
-    utils_functions.update_last_request_time(flask.current_app)
-    assert flask.current_app.config.get("LAST_REQUEST_TIME") >= LAST_REQUEST_TIME
-
-
-def test_before_request(app_context):
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
-    utils_functions.before_request(flask.current_app)
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
-
-
-def test_teardown_request(app_context):
-    LAST_REQUEST_TIME = flask.current_app.config.get("LAST_REQUEST_TIME")
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 1
-    utils_functions.teardown_request(flask.current_app)
-    assert flask.current_app.config.get("REQUEST_COUNTER") == 0
-    assert flask.current_app.config.get("LAST_REQUEST_TIME") >= LAST_REQUEST_TIME
-
-
-def test_versions():
-    list_packages = [
-        "OpenGeode-core",
-        "OpenGeode-IO",
-        "OpenGeode-Geosciences",
-        "OpenGeode-GeosciencesIO",
-    ]
-    versions = utils_functions.versions(list_packages)
-    assert type(versions) is list
-    for version in versions:
-        assert type(version) is dict
-
-
-def test_extension_from_filename():
-    extension = utils_functions.extension_from_filename("test.toto")
-    assert type(extension) is str
-    assert extension.count(".") == 0
-
-
-def test_handle_exception(client):
-    route = "/error"
-    response = client.post(route)
-    assert response.status_code == 500
-    data = response.get_json()
-    assert type(data) is dict
-    assert type(data["description"]) is str
-    assert type(data["name"]) is str
-    assert type(data["code"]) is int
-
-
-def test_generate_native_viewable_and_light_viewable(client):
-    app = client.application
-    with app.app_context():
-        geode_object = "BRep"
-        data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
-
-        result = utils_functions.generate_native_viewable_and_light_viewable(
-            geode_object, data
-        )
-
-    assert type(result) is dict
-    assert type(result["name"]) is str
-    assert type(result["native_file_name"]) is str
-    assert result["native_file_name"] == "native.og_brep"
-    assert type(result["viewable_file_name"]) is str
-    assert result["viewable_file_name"] == "viewable.vtm"
-    assert type(result["id"]) is str
-    assert re.match(r"[0-9a-f]{32}", result["id"])
-    assert type(result["object_type"]) is str
-    assert type(result["binary_light_viewable"]) is str