OpenGeodeWeb-Back 5.8.3rc1__py3-none-any.whl → 5.8.4rc2__py3-none-any.whl

opengeodeweb_back/routes/blueprint_routes.py

@@ -241,61 +241,16 @@ with open(
     methods=save_viewable_file_json["methods"],
 )
 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"]
-    utils_functions.validate_request(flask.request, save_viewable_file_json)
-
     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)
-    generated_id = str(uuid.uuid4()).replace("-", "")
-
-    name = data.name()
-    native_extension = data.native_extension()
-
-    absolute_native_file_path = os.path.join(
-        UPLOAD_FOLDER, generated_id + "." + native_extension
-    )
-
-    saved_viewable_file_path = geode_functions.save_viewable(
-        flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH, generated_id
-    )
-
-    saved_light_viewable_file_path = geode_functions.save_light_viewable(
-        flask.request.json["input_geode_object"],
-        data,
-        DATA_FOLDER_PATH,
-        "light_" + generated_id,
-    )
-
-    f = open(saved_light_viewable_file_path, "rb")
-    binary_light_viewable = f.read()
-    f.close()
-
-    geode_functions.save(
-        flask.request.json["input_geode_object"],
-        data,
-        DATA_FOLDER_PATH,
-        generated_id + "." + native_extension,
-    )
-    os.remove(os.path.join(UPLOAD_FOLDER, secure_filename))
-    object_type = geode_functions.get_object_type(
-        flask.request.json["input_geode_object"]
-    )
-
-    native_file_name = os.path.basename(absolute_native_file_path)
-    viewable_file_name = os.path.basename(saved_viewable_file_path)
-    return flask.make_response(
-        {
-            "name": name,
-            "native_file_name": native_file_name,
-            "viewable_file_name": viewable_file_name,
-            "id": generated_id,
-            "object_type": object_type,
-            "binary_light_viewable": str(binary_light_viewable, "utf-8"),
-        },
-        200,
+    response_data = utils_functions.create_response_with_binary_light_viewable(
+        flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH
     )
+    return flask.jsonify(response_data), 200
 
 
 with open(os.path.join(schemas, "create_point.json"), "r") as file:
@@ -315,29 +270,10 @@ def create_point():
     builder = geode_functions.create_builder("PointSet3D", PointSet3D)
     builder.create_point(opengeode.Point3D([x, y, z]))
     builder.set_name(title)
-    name = PointSet3D.name()
-    generated_id = str(uuid.uuid4()).replace("-", "")
-    object_type = geode_functions.get_object_type("PointSet3D")
-    saved_native_file_path = geode_functions.save(
-        "PointSet3D", PointSet3D, DATA_FOLDER_PATH, generated_id + ".og_pts3d"
-    )
-    saved_viewable_file_path = geode_functions.save_viewable(
-        "PointSet3D", PointSet3D, DATA_FOLDER_PATH, generated_id
-    )
-
-    native_file_name = os.path.basename(saved_native_file_path[0])
-    viewable_file_name = os.path.basename(saved_viewable_file_path)
-
     return flask.make_response(
-        {
-            "viewable_file_name": os.path.basename(saved_viewable_file_path),
-            "id": generated_id,
-            "name": name,
-            "native_file_name": native_file_name,
-            "viewable_file_name": viewable_file_name,
-            "object_type": object_type,
-            "geode_object": "PointSet3D",
-        },
+        utils_functions.create_response_with_binary_light_viewable(
+            "PointSet3D", PointSet3D, DATA_FOLDER_PATH
+        ),
         200,
     )
 

opengeodeweb_back/test_utils.py

@@ -12,14 +12,13 @@ def test_route_wrong_params(client, route, get_full_data):
         response = client.post(route, json=json)
         assert response.status_code == 400
         error_description = response.json["description"]
-        assert error_description == f"Validation error: '{key}' is a required property"
+        assert "data must contain" in error_description
+        assert f"'{key}'" in error_description
 
     json = get_full_data()
     json["dumb_key"] = "dumb_value"
     response = client.post(route, json=json)
     assert response.status_code == 400
     error_description = response.json["description"]
-    assert (
-        error_description
-        == "Validation error: Additional properties are not allowed ('dumb_key' was unexpected)"
-    )
+    assert "data must not contain" in error_description
+    assert "'dumb_key'" in error_description

opengeodeweb_back/utils_functions.py

@@ -2,15 +2,16 @@
 import os
 import threading
 import time
+import uuid
 import zipfile
 
 # Third party imports
 import flask
-from jsonschema import validate
-from jsonschema.exceptions import ValidationError
+import fastjsonschema
 import importlib.metadata as metadata
 
 # Local application imports
+from . import geode_functions
 
 
 def increment_request_counter(current_app):
@@ -82,9 +83,11 @@ def validate_request(request, schema):
         json_data = {}
 
     try:
-        validate(instance=json_data, schema=schema)
-    except ValidationError as e:
-        flask.abort(400, f"Validation error: {e.message}")
+        validate = fastjsonschema.compile(schema)
+        validate(json_data)
+    except fastjsonschema.JsonSchemaException as e:
+        error_msg = str(e)
+        flask.abort(400, error_msg)
 
 
 def set_interval(func, sec, args=None):
@@ -138,3 +141,49 @@ def handle_exception(e):
     )
     response.content_type = "application/json"
     return response
+
+
+def save_native_viewable_binary_file_names(geode_object, data, folder_absolute_path):
+    generated_id = str(uuid.uuid4()).replace("-", "")
+    saved_native_file_path = geode_functions.save(
+        geode_object,
+        data,
+        folder_absolute_path,
+        generated_id + "." + data.native_extension(),
+    )
+    saved_viewable_file_path = geode_functions.save_viewable(
+        geode_object, data, folder_absolute_path, generated_id
+    )
+    saved_light_viewable_file_path = geode_functions.save_light_viewable(
+        geode_object, data, folder_absolute_path, "light_" + generated_id
+    )
+    f = open(saved_light_viewable_file_path, "rb")
+    binary_light_viewable = f.read()
+    f.close()
+    return {
+        "native_file_name": os.path.basename(saved_native_file_path[0]),
+        "viewable_file_name": os.path.basename(saved_viewable_file_path[0]),
+        "binary_light_viewable": str(binary_light_viewable, "utf-8"),
+    }
+
+
+def create_response_with_binary_light_viewable(
+    geode_object, data, folder_absolute_path
+):
+    generated_id = str(uuid.uuid4()).replace("-", "")
+    name = data.name()
+    object_type = geode_functions.get_object_type(geode_object)
+
+    native_file_name, viewable_file_name, binary_light_viewable = (
+        save_native_viewable_binary_file_names(geode_object, data, folder_absolute_path)
+    )
+
+    return {
+        "name": name,
+        "native_file_name": native_file_name,
+        "viewable_file_name": viewable_file_name,
+        "id": generated_id,
+        "object_type": object_type,
+        "binary_light_viewable": binary_light_viewable,
+        "geode_object": geode_object,
+    }

{opengeodeweb_back-5.8.3rc1.dist-info → opengeodeweb_back-5.8.4rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.8.3rc1
+Version: 5.8.4rc2
 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
@@ -15,6 +15,7 @@ Requires-Dist: asgiref==3.8.1
 Requires-Dist: attrs==25.3.0
 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
@@ -27,8 +28,6 @@ Requires-Dist: geode-simplex==9.4.2
 Requires-Dist: geode-viewables==3.1.4
 Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: jinja2==3.1.6
-Requires-Dist: jsonschema==4.24.0
-Requires-Dist: jsonschema-specifications==2025.4.1
 Requires-Dist: markupsafe==3.0.2
 Requires-Dist: opengeode-core==15.21.2
 Requires-Dist: opengeode-geosciences==9.0.0

{opengeodeweb_back-5.8.3rc1.dist-info → opengeodeweb_back-5.8.4rc2.dist-info}/RECORD

@@ -2,9 +2,9 @@ opengeodeweb_back/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 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/test_utils.py,sha256=gvRPOzin4nI5TKuB-AFgIxcekTOYM4h7yUYk0tYIZFI,820
-opengeodeweb_back/utils_functions.py,sha256=NOZq-1oI683vFzXz7rWMzt04kURR3yrkms24jcuYXB0,4057
-opengeodeweb_back/routes/blueprint_routes.py,sha256=dd5ccR6DY4GQGhc9oE3KtLj2YriaVFd1oTVizrnPp1g,14422
+opengeodeweb_back/test_utils.py,sha256=18AbRW9-tfKkPcmRGilTTHXI7S3armYyV7Vdy5UvUKM,794
+opengeodeweb_back/utils_functions.py,sha256=fghIbadgRBCmjiHQ6h_Sh8_96cznt2FlqNcQEpfYyKE,5732
+opengeodeweb_back/routes/blueprint_routes.py,sha256=o1G6gEeRcQUDPWy5OxBorFMB-bpwjuJr0yL4Ex_Lg24,12341
 opengeodeweb_back/routes/models/blueprint_models.py,sha256=F5Rx1UpAII2oz75byx4UWvEWrrwY38xO5rsy6B9_AeM,2321
 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
@@ -22,8 +22,8 @@ opengeodeweb_back/routes/schemas/save_viewable_file.json,sha256=pvvEdaC7bNASPMrl
 opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=m0EqxlvKojXVxK5Csucodu3rq1YMVJPwXJN_Wreb3qc,355
 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.3rc1.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
-opengeodeweb_back-5.8.3rc1.dist-info/METADATA,sha256=eytwSzWy_JyK03FY2M5hTN0X0uNdL1_lXxOfsuTRZk8,3083
-opengeodeweb_back-5.8.3rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengeodeweb_back-5.8.3rc1.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
-opengeodeweb_back-5.8.3rc1.dist-info/RECORD,,
+opengeodeweb_back-5.8.4rc2.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
+opengeodeweb_back-5.8.4rc2.dist-info/METADATA,sha256=AvDrg_aRYZnCVsh58dzIxh_iEd-0PYvSGtxTcda7eJ4,3036
+opengeodeweb_back-5.8.4rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengeodeweb_back-5.8.4rc2.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
+opengeodeweb_back-5.8.4rc2.dist-info/RECORD,,