make new methods private

Author: d-v-b

src/zarr/abc/store.py

@@ -209,7 +209,7 @@ async def get(
         """
         ...
 
-    async def get_bytes(
+    async def _get_bytes(
         self, key: str, *, prototype: BufferPrototype, byte_range: ByteRequest | None = None
     ) -> bytes:
         """
@@ -257,7 +257,7 @@ async def get_bytes(
             raise FileNotFoundError(key)
         return buffer.to_bytes()
 
-    def get_bytes_sync(
+    def _get_bytes_sync(
         self, key: str = "", *, prototype: BufferPrototype, byte_range: ByteRequest | None = None
     ) -> bytes:
         """
@@ -306,9 +306,9 @@ def get_bytes_sync(
         b'hello world'
         """
 
-        return sync(self.get_bytes(key, prototype=prototype, byte_range=byte_range))
+        return sync(self._get_bytes(key, prototype=prototype, byte_range=byte_range))
 
-    async def get_json(
+    async def _get_json(
         self, key: str, *, prototype: BufferPrototype, byte_range: ByteRequest | None = None
     ) -> Any:
         """
@@ -356,9 +356,9 @@ async def get_json(
         {'zarr_format': 3, 'node_type': 'array'}
         """
 
-        return json.loads(await self.get_bytes(key, prototype=prototype, byte_range=byte_range))
+        return json.loads(await self._get_bytes(key, prototype=prototype, byte_range=byte_range))
 
-    def get_json_sync(
+    def _get_json_sync(
         self, key: str = "", *, prototype: BufferPrototype, byte_range: ByteRequest | None = None
     ) -> Any:
         """
@@ -412,7 +412,7 @@ def get_json_sync(
         {'zarr_format': 3, 'node_type': 'array'}
         """
 
-        return sync(self.get_json(key, prototype=prototype, byte_range=byte_range))
+        return sync(self._get_json(key, prototype=prototype, byte_range=byte_range))
 
     @abstractmethod
     async def get_partial_values(

src/zarr/storage/_local.py

@@ -306,7 +306,7 @@ async def list_dir(self, prefix: str) -> AsyncIterator[str]:
         except (FileNotFoundError, NotADirectoryError):
             pass
 
-    async def get_bytes(
+    async def _get_bytes(
         self,
         key: str = "",
         *,
@@ -356,9 +356,9 @@ async def get_bytes(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return await super().get_bytes(key, prototype=prototype, byte_range=byte_range)
+        return await super()._get_bytes(key, prototype=prototype, byte_range=byte_range)
 
-    def get_bytes_sync(
+    def _get_bytes_sync(
         self,
         key: str = "",
         *,
@@ -412,9 +412,9 @@ def get_bytes_sync(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return super().get_bytes_sync(key, prototype=prototype, byte_range=byte_range)
+        return super()._get_bytes_sync(key, prototype=prototype, byte_range=byte_range)
 
-    async def get_json(
+    async def _get_json(
         self,
         key: str = "",
         *,
@@ -471,9 +471,9 @@ async def get_json(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return await super().get_json(key, prototype=prototype, byte_range=byte_range)
+        return await super()._get_json(key, prototype=prototype, byte_range=byte_range)
 
-    def get_json_sync(
+    def _get_json_sync(
         self,
         key: str = "",
         *,
@@ -534,7 +534,7 @@ def get_json_sync(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return super().get_json_sync(key, prototype=prototype, byte_range=byte_range)
+        return super()._get_json_sync(key, prototype=prototype, byte_range=byte_range)
 
     async def move(self, dest_root: Path | str) -> None:
         """

src/zarr/storage/_memory.py

@@ -175,7 +175,7 @@ async def list_dir(self, prefix: str) -> AsyncIterator[str]:
         for key in keys_unique:
             yield key
 
-    async def get_bytes(
+    async def _get_bytes(
         self,
         key: str = "",
         *,
@@ -225,9 +225,9 @@ async def get_bytes(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return await super().get_bytes(key, prototype=prototype, byte_range=byte_range)
+        return await super()._get_bytes(key, prototype=prototype, byte_range=byte_range)
 
-    def get_bytes_sync(
+    def _get_bytes_sync(
         self,
         key: str = "",
         *,
@@ -281,9 +281,9 @@ def get_bytes_sync(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return super().get_bytes_sync(key, prototype=prototype, byte_range=byte_range)
+        return super()._get_bytes_sync(key, prototype=prototype, byte_range=byte_range)
 
-    async def get_json(
+    async def _get_json(
         self,
         key: str = "",
         *,
@@ -340,9 +340,9 @@ async def get_json(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return await super().get_json(key, prototype=prototype, byte_range=byte_range)
+        return await super()._get_json(key, prototype=prototype, byte_range=byte_range)
 
-    def get_json_sync(
+    def _get_json_sync(
         self,
         key: str = "",
         *,
@@ -403,7 +403,7 @@ def get_json_sync(
         """
         if prototype is None:
             prototype = default_buffer_prototype()
-        return super().get_json_sync(key, prototype=prototype, byte_range=byte_range)
+        return super()._get_json_sync(key, prototype=prototype, byte_range=byte_range)
 
 
 class GpuMemoryStore(MemoryStore):

src/zarr/testing/store.py

@@ -534,9 +534,9 @@ async def test_get_bytes(self, store: S) -> None:
         data = b"hello world"
         key = "zarr.json"
         await self.set(store, key, self.buffer_cls.from_bytes(data))
-        assert await store.get_bytes(key, prototype=default_buffer_prototype()) == data
+        assert await store._get_bytes(key, prototype=default_buffer_prototype()) == data
         with pytest.raises(FileNotFoundError):
-            await store.get_bytes("nonexistent_key", prototype=default_buffer_prototype())
+            await store._get_bytes("nonexistent_key", prototype=default_buffer_prototype())
 
     def test_get_bytes_sync(self, store: S) -> None:
         """
@@ -545,7 +545,7 @@ def test_get_bytes_sync(self, store: S) -> None:
         data = b"hello world"
         key = "zarr.json"
         sync(self.set(store, key, self.buffer_cls.from_bytes(data)))
-        assert store.get_bytes_sync(key, prototype=default_buffer_prototype()) == data
+        assert store._get_bytes_sync(key, prototype=default_buffer_prototype()) == data
 
     async def test_get_json(self, store: S) -> None:
         """
@@ -555,7 +555,7 @@ async def test_get_json(self, store: S) -> None:
         data_bytes = json.dumps(data).encode("utf-8")
         key = "zarr.json"
         await self.set(store, key, self.buffer_cls.from_bytes(data_bytes))
-        assert await store.get_json(key, prototype=default_buffer_prototype()) == data
+        assert await store._get_json(key, prototype=default_buffer_prototype()) == data
 
     def test_get_json_sync(self, store: S) -> None:
         """
@@ -565,7 +565,7 @@ def test_get_json_sync(self, store: S) -> None:
         data_bytes = json.dumps(data).encode("utf-8")
         key = "zarr.json"
         sync(self.set(store, key, self.buffer_cls.from_bytes(data_bytes)))
-        assert store.get_json_sync(key, prototype=default_buffer_prototype()) == data
+        assert store._get_json_sync(key, prototype=default_buffer_prototype()) == data
 
 
 class LatencyStore(WrapperStore[Store]):

tests/test_store/test_local.py

@@ -123,7 +123,7 @@ async def test_get_bytes_with_prototype_none(
         key = "test_key"
         await self.set(store, key, self.buffer_cls.from_bytes(data))
 
-        result = await store.get_bytes(key, prototype=buffer_cls)
+        result = await store._get_bytes(key, prototype=buffer_cls)
         assert result == data
 
     @pytest.mark.parametrize("buffer_cls", [None, cpu.buffer_prototype])
@@ -135,7 +135,7 @@ def test_get_bytes_sync_with_prototype_none(
         key = "test_key"
         sync(self.set(store, key, self.buffer_cls.from_bytes(data)))
 
-        result = store.get_bytes_sync(key, prototype=buffer_cls)
+        result = store._get_bytes_sync(key, prototype=buffer_cls)
         assert result == data
 
     @pytest.mark.parametrize("buffer_cls", [None, cpu.buffer_prototype])
@@ -147,7 +147,7 @@ async def test_get_json_with_prototype_none(
         key = "test.json"
         await self.set(store, key, self.buffer_cls.from_bytes(json.dumps(data).encode()))
 
-        result = await store.get_json(key, prototype=buffer_cls)
+        result = await store._get_json(key, prototype=buffer_cls)
         assert result == data
 
     @pytest.mark.parametrize("buffer_cls", [None, cpu.buffer_prototype])
@@ -159,7 +159,7 @@ def test_get_json_sync_with_prototype_none(
         key = "test.json"
         sync(self.set(store, key, self.buffer_cls.from_bytes(json.dumps(data).encode())))
 
-        result = store.get_json_sync(key, prototype=buffer_cls)
+        result = store._get_json_sync(key, prototype=buffer_cls)
         assert result == data
 
 

tests/test_store/test_memory.py

@@ -88,7 +88,7 @@ async def test_get_bytes_with_prototype_none(
         key = "test_key"
         await self.set(store, key, self.buffer_cls.from_bytes(data))
 
-        result = await store.get_bytes(key, prototype=buffer_cls)
+        result = await store._get_bytes(key, prototype=buffer_cls)
         assert result == data
 
     @pytest.mark.parametrize("buffer_cls", [None, cpu.buffer_prototype])
@@ -100,7 +100,7 @@ def test_get_bytes_sync_with_prototype_none(
         key = "test_key"
         sync(self.set(store, key, self.buffer_cls.from_bytes(data)))
 
-        result = store.get_bytes_sync(key, prototype=buffer_cls)
+        result = store._get_bytes_sync(key, prototype=buffer_cls)
         assert result == data
 
     @pytest.mark.parametrize("buffer_cls", [None, cpu.buffer_prototype])
@@ -112,7 +112,7 @@ async def test_get_json_with_prototype_none(
         key = "test.json"
         await self.set(store, key, self.buffer_cls.from_bytes(json.dumps(data).encode()))
 
-        result = await store.get_json(key, prototype=buffer_cls)
+        result = await store._get_json(key, prototype=buffer_cls)
         assert result == data
 
     @pytest.mark.parametrize("buffer_cls", [None, cpu.buffer_prototype])
@@ -124,7 +124,7 @@ def test_get_json_sync_with_prototype_none(
         key = "test.json"
         sync(self.set(store, key, self.buffer_cls.from_bytes(json.dumps(data).encode())))
 
-        result = store.get_json_sync(key, prototype=buffer_cls)
+        result = store._get_json_sync(key, prototype=buffer_cls)
         assert result == data