OpenGeodeWeb-Back 5.8.7rc1__py3-none-any.whl → 5.9.0rc2__py3-none-any.whl

opengeodeweb_back/geode_functions.py

@@ -4,6 +4,8 @@ import os
 # Third party imports
 import opengeode_geosciences as og_gs
 import opengeode as og
+import werkzeug
+import flask
 
 # Local application imports
 from .geode_objects import geode_objects_dict
@@ -26,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):
@@ -38,6 +40,26 @@ def load(geode_object: str, file_absolute_path: str):
     return geode_object_value(geode_object)["load"](file_absolute_path)
 
 
+def data_file_path(data_id: str, filename: str) -> str:
+    data_folder_path = flask.current_app.config["DATA_FOLDER_PATH"]
+    return os.path.join(
+        data_folder_path,
+        data_id,
+        werkzeug.utils.secure_filename(filename),
+    )
+
+
+def load_data(geode_object: str, data_id: str, filename: str):
+    file_absolute_path = data_file_path(data_id, filename)
+    return load(geode_object, file_absolute_path)
+
+
+def upload_file_path(filename):
+    upload_folder = flask.current_app.config["UPLOAD_FOLDER"]
+    secure_filename = werkzeug.utils.secure_filename(filename)
+    return os.path.abspath(os.path.join(upload_folder, secure_filename))
+
+
 def is_saveable(geode_object: str, data, filename: str):
     return geode_object_value(geode_object)["is_saveable"](data, filename)
 

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/routes/blueprint_routes.py

@@ -97,9 +97,10 @@ def allowed_objects():
     if flask.request.method == "OPTIONS":
         return flask.make_response({}, 200)
 
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(flask.request, allowed_objects_json)
-    file_absolute_path = os.path.join(UPLOAD_FOLDER, flask.request.json["filename"])
+    file_absolute_path = geode_functions.upload_file_path(
+        flask.request.json["filename"]
+    )
     allowed_objects = geode_functions.list_geode_objects(
         file_absolute_path, flask.request.json["supported_feature"]
     )
@@ -118,22 +119,29 @@ with open(
     methods=missing_files_json["methods"],
 )
 def missing_files():
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     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"],
-        os.path.join(UPLOAD_FOLDER, flask.request.json["filename"]),
+        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(
         {
@@ -184,11 +192,9 @@ with open(
     methods=inspect_file_json["methods"],
 )
 def inspect_file():
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(flask.request, inspect_file_json)
 
-    secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
-    file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
+    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
     data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
     class_inspector = geode_functions.inspect(
         flask.request.json["input_geode_object"], data
@@ -209,13 +215,13 @@ with open(
     methods=geode_objects_and_output_extensions_json["methods"],
 )
 def geode_objects_and_output_extensions():
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
     utils_functions.validate_request(
         flask.request, geode_objects_and_output_extensions_json
     )
+    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
     data = geode_functions.load(
         flask.request.json["input_geode_object"],
-        os.path.join(UPLOAD_FOLDER, flask.request.json["filename"]),
+        file_path,
     )
     geode_objects_and_output_extensions = (
         geode_functions.geode_objects_output_extensions(
@@ -241,14 +247,10 @@ with open(
 )
 def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
-    secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
-    file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_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, DATA_FOLDER_PATH
+        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,
     )
@@ -261,7 +263,6 @@ with open(os.path.join(schemas, "create_point.json"), "r") as file:
 @routes.route(create_point_json["route"], methods=create_point_json["methods"])
 def create_point():
     utils_functions.validate_request(flask.request, create_point_json)
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     title = flask.request.json["title"]
     x = flask.request.json["x"]
     y = flask.request.json["y"]
@@ -272,8 +273,8 @@ 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(
-            "PointSet3D", PointSet3D, DATA_FOLDER_PATH
+        utils_functions.generate_native_viewable_and_light_viewable_from_object(
+            "PointSet3D", PointSet3D
         ),
         200,
     )
@@ -288,12 +289,13 @@ with open(os.path.join(schemas, "texture_coordinates.json"), "r") as file:
     methods=texture_coordinates_json["methods"],
 )
 def texture_coordinates():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, texture_coordinates_json)
-    data = geode_functions.load(
+    data = geode_functions.load_data(
         flask.request.json["input_geode_object"],
-        os.path.join(DATA_FOLDER_PATH, flask.request.json["filename"]),
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
+
     texture_coordinates = data.texture_manager().texture_names()
 
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
@@ -311,14 +313,13 @@ with open(
     methods=vertex_attribute_names_json["methods"],
 )
 def vertex_attribute_names():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    file_absolute_path = os.path.join(
-        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
-    )
-    data = geode_functions.load(
-        flask.request.json["input_geode_object"], file_absolute_path
+    data = geode_functions.load_data(
+        flask.request.json["input_geode_object"],
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
+
     vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
 
     return flask.make_response(
@@ -341,14 +342,13 @@ with open(
     methods=polygon_attribute_names_json["methods"],
 )
 def polygon_attribute_names():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
-    file_absolute_path = os.path.join(
-        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
-    )
-    data = geode_functions.load(
-        flask.request.json["input_geode_object"], file_absolute_path
+    data = geode_functions.load_data(
+        flask.request.json["input_geode_object"],
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
+
     polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
 
     return flask.make_response(
@@ -371,14 +371,13 @@ with open(
     methods=polyhedron_attribute_names_json["methods"],
 )
 def polyhedron_attribute_names():
-    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
-    utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    file_absolute_path = os.path.join(
-        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
-    )
-    data = geode_functions.load(
-        flask.request.json["input_geode_object"], file_absolute_path
+    utils_functions.validate_request(flask.request, polyhedron_attribute_names_json)
+    data = geode_functions.load_data(
+        flask.request.json["input_geode_object"],
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
+
     polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()
 
     return flask.make_response(

opengeodeweb_back/routes/models/blueprint_models.py

@@ -18,36 +18,27 @@ with open(os.path.join(schemas, "vtm_component_indices.json"), "r") as file:
 )
 def uuid_to_flat_index():
     utils_functions.validate_request(flask.request, vtm_component_indices_json)
-    vtm_file_path = os.path.join(
-        flask.current_app.config["DATA_FOLDER_PATH"], flask.request.json["id"] + ".vtm"
+
+    vtm_file_path = geode_functions.data_file_path(
+        flask.request.json["id"], "viewable.vtm"
     )
     tree = ET.parse(vtm_file_path)
     root = tree.find("vtkMultiBlockDataSet")
     uuid_to_flat_index = {}
     current_index = 0
-
     for elem in root.iter():
         if "uuid" in elem.attrib and elem.tag == "DataSet":
             uuid_to_flat_index[elem.attrib["uuid"]] = current_index
-
         current_index += 1
-
-    return flask.make_response(
-        {"uuid_to_flat_index": uuid_to_flat_index},
-        200,
-    )
+    return flask.make_response({"uuid_to_flat_index": uuid_to_flat_index}, 200)
 
 
-def extract_model_uuids(geode_object, file_path):
-    model = geode_functions.load(geode_object, file_path)
+def extract_model_uuids(model):
     mesh_components = model.mesh_components()
-
     uuid_dict = {}
-
     for mesh_component, ids in mesh_components.items():
         component_name = mesh_component.get()
         uuid_dict[component_name] = [id.string() for id in ids]
-
     return uuid_dict
 
 
@@ -58,10 +49,12 @@ with open(os.path.join(schemas, "mesh_components.json"), "r") as file:
 @routes.route(mesh_components_json["route"], methods=mesh_components_json["methods"])
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
-    file_path = os.path.join(
-        flask.current_app.config["DATA_FOLDER_PATH"], flask.request.json["filename"]
+
+    model = geode_functions.load_data(
+        flask.request.json["geode_object"],
+        flask.request.json["id"],
+        flask.request.json["filename"],
     )
-    if not os.path.exists(file_path):
-        return flask.make_response({"error": "File not found"}, 404)
-    uuid_dict = extract_model_uuids(flask.request.json["geode_object"], file_path)
+
+    uuid_dict = extract_model_uuids(model)
     return flask.make_response({"uuid_dict": uuid_dict}, 200)

opengeodeweb_back/routes/models/schemas/mesh_components.json

@@ -5,14 +5,21 @@
   ],
   "type": "object",
   "properties": {
+    "id": {
+      "type": "string",
+      "minLength": 1      
+    },
     "filename": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "geode_object": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
+    "id",
     "filename",
     "geode_object"
   ],

opengeodeweb_back/routes/models/schemas/vtm_component_indices.json

@@ -6,7 +6,8 @@
   "type": "object",
   "properties": {
     "id": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [

opengeodeweb_back/routes/schemas/polygon_attribute_names.json

@@ -12,11 +12,16 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
-    "filename"
+    "filename",
+    "id"
   ],
   "additionalProperties": false
 }

opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json

@@ -12,11 +12,16 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
-    "filename"
+    "filename",
+    "id"
   ],
   "additionalProperties": false
 }

opengeodeweb_back/routes/schemas/texture_coordinates.json

@@ -12,10 +12,15 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
+    "id",
     "filename"
   ],
   "additionalProperties": false

opengeodeweb_back/routes/schemas/vertex_attribute_names.json

@@ -12,11 +12,16 @@
     "filename": {
       "type": "string",
       "minLength": 1
+    },
+    "id": {
+      "type": "string",
+      "minLength": 1
     }
   },
   "required": [
     "input_geode_object",
-    "filename"
+    "filename",
+    "id"
   ],
   "additionalProperties": false
 }

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,35 +145,83 @@ def handle_exception(e):
     return response
 
 
-def generate_native_viewable_and_light_viewable(
-    geode_object, data, folder_absolute_path
-):
+def create_unique_data_folder() -> tuple[str, str]:
+    base_data_folder = flask.current_app.config["DATA_FOLDER_PATH"]
     generated_id = str(uuid.uuid4()).replace("-", "")
-    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,
-        folder_absolute_path,
-        generated_id + "." + data.native_extension(),
+        data_path,
+        "native." + data.native_extension(),
     )
     saved_viewable_file_path = geode_functions.save_viewable(
-        geode_object, data, folder_absolute_path, generated_id
+        geode_object, data, data_path, "viewable"
     )
     saved_light_viewable_file_path = geode_functions.save_light_viewable(
-        geode_object, data, folder_absolute_path, "light_" + generated_id
+        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": 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.8.7rc1.dist-info → opengeodeweb_back-5.9.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.8.7rc1
+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.8.7rc1.dist-info → opengeodeweb_back-5.9.0rc2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 opengeodeweb_back/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opengeodeweb_back/app_config.py,sha256=gJfYxDJOa_PYLqjqgdXacp3W3F109uujE9LGPvzHOkc,728
-opengeodeweb_back/geode_functions.py,sha256=EPAM6pw9QwZfoeZjOxycFTKUANw6pdeXr2q3vsnPxt8,9121
-opengeodeweb_back/geode_objects.py,sha256=13A9FTGugiA9ClSeYkBiCu5QGzm93nm8YJQwiWB4nNw,25995
+opengeodeweb_back/geode_functions.py,sha256=2lgL0FL8G5ZdJa-S_iUNWGlegHBJEDtU67Tuj5gtJ1c,9812
+opengeodeweb_back/geode_objects.py,sha256=GrC1NltKKSCr0QSgcMy2ES8SLW_RkndCdrokeBOymrA,25995
 opengeodeweb_back/test_utils.py,sha256=18AbRW9-tfKkPcmRGilTTHXI7S3armYyV7Vdy5UvUKM,794
-opengeodeweb_back/utils_functions.py,sha256=RXMdQlCK3bLWYYDhkwOlYCeMpSRjMCejNlqDhxo2VNI,5254
-opengeodeweb_back/routes/blueprint_routes.py,sha256=uqcDIXa2Q7HRShEEVFJcOB6NAxPAYO1VyBMPxtyKl_0,12334
-opengeodeweb_back/routes/models/blueprint_models.py,sha256=EPSlgHnxZVeXwdzJ_TBAHlK6SsjXDk3f1sPYWR5eEL4,2183
-opengeodeweb_back/routes/models/schemas/mesh_components.json,sha256=3hgNqkxKDv691JGgjgMoqI_WgH2m7AtEFfjsOIqAz5Y,295
-opengeodeweb_back/routes/models/schemas/vtm_component_indices.json,sha256=0km8gzawPj-eFodhaGzAgNZjAEOl4wLy24f_Bs3pBlw,217
+opengeodeweb_back/utils_functions.py,sha256=Q3NspzZJ50AvSQALgwFen8RJwHllQOGmNrhsSk_yVJU,7129
+opengeodeweb_back/routes/blueprint_routes.py,sha256=3fxMR9fs0BqnOiYhKFacGdxWm7JFLz5i5PvUqYgB5z4,11308
+opengeodeweb_back/routes/models/blueprint_models.py,sha256=PAyHSKjsvVm5gGfjUyWAnODmE0BJMsIWc1AWl0F3bO0,1955
+opengeodeweb_back/routes/models/schemas/mesh_components.json,sha256=3OQvI4pUCe77WGC46tEr37rEWigQ6n2nsfGUTZRY074,419
+opengeodeweb_back/routes/models/schemas/vtm_component_indices.json,sha256=0XILVxhAxi0RhQFDZZoUeGcAnBMroWz3kNJS7-6_dKQ,239
 opengeodeweb_back/routes/schemas/allowed_files.json,sha256=pRsGf39LiJpl3zEGLg4IqvRtm7iUx3Wq4Tb4tSFXGV0,234
 opengeodeweb_back/routes/schemas/allowed_objects.json,sha256=oy_YYpFzgDICx-keWqNIUpQM3zzB4eE3H6mPNxH9rWc,361
 opengeodeweb_back/routes/schemas/create_point.json,sha256=XjmXLMkr4jgWYHUKSwAhsxz1oLDZi8r8J0SY-QuEvks,386
@@ -16,14 +16,14 @@ opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json,sha256=lnPqe
 opengeodeweb_back/routes/schemas/inspect_file.json,sha256=WoFF2hgZCUfqSDFJRq1sLpivjCQ6TCvSHPH8pKFY6KM,348
 opengeodeweb_back/routes/schemas/missing_files.json,sha256=eOBAkiphA-2xG6e-OAy7wcJK2FeY0YFYXJlLdr8SNSc,349
 opengeodeweb_back/routes/schemas/ping.json,sha256=MhI5jtrjMsAsfIKEzdY8p1HyV9xv4O3hYfESWw6tkyE,162
-opengeodeweb_back/routes/schemas/polygon_attribute_names.json,sha256=u-_ypRIejrDzbSc8tcb-6j6Av026SVJGC-RFPgaay7w,359
-opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json,sha256=ImKRR2-38Ug3jAHaVEzmNaPNMTSoDE10-ZoALsnSjyg,362
+opengeodeweb_back/routes/schemas/polygon_attribute_names.json,sha256=HJ_zVLJNdVL1snoK2mSo5Rb0XOIgiPVq1VLaDTORe54,433
+opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json,sha256=Fw6rcYxuHaiEAc_AcVzPy5ibajcr4wW3jyb2r7T0m-c,436
 opengeodeweb_back/routes/schemas/save_viewable_file.json,sha256=pvvEdaC7bNASPMrl3bXzlcA5blgflK0EYp2hBDf74qY,424
-opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=m0EqxlvKojXVxK5Csucodu3rq1YMVJPwXJN_Wreb3qc,355
+opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=oW84Vh34KfleK935fmMXnqJXy-vaLDd7g87O_PtSzfY,429
 opengeodeweb_back/routes/schemas/upload_file.json,sha256=LJ3U3L5ApKuQDVFIpVT_y2alq4HW_suTvZ3HUucNbhg,219
-opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=bya9KGtTmHFWjD-ur0_0UAY2yf3KkMeuNrk6E1UkjLM,358
-opengeodeweb_back-5.8.7rc1.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
-opengeodeweb_back-5.8.7rc1.dist-info/METADATA,sha256=iy0fGV58FJx9vdvGe5EgjDlf9KIej1eBT6yTC5B0Zuc,3036
-opengeodeweb_back-5.8.7rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengeodeweb_back-5.8.7rc1.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
-opengeodeweb_back-5.8.7rc1.dist-info/RECORD,,
+opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=bmXG0pzVHMUTZY_0iu6ruX7eMUVk8wr2H1o4eEtBlg0,432
+opengeodeweb_back-5.9.0rc2.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
+opengeodeweb_back-5.9.0rc2.dist-info/METADATA,sha256=G0-jcTd93p-b_uODLt2l8jLLsZBoBr2YLUBynqhjwIg,2900
+opengeodeweb_back-5.9.0rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengeodeweb_back-5.9.0rc2.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
+opengeodeweb_back-5.9.0rc2.dist-info/RECORD,,