Move metadata handling to a class (updated)

zarr/_storage/store.py

@@ -1,6 +1,7 @@
 from collections.abc import MutableMapping
 from typing import Any, List, Optional, Union
 
+from zarr.meta import Metadata2
 from zarr.util import normalize_storage_path
 
 # v2 store keys
@@ -32,6 +33,8 @@ class BaseStore(MutableMapping):
     _writeable = True
     _erasable = True
     _listable = True
+    _store_version = 2
+    _metadata_class = Metadata2
 
     def is_readable(self):
         return self._readable
@@ -114,6 +117,7 @@ class Store(BaseStore):
     .. added: 2.11.0
 
     """
+
     def listdir(self, path: str = "") -> List[str]:
         path = normalize_storage_path(path)
         return _listdir_from_keys(self, path)

zarr/attrs.py

@@ -1,6 +1,5 @@
 from collections.abc import MutableMapping
 
-from zarr.meta import parse_metadata
 from zarr._storage.store import Store
 from zarr.util import json_dumps
 
@@ -40,7 +39,7 @@ def _get_nosync(self):
         except KeyError:
             d = dict()
         else:
-            d = parse_metadata(data)
+            d = self.store._metadata_class.parse_metadata(data)
         return d
 
     def asdict(self):

zarr/core.py

@@ -31,7 +31,6 @@
     is_scalar,
     pop_fields,
 )
-from zarr.meta import decode_array_metadata, encode_array_metadata
 from zarr.storage import array_meta_key, attrs_key, getsize, listdir, BaseStore
 from zarr.util import (
     all_equal,
@@ -210,7 +209,7 @@ def _load_metadata_nosync(self):
         else:
 
             # decode and store metadata as instance members
-            meta = decode_array_metadata(meta_bytes)
+            meta = self._store._metadata_class.decode_array_metadata(meta_bytes)
             self._meta = meta
             self._shape = meta['shape']
             self._chunks = meta['chunks']
@@ -267,7 +266,7 @@ def _flush_metadata_nosync(self):
                     compressor=compressor_config, fill_value=self._fill_value,
                     order=self._order, filters=filters_config)
         mkey = self._key_prefix + array_meta_key
-        self._store[mkey] = encode_array_metadata(meta)
+        self._store[mkey] = self._store._metadata_class.encode_array_metadata(meta)
 
     @property
     def store(self):

zarr/hierarchy.py

@@ -14,7 +14,6 @@
     GroupNotFoundError,
     ReadOnlyError,
 )
-from zarr.meta import decode_group_metadata
 from zarr.storage import (
     BaseStore,
     MemoryStore,
@@ -134,8 +133,7 @@ def __init__(self, store, path=None, read_only=False, chunk_store=None,
         except KeyError:
             raise GroupNotFoundError(path)
         else:
-            meta = decode_group_metadata(meta_bytes)
-            self._meta = meta
+            self._meta = self._store._metadata_class.decode_group_metadata(meta_bytes)
 
         # setup attributes
         akey = self._key_prefix + attrs_key