Skip to content

Commit ddc49d9

Browse files
committed
Switch to ome-zarr-models
1 parent ecf2cbf commit ddc49d9

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
python-version: [3.9, "3.10", 3.11, 3.12]
40+
python-version: [3.11, 3.12, 3.13]
4141
os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
4242

4343
steps:

bioio/writers/ome_zarr_writer_2.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from dataclasses import asdict, dataclass
2+
from dataclasses import dataclass
33
from math import prod
44
from typing import Any, List, Tuple, Union
55

@@ -8,7 +8,12 @@
88
import numpy as np
99
import skimage.transform
1010
import zarr
11-
from ngff_zarr.zarr_metadata import Axis, Dataset, Metadata, Scale, Translation
11+
from ome_zarr_models.v04.axes import Axis
12+
from ome_zarr_models.v04.coordinate_transformations import (
13+
VectorScale,
14+
VectorTranslation,
15+
)
16+
from ome_zarr_models.v04.multiscales import Dataset, Multiscale
1217
from zarr.storage import DirectoryStore, FSStore, default_compressor
1318

1419
from bioio import BioImage
@@ -646,19 +651,23 @@ def generate_metadata(
646651
# TODO handle optional translations e.g. xy stage position,
647652
# start time etc
648653
translation.append(0.0)
649-
coordinateTransformations = [Scale(scale), Translation(translation)]
654+
coordinateTransformations = (
655+
VectorScale(type="scale", scale=scale),
656+
VectorTranslation(type="translation", translation=translation),
657+
)
650658
dataset = Dataset(
651659
path=path, coordinateTransformations=coordinateTransformations
652660
)
653661
datasets.append(dataset)
654-
metadata = Metadata(
662+
metadata = Multiscale(
663+
version=OME_NGFF_VERSION,
655664
axes=axes,
656665
datasets=datasets,
657666
name="/",
658667
coordinateTransformations=None,
659668
)
660669

661-
metadata_dict = asdict(metadata)
670+
metadata_dict = metadata.model_dump()
662671
metadata_dict = _pop_metadata_optionals(metadata_dict)
663672

664673
# get the total shape as dict:

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ authors = [
2222
classifiers = [
2323
"Development Status :: 4 - Beta",
2424
"Natural Language :: English",
25-
"Programming Language :: Python :: 3.9",
26-
"Programming Language :: Python :: 3.10",
2725
"Programming Language :: Python :: 3.11",
26+
"Programming Language :: Python :: 3.12",
27+
"Programming Language :: Python :: 3.13",
2828
]
2929
dynamic = ["version"]
3030
dependencies = [
3131
"bioio-base>=0.9.1",
3232
"dask[array]>=2021.4.1",
3333
"fsspec>=2022.8.0",
3434
"imageio[ffmpeg]>=2.11.0,<2.28.0",
35-
"ngff-zarr>=0.8.2",
3635
"numpy>=1.21.0,<2.0.0",
3736
"ome-types[lxml]>=0.4.0",
3837
"ome-zarr>=0.6.1",
38+
"ome-zarr-models>=0.1.1",
3939
# This version was revoked from PyPi, but in case of using a stale version
4040
# or a private package index, this will prevent usage
4141
"scikit-image!=0.23.0",

0 commit comments

Comments
 (0)