merged

Author: rabernat

src/zarr/core/metadata/v3.py

@@ -31,6 +31,8 @@
 from zarr.registry import get_codec_class
 from zarr.strings import STRING_DTYPE
 
+DEFAULT_DTYPE = "float64"
+
 
 def parse_zarr_format(data: object) -> Literal[3]:
     if data == 3:
@@ -184,14 +186,14 @@ def __init__(
         chunk_grid_parsed = ChunkGrid.from_dict(chunk_grid)
         chunk_key_encoding_parsed = ChunkKeyEncoding.from_dict(chunk_key_encoding)
         dimension_names_parsed = parse_dimension_names(dimension_names)
-        fill_value_parsed = parse_fill_value(fill_value, dtype=data_type_parsed.to_numpy_dtype())
+        fill_value_parsed = parse_fill_value(fill_value, dtype=data_type_parsed.to_numpy())
         attributes_parsed = parse_attributes(attributes)
         codecs_parsed_partial = parse_codecs(codecs)
         storage_transformers_parsed = parse_storage_transformers(storage_transformers)
 
         array_spec = ArraySpec(
             shape=shape_parsed,
-            dtype=data_type_parsed.to_numpy_dtype(),
+            dtype=data_type_parsed.to_numpy(),
             fill_value=fill_value_parsed,
             order="C",  # TODO: order is not needed here.
             prototype=default_buffer_prototype(),  # TODO: prototype is not needed here.
@@ -225,13 +227,13 @@ def _validate_metadata(self) -> None:
             raise ValueError("`fill_value` is required.")
         for codec in self.codecs:
             codec.validate(
-                shape=self.shape, dtype=self.data_type.to_numpy_dtype(), chunk_grid=self.chunk_grid
+                shape=self.shape, dtype=self.data_type.to_numpy(), chunk_grid=self.chunk_grid
             )
 
     @property
     def dtype(self) -> np.dtype[Any]:
         """Interpret Zarr dtype as NumPy dtype"""
-        return self.data_type.to_numpy_dtype()
+        return self.data_type.to_numpy()
 
     @property
     def ndim(self) -> int:
@@ -494,14 +496,14 @@ def to_numpy_shortname(self) -> str:
         }
         return data_type_to_numpy[self]
 
-    def to_numpy_dtype(self) -> np.dtype[Any]:
+    def to_numpy(self) -> np.dtype[Any]:
         if self == DataType.string:
             return STRING_DTYPE
         else:
             return np.dtype(self.to_numpy_shortname())
 
     @classmethod
-    def from_numpy_dtype(cls, dtype: np.dtype[Any]) -> DataType:
+    def from_numpy(cls, dtype: np.dtype[Any]) -> DataType:
         if np.issubdtype(np.str_, dtype):
             return DataType.string
         dtype_to_data_type = {
@@ -540,7 +542,7 @@ def parse(cls, dtype: None | DataType | Any) -> DataType:
             raise ValueError(f"Invalid V3 data_type: {dtype}") from e
         # check that this is a valid v3 data_type
         try:
-            data_type = DataType.from_numpy_dtype(dtype)
+            data_type = DataType.from_numpy(dtype)
         except KeyError as e:
             raise ValueError(f"Invalid V3 data_type: {dtype}") from e
         return data_type