OpenGeodeWeb-Back 5.8.7__py3-none-any.whl → 5.9.0rc1__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
@@ -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/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,12 +119,11 @@ 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(
         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()
 
@@ -184,11 +184,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 +207,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 +239,12 @@ 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))
+
+    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, DATA_FOLDER_PATH
+            flask.request.json["input_geode_object"], data
         ),
         200,
     )
@@ -261,7 +257,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"]
@@ -273,7 +268,7 @@ def create_point():
     builder.set_name(title)
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable(
-            "PointSet3D", PointSet3D, DATA_FOLDER_PATH
+            "PointSet3D", PointSet3D
         ),
         200,
     )
@@ -288,12 +283,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 +307,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 +336,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 +365,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

@@ -143,24 +143,25 @@ def handle_exception(e):
     return response
 
 
-def generate_native_viewable_and_light_viewable(
-    geode_object, data, folder_absolute_path
-):
+def generate_native_viewable_and_light_viewable(geode_object, data):
     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)
 
     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"
     )
+    viewable_file_name = os.path.basename(saved_viewable_file_path)
     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()
@@ -169,7 +170,7 @@ def generate_native_viewable_and_light_viewable(
     return {
         "name": name,
         "native_file_name": os.path.basename(saved_native_file_path[0]),
-        "viewable_file_name": os.path.basename(saved_viewable_file_path),
+        "viewable_file_name": viewable_file_name,
         "id": generated_id,
         "object_type": object_type,
         "binary_light_viewable": str(binary_light_viewable, "utf-8"),

{opengeodeweb_back-5.8.7.dist-info → opengeodeweb_back-5.9.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.8.7
+Version: 5.9.0rc1
 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

{opengeodeweb_back-5.8.7.dist-info → opengeodeweb_back-5.9.0rc1.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_functions.py,sha256=JGUbVVDA-CFYbsOmUTKAvpAKwzlf0Wg_Pxuq1IibykY,9806
 opengeodeweb_back/geode_objects.py,sha256=13A9FTGugiA9ClSeYkBiCu5QGzm93nm8YJQwiWB4nNw,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=NWsrhn5MNggtOfqj6kWoGbO_wbAE7XV6rruQKbhxlOA,5348
+opengeodeweb_back/routes/blueprint_routes.py,sha256=UKmp2QZXUxUaFHGlcHWYAn7pd-UFDnAceE_6Jqwc2kA,11290
+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.7.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
-opengeodeweb_back-5.8.7.dist-info/METADATA,sha256=-cuE20GdFPhvimGMGWjGNcl-UYpZMWmOhLSGG-G-3bY,3033
-opengeodeweb_back-5.8.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengeodeweb_back-5.8.7.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
-opengeodeweb_back-5.8.7.dist-info/RECORD,,
+opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=bmXG0pzVHMUTZY_0iu6ruX7eMUVk8wr2H1o4eEtBlg0,432
+opengeodeweb_back-5.9.0rc1.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
+opengeodeweb_back-5.9.0rc1.dist-info/METADATA,sha256=QJrrf0M7Uqa1SgQdvxGF2eihN1_8hvRcBp3JG2y1Wec,3036
+opengeodeweb_back-5.9.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengeodeweb_back-5.9.0rc1.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
+opengeodeweb_back-5.9.0rc1.dist-info/RECORD,,