Merge branch 'next' into feat/get_vertex_attributes

Author: JulienChampagnol

CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG
 
 
+## v5.4.0-rc.2 (2024-11-28)
+
+
 ## v5.4.0-rc.1 (2024-11-27)
 
 ### Features
@@ -11,6 +14,15 @@
 - **routes**: Create point3D route
   ([`88867c6`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/88867c629b8fbf2648faaf328f5adb3452b727c2))
 
+- **polygon attribute**: New route/schemas/test/data
+  ([`e50f3ff`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e50f3ffeb7706e7b3a8fea49c303cd91b6cc1bce))
+
+- **vertex attribute**: New route/schemas/test/data
+  ([`11865dd`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/11865dd747b8e5501f17dbf5b70ad8052cbdef05))
+
+- **test_utils**: Automatic schema validation
+  ([`7dbb3fc`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/7dbb3fc4d1901d4d050249203d3bd84bc2d6b5c1))
+
 
 ## v5.3.2 (2024-11-08)
 

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "5.4.0-rc.1"
+version = "5.4.0-rc.2"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -326,7 +326,7 @@ def vertex_attribute_names():
         flask.request.json["input_geode_object"], file_absolute_path
     )
     vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
-    print(f"vertex_attribute_names: {vertex_attribute_names}", flush=True)
+    
     return flask.make_response(
         {
             "vertex_attribute_names": vertex_attribute_names,
@@ -335,6 +335,37 @@ def vertex_attribute_names():
     )
 
 
+with open(
+    os.path.join(schemas, "polygon_attribute_names.json"),
+    "r",
+) as file:
+    polygon_attribute_names_json = json.load(file)
+
+
+@routes.route(
+    polygon_attribute_names_json["route"],
+    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)
+    file_absolute_path = os.path.join(
+        UPLOAD_FOLDER, werkzeug.utils.secure_filename(flask.request.json["filename"])
+    )
+    data = geode_functions.load(
+        flask.request.json["input_geode_object"], file_absolute_path
+    )
+    polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
+
+    return flask.make_response(
+        {
+            "polygon_attribute_names": polygon_attribute_names,
+        },
+        200,
+    )
+
+
 with open(
     os.path.join(schemas, "ping.json"),
     "r",

src/opengeodeweb_back/routes/schemas/polygon_attribute_names.json

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

tests/polygon_attribute.vtp

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<VTKFile type="PolyData" version="1.0" byte_order="LittleEndian" header_type="UInt32" compressor="vtkZLibDataCompressor">
+	<PolyData>
+		<Piece NumberOfPoints="14" NumberOfPolys="14">
+			<PointData>
+				<DataArray type="Float64" Name="geode_implicit_attribute" format="ascii" NumberOfComponents="1" RangeMin="-5.03872538" RangeMax="2.56229305">-5.03873 -3.56819 -3.29213 -0.379219 0.386424 -1.97966 -0.310684 1.50807 1.80048 2.25409 2.56229 0.235826 -0.162775 -1.4339 </DataArray>
+				<DataArray type="Float64" Name="points" format="ascii" NumberOfComponents="2" RangeMin="1.10000002" RangeMax="10">1.1 4.5 3 5 1.2 6 3 8 5 8.2 5 5.5 1.1 8.3 2 10 4 10 6 10 7 10 5.9 7.7 6.1 7 5.8 5.8 </DataArray>
+				<DataArray type="Float64" Name="unique vertices" format="ascii" NumberOfComponents="1" RangeMin="32" RangeMax="45">32 33 36 37 42 34 38 39 40 41 43 44 45 35 </DataArray>
+				<DataArray type="Float64" Name="gradient_3d_attribute" format="ascii" NumberOfComponents="3" RangeMin="0" RangeMax="1.2239517">0.441452 1.06497 0 0.509268 1.09401 0 0.451134 1.22395 0 0.244789 1.03019 0 0.306431 0.898241 0 0.520398 0.854144 0 0.0558145 0.936744 0 0.17577 1.03026 0 0.179188 0.94981 0 0.242737 0.863881 0 0.312089 0.886676 0 0.328556 0.855054 0 nan nan nan 0.353402 0.897993 0 </DataArray>
+			</PointData>
+			<Points>
+				<DataArray type="Float64" Name="Points" format="ascii" NumberOfComponents="3" RangeMin="1.1000000000000001" RangeMax="10">1.1 4.5 0 3 5 0 1.2 6 0 3 8 0 5 8.2 0 5 5.5 0 1.1 8.3 0 2 10 0 4 10 0 6 10 0 7 10 0 5.9 7.7 0 6.1 7 0 5.8 5.8 0 </DataArray>
+			</Points>
+			<CellData>
+				<DataArray type="Float64" Name="triangle_vertices" format="ascii" NumberOfComponents="3" RangeMin="0" RangeMax="13">0 1 2 1 3 2 1 4 3 1 5 4 2 3 6 3 7 6 3 8 7 3 4 8 4 9 8 4 10 9 4 11 10 4 12 11 5 12 4 5 13 12 </DataArray>
+				<DataArray type="Float64" Name="triangle_adjacents" format="ascii" NumberOfComponents="3" RangeMin="0" RangeMax="4.2949673e+09">4.29497e+09 1 4.29497e+09 2 4 0 3 7 1 4.29497e+09 12 2 1 5 4.29497e+09 6 4.29497e+09 4 7 4.29497e+09 5 2 8 6 9 4.29497e+09 7 10 4.29497e+09 8 11 4.29497e+09 9 12 4.29497e+09 10 13 11 3 4.29497e+09 4.29497e+09 12 </DataArray>
+				<DataArray type="Float64" Name="implicit_on_polygons" format="ascii" NumberOfComponents="1" RangeMin="-3.96634865" RangeMax="1.73426831">-3.96635 -2.41318 -1.18699 -1.72048 -1.32735 0.272721 0.976443 0.602562 1.48033 1.73427 1.06151 0.153159 -0.585337 -1.19211 </DataArray>
+			</CellData>
+			<Polys>
+				<DataArray type="Int64" Name="connectivity" format="ascii" RangeMin="0" RangeMax="13">0 1 2 1 3 2 1 4 3 1 5 4 2 3 6 3 7 6 3 8 7 3 4 8 4 9 8 4 10 9 4 11 10 4 12 11 5 12 4 5 13 12 </DataArray>
+				<DataArray type="Int64" Name="offsets" format="ascii" RangeMin="0" RangeMax="14">3 6 9 12 15 18 21 24 27 30 33 36 39 42 </DataArray>
+			</Polys>
+		</Piece>
+	</PolyData>
+</VTKFile>

tests/test_routes.py

@@ -172,7 +172,6 @@ def test_vertex_attribute_names(client):
     assert response.status_code == 201
 
     route = f"/vertex_attribute_names"
-
     def get_full_data():
         return {
             "input_geode_object": "PolygonalSurface3D",
@@ -190,6 +189,33 @@ def get_full_data():
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
 
+def test_polygon_attribute_names(client):
+    response = client.put(
+        f"/upload_file",
+        data={"file": FileStorage(open("./tests/polygon_attribute.vtp", "rb"))},
+    )
+    assert response.status_code == 201
+
+    route = f"/polygon_attribute_names"
+
+    def get_full_data():
+        return {
+            "input_geode_object": "PolygonalSurface3D",
+            "filename": "polygon_attribute.vtp",
+        }
+
+    # 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["polygon_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}