Fix where handling for string lexpr

Author: lshaw8317

src/blosc2/lazyexpr.py

@@ -3002,26 +3002,12 @@ def _new_expr(cls, expression, operands, guess, out=None, where=None, ne_args=No
                 expression_, operands_ = conserve_functions(
                     _expression, _operands, new_expr.operands | local_vars
                 )
-                # if new_expr has where_args, must have come from where(...) - or possibly where(where(..
-                # since 5*where, where + ...  are evaluated eagerly
-                if hasattr(new_expr, "_where_args"):
-                    st = expression_.find("where(") + len(
-                        "where("
-                    )  # expr always begins where( - should have st = 6 always
-                    finalexpr = ""
-                    counter = 0
-                    for char in expression_[st:]:  # get rid of external where(...)
-                        finalexpr += char
-                        counter += 1 * (char == "(") - 1 * (char == ")")
-                        if counter == 0 and char == ",":
-                            break
-                    expression_ = finalexpr[:-1]  # remove trailing comma
             else:
-                new_expr = cls(None)
                 # An immediate evaluation happened
                 # (e.g. all operands are numpy arrays or constructors)
                 # or passed "a", "a[:10]", 'sum(a)'
                 expression_, operands_ = conserve_functions(_expression, _operands, local_vars)
+            new_expr = cls(None)
             new_expr.expression = f"({expression_})"  # force parenthesis
             new_expr.operands = operands_
             new_expr.expression_tosave = expression

tests/ndarray/test_lazyexpr_fields.py

@@ -220,11 +220,17 @@ def test_where(array_fixture):
     res = expr.where(0, 1).compute()
     nres = ne_evaluate("where(na1**2 + na2**2 > 2 * na1 * na2 + 1, 0, 1)")
     np.testing.assert_allclose(res[:], nres)
+
     # Test with getitem
     sl = slice(100)
     res = expr.where(0, 1)[sl]
     np.testing.assert_allclose(res, nres[sl])
 
+    # Test with string
+    res = blosc2.evaluate("where(a1**2 + a2**2 > 2 * a1 * a2 + 1, a1 + 5, a2)")
+    nres = ne_evaluate("where(na1**2 + na2**2 > 2 * na1 * na2 + 1, na1 + 5, na2)")
+    np.testing.assert_allclose(res, nres)
+
 
 # Test expressions with where() and string comps
 def test_lazy_where(array_fixture):