Merge pull request #414 from Blosc/addLazySlice

Fixed bug for integer indexes

Author: FrancescAlted

src/blosc2/lazyexpr.py

@@ -766,7 +766,7 @@ def convert_to_slice(expression):
             k = expression[i:].find("]")  # start checking from after [
             slice_convert = expression[i : i + k + 1]  # include [ and ]
             slicer = eval(f"np.s_{slice_convert}")
-            slicer = (slicer,) if isinstance(slicer, slice) else slicer  # standardise to tuple
+            slicer = (slicer,) if not isinstance(slicer, tuple) else slicer  # standardise to tuple
             if any(isinstance(el, str) for el in slicer):  # handle fields
                 raise ValueError("Cannot handle fields for slicing lazy expressions.")
             slicer = str(slicer)

tests/ndarray/test_reductions.py

@@ -452,10 +452,19 @@ def test_slicebrackets_lazy():
     res = a[10:15] + 1
     np.testing.assert_allclose(newarr, res[:3])
 
+    # Test other cases
     arr = blosc2.lazyexpr("anarr[10:15, 2:9] + 1", {"anarr": a})
     newarr = arr.compute()
     np.testing.assert_allclose(newarr[:], a[10:15, 2:9] + 1)
 
     arr = blosc2.lazyexpr("anarr[10:15][2:9] + 1", {"anarr": a})
     newarr = arr.compute()
     np.testing.assert_allclose(newarr[:], a[10:15][2:9] + 1)
+
+    arr = blosc2.lazyexpr("anarr[10] + 1", {"anarr": a})
+    newarr = arr.compute()
+    np.testing.assert_allclose(newarr[:], a[10] + 1)
+
+    arr = blosc2.lazyexpr("anarr[10, 1] + 1", {"anarr": a})
+    newarr = arr[:]
+    np.testing.assert_allclose(newarr, a[10, 1] + 1)