legend-pydataobj 1.14.1__py3-none-any.whl → 1.14.3__py3-none-any.whl

{legend_pydataobj-1.14.1.dist-info → legend_pydataobj-1.14.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: legend_pydataobj
-Version: 1.14.1
+Version: 1.14.3
 Summary: LEGEND Python Data Objects
 Author: The LEGEND Collaboration
 Maintainer: The LEGEND Collaboration

{legend_pydataobj-1.14.1.dist-info → legend_pydataobj-1.14.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-legend_pydataobj-1.14.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+legend_pydataobj-1.14.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 lgdo/__init__.py,sha256=fkRv79kdtBasw31gPVK9SdLQ2vEEajTV2t3UPDvFg9o,3206
-lgdo/_version.py,sha256=dJRV9pQgpOiwiRbOfIEKw29vLhc6CuMVTXwqoHaRZvM,513
+lgdo/_version.py,sha256=NzEEMglzBvMvu9NyIM5lnzzARmP98REW0HB5Kp9fzqg,513
 lgdo/cli.py,sha256=s_EWTBWW76l7zWb6gaTSTjiT-0RzzcYEmjeFEQCVxfk,4647
 lgdo/lgdo_utils.py,sha256=6a2YWEwpyEMXlAyTHZMO01aqxy6SxJzPZkGNWKNWuS0,2567
 lgdo/logging.py,sha256=82wIOj7l7xr3WYyeHdpSXbbjzHJsy-uRyKYUYx2vMfQ,1003
@@ -14,14 +14,14 @@ lgdo/compression/utils.py,sha256=W2RkBrxPpXlat84dnU9Ad7d_tTws0irtGl7O1dNWjnk,114
 lgdo/compression/varlen.py,sha256=bjyxhHzfpi6PIPy-Uc47W8_LrRbFoJLJ2kVeD5nhyqo,15125
 lgdo/lh5/__init__.py,sha256=smHTawINIiogHNfYJq3aPvtxleTnBMdPADRCdc1wea8,748
 lgdo/lh5/concat.py,sha256=BZCgK7TWPKK8fMmha8K83d3bC31FVO1b5LOW7x-Ru1s,6186
-lgdo/lh5/core.py,sha256=ER5tAEevD5--xEm_kNHpeHC9hcSaSBFHW3qohyvuvmM,14120
+lgdo/lh5/core.py,sha256=vcYZBJ8QFcfzCl80wmgg9uD2bdYBBG8bytcFj-MZpJ0,14109
 lgdo/lh5/datatype.py,sha256=ry3twFaosuBoskiTKqtBYRMk9PQAf403593xKaItfog,1827
 lgdo/lh5/exceptions.py,sha256=Q374YeqajpptVCYfxJYrThiPZSnfpdbGV3qVwoUuEFo,1697
 lgdo/lh5/iterator.py,sha256=vuN98pa-xHDWXM2GMxvMxFEJGfHatMX6ajqnaP55PuY,20680
 lgdo/lh5/settings.py,sha256=cmPd6ZvneAF5sFMA1qf-9g_YSSygJcQSRmZDp1_sBEU,1001
-lgdo/lh5/store.py,sha256=HJuDjWQ8ztrKDoyWW3cplhtWDnz3J4a-Fe2WF4fzOY4,8676
-lgdo/lh5/tools.py,sha256=EZTCj3TMMp4Rnocq1F0QeO1yYHzx4yMR7l_Em4G7sC4,6503
-lgdo/lh5/utils.py,sha256=hxPoaG25MOhuu7emrw2xzx3zerl-GzeMWdlfoQmLiYo,6667
+lgdo/lh5/store.py,sha256=nW8hwamd5yfaskuYaMrnWT7I-H7UiwQTXWHRpnfd9l4,8837
+lgdo/lh5/tools.py,sha256=v1nmQl3hV4pES6Gu5jiDS7Ov7k4ZcP8d-3Gc5-snmrU,7038
+lgdo/lh5/utils.py,sha256=PPdOcqBCMqDsHy5vpQIoThoeFRtZHN4DL7IDKzucUxU,6905
 lgdo/lh5/_serializers/__init__.py,sha256=eZzxMp1SeZWG0PkEXUiCz3XyprQ8EmelHUmJogC8xYE,1263
 lgdo/lh5/_serializers/read/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgdo/lh5/_serializers/read/array.py,sha256=uWfMCihfAmW2DE2ewip2qCK_kvQC_mb2zvOv26uzijc,1000
@@ -33,7 +33,7 @@ lgdo/lh5/_serializers/read/utils.py,sha256=YfSqPO-83A1XvhhuULxQ0Qz2A5ODa3sb7ApNx
 lgdo/lh5/_serializers/read/vector_of_vectors.py,sha256=765P8mElGArAaEPkHTAUXFQ47t1_3-3BQAete0LckBQ,7207
 lgdo/lh5/_serializers/write/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lgdo/lh5/_serializers/write/array.py,sha256=qzRNPQ4mtvc7HYPE3vUcM6bi7lWYnolNStdJVcDfzPU,3174
-lgdo/lh5/_serializers/write/composite.py,sha256=Cm9q0xVk27fmmrAeAp1q18E7VP7UwHako01115XdFHg,12964
+lgdo/lh5/_serializers/write/composite.py,sha256=LKRXRP5LVzrHUnFKDcKSn2nxfzdLwBWcFsp4HXT2vKo,12953
 lgdo/lh5/_serializers/write/scalar.py,sha256=JPt_fcdTKOSFp5hfJdcKIfK4hxhcD8vhOlvDF-7btQ8,763
 lgdo/lh5/_serializers/write/vector_of_vectors.py,sha256=puGQX9XF5P_5DVbm_Cc6TvPrsDywgBLSYtkqFNltbB4,3493
 lgdo/types/__init__.py,sha256=DNfOErPiAZg-7Gygkp6ZKAi20Yrm1mfderZHvKo1Y4s,821
@@ -49,8 +49,8 @@ lgdo/types/table.py,sha256=huhgpzdAUx0bRaEaitwnb-Ve7oAu5B6zxPK5EXPUfg0,20233
 lgdo/types/vectorofvectors.py,sha256=k1LwNnX3TcRAhOujj85kNkfZN0MXZYL9aaMUbr82JlE,26910
 lgdo/types/vovutils.py,sha256=LW3ZcwECxVYxxcFadAtY3nnK-9-rk8Xbg_m8hY30lo4,10708
 lgdo/types/waveformtable.py,sha256=9S_NMg894NZTGt2pLuskwH4-zQ5EbLnzWI6FVui6fXE,9827
-legend_pydataobj-1.14.1.dist-info/METADATA,sha256=zkJj_GxpFmtHsxmgZOxN2hjUxEZduPKpswZoIS_Kq54,44443
-legend_pydataobj-1.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-legend_pydataobj-1.14.1.dist-info/entry_points.txt,sha256=0KWfnwbuwhNn0vPUqARukjp04Ca6lzfZBSirouRmk7I,76
-legend_pydataobj-1.14.1.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
-legend_pydataobj-1.14.1.dist-info/RECORD,,
+legend_pydataobj-1.14.3.dist-info/METADATA,sha256=rIkDQcuhcusPO0b0wqT9ycAsY7B8Tc95MSE_bYFly-w,44443
+legend_pydataobj-1.14.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+legend_pydataobj-1.14.3.dist-info/entry_points.txt,sha256=0KWfnwbuwhNn0vPUqARukjp04Ca6lzfZBSirouRmk7I,76
+legend_pydataobj-1.14.3.dist-info/top_level.txt,sha256=KyR-EUloqiXcQ62IWnzBmtInDtvsHl4q2ZJAZgTcLXE,5
+legend_pydataobj-1.14.3.dist-info/RECORD,,

lgdo/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.14.1'
-__version_tuple__ = version_tuple = (1, 14, 1)
+__version__ = version = '1.14.3'
+__version_tuple__ = version_tuple = (1, 14, 3)

lgdo/lh5/_serializers/write/composite.py

@@ -59,7 +59,7 @@ def _h5_write_lgdo(
         try:
             fh = h5py.File(lh5_file, mode=mode, **file_kwargs)
         except OSError as oe:
-            raise LH5EncodeError(str(oe), lh5_file, None) from oe
+            raise LH5EncodeError(oe, lh5_file) from oe
 
         opened_here = True
     else:

lgdo/lh5/core.py

@@ -118,7 +118,7 @@ def read(
         try:
             lh5_file = h5py.File(str(Path(lh5_file)), mode="r", locking=locking)
         except (OSError, FileExistsError) as oe:
-            raise LH5DecodeError(str(oe), lh5_file, None) from oe
+            raise LH5DecodeError(oe, lh5_file) from oe
 
         close_after = True
         try:

lgdo/lh5/store.py

@@ -19,6 +19,7 @@ from numpy.typing import ArrayLike
 from .. import types
 from . import _serializers, utils
 from .core import read
+from .exceptions import LH5DecodeError
 
 log = logging.getLogger(__name__)
 
@@ -125,7 +126,10 @@ class LH5Store:
                     "fs_page_size": page_buffer,
                 }
             )
-        h5f = h5py.File(full_path, mode, **file_kwargs)
+        try:
+            h5f = h5py.File(full_path, mode, **file_kwargs)
+        except (OSError, FileExistsError) as oe:
+            raise LH5DecodeError(oe, full_path) from oe
 
         if self.keep_open:
             if isinstance(self.keep_open, int) and len(self.files) >= self.keep_open:

lgdo/lh5/tools.py

@@ -8,6 +8,7 @@ from pathlib import Path
 import h5py
 
 from . import utils
+from .exceptions import LH5DecodeError
 from .store import LH5Store
 
 log = logging.getLogger(__name__)
@@ -123,7 +124,10 @@ def show(
 
     # open file
     if isinstance(lh5_file, (str, Path)):
-        lh5_file = h5py.File(utils.expand_path(Path(lh5_file)), "r", locking=False)
+        try:
+            lh5_file = h5py.File(utils.expand_path(Path(lh5_file)), "r", locking=False)
+        except (OSError, FileExistsError) as oe:
+            raise LH5DecodeError(oe, lh5_file) from oe
 
     # go to group
     if lh5_group != "/":
@@ -145,17 +149,27 @@ def show(
 
     # loop over keys
     while True:
-        val = lh5_file[key]
-        # we want to print the LGDO datatype
-        dtype = val.attrs.get("datatype", default="no datatype")
-        if dtype == "no datatype" and isinstance(val, h5py.Group):
-            dtype = "HDF5 group"
-
-        _attrs = ""
-        if attrs:
-            attrs_d = dict(val.attrs)
-            attrs_d.pop("datatype", "")
-            _attrs = "── " + str(attrs_d) if attrs_d else ""
+        is_link = False
+        link_type = lh5_file.get(key, getlink=True)
+        if isinstance(link_type, (h5py.SoftLink, h5py.ExternalLink)):
+            desc = f"-> {link_type.path}"
+            is_link = True
+
+        else:
+            val = lh5_file[key]
+
+            # we want to print the LGDO datatype
+            dtype = val.attrs.get("datatype", default="no datatype")
+            if dtype == "no datatype" and isinstance(val, h5py.Group):
+                dtype = "HDF5 group"
+
+            _attrs = ""
+            if attrs:
+                attrs_d = dict(val.attrs)
+                attrs_d.pop("datatype", "")
+                _attrs = "── " + str(attrs_d) if attrs_d else ""
+
+            desc = f"· {dtype} {_attrs}"
 
         # is this the last key?
         killme = False
@@ -167,9 +181,10 @@ def show(
         else:
             char = "├──"
 
-        print(f"{indent}{char} \033[1m{key}\033[0m · {dtype} {_attrs}")  # noqa: T201
+        print(f"{indent}{char} \033[1m{key}\033[0m {desc}")  # noqa: T201
 
-        if detail and isinstance(val, h5py.Dataset):
+        if not is_link and detail and isinstance(val, h5py.Dataset):
+            val = lh5_file[key]
             char = "|       "
             if killme:
                 char = "        "
@@ -203,9 +218,9 @@ def show(
             print(toprint)  # noqa: T201
 
         # if it's a group, call this function recursively
-        if isinstance(val, h5py.Group):
+        if not is_link and isinstance(val, h5py.Group):
             show(
-                val,
+                lh5_file[key],
                 indent=indent + ("    " if killme else "│   "),
                 header=False,
                 attrs=attrs,

lgdo/lh5/utils.py

@@ -45,7 +45,10 @@ def read_n_rows(name: str, h5f: str | Path | h5py.File) -> int | None:
     Return ``None`` if `name` is a :class:`.Scalar` or a :class:`.Struct`.
     """
     if not isinstance(h5f, h5py.File):
-        h5f = h5py.File(h5f, "r", locking=False)
+        try:
+            h5f = h5py.File(h5f, "r", locking=False)
+        except (OSError, FileExistsError) as oe:
+            raise LH5DecodeError(oe, h5f, None) from oe
 
     try:
         h5o = h5f[name].id
@@ -61,7 +64,10 @@ def read_size_in_bytes(name: str, h5f: str | Path | h5py.File) -> int | None:
     recursively through members of a Struct or Table
     """
     if not isinstance(h5f, h5py.File):
-        h5f = h5py.File(h5f, "r", locking=False)
+        try:
+            h5f = h5py.File(h5f, "r", locking=False)
+        except (OSError, FileExistsError) as oe:
+            raise LH5DecodeError(oe, h5f) from oe
 
     try:
         h5o = h5f[name].id