bugfix for crs

Author: valentin-gauthier-geosiris

energyml-utils/D

@@ -23,10 +23,10 @@
     get_object_attribute,
     search_attribute_matching_name_with_path,
 )
-from energyml.resqml.v2_2.resqmlv2 import VerticalCRS
-from energyml.resqml.v2_0_1.resqmlv2 import DiscreteProperty as DiscreteProperty201, ContinuousProperty as ContinuousProperty201
-from energyml.eml.v2_3.commonv2 import TimeSeries, ColumnBasedTable
-from energyml.eml.v2_1.commonv2 import TimeSeries as TimeSeries21
+# from energyml.resqml.v2_2.resqmlv2 import VerticalCRS
+# from energyml.resqml.v2_0_1.resqmlv2 import DiscreteProperty as DiscreteProperty201, ContinuousProperty as ContinuousProperty201
+# from energyml.eml.v2_3.commonv2 import TimeSeries, ColumnBasedTable
+# from energyml.eml.v2_1.commonv2 import TimeSeries as TimeSeries21
 
 from energyml.utils.serialization import read_energyml_xml_str, serialize_json
 
@@ -271,10 +271,14 @@ def read_props_and_cbt(
 
     epcs = []
     for path in epc_path:
-        epc = EpcStreamReader(
+        epc = Epc.read_file(
             epc_file_path=path,
-            rels_update_mode=RelsUpdateMode.MANUAL,
+            # rels_update_mode=RelsUpdateMode.MANUAL,
         )
+        # epc = EpcStreamReader(
+        #     epc_file_path=path,
+        #     rels_update_mode=RelsUpdateMode.MANUAL,
+        # )
         # epc = Epc.read_file(f"{path}", read_rels_from_files=False, recompute_rels=False)
         epcs.append(epc)
 
@@ -464,6 +468,7 @@ def test_read_write_array(h5_path):
 
 
 if __name__ == "__main__":
+    # Run $env:PYTHONPATH="src" if it fails to be executed from the project root.
     logging.basicConfig(level=logging.DEBUG)
     meshes = []
     # meshes = read_grid()
@@ -472,7 +477,7 @@ def test_read_write_array(h5_path):
     # meshes = read_representation_set_representation()
     # meshes = read_trset()
     # meshes = read_pointset()
-    meshes = read_wellbore_frame_repr_demo_jfr_02_26()
+    # meshes = read_wellbore_frame_repr_demo_jfr_02_26()
 
     print(f"Number of meshes read: {len(meshes)}")
 
@@ -495,4 +500,6 @@ def test_read_write_array(h5_path):
                     raise e
 
     # read_props_and_cbt()
+    read_props_and_cbt(epc_path=["D:/Geosiris/Gitlab/clients/brgm/csv-to-energyml/rc/output/result.epc"], 
+                       p_or_cbt_uuids=["deaa96db-9cd0-456c-beb1-dc19607fcfb9", "399678cf-6fe6-4522-9fba-710115c546cf"])
     # test_read_write_array("test_array_rw.h5")

energyml-utils/example/attic/arrays_test.py

@@ -889,6 +889,9 @@ def extract_crs_info(
     """
     if crs_obj is None:
         return CrsInfo()
+    
+    if isinstance(crs_obj, CrsInfo):
+        return crs_obj
 
     # Transparently resolve DataObjectReference inputs (e.g. from get_datum_information)
     # so callers do not have to resolve DORs before calling this function.

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

@@ -83,7 +83,7 @@ def _point_as_array(point: Any) -> List:
     ]
 
 
-def is_z_reversed(crs: Optional[Any]) -> bool:
+def is_z_reversed(crs: Optional[Any], workspace: Optional[EnergymlStorageInterface] = None) -> bool:
     """
     Returns True if the Z axis increases downward
     (``ZIncreasingDownward==True`` or ``VerticalAxis.Direction=='down'``).
@@ -93,12 +93,12 @@ def is_z_reversed(crs: Optional[Any]) -> bool:
     :param crs: a CRS object
     :return: By default, ``False`` is returned when *crs* is ``None``.
     """
-    result = extract_crs_info(crs).z_increasing_downward
+    result = extract_crs_info(crs, workspace).z_increasing_downward
     # logging.debug(f"is_z_reversed: {result}")
     return result
 
 
-def get_vertical_epsg_code(crs_object: Any) -> Optional[int]:
+def get_vertical_epsg_code(crs_object: Any, workspace: Optional[EnergymlStorageInterface] = None) -> Optional[int]:
     """Return the EPSG code of the vertical CRS.  Delegates to :func:`extract_crs_info`."""
     return extract_crs_info(crs_object).vertical_epsg_code
 

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

@@ -1126,8 +1126,24 @@ def read_property_interpreted_with_cbt(
                     else None
                 )
             elif isinstance(category_lookup_data, dict):
-                # Transpose so that each index corresponds to a category (column), not a row
-                category_lookup_matrice = np.array(list(category_lookup_data.values())).T
+                # Transpose so that each index corresponds to a category (column), not a row.
+                logging.debug(f"category_lookup_data dict : {category_lookup_data}")
+
+                # Guard against inhomogeneous column lengths (e.g. one column is
+                # empty while another is not).  Pad all columns with None up to
+                # the maximum column length so that np.array() can build a
+                # rectangular (n_columns, max_rows) matrix before transposing.
+                col_values = [
+                    list(v) if not isinstance(v, list) else v
+                    for v in category_lookup_data.values()
+                ]
+                max_len = max((len(c) for c in col_values), default=0)
+                if max_len == 0:
+                    # All columns empty — nothing to look up.
+                    return prop_arrays if not _return_none_if_no_category_lookup else None
+
+                padded = [c + [None] * (max_len - len(c)) for c in col_values]
+                category_lookup_matrice = np.array(padded, dtype=object).T
                 # logging.debug(f"category_lookup_matrice : {category_lookup_matrice}")
                 # return a matrice with the same shape as prop_arrays but with the values from the category lookup array using the prop value as key in the category lookup array
                 result = (