fixup

Author: TomAugspurger

src/zarr/_info.py

@@ -57,7 +57,7 @@ def human_readable_size(size: int) -> str:
 
 def byte_info(size: int) -> str:
     if size < 2**10:
-        return size
+        return str(size)
     else:
         return f"{size} ({human_readable_size(size)})"
 
@@ -67,8 +67,8 @@ class ArrayInfo:
     type: Literal["Array"] = "Array"
     zarr_format: Literal[2, 3]
     data_type: str
-    shape: tuple[int,]
-    chunk_shape: tuple[int,]
+    shape: tuple[int, ...]
+    chunk_shape: tuple[int, ...] | None = None
     order: Literal["C", "F"]
     read_only: bool
     store_type: str
@@ -91,6 +91,9 @@ def __repr__(self) -> str:
         Store type         : {store_type}""")
 
         kwargs = dataclasses.asdict(self)
+        if self.chunk_shape is None:
+            # for non-regular chunk grids
+            kwargs["chunk_shape"] = "<variable>"
         if self.compressor is not None:
             template += "\nCompressor         : {compressor}"
 

src/zarr/core/array.py

@@ -1148,27 +1148,39 @@ def __repr__(self) -> str:
 
     @property
     def info(self) -> ArrayInfo:
-        kwargs = {}
+        return self._info()
+
+    async def info_complete(self) -> ArrayInfo:
+        # do the I/O to get the extra
+        extra: dict[str, int] = {}
+        return self._info(extra=extra)
+
+    def _info(self, extra: dict[str, int] | None = None) -> ArrayInfo:
+        kwargs: dict[str, Any] = {}
         if self.metadata.zarr_format == 2:
-            kwargs["compressor"] = self.metadata.compressor
-            kwargs["filters"] = self.metadata.filters
+            assert isinstance(self.metadata, ArrayV2Metadata)
+            if self.metadata.compressor is not None:
+                kwargs["compressor"] = str(self.metadata.compressor)
+            if self.metadata.filters is not None:
+                kwargs["filters"] = str(self.metadata.filters)
+            kwargs["data_type"] = str(self.metadata.dtype)
+            kwargs["chunks"] = self.metadata.chunks
         else:
-            kwargs["codecs"] = self.metadata.codecs
+            kwargs["codecs"] = str(self.metadata.codecs)
+            kwargs["data_type"] = str(self.metadata.data_type)
+            # just regular?
+            if isinstance(self.metadata.chunk_grid, RegularChunkGrid):
+                kwargs["chunks"] = self.metadata.chunk_grid.chunk_shape
 
         return ArrayInfo(
             zarr_format=self.metadata.zarr_format,
-            data_type=self.metadata.data_type,
             shape=self.shape,
-            chunk_shape=self.metadata.chunk_grid.chunk_shape,
             order=self.order,
             read_only=self.store_path.store.mode.readonly,
             store_type=type(self.store_path.store).__name__,
-            **kwargs
+            **kwargs,
         )
 
-    async def info_full(self) -> None:
-        return ArrayInfo()
-
 
 @dataclass(frozen=True)
 class Array:
@@ -2844,7 +2856,7 @@ def info(self) -> ArrayInfo:
         return self._async_array.info
 
     def info_complete(self) -> ArrayInfo:
-        return sync(self._async_array.info_complete)
+        return sync(self._async_array.info_complete())
 
 
 def nchunks_initialized(

src/zarr/core/group.py

@@ -825,7 +825,8 @@ def _info(
             read_only=self.store_path.store.mode.readonly,
             store_type=type(self.store_path.store).__name__,
             zarr_format=self.metadata.zarr_format,
-            **kwargs,
+            # maybe do a typeddict
+            **kwargs,  # type: ignore[arg-type]
         )
 
     @property

tests/v3/test_info.py

@@ -1,11 +1,9 @@
 import textwrap
-from typing import Literal
 
 import pytest
 
-from zarr.core.common import ZarrFormat
 from zarr._info import ArrayInfo, GroupInfo
-
+from zarr.core.common import ZarrFormat
 
 ZARR_FORMATS = [2, 3]
 
@@ -48,7 +46,7 @@ def test_group_info_complete(zarr_format: ZarrFormat) -> None:
 
 
 @pytest.mark.parametrize("zarr_format", ZARR_FORMATS)
-def test_array_info(zarr_format: ZarrFormat):
+def test_array_info(zarr_format: ZarrFormat) -> None:
     info = ArrayInfo(
         zarr_format=zarr_format,
         data_type="int32",
@@ -73,10 +71,10 @@ def test_array_info(zarr_format: ZarrFormat):
 
 
 @pytest.mark.parametrize("zarr_format", ZARR_FORMATS)
-@pytest.mark.parametrize("bytes_things", [(1_000_000, "976.6K", 500_000, "5", "2.0", 5)])
+@pytest.mark.parametrize("bytes_things", [(1_000_000, "976.6K", 500_000, "500000", "2.0", 5)])
 def test_array_info_complete(
     zarr_format: ZarrFormat, bytes_things: tuple[int, str, int, str, str, int]
-):
+) -> None:
     (
         count_bytes,
         count_bytes_formatted,
@@ -109,7 +107,7 @@ def test_array_info_complete(
         Read-only          : True
         Store type         : MemoryStore
         Codecs             : ["BytesCodec(endian=<Endian.little: 'little'>"]
-        No. bytes          : 1000000 (976.6K)
-        No. bytes stored   : 500000
-        Storage ratio      : 2.0
+        No. bytes          : {count_bytes} ({count_bytes_formatted})
+        No. bytes stored   : {count_bytes_stored_formatted}
+        Storage ratio      : {storage_ratio_formatted}
         Chunks Initialized : 5""")