OpenGeodeWeb-Back 6.13.0rc1__tar.gz → 6.13.0rc3__tar.gz

{opengeodeweb_back-6.13.0rc1 → opengeodeweb_back-6.13.0rc3}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.13.0-rc.1"
+version = "6.13.0-rc.3"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
 description = "OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"

{opengeodeweb_back-6.13.0rc1 → opengeodeweb_back-6.13.0rc3}/src/OpenGeodeWeb_Back.egg-info/PKG-INFO

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

@@ -73,13 +73,26 @@ def upload_file() -> flask.Response:
     if not os.path.exists(UPLOAD_FOLDER_PATH):
         os.makedirs(UPLOAD_FOLDER_PATH, exist_ok=True)
 
-    file = flask.request.files["file"]
-    if file.filename is None:
-        flask.abort(400, "Filename is required")
-    filename = werkzeug.utils.secure_filename(os.path.basename(file.filename))
+    # Multipart callers (e.g. Vease) still send the file as a "file" form part;
+    # streaming callers PUT the raw bytes as the body with ?filename= as a query param.
+    if flask.request.mimetype == "multipart/form-data":
+        file = flask.request.files["file"]
+        if file.filename is None:
+            flask.abort(400, "Filename is required")
+        filename = werkzeug.utils.secure_filename(os.path.basename(file.filename))
+        file_path = os.path.join(UPLOAD_FOLDER_PATH, filename)
+        file.save(file_path)
+    else:
+        raw_filename = flask.request.args.get("filename")
+        if not raw_filename:
+            flask.abort(400, "Filename is required")
+        filename = werkzeug.utils.secure_filename(os.path.basename(raw_filename))
+        file_path = os.path.join(UPLOAD_FOLDER_PATH, filename)
+        chunk_size = 1024 * 1024
+        with open(file_path, "wb") as destination:
+            while chunk := flask.request.stream.read(chunk_size):
+                destination.write(chunk)
     print(f"{filename=}", flush=True)
-    file_path = os.path.join(UPLOAD_FOLDER_PATH, filename)
-    file.save(file_path)
     if filename.lower().endswith(".csv.json"):
         shutil.copyfile(
             file_path, os.path.join(UPLOAD_FOLDER_PATH, filename[:-9] + ".json")
@@ -257,23 +270,42 @@ def extract_valid_attribute_values(
     attribute_name: str,
     item_index: int,
 ) -> tuple[list[float], bool]:
-    attribute_ids_matching_name = attribute_manager.attribute_ids_matching_name(
-        attribute_name
-    )
-    if not isinstance(attribute_ids_matching_name, list):
-        return [], False
-    component_attribute = attribute_manager.find_generic_attribute(
-        attribute_ids_matching_name[0]
-    )
-    if component_attribute is None:
+    attribute_ids = attribute_manager.attribute_ids_matching_name(attribute_name)
+    if not isinstance(attribute_ids, list):
         return [], False
-    if not component_attribute.is_genericable():
+    attribute = attribute_manager.find_generic_attribute(attribute_ids[0])
+    if (
+        attribute is None
+        or not attribute.is_genericable()
+        or not attribute.properties().transferable
+    ):
         return [], False
+
+    nb_items = attribute.nb_items()
+    default_values = getattr(attribute, "default_values", None)
+    no_value = default_values().no_value if default_values else None
+    if no_value is None and (
+        "Point" in attribute.type() or "Vector" in attribute.type()
+    ):
+        no_value = [0.0] * nb_items
+
+    value_getter = getattr(
+        attribute,
+        "value",
+        lambda element_index: [
+            attribute.generic_item_value(element_index, i) for i in range(nb_items)
+        ],
+    )
+
     valid_values: list[float] = []
     has_nan = False
     for element_index in range(attribute_manager.nb_elements()):
-        value = component_attribute.generic_item_value(element_index, item_index)
-        if value is None or math.isnan(value):
+        value = attribute.generic_item_value(element_index, item_index)
+        if (
+            value is None
+            or math.isnan(value)
+            or (no_value is not None and value_getter(element_index) == no_value)
+        ):
             has_nan = True
         else:
             valid_values.append(value)
@@ -293,7 +325,7 @@ def attributes_metadata(
         attribute_name = attribute.name()
         if attribute_name is None:
             continue
-        if not attribute.is_genericable():
+        if not attribute.is_genericable() or not attribute.properties().transferable:
             continue
         nb_items = attribute.nb_items()
         min_values, max_values = [], []

{opengeodeweb_back-6.13.0rc1 → opengeodeweb_back-6.13.0rc3}/tests/test_routes.py

@@ -2,6 +2,7 @@
 import os
 
 # Third party imports
+import opengeode as og
 from werkzeug.datastructures import FileStorage
 from flask.testing import FlaskClient
 from werkzeug.test import TestResponse
@@ -13,6 +14,7 @@ import zipfile
 from opengeodeweb_microservice.database.data import Data
 from opengeodeweb_microservice.database.connection import get_session
 from opengeodeweb_back import geode_functions, test_utils
+from opengeodeweb_back.routes.blueprint_routes import extract_valid_attribute_values
 from opengeodeweb_back.geode_objects.geode_polygonal_surface3d import (
     GeodePolygonalSurface3D,
 )
@@ -79,6 +81,36 @@ def test_upload_file(client: FlaskClient, filename: str = "test.og_brep") -> Non
     assert response.status_code == 201
 
 
+def test_upload_file_raw(client: FlaskClient, filename: str = "test.og_brep") -> None:
+    file = os.path.join(data_dir, filename)
+    with open(file, "rb") as opened_file:
+        file_bytes = opened_file.read()
+
+    raw_filename = "raw_upload_test.og_brep"
+    response = client.put(
+        f"/opengeodeweb_back/upload_file?filename={raw_filename}",
+        data=file_bytes,
+        content_type="application/octet-stream",
+    )
+    assert response.status_code == 201
+
+    uploaded_path = os.path.join(data_dir, raw_filename)
+    try:
+        with open(uploaded_path, "rb") as uploaded_file:
+            assert uploaded_file.read() == file_bytes
+    finally:
+        os.remove(uploaded_path)
+
+
+def test_upload_file_raw_missing_filename(client: FlaskClient) -> None:
+    response = client.put(
+        f"/opengeodeweb_back/upload_file",
+        data=b"some raw bytes",
+        content_type="application/octet-stream",
+    )
+    assert response.status_code == 400
+
+
 def test_missing_files(client: FlaskClient) -> None:
     route = f"/opengeodeweb_back/missing_files"
 
@@ -495,7 +527,7 @@ def test_model_components(client: FlaskClient) -> None:
     assert isinstance(mesh_components, list)
     assert len(mesh_components) > 0
     for mesh_component in mesh_components:
-        assert isinstance(mesh_component, object)
+        assert isinstance(mesh_component, dict)
         assert isinstance(mesh_component["geode_id"], str)
         assert isinstance(mesh_component["viewer_id"], int)
         assert isinstance(mesh_component["name"], str)
@@ -511,7 +543,7 @@ def test_model_components(client: FlaskClient) -> None:
     collection_components = response.get_json()["collection_components"]
     assert isinstance(collection_components, list)
     for collection_component in collection_components:
-        assert isinstance(collection_component, object)
+        assert isinstance(collection_component, dict)
         assert isinstance(collection_component["geode_id"], str)
         assert isinstance(collection_component["name"], str)
         assert isinstance(collection_component["items"], list)
@@ -659,15 +691,18 @@ def _load_brep_components(client: FlaskClient) -> tuple[str, dict[str, list[str]
     response = test_save_viewable_file(client, "BRep", "cube.og_brep")
     assert response.status_code == 200
     model_id: str = response.get_json()["id"]
-    mesh_components: list[dict] = response.get_json()["mesh_components"]
+    mesh_components: list[dict[str, object]] = response.get_json()["mesh_components"]
     by_type: dict[str, list[str]] = {}
-    for mc in mesh_components:
-        component_type = mc["type"]
-        by_type.setdefault(component_type, []).append(mc["geode_id"])
+    for mesh_component in mesh_components:
+        component_type = mesh_component["type"]
+        geode_id = mesh_component["geode_id"]
+        assert isinstance(component_type, str)
+        assert isinstance(geode_id, str)
+        by_type.setdefault(component_type, []).append(geode_id)
     return model_id, by_type
 
 
-def _assert_attributes_response(response) -> None:
+def _assert_attributes_response(response: TestResponse) -> None:
     assert response.status_code == 200
     attributes = response.get_json()["attributes"]
     assert isinstance(attributes, list)
@@ -744,3 +779,47 @@ def test_model_component_polyhedron_attribute_names(client: FlaskClient) -> None
         return {"id": model_id, "component_ids": block_ids}
 
     test_utils.test_route_wrong_params(client, route, get_full_data)
+
+
+def test_extract_valid_attribute_values_with_sentinel_no_value() -> None:
+    mesh = og.TriangulatedSurface3D.create()
+    builder = og.TriangulatedSurfaceBuilder3D.create(mesh)
+    vertex_0 = builder.create_point(og.Point3D([0, 0, 0]))
+    vertex_1 = builder.create_point(og.Point3D([1, 0, 0]))
+    builder.create_triangle([vertex_0, vertex_1, vertex_0])
+
+    attribute_manager = mesh.vertex_attribute_manager()
+    values_config = og.AttributeValuesDouble()
+    values_config.no_value = -999.0
+    attribute_id = attribute_manager.create_attribute_variable_double(
+        "variable_double", values_config, og.AttributeProperties()
+    )
+    attribute = attribute_manager.find_attribute_variable_double(attribute_id)
+    attribute.set_value(vertex_0, -999.0)
+    attribute.set_value(vertex_1, 42.0)
+
+    valid_values, has_nan = extract_valid_attribute_values(
+        attribute_manager, "variable_double", 0
+    )
+    assert has_nan is True
+    assert valid_values == [42.0]
+
+
+def test_extract_valid_attribute_values_with_non_transferable_attribute() -> None:
+    mesh = og.TriangulatedSurface3D.create()
+    builder = og.TriangulatedSurfaceBuilder3D.create(mesh)
+    vertex_0 = builder.create_point(og.Point3D([0, 0, 0]))
+    builder.create_triangle([vertex_0, vertex_0, vertex_0])
+
+    attribute_manager = mesh.vertex_attribute_manager()
+    properties = og.AttributeProperties()
+    properties.transferable = False
+    attribute_manager.create_attribute_variable_double(
+        "internal_attribute", og.AttributeValuesDouble(), properties
+    )
+
+    valid_values, has_nan = extract_valid_attribute_values(
+        attribute_manager, "internal_attribute", 0
+    )
+    assert has_nan is False
+    assert valid_values == []