Remove re-export from __init__.py

Author: kylebarron

docs/user-guide/storage.rst

@@ -103,20 +103,22 @@ Object Store
 ~~~~~~~~~~~~
 
 
-:class:`zarr.storage.ObjectStore` stores the contents of the Zarr hierarchy using any ObjectStore
+:class:`zarr.storage.obstore.ObjectStore` stores the contents of the Zarr hierarchy using any ObjectStore
 `storage implementation <https://developmentseed.org/obstore/latest/api/store/>`_, such as
 AWS S3, Google Cloud Storage, and Azure Blob Storage. This store is backed by `obstore <https://developmentseed.org/obstore/latest/>`_, which
 builds on the production quality Rust library `object_store <https://docs.rs/object_store/latest/object_store/>`_.
 
 
+   >>> from zarr.storage.obstore import ObjectStore
    >>> from obstore.store import MemoryStore
-   >>> store = zarr.storage.ObjectStore(MemoryStore())
+   >>>
+   >>> store = ObjectStore(MemoryStore())
    >>> zarr.create_array(store=store, shape=(2,), dtype='float64')
    <Array object://... shape=(2,) dtype=float64>
 
 
 .. warning::
-   The :class:`zarr.storage.ObjectStore` class is experimental.
+   The :class:`zarr.storage.obstore.ObjectStore` class is experimental.
 
 .. _user-guide-custom-stores:
 

src/zarr/storage/__init__.py

@@ -8,7 +8,6 @@
 from zarr.storage._local import LocalStore
 from zarr.storage._logging import LoggingStore
 from zarr.storage._memory import GpuMemoryStore, MemoryStore
-from zarr.storage._object import ObjectStore
 from zarr.storage._wrapper import WrapperStore
 from zarr.storage._zip import ZipStore
 
@@ -18,7 +17,6 @@
     "LocalStore",
     "LoggingStore",
     "MemoryStore",
-    "ObjectStore",
     "StoreLike",
     "StorePath",
     "WrapperStore",

src/zarr/storage/_object.py renamed to src/zarr/storage/obstore.py

@@ -5,7 +5,7 @@
 import pickle
 from collections import defaultdict
 from collections.abc import Iterable
-from typing import TYPE_CHECKING, Any, TypedDict, TypeVar
+from typing import TYPE_CHECKING, Any, TypedDict
 
 import obstore as obs
 from obstore.store import (
@@ -37,14 +37,14 @@
     from zarr.core.buffer import BufferPrototype
     from zarr.core.common import BytesLike
 
-ALLOWED_EXCEPTIONS: tuple[type[Exception], ...] = (
+__all__ = ["ObjectStore"]
+
+_ALLOWED_EXCEPTIONS: tuple[type[Exception], ...] = (
     FileNotFoundError,
     IsADirectoryError,
     NotADirectoryError,
 )
 
-S = TypeVar("S", bound=Store)
-
 
 class ObjectStore(Store):
     """A Zarr store that uses obstore for fast read/write from AWS, GCP, Azure.
@@ -175,7 +175,7 @@ async def get(
                 return prototype.buffer.from_bytes(await resp.bytes_async())  # type: ignore[arg-type]
             else:
                 raise ValueError(f"Unexpected byte_range, got {byte_range}")
-        except ALLOWED_EXCEPTIONS:
+        except _ALLOWED_EXCEPTIONS:
             return None
 
     async def get_partial_values(