Updated config

Author: TomAugspurger

src/zarr/core/buffer/cpu.py

@@ -223,5 +223,5 @@ def numpy_buffer_prototype() -> core.BufferPrototype:
     return core.BufferPrototype(buffer=Buffer, nd_buffer=NDBuffer)
 
 
-register_buffer(Buffer)
-register_ndbuffer(NDBuffer)
+register_buffer(Buffer, qualname="zarr.buffer.cpu.Buffer")
+register_ndbuffer(NDBuffer, qualname="zarr.buffer.cpu.NDBuffer")

src/zarr/registry.py

@@ -45,8 +45,10 @@ def lazy_load(self) -> None:
             self.register(e.load())
         self.lazy_load_list.clear()
 
-    def register(self, cls: type[T]) -> None:
-        self[fully_qualified_name(cls)] = cls
+    def register(self, cls: type[T], qualname: str | None = None) -> None:
+        if qualname is None:
+            qualname = fully_qualified_name(cls)
+        self[qualname] = cls
 
 
 __codec_registries: dict[str, Registry[Codec]] = defaultdict(Registry)
@@ -123,12 +125,12 @@ def register_pipeline(pipe_cls: type[CodecPipeline]) -> None:
     __pipeline_registry.register(pipe_cls)
 
 
-def register_ndbuffer(cls: type[NDBuffer]) -> None:
-    __ndbuffer_registry.register(cls)
+def register_ndbuffer(cls: type[NDBuffer], qualname: str | None = None) -> None:
+    __ndbuffer_registry.register(cls, qualname)
 
 
-def register_buffer(cls: type[Buffer]) -> None:
-    __buffer_registry.register(cls)
+def register_buffer(cls: type[Buffer], qualname: str | None = None) -> None:
+    __buffer_registry.register(cls, qualname)
 
 
 def get_codec_class(key: str, reload_config: bool = False) -> type[Codec]:

tests/test_config.py

@@ -88,8 +88,8 @@ def test_config_defaults_set() -> None:
                 "path": "zarr.core.codec_pipeline.BatchedCodecPipeline",
                 "batch_size": 1,
             },
-            "buffer": "zarr.core.buffer.cpu.Buffer",
-            "ndbuffer": "zarr.core.buffer.cpu.NDBuffer",
+            "buffer": "zarr.buffer.cpu.Buffer",
+            "ndbuffer": "zarr.buffer.cpu.NDBuffer",
             "codecs": {
                 "blosc": "zarr.codecs.blosc.BloscCodec",
                 "gzip": "zarr.codecs.gzip.GzipCodec",
@@ -223,9 +223,6 @@ class NewBloscCodec(BloscCodec):
 
 @pytest.mark.parametrize("store", ["local", "memory"], indirect=["store"])
 def test_config_ndbuffer_implementation(store: Store) -> None:
-    # has default value
-    assert fully_qualified_name(get_ndbuffer_class()) == config.defaults[0]["ndbuffer"]
-
     # set custom ndbuffer with TestNDArrayLike implementation
     register_ndbuffer(NDBufferUsingTestNDArrayLike)
     with config.set({"ndbuffer": fully_qualified_name(NDBufferUsingTestNDArrayLike)}):
@@ -242,9 +239,6 @@ def test_config_ndbuffer_implementation(store: Store) -> None:
 
 
 def test_config_buffer_implementation() -> None:
-    # has default value
-    assert fully_qualified_name(get_buffer_class()) == config.defaults[0]["buffer"]
-
     arr = zeros(shape=(100), store=StoreExpectingTestBuffer())
 
     # AssertionError of StoreExpectingTestBuffer when not using my buffer