OpenGeodeWeb-Back 6.14.2rc1__tar.gz → 6.15.0__tar.gz

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.14.2rc1
+Version: 6.15.0
 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
@@ -30,7 +30,7 @@ Requires-Dist: opengeode-inspector-geosciences==1.2.1
 Requires-Dist: opengeode-io==7.10.0
 Requires-Dist: types-defusedxml==0.7.0.20260504
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.14.2-rc.1"
+version = "6.15.0"
 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.14.2rc1 → opengeodeweb_back-6.15.0}/requirements.txt

@@ -70,4 +70,4 @@ werkzeug==3.1.8
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.3.2rc1
+opengeodeweb-microservice==1.*,>=1.3.2

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/OpenGeodeWeb_Back.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.14.2rc1
+Version: 6.15.0
 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
@@ -30,7 +30,7 @@ Requires-Dist: opengeode-inspector-geosciences==1.2.1
 Requires-Dist: opengeode-io==7.10.0
 Requires-Dist: types-defusedxml==0.7.0.20260504
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -17,4 +17,4 @@ opengeode-inspector-geosciences==1.2.1
 opengeode-io==7.10.0
 types-defusedxml==0.7.0.20260504
 werkzeug==3.1.8
-opengeodeweb-microservice==1.*,>=1.3.2rc1
+opengeodeweb-microservice==1.*,>=1.3.2

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -246,15 +246,24 @@ def texture_coordinates(
     return schemas.TextureCoordinatesResponse(texture_coordinates=texture_coordinates)
 
 
-def extract_valid_attribute_values(
+def _attribute_ids_for_name(
+    attribute_manager: og.AttributeManager, attribute_name: str
+) -> list[og.uuid]:
+    time_steps = attribute_manager.time_steps(attribute_name)
+    if time_steps:
+        return [time_step.attribute_id for time_step in time_steps]
+    attribute_ids = attribute_manager.attribute_ids_matching_name(attribute_name)
+    if not isinstance(attribute_ids, list) or not attribute_ids:
+        return []
+    return attribute_ids[:1]
+
+
+def _extract_valid_values_from_attribute(
     attribute_manager: og.AttributeManager,
-    attribute_name: str,
+    attribute_id: og.uuid,
     item_index: int,
 ) -> tuple[list[float], bool]:
-    attribute_ids = attribute_manager.attribute_ids_matching_name(attribute_name)
-    if not isinstance(attribute_ids, list):
-        return [], False
-    attribute = attribute_manager.find_generic_attribute(attribute_ids[0])
+    attribute = attribute_manager.find_generic_attribute(attribute_id)
     if (
         attribute is None
         or not attribute.is_genericable()
@@ -287,48 +296,98 @@ def extract_valid_attribute_values(
     return valid_values, has_nan
 
 
+def extract_valid_attribute_values(
+    attribute_manager: og.AttributeManager,
+    attribute_name: str,
+    item_index: int,
+) -> tuple[list[float], bool]:
+    valid_values: list[float] = []
+    has_nan = False
+    for attribute_id in _attribute_ids_for_name(attribute_manager, attribute_name):
+        step_values, step_has_nan = _extract_valid_values_from_attribute(
+            attribute_manager, attribute_id, item_index
+        )
+        valid_values.extend(step_values)
+        has_nan = has_nan or step_has_nan
+    return valid_values, has_nan
+
+
+def _common_time_steps(
+    attribute_managers: list[og.AttributeManager], attribute_name: str
+) -> list[float] | None:
+    times = [time_step.time for time_step in attribute_managers[0].time_steps(attribute_name)]
+    for attribute_manager in attribute_managers[1:]:
+        other_times = [time_step.time for time_step in attribute_manager.time_steps(attribute_name)]
+        if other_times != times:
+            return None
+    return times
+
+
+def _attribute_ranges(
+    attribute_managers: list[og.AttributeManager],
+    attribute_name: str,
+    nb_items: int,
+) -> tuple[list[float], list[float], bool]:
+    min_values: list[float] = []
+    max_values: list[float] = []
+    attribute_has_nan = False
+    for item_index in range(nb_items):
+        valid_values: list[float] = []
+        for attribute_manager in attribute_managers:
+            extracted_values, has_nan = extract_valid_attribute_values(
+                attribute_manager, attribute_name, item_index
+            )
+            valid_values.extend(extracted_values)
+            attribute_has_nan = attribute_has_nan or has_nan
+        if valid_values:
+            min_values.append(min(valid_values))
+            max_values.append(max(valid_values))
+    return min_values, max_values, attribute_has_nan
+
+
 def attributes_metadata(
     manager: og.AttributeManager | list[og.AttributeManager],
 ) -> 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 | bool | list[float]]] = []
     first_manager = attribute_managers[0]
+    listed_time_series: set[str] = set()
     for attribute_id in first_manager.attribute_ids():
         attribute = first_manager.find_generic_attribute(attribute_id)
         if attribute is None:
             continue
         attribute_name = attribute.name()
-        if attribute_name is None:
+        if attribute_name is None or attribute_name in listed_time_series:
             continue
         if not attribute.is_genericable() or not attribute.properties().transferable:
             continue
+        time_steps = _common_time_steps(attribute_managers, attribute_name)
+        if time_steps is None:
+            continue
+        if time_steps:
+            listed_time_series.add(attribute_name)
         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:
-                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))
+        min_values, max_values, attribute_has_nan = _attribute_ranges(
+            attribute_managers, attribute_name, nb_items
+        )
         if not min_values or not max_values:
             continue
+        series_id = (
+            first_manager.time_steps(attribute_name)[0].attribute_id.string()
+            if time_steps
+            else attribute_id.string()
+        )
         attributes.append(
             {
                 "attribute_name": attribute_name,
-                "attribute_id": attribute_id.string(),
+                "attribute_id": series_id,
                 "nb_items": nb_items,
                 "min_value": min(min_values),
                 "max_value": max(max_values),
                 "min_values": min_values,
                 "max_values": max_values,
                 "no_data": attribute_has_nan,
+                "time_steps": time_steps,
             }
         )
     return attributes

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/cell_attribute_names.json

@@ -52,6 +52,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -62,7 +68,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/cell_attribute_names.py

@@ -27,6 +27,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/edge_attribute_names.json

@@ -52,6 +52,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -62,7 +68,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/edge_attribute_names.py

@@ -27,6 +27,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_edge_attribute_names.json

@@ -62,6 +62,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -72,7 +78,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_edge_attribute_names.py

@@ -28,6 +28,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_polygon_attribute_names.json

@@ -62,6 +62,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -72,7 +78,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_polygon_attribute_names.py

@@ -28,6 +28,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_polyhedron_attribute_names.json

@@ -62,6 +62,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -72,7 +78,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_polyhedron_attribute_names.py

@@ -28,6 +28,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_vertex_attribute_names.json

@@ -62,6 +62,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -72,7 +78,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/model_component_vertex_attribute_names.py

@@ -28,6 +28,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/polygon_attribute_names.json

@@ -52,6 +52,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -62,7 +68,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/polygon_attribute_names.py

@@ -27,6 +27,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json

@@ -52,6 +52,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -62,7 +68,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/polyhedron_attribute_names.py

@@ -27,6 +27,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/vertex_attribute_names.json

@@ -52,6 +52,12 @@
             },
             "no_data": {
               "type": "boolean"
+            },
+            "time_steps": {
+              "type": "array",
+              "items": {
+                "type": "number"
+              }
             }
           },
           "required": [
@@ -62,7 +68,8 @@
             "max_value",
             "min_values",
             "max_values",
-            "no_data"
+            "no_data",
+            "time_steps"
           ],
           "additionalProperties": false
         }

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/src/opengeodeweb_back/routes/schemas/vertex_attribute_names.py

@@ -27,6 +27,7 @@ class Attribute(DataClassJsonMixin):
     min_values: List[float]
     nb_items: int
     no_data: bool
+    time_steps: List[float]
 
 
 @dataclass

{opengeodeweb_back-6.14.2rc1 → opengeodeweb_back-6.15.0}/tests/test_routes.py

@@ -350,6 +350,8 @@ def test_vertex_attribute_names(client: FlaskClient) -> None:
         assert "max_values" in attribute
         assert "no_data" in attribute
         assert isinstance(attribute["no_data"], bool)
+        assert "time_steps" in attribute
+        assert isinstance(attribute["time_steps"], list)
 
 
 def test_cell_attribute_names(client: FlaskClient) -> None:
@@ -733,6 +735,8 @@ def _assert_attributes_response(response: TestResponse) -> None:
         assert "max_values" in attribute
         assert "no_data" in attribute
         assert isinstance(attribute["no_data"], bool)
+        assert "time_steps" in attribute
+        assert isinstance(attribute["time_steps"], list)
 
 
 def test_model_component_vertex_attribute_names(client: FlaskClient) -> None:
@@ -853,3 +857,32 @@ def test_component_id_length_is_strict(client: FlaskClient) -> None:
     model_id, _ = _load_brep_components(client)
     response = client.post(route, json={"id": model_id, "component_ids": ["a" * 32]})
     assert response.status_code == 400
+
+
+def test_vertex_attribute_names_time_series(client: FlaskClient) -> None:
+    route = "/opengeodeweb_back/vertex_attribute_names"
+
+    with client.application.app_context():
+        file = str(data_dir / "time_series.og_psf3d")
+        data = Data.create(
+            geode_id=DUMMY_GEODE_ID,
+            geode_object=GeodePolygonalSurface3D.geode_object_type(),
+            viewer_object=GeodePolygonalSurface3D.viewer_type(),
+            viewer_elements_type=GeodePolygonalSurface3D.viewer_elements_type(),
+        )
+        data.native_file = file
+        session = get_session()
+        if session:
+            session.commit()
+
+        data_path = Path(geode_functions.data_file_path(data.id, data.native_file))
+        data_path.parent.mkdir(parents=True, exist_ok=True)
+        assert data_path.exists(), f"File not found at {data_path}"
+    response = client.post(route, json={"id": data.id})
+    assert response.status_code == 200
+    attributes = response.get_json()["attributes"]
+    temperature = [
+        attribute for attribute in attributes if attribute["attribute_name"] == "temperature"
+    ]
+    assert len(temperature) == 1
+    assert temperature[0]["time_steps"] == [0.5, 1.0, 2.0]