OpenGeodeWeb-Back 5.8.4rc1__tar.gz → 5.8.5__tar.gz

{opengeodeweb_back-5.8.4rc1/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-5.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.8.4rc1
+Version: 5.8.5
 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.4rc1 → opengeodeweb_back-5.8.5}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "5.8.4-rc.1"
+version = "5.8.5"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="team-web@geode-solutions.com" },

{opengeodeweb_back-5.8.4rc1 → opengeodeweb_back-5.8.5/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.8.4rc1
+Version: 5.8.5
 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.4rc1 → opengeodeweb_back-5.8.5}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -6,7 +6,6 @@ import time
 # Third party imports
 import flask
 import opengeode
-import uuid
 import werkzeug
 
 # Local application imports
@@ -241,59 +240,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"),
-        },
+        utils_functions.generate_native_viewable_and_light_viewable(
+            flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH
+        ),
         200,
     )
 
@@ -315,29 +271,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.generate_native_viewable_and_light_viewable(
+            "PointSet3D", PointSet3D, DATA_FOLDER_PATH
+        ),
         200,
     )
 

{opengeodeweb_back-5.8.4rc1 → opengeodeweb_back-5.8.5}/src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -17,13 +17,10 @@ with open(os.path.join(schemas, "vtm_component_indices.json"), "r") as file:
     vtm_component_indices_json["route"], methods=vtm_component_indices_json["methods"]
 )
 def uuid_to_flat_index():
-
-    print(f"uuid_to_flat_index : {flask.request=}", flush=True)
     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"
     )
-
     tree = ET.parse(vtm_file_path)
     root = tree.find("vtkMultiBlockDataSet")
     uuid_to_flat_index = {}
@@ -60,16 +57,11 @@ 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():
-    print(f"extract_uuids_endpoint : {flask.request=}", flush=True)
-
     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"]
     )
-
     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)
     return flask.make_response({"uuid_dict": uuid_dict}, 200)

{opengeodeweb_back-5.8.4rc1 → opengeodeweb_back-5.8.5}/src/opengeodeweb_back/utils_functions.py

@@ -2,6 +2,7 @@
 import os
 import threading
 import time
+import uuid
 import zipfile
 
 # Third party imports
@@ -10,6 +11,7 @@ import fastjsonschema
 import importlib.metadata as metadata
 
 # Local application imports
+from . import geode_functions
 
 
 def increment_request_counter(current_app):
@@ -139,3 +141,37 @@ def handle_exception(e):
     )
     response.content_type = "application/json"
     return response
+
+
+def generate_native_viewable_and_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)
+
+    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 {
+        "name": 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"),
+        "geode_object": geode_object,
+    }

{opengeodeweb_back-5.8.4rc1 → opengeodeweb_back-5.8.5}/tests/test_utils_functions.py

@@ -1,10 +1,12 @@
 # Standard library imports
+import re
+import os
 
 # Third party imports
 import flask
 
 # Local application imports
-from src.opengeodeweb_back import utils_functions
+from src.opengeodeweb_back import geode_functions, utils_functions
 
 
 def test_increment_request_counter(app_context):
@@ -67,3 +69,25 @@ def test_handle_exception(client):
     assert type(data["description"]) is str
     assert type(data["name"]) is str
     assert type(data["code"]) is int
+
+
+def test_generate_native_viewable_and_light_viewable():
+    geode_object = "BRep"
+    folder_absolute_path = os.path.abspath("./data")
+    data = geode_functions.load(
+        geode_object, os.path.join(folder_absolute_path, "test.og_brep")
+    )
+    folder_absolute_path = "None"
+    result = utils_functions.generate_native_viewable_and_light_viewable(
+        geode_object, data, folder_absolute_path
+    )
+    assert type(result) is dict
+    assert type(result["name"]) is str
+    assert type(result["native_file_name"]) is str
+    assert re.match(r"[0-9a-f]{32}\.[a-zA-Z0-9]+", result["native_file_name"])
+    assert type(result["viewable_file_name"]) is str
+    assert re.match(r"[0-9a-f]{32}\.[a-zA-Z0-9]+", result["viewable_file_name"])
+    assert type(result["id"]) is str
+    assert re.match(r"[0-9a-f]{32}", result["id"])
+    assert type(result["object_type"]) is str
+    assert type(result["binary_light_viewable"]) is str