legend-pydataobj 1.11.4__tar.gz → 1.11.6__tar.gz

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: legend_pydataobj
-Version: 1.11.4
+Version: 1.11.6
 Summary: LEGEND Python Data Objects
 Author: The LEGEND Collaboration
 Maintainer: The LEGEND Collaboration
@@ -725,6 +725,7 @@ Requires-Dist: pre-commit; extra == "test"
 Requires-Dist: pylegendtestdata; extra == "test"
 Requires-Dist: pytest>=6.0; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: dbetto; extra == "test"
 
 # legend-pydataobj
 

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/pyproject.toml

@@ -76,6 +76,7 @@ test = [
     "pylegendtestdata",
     "pytest>=6.0",
     "pytest-cov",
+    "dbetto",
 ]
 
 [project.scripts]

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/src/legend_pydataobj.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: legend_pydataobj
-Version: 1.11.4
+Version: 1.11.6
 Summary: LEGEND Python Data Objects
 Author: The LEGEND Collaboration
 Maintainer: The LEGEND Collaboration
@@ -725,6 +725,7 @@ Requires-Dist: pre-commit; extra == "test"
 Requires-Dist: pylegendtestdata; extra == "test"
 Requires-Dist: pytest>=6.0; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: dbetto; extra == "test"
 
 # legend-pydataobj
 

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/src/legend_pydataobj.egg-info/requires.txt

@@ -29,3 +29,4 @@ pre-commit
 pylegendtestdata
 pytest>=6.0
 pytest-cov
+dbetto

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/src/lgdo/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.11.4'
-__version_tuple__ = version_tuple = (1, 11, 4)
+__version__ = version = '1.11.6'
+__version_tuple__ = version_tuple = (1, 11, 6)

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/src/lgdo/types/table.py

@@ -351,31 +351,39 @@ 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 (and no global dictionary)
-        if not has_ak and modules is None:
-            out_data = ne.evaluate(
-                expr,
-                local_dict=(self_unwrap | parameters),
-            )
-
-            msg = f"...the result is {out_data!r}"
-            log.debug(msg)
-
-            # need to convert back to LGDO
-            # np.evaluate should always return a numpy thing?
-            if out_data.ndim == 0:
-                return Scalar(out_data.item())
-            if out_data.ndim == 1:
-                return Array(out_data)
-            if out_data.ndim == 2:
-                return ArrayOfEqualSizedArrays(nda=out_data)
+        def _make_lgdo(data):
+            if data.ndim == 0:
+                return Scalar(data.item())
+            if data.ndim == 1:
+                return Array(data)
+            if data.ndim == 2:
+                return ArrayOfEqualSizedArrays(nda=data)
 
             msg = (
-                f"evaluation resulted in {out_data.ndim}-dimensional data, "
+                f"evaluation resulted in {data.ndim}-dimensional data, "
                 "I don't know which LGDO this corresponds to"
             )
             raise RuntimeError(msg)
 
+        # use numexpr if we are only dealing with numpy data types (and no global dictionary)
+        if not has_ak and modules is None:
+            try:
+                out_data = ne.evaluate(
+                    expr,
+                    local_dict=(self_unwrap | parameters),
+                )
+
+                msg = f"...the result is {out_data!r}"
+                log.debug(msg)
+
+                # need to convert back to LGDO
+                # np.evaluate should always return a numpy thing?
+                return _make_lgdo(out_data)
+
+            except Exception:
+                msg = f"Warning {expr} could not be evaluated with numexpr probably due to some not allowed characters, trying with eval()."
+                log.debug(msg)
+
         # resort to good ol' eval()
         globs = {"ak": ak, "np": np}
         if modules is not None:
@@ -392,6 +400,10 @@ class Table(Struct):
                 return Array(out_data.to_numpy())
             return VectorOfVectors(out_data)
 
+        # modules can still produce numpy array
+        if isinstance(out_data, np.ndarray):
+            return _make_lgdo(out_data)
+
         if np.isscalar(out_data):
             return Scalar(out_data)
 

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/src/lgdo/types/vectorofvectors.py

@@ -13,6 +13,7 @@ import awkward as ak
 import awkward_pandas as akpd
 import numpy as np
 import pandas as pd
+from numba import jit
 from numpy.typing import ArrayLike, DTypeLike, NDArray
 
 from .. import utils
@@ -560,18 +561,16 @@ class VectorOfVectors(LGDO):
             compatible one.
         """
         if self.ndim == 2:
-            ak_arr = self.view_as("ak")
-
             if max_len is None:
-                max_len = int(ak.max(ak.count(ak_arr, axis=-1)))
-
-            nda = ak.fill_none(
-                ak.pad_none(ak_arr, max_len, clip=True), fill_val
-            ).to_numpy(allow_missing=False)
-
+                lens = np.copy(self.cumulative_length)
+                lens[1:] = lens[1:] - lens[:-1]
+                max_len = int(np.max(lens))
+            nda = np.full((len(self), max_len), fill_val)
             if preserve_dtype:
                 nda = nda.astype(self.flattened_data.dtype, copy=False)
 
+            _to_aoesa(self.flattened_data.nda, self.cumulative_length.nda, nda)
+
             return aoesa.ArrayOfEqualSizedArrays(nda=nda, attrs=self.getattrs())
 
         raise NotImplementedError
@@ -664,3 +663,11 @@ class VectorOfVectors(LGDO):
 
         msg = f"{library} is not a supported third-party format."
         raise ValueError(msg)
+
+
+@jit
+def _to_aoesa(flattened_array, cumulative_length, nda):
+    prev_cl = 0
+    for i, cl in enumerate(cumulative_length):
+        nda[i, : (cl - prev_cl)] = flattened_array[prev_cl:cl]
+        prev_cl = cl

{legend_pydataobj-1.11.4 → legend_pydataobj-1.11.6}/tests/types/test_table_eval.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import dbetto
 import hist
 import numpy as np
 import pytest
@@ -85,6 +86,19 @@ def test_eval_dependency():
     res = obj.eval("lgdo.Array([1,2,3])", {}, modules={"lgdo": lgdo})
     assert res == lgdo.Array([1, 2, 3])
 
+    # test with module returning np.array
+    assert obj.eval("np.sum(a)", {}, modules={"np": np}).value == np.int64(10)
+
     # check bad type
     with pytest.raises(RuntimeError):
         obj.eval("hist.Hist()", modules={"hist": hist})
+
+    # check impossible numexpr can still run
+    assert np.allclose(
+        obj.eval(
+            "a*args.value",
+            {"args": dbetto.AttrsDict({"value": 2})},
+            modules={"lgdo": lgdo},
+        ).view_as("np"),
+        [2, 4, 6, 8],
+    )