legend-pydataobj 1.11.1__tar.gz → 1.11.2__tar.gz

{legend_pydataobj-1.11.1 → legend_pydataobj-1.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: legend_pydataobj
-Version: 1.11.1
+Version: 1.11.2
 Summary: LEGEND Python Data Objects
 Author: The LEGEND Collaboration
 Maintainer: The LEGEND Collaboration

{legend_pydataobj-1.11.1 → legend_pydataobj-1.11.2}/src/legend_pydataobj.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: legend_pydataobj
-Version: 1.11.1
+Version: 1.11.2
 Summary: LEGEND Python Data Objects
 Author: The LEGEND Collaboration
 Maintainer: The LEGEND Collaboration

{legend_pydataobj-1.11.1 → legend_pydataobj-1.11.2}/src/lgdo/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.11.1'
-__version_tuple__ = version_tuple = (1, 11, 1)
+__version__ = version = '1.11.2'
+__version_tuple__ = version_tuple = (1, 11, 2)

{legend_pydataobj-1.11.1 → legend_pydataobj-1.11.2}/src/lgdo/lh5/_serializers/read/vector_of_vectors.py

@@ -189,8 +189,9 @@ def _h5_read_vector_of_vectors(
         # if the buffer is partially filled, cumulative_length will be invalid
         # (i.e. non monotonically increasing). Let's fix that but filling the
         # rest of the array with the length of flattened_data
-        end = obj_buf_start + n_rows_read
-        obj_buf.cumulative_length.nda[end:] = obj_buf.cumulative_length.nda[end - 1]
+        if n_rows_read > 0:
+            end = obj_buf_start + n_rows_read
+            obj_buf.cumulative_length.nda[end:] = obj_buf.cumulative_length.nda[end - 1]
 
         return obj_buf, n_rows_read
 

{legend_pydataobj-1.11.1 → legend_pydataobj-1.11.2}/src/lgdo/types/table.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import logging
 from collections.abc import Mapping
+from types import ModuleType
 from typing import Any
 from warnings import warn
 
@@ -266,6 +267,7 @@ class Table(Struct):
         self,
         expr: str,
         parameters: Mapping[str, str] | None = None,
+        modules: Mapping[str, ModuleType] | None = None,
     ) -> LGDO:
         """Apply column operations to the table and return a new LGDO.
 
@@ -299,6 +301,10 @@ class Table(Struct):
             a dictionary of function parameters. Passed to
             :func:`numexpr.evaluate`` as `local_dict` argument or to
             :func:`eval` as `locals` argument.
+        modules
+            a dictionary of additional modules used by the expression. If this is not `None`
+            then :func:`eval`is used and the expression can depend on any modules from this dictionary in
+            addition to awkward and numpy. These are passed to :func:`eval` as `globals` argument.
 
         Examples
         --------
@@ -339,8 +345,8 @@ class Table(Struct):
         msg = f"evaluating {expr!r} with locals={(self_unwrap | parameters)} and {has_ak=}"
         log.debug(msg)
 
-        # use numexpr if we are only dealing with numpy data types
-        if not has_ak:
+        # use numexpr if we are only dealing with numpy data types (and no global dictionary)
+        if not has_ak and modules is None:
             out_data = ne.evaluate(
                 expr,
                 local_dict=(self_unwrap | parameters),
@@ -366,6 +372,9 @@ class Table(Struct):
 
         # resort to good ol' eval()
         globs = {"ak": ak, "np": np}
+        if modules is not None:
+            globs = globs | modules
+
         out_data = eval(expr, globs, (self_unwrap | parameters))
 
         msg = f"...the result is {out_data!r}"
@@ -380,6 +389,10 @@ class Table(Struct):
         if np.isscalar(out_data):
             return Scalar(out_data)
 
+        # if out_data is already an LGDO just return it
+        if isinstance(out_data, LGDO):
+            return out_data
+
         msg = (
             f"evaluation resulted in a {type(out_data)} object, "
             "I don't know which LGDO this corresponds to"

{legend_pydataobj-1.11.1 → legend_pydataobj-1.11.2}/tests/lh5/test_lh5_store.py

@@ -292,6 +292,10 @@ def test_read_table_fancy_idx(lh5_file):
     assert isinstance(lh5_obj, types.Table)
     assert n_rows == 2
 
+    lh5_obj, n_rows = store.read("/data/struct/table", lh5_file, idx=[])
+    assert isinstance(lh5_obj, types.Table)
+    assert n_rows == 0
+
 
 def test_read_empty_struct(lh5_file):
     store = lh5.LH5Store()
@@ -468,6 +472,16 @@ def test_read_lgnd_vov_fancy_idx(lgnd_file):
     assert (lh5_obj.cumulative_length.nda == [1, 2, 3, 4, 5, 6, 7]).all()
     assert (lh5_obj.flattened_data.nda == [40, 60, 64, 60, 64, 28, 60]).all()
 
+    lh5_obj, n_rows = store.read("/geds/raw/tracelist", lgnd_file, idx=[])
+    assert isinstance(lh5_obj, types.VectorOfVectors)
+    assert n_rows == 0
+    assert len(lh5_obj) == 0
+
+    lh5_obj, n_rows = store.read("/geds/raw/tracelist", [lgnd_file] * 3, idx=[250])
+    assert isinstance(lh5_obj, types.VectorOfVectors)
+    assert n_rows == 1
+    assert len(lh5_obj) == 1
+
 
 def test_read_array_concatenation(lgnd_file):
     store = lh5.LH5Store()

{legend_pydataobj-1.11.1 → legend_pydataobj-1.11.2}/tests/types/test_table_eval.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
+import hist
 import numpy as np
+import pytest
 
 import lgdo
 
@@ -31,6 +33,7 @@ def test_eval_dependency():
             ),
         }
     )
+
     r = obj.eval("sum(a)")
     assert isinstance(r, lgdo.Scalar)
 
@@ -77,3 +80,11 @@ def test_eval_dependency():
     assert isinstance(r, lgdo.Scalar)
 
     assert obj.eval("np.sum(a) + ak.sum(e)")
+
+    # test with modules argument, the simplest is using directly lgdo
+    res = obj.eval("lgdo.Array([1,2,3])", {}, modules={"lgdo": lgdo})
+    assert res == lgdo.Array([1, 2, 3])
+
+    # check bad type
+    with pytest.raises(RuntimeError):
+        obj.eval("hist.Hist()", modules={"hist": hist})