catch numexpr errors and try with eval() and also test the case that …

…a module returns a np.array

src/lgdo/types/table.py

@@ -367,17 +367,22 @@ def _make_lgdo(data):
 
         # 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?
-            return _make_lgdo(out_data)
+            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}

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],
+    )