Merge branch 'main' into use-cached-attrs

* main:
  Couple fixes (zarr-developers#1737)
  Bump actions/setup-python from 5.0.0 to 5.1.0 (zarr-developers#1736)
  Optimize Array.info and Group.info (zarr-developers#1733)
  chore: update pre-commit hooks (zarr-developers#1738)

Author: dcherian

.github/workflows/releases.yml

@@ -16,7 +16,7 @@ jobs:
           submodules: true
           fetch-depth: 0
 
-      - uses: actions/setup-python@v5.0.0
+      - uses: actions/setup-python@v5.1.0
         name: Install Python
         with:
           python-version: '3.9'

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ default_language_version:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.3.4'
+    rev: 'v0.3.5'
     hooks:
     - id: ruff
   - repo: https://github.com/psf/black

docs/release.rst

@@ -21,6 +21,8 @@ Unreleased
 Enhancements
 ~~~~~~~~~~~~
 
+* Optimize ``Array.info`` so that it calls `getsize` only once.
+  By :user:`Deepak Cherian <dcherian>`.
 * Override IPython ``_repr_*_`` methods to avoid expensive lookups against object stores.
   By :user:`Deepak Cherian <dcherian>` :issue:`1716`.
 

zarr/_storage/store.py

@@ -462,7 +462,7 @@ def inner_store(self) -> Union["StorageTransformer", StoreV3]:
 
     def __eq__(self, other):
         return (
-            type(self) == type(other)
+            type(self) is type(other)
             and self._inner_store == other._inner_store
             and self.get_config() == other.get_config()
         )

zarr/core.py

@@ -181,7 +181,6 @@ def __init__(
         )
 
         # initialize info reporter
-        self._info_reporter = InfoReporter(self)
 
         # initialize indexing helpers
         self._oindex = OIndex(self)
@@ -2434,7 +2433,7 @@ def info(self):
         Chunks initialized : 0/10
 
         """
-        return self._info_reporter
+        return InfoReporter(self)
 
     def info_items(self):
         return self._synchronized_op(self._info_items_nosync)
@@ -2476,14 +2475,16 @@ def bytestr(n):
             items += [("Synchronizer type", typestr(self._synchronizer))]
 
         # storage info
+        nbytes = self.nbytes
+        nbytes_stored = self.nbytes_stored
         items += [("Store type", typestr(self._store))]
         if self._chunk_store is not None:
             items += [("Chunk store type", typestr(self._chunk_store))]
-        items += [("No. bytes", bytestr(self.nbytes))]
-        if self.nbytes_stored > 0:
+        items += [("No. bytes", bytestr(nbytes))]
+        if nbytes_stored > 0:
             items += [
-                ("No. bytes stored", bytestr(self.nbytes_stored)),
-                ("Storage ratio", f"{self.nbytes / self.nbytes_stored:.1f}"),
+                ("No. bytes stored", bytestr(nbytes_stored)),
+                ("Storage ratio", f"{nbytes / nbytes_stored:.1f}"),
             ]
         items += [("Chunks initialized", f"{self.nchunks_initialized}/{self.nchunks}")]
 

zarr/hierarchy.py

@@ -216,7 +216,6 @@ def __init__(
         )
 
         # setup info
-        self._info = InfoReporter(self)
 
     @property
     def store(self):
@@ -271,7 +270,7 @@ def attrs(self):
     @property
     def info(self):
         """Return diagnostic information about the group."""
-        return self._info
+        return InfoReporter(self)
 
     @property
     def meta_array(self):

zarr/tests/test_core.py

@@ -123,7 +123,7 @@ def create_array(self, shape: Union[int, Tuple[int, ...]], **kwargs):
             "compressor": kwargs.pop("compressor", self.compressor),
             "chunk_store": chunk_store,
             "storage_transformers": self.create_storage_transformers(shape),
-            "filters": kwargs.pop("filters", self.create_filters(kwargs.get("dtype", None))),
+            "filters": kwargs.pop("filters", self.create_filters(kwargs.get("dtype"))),
         }
 
         # keyword arguments for array instantiation

zarr/util.py

@@ -408,14 +408,13 @@ def info_html_report(items) -> str:
 class InfoReporter:
     def __init__(self, obj):
         self.obj = obj
+        self.items = self.obj.info_items()
 
     def __repr__(self):
-        items = self.obj.info_items()
-        return info_text_report(items)
+        return info_text_report(self.items)
 
     def _repr_html_(self):
-        items = self.obj.info_items()
-        return info_html_report(items)
+        return info_html_report(self.items)
 
 
 class TreeNode: