Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ dependencies = [
"networkx",
"numba>=0.55.0",
"numpy",
"ome_zarr>=0.12.2",
"ome_zarr>=0.14.0",
"pandas",
"pooch",
"pyarrow",
Expand Down
9 changes: 2 additions & 7 deletions src/spatialdata/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
from importlib.metadata import version
from typing import TYPE_CHECKING, Any

import spatialdata.models._accessor # noqa: F401

__version__ = version("spatialdata")

_submodules = {
Expand DownExpand Up@@ -129,15 +131,8 @@
"settings",
]

_accessor_loaded = False


def __getattr__(name: str) -> Any:
global _accessor_loaded
if not _accessor_loaded:
_accessor_loaded = True
import spatialdata.models._accessor # noqa: F401

if name in _submodules:
return importlib.import_module(f"spatialdata.{name}")
if name in _LAZY_IMPORTS:
Expand Down
140 changes: 129 additions & 11 deletions src/spatialdata/_io/io_raster.py
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
from __future__ import annotations

from collections.abc import Sequence
from pathlib import Path
from typing import Any, Literal
from typing import Any, Literal, TypeGuard

import dask.array as da
import numpy as np
Expand DownExpand Up@@ -38,6 +39,126 @@
)


def _is_flat_int_sequence(value: object) -> TypeGuard[Sequence[int]]:
# e.g. "", "auto" or b"auto"
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return all(isinstance(v, int) for v in value)


def _is_dask_chunk_grid(value: object) -> TypeGuard[Sequence[Sequence[int]]]:
if isinstance(value, str | bytes):
return False
if not isinstance(value, Sequence):
return False
return len(value) > 0 and all(_is_flat_int_sequence(axis_chunks) for axis_chunks in value)


def _is_regular_dask_chunk_grid(chunk_grid: Sequence[Sequence[int]]) -> bool:
"""Check whether a Dask chunk grid is regular (zarr-compatible).

A grid is regular when every axis has at most one unique chunk size among all but the last
chunk, and the last chunk is not larger than the first.

Parameters
----------
chunk_grid
Per-axis tuple of chunk sizes, for instance as returned by ``dask_array.chunks``.

Examples
--------
Triggers ``continue`` on the first ``if`` (single or empty axis):

>>> _is_regular_dask_chunk_grid([(4,)]) # single chunk → True
True
>>> _is_regular_dask_chunk_grid([()]) # empty axis → True
True

Triggers the first ``return False`` (non-uniform interior chunks):

>>> _is_regular_dask_chunk_grid([(4, 4, 3, 4)]) # interior sizes differ → False
False

Triggers the second ``return False`` (last chunk larger than the first):

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 5)]) # last > first → False
False

Exits with ``return True``:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 4)]) # all equal → True
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1)]) # last < first → True
True

Empty grid (loop never executes) → True:

>>> _is_regular_dask_chunk_grid([])
True

Multi-axis: all axes regular → True; one axis irregular → False:

>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (3, 3, 2)])
True
>>> _is_regular_dask_chunk_grid([(4, 4, 4, 1), (4, 4, 3, 4)])
False
"""
# Match Dask's private _check_regular_chunks() logic without depending on its internal API.
for axis_chunks in chunk_grid:
if len(axis_chunks) <= 1:
continue
if len(set(axis_chunks[:-1])) > 1:
return False
if axis_chunks[-1] > axis_chunks[0]:
return False
return True
Comment on lines +59 to +116

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a docstring with examples (or examples in-line with the code) to show what fails and what not.

I would add the following:
triggers the continue in the first if:

  • [(4,)]
  • [()]

triggers the first return False

  • [(4, 4, 3, 4)]

triggers the second return False

  • [(4, 4, 4, 5)]

exits with the last return True

  • [(4, 4, 4, 4)], succeeds, all chunks equal
  • [(4, 4, 4, 1)], succeeds, final chunk is < of the initial one

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also: I would add all the examples above in a test, for the function _is_regular_dask_chunk_grid().

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added docstring and tests here: 2450bd4



def _chunks_to_zarr_chunks(chunks: object) -> tuple[int, ...] | int | None:
if isinstance(chunks, int):
return chunks
if _is_flat_int_sequence(chunks):
return tuple(chunks)
if _is_dask_chunk_grid(chunks):
chunk_grid = tuple(tuple(axis_chunks) for axis_chunks in chunks)
if _is_regular_dask_chunk_grid(chunk_grid):
return tuple(axis_chunks[0] for axis_chunks in chunk_grid)
return None
return None


def _normalize_explicit_chunks(chunks: object) -> tuple[int, ...] | int:
normalized = _chunks_to_zarr_chunks(chunks)
if normalized is None:
raise ValueError(
'storage_options["chunks"] must resolve to a Zarr chunk shape or a regular Dask chunk grid. '
"The current raster has irregular Dask chunks, which cannot be written to Zarr. "
"To fix this, rechunk before writing, for example by passing regular chunks=... "
"to Image2DModel.parse(...) / Labels2DModel.parse(...)."
)
return normalized


def _prepare_storage_options(
storage_options: JSONDict | list[JSONDict] | None,
) -> JSONDict | list[JSONDict] | None:
if storage_options is None:
return None
if isinstance(storage_options, dict):
prepared = dict(storage_options)
if "chunks" in prepared:
prepared["chunks"] = _normalize_explicit_chunks(prepared["chunks"])
return prepared

prepared_options = [dict(options) for options in storage_options]
for options in prepared_options:
if "chunks" in options:
options["chunks"] = _normalize_explicit_chunks(options["chunks"])
return prepared_options


def _read_multiscale(
store: str | Path, raster_type: Literal["image", "labels"], reader_format: Format
) -> DataArray | DataTree:
Expand DownExpand Up@@ -251,20 +372,18 @@ def _write_raster_dataarray(
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
input_axes: tuple[str, ...] = tuple(raster_data.dims)
chunks = raster_data.chunks
parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
if storage_options is not None:
if "chunks" not in storage_options and isinstance(storage_options, dict):
storage_options["chunks"] = chunks
else:
storage_options = {"chunks": chunks}
# Scaler needs to be None since we are passing the data already downscaled for the multiscale case.
# We need this because the argument of write_image_ngff is called image while the argument of
storage_options = _prepare_storage_options(storage_options)
# Explicitly disable pyramid generation for single-scale rasters. Recent ome-zarr versions default
# write_image()/write_labels() to scale_factors=(2, 4, 8, 16), which would otherwise write s0, s1, ...
# even when the input is a plain DataArray.
# We need this because the argument of write_image_ngff is called image while the argument of
# write_labels_ngff is called label.
metadata[raster_type] = data
ome_zarr_format = get_ome_zarr_format(raster_format)
write_single_scale_ngff(
group=group,
scale_factors=[],
scaler=None,
fmt=ome_zarr_format,
axes=parsed_axes,
Expand DownExpand Up@@ -322,10 +441,9 @@ def _write_raster_datatree(
transformations = _get_transformations_xarray(xdata)
if transformations is None:
raise ValueError(f"{element_name} does not have any transformations and can therefore not be written.")
chunks = get_pyramid_levels(raster_data, "chunks")

parsed_axes = _get_valid_axes(axes=list(input_axes), fmt=raster_format)
storage_options = [{"chunks": chunk} for chunk in chunks]
storage_options = _prepare_storage_options(storage_options)
ome_zarr_format = get_ome_zarr_format(raster_format)
dask_delayed = write_multi_scale_ngff(
pyramid=data,
Expand Down
20 changes: 10 additions & 10 deletions tests/io/test_partial_read.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,9 +184,9 @@ def sdata_with_corrupted_image_chunks_zarrv3(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -206,9 +206,9 @@ def sdata_with_corrupted_image_chunks_zarrv2(session_tmp_path: Path) -> PartialR
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
(sdata_path / "images" / corrupted / "0").touch()
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray") # it will hide the "0" array from the Zarr reader
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")
(sdata_path / "images" / corrupted / "s0").touch()
not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

return PartialReadTestCase(
Expand DownExpand Up@@ -315,8 +315,8 @@ def sdata_with_missing_image_chunks_zarrv3(
sdata.write(sdata_path)

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / "zarr.json")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand All@@ -339,8 +339,8 @@ def sdata_with_missing_image_chunks_zarrv2(
sdata.write(sdata_path, sdata_formats=SpatialDataContainerFormatV01())

corrupted = "blobs_image"
os.unlink(sdata_path / "images" / corrupted / "0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "0", sdata_path / "images" / corrupted / "0_corrupted")
os.unlink(sdata_path / "images" / corrupted / "s0" / ".zarray")
os.rename(sdata_path / "images" / corrupted / "s0", sdata_path / "images" / corrupted / "s0_corrupted")

not_corrupted = [name for _, name, _ in sdata.gen_elements() if name != corrupted]

Expand Down
Loading