Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/light_viewable

Author: JulienChampagnol

.github/workflows/CICD.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.9"
+          python-version: "3.12"
       - name: Test
         run: |
           pip install -r requirements.txt

CHANGELOG.md

@@ -1,6 +1,47 @@
 # CHANGELOG
 
 
+## v5.7.4 (2025-05-21)
+
+
+## v5.7.4-rc.2 (2025-05-21)
+
+### Bug Fixes
+
+- **Copyright**: Update year
+  ([`af8afcf`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/af8afcfafb9a7ed6f98add3263feead6ea8a25b1))
+
+
+## v5.7.4-rc.1 (2025-05-21)
+
+### Bug Fixes
+
+- **python 3.12**: Compatibility
+  ([`0b43168`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/0b43168d1ce5776c2767172df02e922898c908bb))
+
+
+## v5.7.3 (2025-05-20)
+
+
+## v5.7.3-rc.1 (2025-05-20)
+
+### Bug Fixes
+
+- **blueprint_models**: Set current_index
+  ([`1e831c7`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/1e831c792d99bd812234e7a03cab25902dc6c9fb))
+
+
+## v5.7.2 (2025-05-19)
+
+
+## v5.7.2-rc.1 (2025-05-19)
+
+### Bug Fixes
+
+- **blueprint_models**: Change getroot to find & rm current_index from the if
+  ([`3ddcf96`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3ddcf96fff539f273542da63f6091f654e892ad1))
+
+
 ## v5.7.1 (2025-05-07)
 
 

README.md

@@ -29,4 +29,4 @@ Detailed changes for each release are documented in the [release notes](https://
 
 [MIT](https://opensource.org/licenses/MIT)
 
-Copyright (c) 2019 - 2024, Geode-solutions
+Copyright (c) 2019 - 2025, Geode-solutions

pyproject.toml

@@ -5,14 +5,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "5.7.1"
+version = "5.7.4"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },
 ]
 description = "OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9, <3.13"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -25,14 +25,15 @@ def uuid_to_flat_index():
     )
 
     tree = ET.parse(vtm_file_path)
-    root = tree.getroot()
+    root = tree.find("vtkMultiBlockDataSet")
     uuid_to_flat_index = {}
-    current_index = 1
+    current_index = 0
 
     for elem in root.iter():
         if "uuid" in elem.attrib and elem.tag == "DataSet":
             uuid_to_flat_index[elem.attrib["uuid"]] = current_index
-            current_index += 1
+
+        current_index += 1
 
     return flask.make_response(
         {"uuid_to_flat_index": uuid_to_flat_index},

src/opengeodeweb_back/utils_functions.py

@@ -8,7 +8,7 @@
 import flask
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
-import pkg_resources
+import importlib.metadata as metadata
 
 # Local application imports
 
@@ -70,10 +70,7 @@ def versions(list_packages: list):
     list_with_versions = []
     for package in list_packages:
         list_with_versions.append(
-            {
-                "package": package,
-                "version": pkg_resources.get_distribution(package).version,
-            }
+            {"package": package, "version": metadata.distribution(package).version}
         )
     return list_with_versions
 

tests/test_models_routes.py

@@ -4,27 +4,27 @@ def test_model_mesh_components(client):
     json = get_full_data()
     response = client.post(route, json=json)
     assert response.status_code == 200
+
     uuid_dict = response.json["uuid_to_flat_index"]
-    assert type(uuid_dict) is dict
+    assert isinstance(uuid_dict, dict)
 
     indices = list(uuid_dict.values())
     indices.sort()
-    assert indices[0] == 1
-    assert all(indices[i] == indices[i - 1] + 1 for i in range(1, len(indices)))
+    assert all(indices[i] > indices[i - 1] for i in range(1, len(indices)))
+    for uuid in uuid_dict.keys():
+        assert isinstance(uuid, str)
 
 
 def test_extract_brep_uuids(client):
     route = "/models/mesh_components"
     json_data = {"filename": "cube.og_brep", "geode_object": "BRep"}
-
     response = client.post(route, json=json_data)
 
     assert response.status_code == 200
     uuid_dict = response.json["uuid_dict"]
     assert isinstance(uuid_dict, dict)
-    assert (
-        "Block" in uuid_dict
-        or "Line" in uuid_dict
-        or "Surface" in uuid_dict
-        or "Corner" in uuid_dict
-    )
+    expected_keys = {"Block", "Line", "Surface", "Corner"}
+    assert any(key in uuid_dict for key in expected_keys)
+    for key, value in uuid_dict.items():
+        assert isinstance(value, list)
+        assert all(isinstance(v, str) for v in value)