bugfix

Author: valentin-gauthier-geosiris

energyml-utils/src/energyml/utils/data/crs.py

@@ -321,9 +321,9 @@ def _extract_vertical_crs_details(vertical_crs_obj: Any) -> dict:
     **must not** override a parent-level ``ZIncreasingDownward`` when this
     value is ``None``.
     """
-    logging.debug(
-        f"Extracting vertical CRS details from object of type {type(vertical_crs_obj).__name__} with URI {get_obj_uri(vertical_crs_obj)}"
-    )
+    # logging.debug(
+    #     f"Extracting vertical CRS details from object of type {type(vertical_crs_obj).__name__} with URI {get_obj_uri(vertical_crs_obj)}"
+    # )
     result: dict = {
         "epsg_code": None,
         "wkt": None,

energyml-utils/src/energyml/utils/data/helper.py

@@ -385,7 +385,7 @@ def get_crs_obj(
         if crs_list is not None and len(crs_list) > 0 and crs_list[0] is not None:
             # logging.debug(crs_list[0])
             crs = workspace.get_object(get_obj_uri(crs_list[0]))
-            logging.debug(f"CRS found for {get_obj_title(context_obj)} ({type(context_obj).__name__}): {crs}")
+            # logging.debug(f"CRS found for {get_obj_title(context_obj)} ({type(context_obj).__name__}): {crs}")
             if crs is None:
                 # logging.debug(f"CRS {crs_list[0]} not found (or not read correctly)")
                 _crs_list = workspace.get_object_by_uuid(get_obj_uuid(crs_list[0]))

energyml-utils/src/energyml/utils/data/mesh_numpy.py

@@ -1990,6 +1990,32 @@ def read_numpy_mesh_object(
 # ---------------------------------------------------------------------------
 
 
+def _import_pyvista() -> Any:
+    """Import PyVista and apply forward-compatibility fixes.
+
+    PyVista 0.43 deprecated ``PolyData.n_faces`` (which used to return the
+    total cell count, equivalent to ``n_cells``); PyVista 0.46 converted that
+    deprecation into a hard ``AttributeError``.  Calling
+    ``use_strict_n_faces(True)`` opts into the new, permanent semantics where
+    ``n_faces`` returns only the polygon (face) count — identical to
+    ``n_faces_strict`` — rather than raising an error.
+
+    This is safe to call multiple times; the flag is a class-level boolean on
+    ``pyvista.PolyData`` and the call is idempotent.
+    """
+    try:
+        import pyvista as pv  # type: ignore[import]
+    except ImportError as exc:
+        raise ImportError(
+            "pyvista is not installed.  Install it with: pip install pyvista"
+        ) from exc
+    # Enable strict n_faces mode: makes n_faces return n_faces_strict (polygon
+    # count) instead of raising AttributeError in PyVista >= 0.46.
+    if hasattr(pv.PolyData, "use_strict_n_faces"):
+        pv.PolyData.use_strict_n_faces(True)
+    return pv
+
+
 def numpy_mesh_to_pyvista(mesh: NumpyMesh) -> Any:
     """Convert a :class:`NumpyMesh` to the appropriate PyVista dataset.
 
@@ -2006,10 +2032,7 @@ def numpy_mesh_to_pyvista(mesh: NumpyMesh) -> Any:
     * :class:`NumpySurfaceMesh`   → ``pyvista.PolyData(points, faces=faces)``
     * :class:`NumpyVolumeMesh`    → ``pyvista.UnstructuredGrid(cells, cell_types, points)``
     """
-    try:
-        import pyvista as pv  # type: ignore[import]
-    except ImportError as exc:
-        raise ImportError("pyvista is not installed.  " "Install it with: pip install pyvista") from exc
+    pv = _import_pyvista()
 
     pts = mesh.points  # (N, 3) float64 — no copy
 
@@ -2040,10 +2063,7 @@ def numpy_multi_mesh_to_pyvista(multi: "NumpyMultiMesh") -> Any:
 
     Requires ``pyvista`` to be installed (``pip install pyvista``).
     """
-    try:
-        import pyvista as pv  # type: ignore[import]
-    except ImportError as exc:
-        raise ImportError("pyvista is not installed.  Install it with: pip install pyvista") from exc
+    pv = _import_pyvista()
 
     block: pv.MultiBlock = pv.MultiBlock()
     for child in multi.children:

energyml-utils/src/energyml/utils/data/representation_context.py

@@ -111,13 +111,13 @@ def get_default_color(self) -> ScalarRenderingInfo:
         for gis_uri, entries in self.graphical_info.items():
             for entry in entries:
                 try:
-                    rendering_info = read_graphical_rendering_info(entry, self.workspace)
+                    rendering_info = read_graphical_rendering_info(entry, self.uri.uuid, self.workspace)
                     if rendering_info is not None:
                         return rendering_info
                 except Exception as exc:
                     logging.debug(f"Error reading graphical rendering info for entry {entry}: {exc}")
         # No color information found, generate a random color from uuid
-        return ScalarRenderingInfo(constant_color=RgbaColor.from_uuid(self.uri.uuid))
+        return ScalarRenderingInfo(constant_color=RgbaColor.random_from_uuid(self.uri.uuid))
 
     def get_property(self, property_uuid: str) -> Optional[Any]:
         """Return the property object with the given uuid, or None."""