fix: cleanups

Author: ilan-gold

python/zarrs/_internal.pyi

@@ -7,10 +7,6 @@ import typing
 import numpy.typing
 import zarr.abc.store
 
-@typing.final
-class Basic:
-    def __new__(cls, byte_interface: typing.Any, chunk_spec: typing.Any) -> Basic: ...
-
 @typing.final
 class CodecPipelineImpl:
     def __new__(
@@ -40,8 +36,9 @@ class CodecPipelineImpl:
 class WithSubset:
     def __new__(
         cls,
-        item: Basic,
+        key: builtins.str,
         chunk_subset: typing.Sequence[slice],
+        chunk_shape: typing.Sequence[builtins.int],
         subset: typing.Sequence[slice],
         shape: typing.Sequence[builtins.int],
     ) -> WithSubset: ...

src/chunk_item.rs

@@ -11,32 +11,6 @@ use zarrs::{array_subset::ArraySubset, storage::StoreKey};
 
 use crate::utils::PyErrExt;
 
-pub fn fill_value_to_bytes(dtype: &str, fill_value: &Bound<'_, PyAny>) -> PyResult<Vec<u8>> {
-    if dtype == "string" {
-        // Match zarr-python 2.x.x string fill value behaviour with a 0 fill value
-        // See https://github.com/zarr-developers/zarr-python/issues/2792#issuecomment-2644362122
-        if let Ok(fill_value_downcast) = fill_value.cast::<PyInt>() {
-            let fill_value_usize: usize = fill_value_downcast.extract()?;
-            if fill_value_usize == 0 {
-                return Ok(vec![]);
-            }
-            Err(PyErr::new::<PyValueError, _>(format!(
-                "Cannot understand non-zero integer {fill_value_usize} fill value for dtype {dtype}"
-            )))?;
-        }
-    }
-
-    if let Ok(fill_value_downcast) = fill_value.cast::<PyBytes>() {
-        Ok(fill_value_downcast.as_bytes().to_vec())
-    } else if fill_value.hasattr("tobytes")? {
-        Ok(fill_value.call_method0("tobytes")?.extract()?)
-    } else {
-        Err(PyErr::new::<PyValueError, _>(format!(
-            "Unsupported fill value {fill_value:?}"
-        )))
-    }
-}
-
 #[derive(Clone)]
 #[gen_stub_pyclass]
 #[pyclass]

src/lib.rs

@@ -28,12 +28,7 @@ use zarrs::array::{
 };
 use zarrs::array_subset::ArraySubset;
 use zarrs::config::global_config;
-use zarrs::convert::{
-    ArrayMetadataV2ToV3Error, array_metadata_v2_to_v3, codec_metadata_v2_to_v3,
-    data_type_metadata_v2_to_v3, fill_value_metadata_v2_to_v3,
-};
-use zarrs::metadata::v2::data_type_metadata_v2_to_endianness;
-use zarrs::metadata::v3::MetadataV3;
+use zarrs::convert::array_metadata_v2_to_v3;
 use zarrs::storage::{ReadableWritableListableStorage, StorageHandle, StoreKey};
 
 mod chunk_item;
@@ -44,7 +39,6 @@ mod store;
 mod tests;
 mod utils;
 
-use crate::chunk_item::fill_value_to_bytes;
 use crate::concurrency::ChunkConcurrentLimitAndCodecOptions;
 use crate::store::StoreConfig;
 use crate::utils::{PyCodecErrExt, PyErrExt as _, PyUntypedArrayExt as _};