Merge pull request #2 from TomNicholas/remove_indexing_adapter

Remove explicit indexing adapter

Author: TomNicholas

cubed_xarray/cubedmanager.py

@@ -35,41 +35,19 @@ def chunks(self, data: "CubedArray") -> T_Chunks:
         return data.chunks
 
     def from_array(self, data: np.ndarray, chunks, **kwargs) -> "CubedArray":
-        from cubed import Array, from_array
+        from cubed import from_array
 
-        from xarray.core import indexing
-
-        # cubed-specific kwargs
+        # Extract cubed-specific kwargs.
+        # Also ignores dask-specific kwargs that are passed in.
+        # The passing of dask-specific kwargs to cubed should be eventually removed by deprecating them
+        # as explicit arguments to xarray methods
         spec = kwargs.pop("spec", None)
 
-        if isinstance(data, Array):
-            data = data.rechunk(chunks)
-        elif is_duck_dask_array(data):
-            raise TypeError("Trying to rechunk a dask array using cubed")
-        else:
-            if isinstance(data, indexing.ExplicitlyIndexed):
-                # Unambiguously handle array storage backends (like NetCDF4 and h5py)
-                # that can't handle general array indexing. For example, in netCDF4 you
-                # can do "outer" indexing along two dimensions independent, which works
-                # differently from how NumPy handles it.
-                # da.from_array works by using lazy indexing with a tuple of slices.
-                # Using OuterIndexer is a pragmatic choice: dask does not yet handle
-                # different indexing types in an explicit way:
-                # https://github.com/dask/dask/issues/2883
-                data = indexing.ImplicitToExplicitIndexingAdapter(
-                    data, indexing.OuterIndexer
-                )
-
-            if utils.is_dict_like(chunks):
-                chunks = tuple(chunks.get(n, s) for n, s in enumerate(data.shape))
-
-            data = from_array(
-                data,
-                chunks,
-                spec=spec,
-            )
-
-        return data
+        return from_array(
+            data,
+            chunks,
+            spec=spec,
+        )
 
     def rechunk(self, data: "CubedArray", chunks, **kwargs) -> "CubedArray":
         return data.rechunk(chunks, **kwargs)