OpenGeodeWeb-Back 5.4.3__tar.gz → 5.5.0rc1__tar.gz

{opengeodeweb_back-5.4.3/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-5.5.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: OpenGeodeWeb-Back
-Version: 5.4.3
+Version: 5.5.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.4.3 → opengeodeweb_back-5.5.0rc1}/pyproject.toml

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

{opengeodeweb_back-5.4.3 → opengeodeweb_back-5.5.0rc1/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: OpenGeodeWeb-Back
-Version: 5.4.3
+Version: 5.5.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.4.3 → opengeodeweb_back-5.5.0rc1}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ src/opengeodeweb_back/routes/schemas/inspect_file.json
 src/opengeodeweb_back/routes/schemas/missing_files.json
 src/opengeodeweb_back/routes/schemas/ping.json
 src/opengeodeweb_back/routes/schemas/polygon_attribute_names.json
+src/opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json
 src/opengeodeweb_back/routes/schemas/save_viewable_file.json
 src/opengeodeweb_back/routes/schemas/upload_file.json
 src/opengeodeweb_back/routes/schemas/vertex_attribute_names.json

{opengeodeweb_back-5.4.3 → opengeodeweb_back-5.5.0rc1}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -256,6 +256,7 @@ def save_viewable_file():
         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"]
     )
@@ -316,11 +317,10 @@ with open(
     methods=vertex_attribute_names_json["methods"],
 )
 def vertex_attribute_names():
-
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
+    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(
-        UPLOAD_FOLDER, werkzeug.utils.secure_filename(flask.request.json["filename"])
+        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
     )
     data = geode_functions.load(
         flask.request.json["input_geode_object"], file_absolute_path
@@ -347,11 +347,10 @@ with open(
     methods=polygon_attribute_names_json["methods"],
 )
 def polygon_attribute_names():
-
-    UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
-    utils_functions.validate_request(flask.request, vertex_attribute_names_json)
+    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(
-        UPLOAD_FOLDER, werkzeug.utils.secure_filename(flask.request.json["filename"])
+        DATA_FOLDER_PATH, werkzeug.utils.secure_filename(flask.request.json["filename"])
     )
     data = geode_functions.load(
         flask.request.json["input_geode_object"], file_absolute_path
@@ -366,6 +365,36 @@ def polygon_attribute_names():
     )
 
 
+with open(
+    os.path.join(schemas, "polyhedron_attribute_names.json"),
+    "r",
+) as file:
+    polyhedron_attribute_names_json = json.load(file)
+
+
+@routes.route(
+    polyhedron_attribute_names_json["route"],
+    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
+    )
+    polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()
+
+    return flask.make_response(
+        {
+            "polyhedron_attribute_names": polyhedron_attribute_names,
+        },
+        200,
+    )
+
+
 with open(
     os.path.join(schemas, "ping.json"),
     "r",

opengeodeweb_back-5.5.0rc1/src/opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json

@@ -0,0 +1,15 @@
+{
+  "route": "/polyhedron_attribute_names",
+  "methods": ["POST"],
+  "type": "object",
+  "properties": {
+    "input_geode_object": {
+      "type": "string"
+    },
+    "filename": {
+      "type": "string"
+    }
+  },
+  "required": ["input_geode_object", "filename"],
+  "additionalProperties": false
+}

{opengeodeweb_back-5.4.3 → opengeodeweb_back-5.5.0rc1}/tests/test_routes.py

@@ -4,6 +4,7 @@ import os
 
 # Third party imports
 from werkzeug.datastructures import FileStorage
+from flask import app
 
 # Local application imports
 from src.opengeodeweb_back import test_utils
@@ -174,12 +175,22 @@ def test_vertex_attribute_names(client):
     )
     assert response.status_code == 201
 
+    response = client.post(
+        "/save_viewable_file",
+        json={
+            "input_geode_object": "PolygonalSurface3D",
+            "filename": "vertex_attribute.vtp",
+        },
+    )
+    assert response.status_code == 200
+    native_file_name = response.json["native_file_name"]
+
     route = f"/vertex_attribute_names"
 
     def get_full_data():
         return {
             "input_geode_object": "PolygonalSurface3D",
-            "filename": "vertex_attribute.vtp",
+            "filename": native_file_name,
         }
 
     # Normal test with filename 'vertex_attribute.vtp'
@@ -200,12 +211,22 @@ def test_polygon_attribute_names(client):
     )
     assert response.status_code == 201
 
+    response = client.post(
+        "/save_viewable_file",
+        json={
+            "input_geode_object": "PolygonalSurface3D",
+            "filename": "polygon_attribute.vtp",
+        },
+    )
+    assert response.status_code == 200
+    native_file_name = response.json["native_file_name"]
+
     route = f"/polygon_attribute_names"
 
     def get_full_data():
         return {
             "input_geode_object": "PolygonalSurface3D",
-            "filename": "polygon_attribute.vtp",
+            "filename": native_file_name,
         }
 
     # Normal test with filename 'vertex_attribute.vtp'
@@ -220,6 +241,43 @@ def test_polygon_attribute_names(client):
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
 
+def test_polyhedron_attribute_names(client):
+    response = client.put(
+        f"/upload_file",
+        data={"file": FileStorage(open("./tests/polyhedron_attribute.vtu", "rb"))},
+    )
+    assert response.status_code == 201
+
+    response = client.post(
+        "/save_viewable_file",
+        json={
+            "input_geode_object": "HybridSolid3D",
+            "filename": "polyhedron_attribute.vtu",
+        },
+    )
+    assert response.status_code == 200
+    native_file_name = response.json["native_file_name"]
+
+    route = f"/polyhedron_attribute_names"
+
+    def get_full_data():
+        return {
+            "input_geode_object": "HybridSolid3D",
+            "filename": native_file_name,
+        }
+
+    # Normal test with filename 'vertex_attribute.vtp'
+    response = client.post(route, json=get_full_data())
+    assert response.status_code == 200
+    polygon_attribute_names = response.json["polyhedron_attribute_names"]
+    assert type(polygon_attribute_names) is list
+    for polygon_attribute_name in polygon_attribute_names:
+        assert type(polygon_attribute_name) is str
+
+    # Test all params
+    test_utils.test_route_wrong_params(client, route, get_full_data)
+
+
 def test_create_point(client):
     route = f"/create_point"
     get_full_data = lambda: {"x": 1, "y": 2, "z": 3}