Merge pull request #40 from Geode-solutions/feat/is_saveable

Author: JulienChampagnol

.gitignore

@@ -3,3 +3,4 @@ dist
 venv
 output
 __pycache__
+.vscode

requirements.txt

@@ -2,23 +2,11 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile
+#    pip-compile --pre --resolver=backtracking requirements.in
 #
-asgiref==3.7.2
-    # via flask
-attrs==23.1.0
-    # via
-    #   jsonschema
-    #   referencing
-blinker==1.7.0
-    # via flask
-click==8.1.7
-    # via flask
-flask[async]==3.0.0
-    # via -r requirements.in
-geode-common==29.0.1
+geode-common==30.0.0rc7
     # via geode-viewables
-geode-viewables==2.1.3
+geode-viewables==2.1.4rc1
     # via -r requirements.in
 itsdangerous==2.1.2
     # via flask
@@ -41,19 +29,19 @@ opengeode-core==14.9.3
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==7.2.1
+opengeode-geosciences==7.2.2rc4
     # via
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
     #   opengeode-inspector
-opengeode-geosciencesio==4.5.1
+opengeode-geosciencesio==4.5.2rc1
     # via
     #   -r requirements.in
     #   opengeode-inspector
-opengeode-inspector==4.0.0
+opengeode-inspector==4.0.1rc1
     # via -r requirements.in
-opengeode-io==6.2.1
+opengeode-io==6.2.2rc1
     # via
     #   -r requirements.in
     #   geode-viewables

src/opengeodeweb_back/geode_functions.py

@@ -38,6 +38,10 @@ def load(geode_object: str, file_absolute_path: str):
     return geode_object_value(geode_object)["load"](file_absolute_path)
 
 
+def is_saveable(geode_object: str, data, filename: str):
+    return geode_object_value(geode_object)["is_saveable"](data, filename)
+
+
 def save(geode_object: str, data, folder_absolute_path: str, filename: str):
     return geode_object_value(geode_object)["save"](
         data, os.path.join(folder_absolute_path, filename)
@@ -146,20 +150,27 @@ def list_geode_objects(extension: str, key: str = None):
     return geode_objects_list
 
 
-def geode_objects_output_extensions(geode_object: str):
+def geode_objects_output_extensions(geode_object: str, data):
     return_list = []
     geode_object_dict = {}
     geode_object_dict["geode_object"] = geode_object
-    geode_object_dict["output_extensions"] = geode_object_output_extensions(
-        geode_object
-    )
+
+    output = geode_object_output_extensions(geode_object)
+
+    extension_saveable_array = []
+    for output_extension in output:
+        bool_is_saveable = is_saveable(geode_object, data, f"test.{output_extension}")
+        extension_saveable_array.append(
+            {"extension": output_extension, "is_saveable": bool_is_saveable}
+        )
+
+    geode_object_dict["outputs"] = extension_saveable_array
 
     return_list.append(geode_object_dict)
 
     if "parent" in geode_object_value(geode_object).keys():
         parent_key = geode_object_value(geode_object)["parent"]
-        return_list += geode_objects_output_extensions(parent_key)
-
+        return_list += geode_objects_output_extensions(parent_key, data)
     return return_list
 
 
@@ -175,22 +186,6 @@ def versions(list_packages: list):
     return list_with_versions
 
 
-def upload_file(file: str, file_name: str, upload_folder: str, file_size: int):
-    if not os.path.exists(upload_folder):
-        os.mkdir(upload_folder)
-    file_decoded = base64.b64decode(file.split(",")[-1])
-    secure_file_name = werkzeug.utils.secure_filename(file_name)
-    file_path = os.path.join(upload_folder, secure_file_name)
-    f = open(file_path, "wb")
-    f.write(file_decoded)
-    f.close()
-
-    final_size = os.path.getsize(file_path)
-    uploaded_file = int(file_size) == int(final_size)
-    if not uploaded_file:
-        flask.abort(500, "File not uploaded")
-
-
 def create_lock_file(
     folder_absolute_path,
 ):

src/opengeodeweb_back/geode_objects.py

@@ -13,6 +13,7 @@ def geode_objects_dict():
             "output_factory": og.BRepOutputFactory,
             "missing_files": og.check_brep_missing_files,
             "load": og.load_brep,
+            "is_saveable": og.is_brep_saveable,
             "save": og.save_brep,
             "builder": og.BRepBuilder,
             "crs": {
@@ -32,6 +33,7 @@ def geode_objects_dict():
             "output_factory": og_gs.CrossSectionOutputFactory,
             "missing_files": og_gs.check_cross_section_missing_files,
             "load": og_gs.load_cross_section,
+            "is_saveable": og_gs.is_cross_section_saveable,
             "save": og_gs.save_cross_section,
             "builder": og_gs.CrossSectionBuilder,
             "crs": {
@@ -50,6 +52,7 @@ def geode_objects_dict():
             "output_factory": og.EdgedCurveOutputFactory2D,
             "missing_files": og.check_edged_curve_missing_files2D,
             "load": og.load_edged_curve2D,
+            "is_saveable": og.is_edged_curve_saveable2D,
             "save": og.save_edged_curve2D,
             "builder": og.EdgedCurveBuilder2D.create,
             "crs": {
@@ -68,6 +71,7 @@ def geode_objects_dict():
             "output_factory": og.EdgedCurveOutputFactory3D,
             "missing_files": og.check_edged_curve_missing_files3D,
             "load": og.load_edged_curve3D,
+            "is_saveable": og.is_edged_curve_saveable3D,
             "save": og.save_edged_curve3D,
             "builder": og.EdgedCurveBuilder3D.create,
             "crs": {
@@ -86,6 +90,7 @@ def geode_objects_dict():
             "output_factory": og.GraphOutputFactory,
             "missing_files": og.check_graph_missing_files,
             "load": og.load_graph,
+            "is_saveable": og.is_graph_saveable,
             "save": og.save_graph,
             "builder": og.GraphBuilder.create,
             "is_model": False,
@@ -97,6 +102,7 @@ def geode_objects_dict():
             "output_factory": og.HybridSolidOutputFactory3D,
             "missing_files": og.check_hybrid_solid_missing_files3D,
             "load": og.load_hybrid_solid3D,
+            "is_saveable": og.is_hybrid_solid_saveable3D,
             "save": og.save_hybrid_solid3D,
             "builder": og.HybridSolidBuilder3D.create,
             "crs": {
@@ -115,6 +121,7 @@ def geode_objects_dict():
             "output_factory": og.PointSetOutputFactory2D,
             "missing_files": og.check_point_set_missing_files2D,
             "load": og.load_point_set2D,
+            "is_saveable": og.is_point_set_saveable2D,
             "save": og.save_point_set2D,
             "builder": og.PointSetBuilder2D.create,
             "crs": {
@@ -133,6 +140,7 @@ def geode_objects_dict():
             "output_factory": og.PointSetOutputFactory3D,
             "missing_files": og.check_point_set_missing_files3D,
             "load": og.load_point_set3D,
+            "is_saveable": og.is_point_set_saveable3D,
             "save": og.save_point_set3D,
             "builder": og.PointSetBuilder3D.create,
             "crs": {
@@ -151,6 +159,7 @@ def geode_objects_dict():
             "output_factory": og.PolygonalSurfaceOutputFactory2D,
             "missing_files": og.check_polygonal_surface_missing_files2D,
             "load": og.load_polygonal_surface2D,
+            "is_saveable": og.is_polygonal_surface_saveable2D,
             "save": og.save_polygonal_surface2D,
             "builder": og.PolygonalSurfaceBuilder2D.create,
             "crs": {
@@ -169,6 +178,7 @@ def geode_objects_dict():
             "output_factory": og.PolygonalSurfaceOutputFactory3D,
             "missing_files": og.check_polygonal_surface_missing_files3D,
             "load": og.load_polygonal_surface3D,
+            "is_saveable": og.is_polygonal_surface_saveable3D,
             "save": og.save_polygonal_surface3D,
             "builder": og.PolygonalSurfaceBuilder3D.create,
             "crs": {
@@ -187,6 +197,7 @@ def geode_objects_dict():
             "output_factory": og.PolyhedralSolidOutputFactory3D,
             "missing_files": og.check_polyhedral_solid_missing_files3D,
             "load": og.load_polyhedral_solid3D,
+            "is_saveable": og.is_polyhedral_solid_saveable3D,
             "save": og.save_polyhedral_solid3D,
             "builder": og.PolyhedralSolidBuilder3D.create,
             "crs": {
@@ -205,6 +216,7 @@ def geode_objects_dict():
             "output_factory": og.RasterImageOutputFactory2D,
             "missing_files": og.check_raster_image_missing_files2D,
             "load": og.load_raster_image2D,
+            "is_saveable": og.is_raster_image_saveable2D,
             "save": og.save_raster_image2D,
             "is_model": False,
             "is_3D": False,
@@ -216,6 +228,7 @@ def geode_objects_dict():
             "output_factory": og.RasterImageOutputFactory3D,
             "missing_files": og.check_raster_image_missing_files3D,
             "load": og.load_raster_image3D,
+            "is_saveable": og.is_raster_image_saveable3D,
             "save": og.save_raster_image3D,
             "is_model": False,
             "is_3D": False,
@@ -227,6 +240,7 @@ def geode_objects_dict():
             "output_factory": og.RegularGridOutputFactory2D,
             "missing_files": og.check_regular_grid_missing_files2D,
             "load": og.load_regular_grid2D,
+            "is_saveable": og.is_regular_grid_saveable2D,
             "save": og.save_regular_grid2D,
             "builder": og.RegularGridBuilder2D.create,
             "crs": {
@@ -244,6 +258,7 @@ def geode_objects_dict():
             "output_factory": og.RegularGridOutputFactory3D,
             "missing_files": og.check_regular_grid_missing_files3D,
             "load": og.load_regular_grid3D,
+            "is_saveable": og.is_regular_grid_saveable3D,
             "save": og.save_regular_grid3D,
             "builder": og.RegularGridBuilder3D.create,
             "crs": {
@@ -261,6 +276,7 @@ def geode_objects_dict():
             "output_factory": og.SectionOutputFactory,
             "missing_files": og.check_section_missing_files,
             "load": og.load_section,
+            "is_saveable": og.is_section_saveable,
             "save": og.save_section,
             "builder": og.SectionBuilder,
             "crs": {
@@ -280,6 +296,7 @@ def geode_objects_dict():
             "output_factory": og_gs.StructuralModelOutputFactory,
             "missing_files": og_gs.check_structural_model_missing_files,
             "load": og_gs.load_structural_model,
+            "is_saveable": og_gs.is_structural_model_saveable,
             "save": og_gs.save_structural_model,
             "builder": og_gs.StructuralModelBuilder,
             "crs": {
@@ -296,8 +313,9 @@ def geode_objects_dict():
         "TetrahedralSolid3D": {
             "input_factory": og.TetrahedralSolidInputFactory3D,
             "output_factory": og.TetrahedralSolidOutputFactory3D,
-            "load": og.load_tetrahedral_solid3D,
             "missing_files": og.check_tetrahedral_solid_missing_files3D,
+            "load": og.load_tetrahedral_solid3D,
+            "is_saveable": og.is_tetrahedral_solid_saveable3D,
             "save": og.save_tetrahedral_solid3D,
             "builder": og.TetrahedralSolidBuilder3D.create,
             "crs": {
@@ -316,6 +334,7 @@ def geode_objects_dict():
             "output_factory": og.TriangulatedSurfaceOutputFactory2D,
             "missing_files": og.check_triangulated_surface_missing_files2D,
             "load": og.load_triangulated_surface2D,
+            "is_saveable": og.is_triangulated_surface_saveable2D,
             "save": og.save_triangulated_surface2D,
             "builder": og.TriangulatedSurfaceBuilder2D.create,
             "crs": {
@@ -334,6 +353,7 @@ def geode_objects_dict():
             "output_factory": og.TriangulatedSurfaceOutputFactory3D,
             "missing_files": og.check_triangulated_surface_missing_files3D,
             "load": og.load_triangulated_surface3D,
+            "is_saveable": og.is_triangulated_surface_saveable3D,
             "save": og.save_triangulated_surface3D,
             "builder": og.TriangulatedSurfaceBuilder3D.create,
             "crs": {
@@ -352,6 +372,7 @@ def geode_objects_dict():
             "output_factory": og.VertexSetOutputFactory,
             "missing_files": og.check_vertex_set_missing_files,
             "load": og.load_vertex_set,
+            "is_saveable": og.is_vertex_set_saveable,
             "save": og.save_vertex_set,
             "builder": og.VertexSetBuilder.create,
             "is_model": False,