OpenGeodeWeb-Back 5.10.0rc8__py3-none-any.whl → 5.10.0rc10__py3-none-any.whl

opengeodeweb_back/data.py

@@ -10,7 +10,6 @@ class Data(Base):
     id: Mapped[str] = mapped_column(
         String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
     )
-    name: Mapped[str] = mapped_column(String, nullable=False)
     native_file_name: Mapped[str] = mapped_column(String, nullable=False)
     viewable_file_name: Mapped[str] = mapped_column(String, nullable=False)
     geode_object: Mapped[str] = mapped_column(String, nullable=False)
@@ -21,7 +20,6 @@ class Data(Base):
 
     @staticmethod
     def create(
-        name: str,
         geode_object: str,
         input_file: str | None = None,
         additional_files: list[str] | None = None,
@@ -30,7 +28,6 @@ class Data(Base):
         additional_files = additional_files if additional_files is not None else []
 
         data_entry = Data(
-            name=name,
             geode_object=geode_object,
             input_file=input_file,
             additional_files=additional_files,
@@ -42,3 +39,7 @@ class Data(Base):
         database.session.add(data_entry)
         database.session.flush()
         return data_entry
+
+    @staticmethod
+    def get(data_id: str) -> "Data | None":
+        return database.session.get(Data, data_id)

opengeodeweb_back/geode_functions.py

@@ -6,10 +6,13 @@ import opengeode_geosciences as og_gs  # type: ignore
 import opengeode as og  # type: ignore
 import werkzeug
 import flask
+from typing import Any
 
 # Local application imports
 from .geode_objects import geode_objects_dict
 from . import utils_functions
+from .data import Data
+from .database import database
 
 
 def geode_object_value(geode_object: str):
@@ -45,21 +48,32 @@ 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:
+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),
-    )
+    if filename:
+        return os.path.join(data_folder_path, data_id, filename)
+    return os.path.join(data_folder_path, data_id)
+
+
+def load_data(data_id: str) -> Any:
+    data_entry = Data.get(data_id)
+    if not data_entry:
+        flask.abort(404, f"Data with id {data_id} not found")
+
+    file_absolute_path = data_file_path(data_id, data_entry.native_file_name)
+    return load(data_entry.geode_object, file_absolute_path)
+
 
+def get_data_info(data_id: str) -> Data:
+    from .data import Data
 
-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)
+    data_entry = Data.get(data_id)
+    if not data_entry:
+        flask.abort(404, f"Data with id {data_id} not found")
+    return data_entry
 
 
-def upload_file_path(filename):
+def upload_file_path(filename: str) -> str:
     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))

opengeodeweb_back/geode_objects.py

@@ -217,7 +217,7 @@ def geode_objects_dict():
             "elements": [points, polygons],
             "is_3D": False,
             "is_viewable": True,
-            "save_viewable": g_v.save_light_viewable_light_regular_grid2D,
+            "save_viewable": g_v.save_viewable_light_regular_grid2D,
             "save_light_viewable": g_v.save_light_viewable_light_regular_grid2D,
         },
         "LightRegularGrid3D": {

opengeodeweb_back/routes/blueprint_routes.py

@@ -53,7 +53,7 @@ with open(
 def allowed_files():
     utils_functions.validate_request(flask.request, allowed_files_json)
     extensions = geode_functions.list_input_extensions(
-        flask.request.json["supported_feature"]
+        flask.request.get_json()["supported_feature"]
     )
     return flask.make_response({"extensions": extensions}, 200)
 
@@ -99,10 +99,10 @@ def allowed_objects():
 
     utils_functions.validate_request(flask.request, allowed_objects_json)
     file_absolute_path = geode_functions.upload_file_path(
-        flask.request.json["filename"]
+        flask.request.get_json()["filename"]
     )
     allowed_objects = geode_functions.list_geode_objects(
-        file_absolute_path, flask.request.json["supported_feature"]
+        file_absolute_path, flask.request.get_json()["supported_feature"]
     )
     return flask.make_response({"allowed_objects": allowed_objects}, 200)
 
@@ -120,10 +120,10 @@ 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"])
+    file_path = geode_functions.upload_file_path(flask.request.get_json()["filename"])
 
     additional_files = geode_functions.additional_files(
-        flask.request.json["input_geode_object"],
+        flask.request.get_json()["input_geode_object"],
         file_path,
     )
 
@@ -167,7 +167,7 @@ with open(
 def crs_converter_geographic_coordinate_systems():
     utils_functions.validate_request(flask.request, geographic_coordinate_systems_json)
     infos = geode_functions.geographic_coordinate_systems(
-        flask.request.json["input_geode_object"]
+        flask.request.get_json()["input_geode_object"]
     )
     crs_list = []
     for info in infos:
@@ -194,10 +194,12 @@ with open(
 def inspect_file():
     utils_functions.validate_request(flask.request, inspect_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)
+    file_path = geode_functions.upload_file_path(flask.request.get_json()["filename"])
+    data = geode_functions.load(
+        flask.request.get_json()["input_geode_object"], file_path
+    )
     class_inspector = geode_functions.inspect(
-        flask.request.json["input_geode_object"], data
+        flask.request.get_json()["input_geode_object"], data
     )
     inspection_result = geode_functions.get_inspector_children(class_inspector)
     return flask.make_response({"inspection_result": inspection_result}, 200)
@@ -218,14 +220,14 @@ def geode_objects_and_output_extensions():
     utils_functions.validate_request(
         flask.request, geode_objects_and_output_extensions_json
     )
-    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
+    file_path = geode_functions.upload_file_path(flask.request.get_json()["filename"])
     data = geode_functions.load(
-        flask.request.json["input_geode_object"],
+        flask.request.get_json()["input_geode_object"],
         file_path,
     )
     geode_objects_and_output_extensions = (
         geode_functions.geode_objects_output_extensions(
-            flask.request.json["input_geode_object"], data
+            flask.request.get_json()["input_geode_object"], data
         )
     )
     return flask.make_response(
@@ -249,8 +251,8 @@ def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable_from_file(
-            geode_object=flask.request.json["input_geode_object"],
-            input_filename=flask.request.json["filename"],
+            geode_object=flask.request.get_json()["input_geode_object"],
+            input_filename=flask.request.get_json()["filename"],
         ),
         200,
     )
@@ -263,10 +265,10 @@ 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)
-    title = flask.request.json["title"]
-    x = flask.request.json["x"]
-    y = flask.request.json["y"]
-    z = flask.request.json["z"]
+    title = flask.request.get_json()["title"]
+    x = flask.request.get_json()["x"]
+    y = flask.request.get_json()["y"]
+    z = flask.request.get_json()["z"]
     class_ = geode_functions.geode_object_class("PointSet3D")
     PointSet3D = class_.create()
     builder = geode_functions.create_builder("PointSet3D", PointSet3D)
@@ -290,14 +292,8 @@ with open(os.path.join(schemas, "texture_coordinates.json"), "r") as file:
 )
 def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
-    data = geode_functions.load_data(
-        flask.request.json["input_geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    data = geode_functions.load_data(flask.request.get_json().get("id"))
     texture_coordinates = data.texture_manager().texture_names()
-
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
 
 
@@ -314,14 +310,8 @@ with open(
 )
 def vertex_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_data(
-        flask.request.json["input_geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    data = geode_functions.load_data(flask.request.get_json().get("id"))
     vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
-
     return flask.make_response(
         {
             "vertex_attribute_names": vertex_attribute_names,
@@ -343,14 +333,8 @@ with open(
 )
 def polygon_attribute_names():
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
-    data = geode_functions.load_data(
-        flask.request.json["input_geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    data = geode_functions.load_data(flask.request.get_json().get("id"))
     polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
-
     return flask.make_response(
         {
             "polygon_attribute_names": polygon_attribute_names,
@@ -372,14 +356,8 @@ with open(
 )
 def polyhedron_attribute_names():
     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"],
-    )
-
+    data = geode_functions.load_data(flask.request.get_json().get("id"))
     polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()
-
     return flask.make_response(
         {
             "polyhedron_attribute_names": polyhedron_attribute_names,

opengeodeweb_back/routes/models/blueprint_models.py

@@ -20,7 +20,7 @@ def uuid_to_flat_index():
     utils_functions.validate_request(flask.request, vtm_component_indices_json)
 
     vtm_file_path = geode_functions.data_file_path(
-        flask.request.json["id"], "viewable.vtm"
+        flask.request.get_json().get("id"), "viewable.vtm"
     )
     tree = ET.parse(vtm_file_path)
     root = tree.find("vtkMultiBlockDataSet")
@@ -49,12 +49,6 @@ 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)
-
-    model = geode_functions.load_data(
-        flask.request.json["geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    model = geode_functions.load_data(flask.request.get_json().get("id"))
     uuid_dict = extract_model_uuids(model)
     return flask.make_response({"uuid_dict": uuid_dict}, 200)

opengeodeweb_back/routes/models/schemas/mesh_components.json

@@ -8,20 +8,10 @@
     "id": {
       "type": "string",
       "minLength": 1      
-    },
-    "filename": {
-      "type": "string",
-      "minLength": 1
-    },
-    "geode_object": {
-      "type": "string",
-      "minLength": 1
     }
   },
   "required": [
-    "id",
-    "filename",
-    "geode_object"
+    "id"
   ],
   "additionalProperties": false
 }

opengeodeweb_back/routes/schemas/polygon_attribute_names.json

@@ -5,22 +5,12 @@
   ],
   "type": "object",
   "properties": {
-    "input_geode_object": {
-      "type": "string",
-      "minLength": 1
-    },
-    "filename": {
-      "type": "string",
-      "minLength": 1
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "input_geode_object",
-    "filename",
     "id"
   ],
   "additionalProperties": false

opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json

@@ -5,22 +5,12 @@
   ],
   "type": "object",
   "properties": {
-    "input_geode_object": {
-      "type": "string",
-      "minLength": 1
-    },
-    "filename": {
-      "type": "string",
-      "minLength": 1
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "input_geode_object",
-    "filename",
     "id"
   ],
   "additionalProperties": false

opengeodeweb_back/routes/schemas/texture_coordinates.json

@@ -5,23 +5,13 @@
   ],
   "type": "object",
   "properties": {
-    "input_geode_object": {
-      "type": "string",
-      "minLength": 1
-    },
-    "filename": {
-      "type": "string",
-      "minLength": 1
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "input_geode_object",
-    "id",
-    "filename"
+    "id"
   ],
   "additionalProperties": false
 }

opengeodeweb_back/routes/schemas/vertex_attribute_names.json

@@ -5,22 +5,12 @@
   ],
   "type": "object",
   "properties": {
-    "input_geode_object": {
-      "type": "string",
-      "minLength": 1
-    },
-    "filename": {
-      "type": "string",
-      "minLength": 1
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "input_geode_object",
-    "filename",
     "id"
   ],
   "additionalProperties": false

opengeodeweb_back/utils_functions.py

@@ -170,7 +170,6 @@ def save_all_viewables_and_return_info(
         additional_files = []
 
     data_entry = Data.create(
-        name=data.name(),
         geode_object=geode_object,
         input_file=input_file,
         additional_files=additional_files,
@@ -197,7 +196,6 @@ def save_all_viewables_and_return_info(
     database.session.commit()
 
     return {
-        "name": data_entry.name,
         "native_file_name": data_entry.native_file_name,
         "viewable_file_name": data_entry.viewable_file_name,
         "id": data_entry.id,
@@ -219,7 +217,6 @@ def generate_native_viewable_and_light_viewable_from_file(
     geode_object: str, input_filename: str
 ) -> dict[str, Any]:
     temp_data_entry = Data.create(
-        name="temp",
         geode_object=geode_object,
         input_file=input_filename,
         additional_files=[],
@@ -248,7 +245,7 @@ def generate_native_viewable_and_light_viewable_from_file(
         shutil.copy2(source_path, dest_path)
         additional_files_copied.append(additional_file.filename)
 
-    data = geode_functions.load_data(geode_object, temp_data_entry.id, input_filename)
+    data = geode_functions.load(geode_object, copied_full_path)
 
     database.session.delete(temp_data_entry)
     database.session.flush()

{opengeodeweb_back-5.10.0rc8.dist-info → opengeodeweb_back-5.10.0rc10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.0rc8
+Version: 5.10.0rc10
 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.10.0rc8.dist-info → opengeodeweb_back-5.10.0rc10.dist-info}/RECORD

@@ -1,14 +1,14 @@
 opengeodeweb_back/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opengeodeweb_back/app_config.py,sha256=XFl5KqrOWifVxdudiLm-LXmczYDBCbZtNboSYnNbLf8,1142
-opengeodeweb_back/data.py,sha256=6705K-Z6amrsCYxeYFEbYJa6d4SjvPbqZbr7X7ziZCU,1552
+opengeodeweb_back/data.py,sha256=wwLcWoYfPdE6jILnmkDQfkRJkMrHH9CB6VzPblrUgnk,1562
 opengeodeweb_back/database.py,sha256=lXbbJRZCdqLcQU-Xqi1jPmo8cIitbHOqUJW5uLBF85w,381
-opengeodeweb_back/geode_functions.py,sha256=1Y7o3NjGJxoW1O2s4KEIZ1C5tN5x-EqPNGVnIPzi-Ak,10208
-opengeodeweb_back/geode_objects.py,sha256=uXCKX8AOdXkItqmYItLnFfHcIBiMFaeN_WmGs4j64Ro,27782
+opengeodeweb_back/geode_functions.py,sha256=uEWJSjlBpaJC4Qd5JPpiWiqLlCitb7peSMWzYRIVho8,10648
+opengeodeweb_back/geode_objects.py,sha256=_NclGPa024kCwUHdORkFuXYtiZBmQpgq6sO3LRkBhe8,27776
 opengeodeweb_back/test_utils.py,sha256=18AbRW9-tfKkPcmRGilTTHXI7S3armYyV7Vdy5UvUKM,794
-opengeodeweb_back/utils_functions.py,sha256=KAlXp689N-51RXSAdBiDylVBeeozY_rzDBGH1VgqH6w,8543
-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/utils_functions.py,sha256=PclYunLMDVQn5s3V54v5jQ2zjtTFtH0C1m4niPOc2-0,8440
+opengeodeweb_back/routes/blueprint_routes.py,sha256=h_yfFC3ljH0KqFr5Ab_-IQYNB7VVRENwAMQk4NDsh18,11042
+opengeodeweb_back/routes/models/blueprint_models.py,sha256=Jo9pUDeu1nO3_IbBiuHGk57cc4_fhwxjM0EKNyv1FT0,1874
+opengeodeweb_back/routes/models/schemas/mesh_components.json,sha256=JmQUvpy7HpGS6FlThZLx1YjHqiInRTqUZ_Ft5MfOzEE,239
 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
@@ -18,14 +18,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=HJ_zVLJNdVL1snoK2mSo5Rb0XOIgiPVq1VLaDTORe54,433
-opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json,sha256=Fw6rcYxuHaiEAc_AcVzPy5ibajcr4wW3jyb2r7T0m-c,436
+opengeodeweb_back/routes/schemas/polygon_attribute_names.json,sha256=1BrpfjcbRL1ZOL4azHIHirqXIc8tpu4xGnMRFEMEshU,241
+opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json,sha256=Tt6fWBGOWgxOVC-n76_JbOQcZ-Ss-foPghMrQOY-DIE,244
 opengeodeweb_back/routes/schemas/save_viewable_file.json,sha256=pvvEdaC7bNASPMrl3bXzlcA5blgflK0EYp2hBDf74qY,424
-opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=oW84Vh34KfleK935fmMXnqJXy-vaLDd7g87O_PtSzfY,429
+opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=2uQueIl1jOmxFG_gIi_vJETR4IurrwuSf8GAnzphk9g,237
 opengeodeweb_back/routes/schemas/upload_file.json,sha256=LJ3U3L5ApKuQDVFIpVT_y2alq4HW_suTvZ3HUucNbhg,219
-opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=bmXG0pzVHMUTZY_0iu6ruX7eMUVk8wr2H1o4eEtBlg0,432
-opengeodeweb_back-5.10.0rc8.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
-opengeodeweb_back-5.10.0rc8.dist-info/METADATA,sha256=Ra3r2pMEyjKTkKGk7vNfOk54CJb5Kmmn8S1xNqEex5Y,2821
-opengeodeweb_back-5.10.0rc8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengeodeweb_back-5.10.0rc8.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
-opengeodeweb_back-5.10.0rc8.dist-info/RECORD,,
+opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=ECIflohiqPZNsflAdkfEzksL4we0JvZhIxUd84Ubctg,240
+opengeodeweb_back-5.10.0rc10.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
+opengeodeweb_back-5.10.0rc10.dist-info/METADATA,sha256=45XAIHH_6jDhQYI_zDliB3tfXk5WnZyVarolN4G5I9s,2822
+opengeodeweb_back-5.10.0rc10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengeodeweb_back-5.10.0rc10.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
+opengeodeweb_back-5.10.0rc10.dist-info/RECORD,,