Merge branch 'next' into actions/py

Author: BotellaA

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="[email protected]" },

requirements.txt

@@ -1,60 +1 @@
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile --output-file=requirements.txt requirements.in
-#
-asgiref==3.9.1
-    # via flask
-blinker==1.9.0
-    # via flask
-click==8.2.1
-    # via flask
-fastjsonschema==2.16.2
-    # via -r requirements.in
-flask[async]==3.*,>=3.0.3
-    # via
-    #   -r requirements.in
-    #   flask-cors
-flask-cors==6.0.1
-    # via -r requirements.in
-geode-common==33.8.8
-    # via geode-viewables
-geode-viewables==3.1.4
-    # via -r requirements.in
-itsdangerous==2.2.0
-    # via flask
-jinja2==3.1.6
-    # via flask
-markupsafe==3.0.2
-    # via
-    #   jinja2
-    #   werkzeug
-opengeode-core==15.21.2
-    # via
-    #   -r requirements.in
-    #   geode-common
-    #   geode-viewables
-    #   opengeode-geosciences
-    #   opengeode-geosciencesio
-    #   opengeode-inspector
-    #   opengeode-io
-opengeode-geosciences==9.0.0
-    # via
-    #   -r requirements.in
-    #   geode-viewables
-    #   opengeode-geosciencesio
-opengeode-geosciencesio==5.4.2
-    # via -r requirements.in
-opengeode-inspector==6.6.1
-    # via -r requirements.in
-opengeode-io==7.*,>=7.2.1
-    # via
-    #   -r requirements.in
-    #   geode-viewables
-    #   opengeode-geosciencesio
-werkzeug==3.0.3
-    # via
-    #   -r requirements.in
-    #   flask
-    #   flask-cors
+

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):

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,

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -121,19 +121,27 @@ def allowed_objects():
 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 @@ def geode_objects_and_output_extensions():
 )
 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,