Remove zarray and zarray_maybe_lazy properties from Cubed Array. (#743)

These are not meant for general use.

Author: tomwhite

cubed/core/array.py

@@ -47,16 +47,6 @@ def __init__(self, name, zarray, spec, plan):
         self.spec = spec or spec_from_config(config)
         self.plan = plan
 
-    @property
-    def zarray_maybe_lazy(self):
-        """The underlying Zarr array or LazyZarrArray. Use this during planning, before the computation has started."""
-        return self._zarray
-
-    @property
-    def zarray(self):
-        """The underlying Zarr array. May only be used during the computation once the array has been created."""
-        return open_if_lazy_zarr_array(self._zarray)
-
     @property
     def blocks(self):
         """An array-like interface to the blocks of an array."""
@@ -123,7 +113,8 @@ def _read_stored(self):
         # Only works if the array has been computed
         if self.size > 0:
             # read back from zarr
-            return numpy_array_to_backend_array(self.zarray[...])
+            zarray = open_if_lazy_zarr_array(self._zarray)
+            return numpy_array_to_backend_array(zarray[...])
         else:
             # this case fails for zarr, so just return an empty array of the correct shape
             return nxp.empty(self.shape, dtype=self.dtype)

cubed/core/ops.py

@@ -286,7 +286,7 @@ def blockwise(
 
     # replace arrays with zarr arrays
     zargs = list(args)
-    zargs[::2] = [a.zarray_maybe_lazy for a in arrays]
+    zargs[::2] = [a._zarray for a in arrays]
     in_names = [a.name for a in arrays]
 
     extra_source_arrays = kwargs.pop("extra_source_arrays", [])
@@ -438,7 +438,7 @@ def _general_blockwise(
     assert len(arrays) > 0
 
     # replace arrays with zarr arrays
-    zargs = [a.zarray_maybe_lazy for a in arrays]
+    zargs = [a._zarray for a in arrays]
     in_names = [a.name for a in arrays]
 
     extra_source_arrays = kwargs.pop("extra_source_arrays", [])
@@ -1079,7 +1079,7 @@ def rechunk(x, chunks, *, target_store=None, min_mem=None, use_new_impl=True):
     name_int = f"{name}-int"
     temp_store = new_temp_path(name=name_int, spec=spec)
     ops = primitive_rechunk(
-        x.zarray_maybe_lazy,
+        x._zarray,
         source_array_name=name,
         int_array_name=name_int,
         target_chunks=target_chunks,