Fix shape recalculation bug for lazyexpr

Author: lshaw8317

src/blosc2/lazyexpr.py

@@ -2567,19 +2567,16 @@ def shape(self):
             return None
 
         # Operands shape can change, so we always need to recompute this
-        try:
+        if any(constructor in self.expression for constructor in constructors):
+            # might have an expression with pure constructors
+            opshapes = {k: v if not hasattr(v, "shape") else v.shape for k, v in self.operands.items()}
+            _shape = infer_shape(self.expression, opshapes)  # infer shape, includes constructors
+        else:
             _shape, chunks, blocks, fast_path = validate_inputs(self.operands, getattr(self, "_out", None))
             if fast_path:
                 # fast_path ensure that all the operands have the same partitions
                 self._chunks = chunks
                 self._blocks = blocks
-        except ValueError as e:
-            if any(constructor in self.expression for constructor in constructors):
-                # might have an expression with pure constructors
-                opshapes = {k: v if not hasattr(v, "shape") else v.shape for k, v in self.operands.items()}
-                _shape = infer_shape(self.expression, opshapes)  # infer shape, includes constructors
-            else:
-                raise e
 
         self._shape_ = _shape
         self._expression_ = self.expression

tests/ndarray/test_lazyexpr.py

@@ -952,6 +952,21 @@ def test_broadcasting(broadcast_fixture):
     np.testing.assert_allclose(res, nres)
 
 
+def test_incompatible_shape():
+    shape1 = (1000,)
+    shape2 = (100,)
+    a = blosc2.ones(shape1)
+    b = blosc2.zeros(shape2)
+    expr = a + b
+    with pytest.raises(ValueError):
+        s = expr.shape
+
+    # Test constructor too
+    expr = a + blosc2.lazyexpr(f"linspace(0, 10, {np.prod(shape2)}, shape={shape2})")
+    with pytest.raises(ValueError):
+        s = expr.shape
+
+
 def test_broadcasting_str(broadcast_fixture):
     a1, a2, na1, na2 = broadcast_fixture
     expr1 = blosc2.lazyexpr("a1 + a2")