OpenGeodeWeb-Back 6.12.6__tar.gz → 6.13.0rc2__tar.gz

{opengeodeweb_back-6.12.6 → opengeodeweb_back-6.13.0rc2}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.12.6"
+version = "6.13.0-rc.2"
 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.12.6 → opengeodeweb_back-6.13.0rc2}/src/OpenGeodeWeb_Back.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.12.6
+Version: 6.13.0rc2
 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.12.6 → opengeodeweb_back-6.13.0rc2}/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")
@@ -256,32 +269,35 @@ def extract_valid_attribute_values(
     attribute_manager: og.AttributeManager,
     attribute_name: str,
     item_index: int,
-) -> list[float]:
+) -> 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 []
+        return [], False
     component_attribute = attribute_manager.find_generic_attribute(
         attribute_ids_matching_name[0]
     )
     if component_attribute is None:
-        return []
+        return [], False
     if not component_attribute.is_genericable():
-        return []
+        return [], False
     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 not None and not math.isnan(value):
+        if value is None or math.isnan(value):
+            has_nan = True
+        else:
             valid_values.append(value)
-    return valid_values
+    return valid_values, has_nan
 
 
 def attributes_metadata(
     manager: og.AttributeManager | list[og.AttributeManager],
-) -> list[dict[str, str | int | float | list[float]]]:
+) -> list[dict[str, str | int | float | bool | list[float]]]:
     attribute_managers = manager if isinstance(manager, list) else [manager]
-    attributes: list[dict[str, str | int | float | list[float]]] = []
+    attributes: list[dict[str, str | int | float | bool | list[float]]] = []
     first_manager = attribute_managers[0]
     for id in first_manager.attribute_ids():
         attribute = first_manager.find_generic_attribute(id)
@@ -294,14 +310,16 @@ def attributes_metadata(
             continue
         nb_items = attribute.nb_items()
         min_values, max_values = [], []
+        attribute_has_nan = False
         for item_index in range(nb_items):
             valid_values: list[float] = []
             for attribute_manager in attribute_managers:
-                valid_values.extend(
-                    extract_valid_attribute_values(
-                        attribute_manager, attribute_name, item_index
-                    )
+                extracted_values, has_nan = extract_valid_attribute_values(
+                    attribute_manager, attribute_name, item_index
                 )
+                valid_values.extend(extracted_values)
+                if has_nan:
+                    attribute_has_nan = True
             if valid_values:
                 min_values.append(min(valid_values))
                 max_values.append(max(valid_values))
@@ -316,6 +334,7 @@ def attributes_metadata(
                 "max_value": max(max_values),
                 "min_values": min_values,
                 "max_values": max_values,
+                "no_data": attribute_has_nan,
             }
         )
     return attributes

{opengeodeweb_back-6.12.6 → opengeodeweb_back-6.13.0rc2}/tests/test_routes.py

@@ -79,6 +79,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"
 
@@ -261,6 +291,8 @@ def test_vertex_attribute_names(client: FlaskClient, test_id: str) -> None:
         assert "nb_items" in attribute
         assert "min_values" in attribute
         assert "max_values" in attribute
+        assert "no_data" in attribute
+        assert isinstance(attribute["no_data"], bool)
     print(
         f"[ATTRIBUTES]: ",
         [attribute["nb_items"] for attribute in attributes],
@@ -297,6 +329,8 @@ def test_cell_attribute_names(client: FlaskClient, test_id: str) -> None:
         assert "nb_items" in attribute
         assert "min_values" in attribute
         assert "max_values" in attribute
+        assert "no_data" in attribute
+        assert isinstance(attribute["no_data"], bool)
     print(
         f"[ATTRIBUTES]: ",
         [attribute["nb_items"] for attribute in attributes],
@@ -333,6 +367,8 @@ def test_polygon_attribute_names(client: FlaskClient, test_id: str) -> None:
         assert "nb_items" in attribute
         assert "min_values" in attribute
         assert "max_values" in attribute
+        assert "no_data" in attribute
+        assert isinstance(attribute["no_data"], bool)
     print(
         f"[ATTRIBUTES]: ",
         [attribute["nb_items"] for attribute in attributes],
@@ -370,6 +406,8 @@ def test_polyhedron_attribute_names(client: FlaskClient, test_id: str) -> None:
         assert "nb_items" in attribute
         assert "min_values" in attribute
         assert "max_values" in attribute
+        assert "no_data" in attribute
+        assert isinstance(attribute["no_data"], bool)
         if attribute["attribute_name"] == "Range":
             assert attribute["min_value"] == 0.0
             assert attribute["max_value"] == 579.0
@@ -411,6 +449,8 @@ def test_edge_attribute_names(client: FlaskClient, test_id: str) -> None:
         assert "nb_items" in attribute
         assert "min_values" in attribute
         assert "max_values" in attribute
+        assert "no_data" in attribute
+        assert isinstance(attribute["no_data"], bool)
     print(
         f"[ATTRIBUTES]: ",
         [attribute["nb_items"] for attribute in attributes],
@@ -485,7 +525,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)
@@ -501,7 +541,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)
@@ -649,15 +689,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)
@@ -668,6 +711,8 @@ def _assert_attributes_response(response) -> None:
         assert "nb_items" in attribute
         assert "min_values" in attribute
         assert "max_values" in attribute
+        assert "no_data" in attribute
+        assert isinstance(attribute["no_data"], bool)
 
 
 def test_model_component_vertex_attribute_names(client: FlaskClient) -> None: