ngio 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

ngio/ome_zarr_meta/ngio_specs/_ngio_hcs.py

@@ -1,5 +1,7 @@
 """HCS (High Content Screening) specific metadata classes for NGIO."""
 
+from typing import Annotated
+
 from ome_zarr_models.v04.hcs import HCSAttrs
 from ome_zarr_models.v04.plate import (
     Acquisition,
@@ -8,12 +10,34 @@ from ome_zarr_models.v04.plate import (
     Row,
     WellInPlate,
 )
-from ome_zarr_models.v04.well import WellAttrs
-from ome_zarr_models.v04.well_types import WellImage, WellMeta
-from pydantic import BaseModel
-
-from ngio.ome_zarr_meta.ngio_specs._ngio_image import NgffVersion
-from ngio.utils import NgioValueError
+from ome_zarr_models.v04.well import WellAttrs as WellAttrs04
+from ome_zarr_models.v04.well_types import WellImage as WellImage04
+from ome_zarr_models.v04.well_types import WellMeta as WellMeta04
+from pydantic import BaseModel, SkipValidation, field_serializer
+
+from ngio.ome_zarr_meta.ngio_specs._ngio_image import DefaultNgffVersion, NgffVersions
+from ngio.utils import NgioValueError, ngio_logger
+
+
+def path_in_well_validation(path: str) -> str:
+    """Validate the path in the well."""
+    if path.find("_") != -1:
+        # Remove underscores from the path
+        # This is a custom serialization step
+        old_value = path
+        path = path.replace("_", "")
+        ngio_logger.warning(
+            f"Underscores in well-paths are not allowed. "
+            f"Path '{old_value}' was changed to '{path}'"
+            f" to comply with the specification."
+        )
+    # Check if the value contains only alphanumeric characters
+    if not path.isalnum():
+        raise NgioValueError(
+            f"Path '{path}' contains non-alphanumeric characters. "
+            f"Only alphanumeric characters are allowed."
+        )
+    return path
 
 
 class ImageInWellPath(BaseModel):
@@ -26,25 +50,55 @@ class ImageInWellPath(BaseModel):
     acquisition_name: str | None = None
 
 
-class NgioWellMeta(WellAttrs):
+class CustomWellImage(WellImage04):
+    path: Annotated[str, SkipValidation]
+
+    @field_serializer("path")
+    def serialize_path(self, value: str) -> str:
+        """Custom serialization for the path."""
+        return path_in_well_validation(value)
+
+
+class CustomWellMeta(WellMeta04):
+    images: list[CustomWellImage]  # type: ignore[valid-type]
+
+
+class CustomWellAttrs(WellAttrs04):
+    well: CustomWellMeta  # type: ignore[valid-type]
+
+
+class NgioWellMeta(CustomWellAttrs):
     """HCS well metadata."""
 
     @classmethod
     def default_init(
         cls,
-        images: list[ImageInWellPath] | None = None,
-        version: NgffVersion | None = None,
+        version: NgffVersions | None = None,
     ) -> "NgioWellMeta":
         if version is None:
-            version = "0.4"
-        well = cls(well=WellMeta(images=[], version=version))
-        if images is None:
-            return well
-
-        for image in images:
-            well = well.add_image(path=image.path, acquisition=image.acquisition_id)
+            version = DefaultNgffVersion
+        well = cls(well=CustomWellMeta(images=[], version=version))
         return well
 
+    @property
+    def acquisition_ids(self) -> list[int]:
+        """Return the acquisition ids in the well."""
+        acquisitions = []
+        for images in self.well.images:
+            if (
+                images.acquisition is not None
+                and images.acquisition not in acquisitions
+            ):
+                acquisitions.append(images.acquisition)
+        return acquisitions
+
+    def get_image_acquisition_id(self, image_path: str) -> int | None:
+        """Return the acquisition id for the given image path."""
+        for images in self.well.images:
+            if images.path == image_path:
+                return images.acquisition
+        raise NgioValueError(f"Image at path {image_path} not found in the well.")
+
     def paths(self, acquisition: int | None = None) -> list[str]:
         """Return the images paths in the well.
 
@@ -62,12 +116,16 @@ class NgioWellMeta(WellAttrs):
             if images.acquisition == acquisition
         ]
 
-    def add_image(self, path: str, acquisition: int | None = None) -> "NgioWellMeta":
+    def add_image(
+        self, path: str, acquisition: int | None = None, strict: bool = True
+    ) -> "NgioWellMeta":
         """Add an image to the well.
 
         Args:
             path (str): The path of the image.
             acquisition (int | None): The acquisition id of the image.
+            strict (bool): If True, check if the image already exists in the well.
+                If False, do not check if the image already exists in the well.
         """
         list_of_images = self.well.images
         for image in list_of_images:
@@ -76,10 +134,20 @@ class NgioWellMeta(WellAttrs):
                     f"Image at path {path} already exists in the well."
                 )
 
-        new_image = WellImage(path=path, acquisition=acquisition)
+        if (
+            strict
+            and (acquisition is not None)
+            and (acquisition not in self.acquisition_ids)
+        ):
+            raise NgioValueError(
+                f"Acquisition ID {acquisition} not found in well. "
+                "Please add it to the plate metadata first."
+            )
+
+        new_image = CustomWellImage(path=path, acquisition=acquisition)
         list_of_images.append(new_image)
         return NgioWellMeta(
-            well=WellMeta(images=list_of_images, version=self.well.version)
+            well=CustomWellMeta(images=list_of_images, version=self.well.version)
         )
 
     def remove_image(self, path: str) -> "NgioWellMeta":
@@ -93,7 +161,9 @@ class NgioWellMeta(WellAttrs):
             if image.path == path:
                 list_of_images.remove(image)
                 return NgioWellMeta(
-                    well=WellMeta(images=list_of_images, version=self.well.version)
+                    well=CustomWellMeta(
+                        images=list_of_images, version=self.well.version
+                    )
                 )
         raise NgioValueError(f"Image at path {path} not found in the well.")
 
@@ -165,7 +235,7 @@ class NgioPlateMeta(HCSAttrs):
         cls,
         images: list[ImageInWellPath] | None = None,
         name: str | None = None,
-        version: NgffVersion | None = None,
+        version: NgffVersions | None = None,
     ) -> "NgioPlateMeta":
         plate = cls(
             plate=Plate(
@@ -186,9 +256,12 @@ class NgioPlateMeta(HCSAttrs):
             plate = plate.add_well(
                 row=image.row,
                 column=image.column,
-                acquisition_id=image.acquisition_id,
-                acquisition_name=image.acquisition_name,
             )
+            if image.acquisition_id is not None:
+                plate = plate.add_acquisition(
+                    acquisition_id=image.acquisition_id,
+                    acquisition_name=image.acquisition_name,
+                )
         return plate
 
     @property
@@ -209,7 +282,7 @@ class NgioPlateMeta(HCSAttrs):
         return [acquisitions.name for acquisitions in self.plate.acquisitions]
 
     @property
-    def acquisitions_ids(self) -> list[int]:
+    def acquisition_ids(self) -> list[int]:
         """Return the acquisitions ids in the plate."""
         if self.plate.acquisitions is None:
             return []
@@ -256,50 +329,94 @@ class NgioPlateMeta(HCSAttrs):
             f"Well at row {row} and column {column} not found in the plate."
         )
 
-    def add_well(
-        self,
-        row: str,
-        column: str | int,
-        acquisition_id: int | None = None,
-        acquisition_name: str | None = None,
-        **acquisition_kwargs,
-    ) -> "NgioPlateMeta":
-        """Add an image to the well.
+    def add_row(self, row: str) -> "tuple[NgioPlateMeta, int]":
+        """Add a row to the plate.
 
         Args:
-            row (str): The row of the well.
-            column (str | int): The column of the well.
-            acquisition_id (int | None): The acquisition id of the well.
-            acquisition_name (str | None): The acquisition name of the well.
-            **acquisition_kwargs: Additional acquisition metadata.
+            row (str): The row to add.
         """
         relabel_wells = False
 
         row_names = self.rows
         row_idx = _find_row_index(row_names, row)
-        if row_idx is None:
-            row_names.append(row)
-            row_names.sort()
-            row_idx = row_names.index(row)
-            relabel_wells = True
+        if row_idx is not None:
+            # Nothing to do
+            return self, row_idx
+
+        row_names.append(row)
+        row_names.sort()
+        row_idx = row_names.index(row)
+        relabel_wells = True
 
         rows = [Row(name=row) for row in row_names]
 
+        if relabel_wells:
+            wells = _relabel_wells(self.plate.wells, rows, self.plate.columns)
+        else:
+            wells = self.plate.wells
+
+        new_plate = Plate(
+            rows=rows,
+            columns=self.plate.columns,
+            acquisitions=self.plate.acquisitions,
+            wells=wells,
+            field_count=self.plate.field_count,
+            version=self.plate.version,
+        )
+        return NgioPlateMeta(plate=new_plate), row_idx
+
+    def add_column(self, column: str | int) -> "tuple[NgioPlateMeta, int]":
+        """Add a column to the plate.
+
+        Args:
+            column (str | int): The column to add.
+        """
+        relabel_wells = False
+
         columns_names = self.columns
         column_idx = _find_column_index(columns_names, column)
-        if column_idx is None:
-            columns_names.append(_stringify_column(column))
-            # sort as numbers
-            columns_names.sort(key=lambda x: int(x))
-            column_idx = columns_names.index(_stringify_column(column))
-            relabel_wells = True
+        if column_idx is not None:
+            # Nothing to do
+            return self, column_idx
+
+        columns_names.append(_stringify_column(column))
+        # sort as numbers
+        columns_names.sort(key=lambda x: int(x))
+        column_idx = columns_names.index(_stringify_column(column))
+        relabel_wells = True
 
         columns = [Column(name=column) for column in columns_names]
 
-        wells = self.plate.wells
         if relabel_wells:
-            wells = _relabel_wells(wells, rows, columns)
+            wells = _relabel_wells(self.plate.wells, self.plate.rows, columns)
+        else:
+            wells = self.plate.wells
 
+        new_plate = Plate(
+            rows=self.plate.rows,
+            columns=columns,
+            acquisitions=self.plate.acquisitions,
+            wells=wells,
+            field_count=self.plate.field_count,
+            version=self.plate.version,
+        )
+        return NgioPlateMeta(plate=new_plate), column_idx
+
+    def add_well(
+        self,
+        row: str,
+        column: str | int,
+    ) -> "NgioPlateMeta":
+        """Add an image to the well.
+
+        Args:
+            row (str): The row of the well.
+            column (str | int): The column of the well.
+        """
+        plate, row_idx = self.add_row(row=row)
+        plate, column_idx = plate.add_column(column=column)
+
+        wells = plate.plate.wells
         for well_obj in wells:
             if well_obj.rowIndex == row_idx and well_obj.columnIndex == column_idx:
                 break
@@ -312,28 +429,49 @@ class NgioPlateMeta(HCSAttrs):
                 )
             )
 
+        new_plate = Plate(
+            rows=plate.plate.rows,
+            columns=plate.plate.columns,
+            acquisitions=plate.plate.acquisitions,
+            wells=wells,
+            field_count=plate.plate.field_count,
+            version=plate.plate.version,
+        )
+        return NgioPlateMeta(plate=new_plate)
+
+    def add_acquisition(
+        self,
+        acquisition_id: int,
+        acquisition_name: str | None = None,
+        **acquisition_kwargs,
+    ) -> "NgioPlateMeta":
+        """Add an acquisition to the plate.
+
+        Args:
+            acquisition_id (int): The acquisition id of the well.
+            acquisition_name (str | None): The acquisition name of the well.
+            **acquisition_kwargs: Additional acquisition metadata.
+        """
         acquisitions = self.plate.acquisitions
-        if acquisition_id is not None:
-            if acquisitions is None and len(wells) > 0:
-                acquisitions = [Acquisition(id=0, name=acquisition_name)]
-            elif acquisitions is None:
-                acquisitions = []
-
-            for acquisition_obj in acquisitions:
-                if acquisition_obj.id == acquisition_id:
-                    break
-            else:
-                acquisitions.append(
-                    Acquisition(
-                        id=acquisition_id, name=acquisition_name, **acquisition_kwargs
-                    )
-                )
+        if acquisitions is None:
+            acquisitions = []
+
+        for acquisition_obj in acquisitions:
+            if acquisition_obj.id == acquisition_id:
+                # If the acquisition already exists
+                # Nothing to do
+                # Maybe we should update the acquisition name and kwargs
+                return self
+
+        acquisitions.append(
+            Acquisition(id=acquisition_id, name=acquisition_name, **acquisition_kwargs)
+        )
 
         new_plate = Plate(
-            rows=rows,
-            columns=columns,
+            rows=self.plate.rows,
+            columns=self.plate.columns,
             acquisitions=acquisitions,
-            wells=wells,
+            wells=self.plate.wells,
             field_count=self.plate.field_count,
             version=self.plate.version,
         )
@@ -374,5 +512,39 @@ class NgioPlateMeta(HCSAttrs):
         )
         return NgioPlateMeta(plate=new_plate)
 
+    def derive(
+        self,
+        name: str | None = None,
+        version: NgffVersions | None = None,
+        keep_acquisitions: bool = False,
+    ) -> "NgioPlateMeta":
+        """Derive the plate metadata.
+
+        Args:
+            name (str): The name of the derived plate.
+            version (NgffVersion | None): The version of the derived plate.
+                If None, use the version of the original plate.
+            keep_acquisitions (bool): If True, keep the acquisitions in the plate.
+        """
+        columns = self.plate.columns
+        rows = self.plate.rows
+
+        if keep_acquisitions:
+            acquisitions = self.plate.acquisitions
+        else:
+            acquisitions = None
+
+        if version is None:
+            version = self.plate.version  # type: ignore[assignment]
 
-# %%
+        return NgioPlateMeta(
+            plate=Plate(
+                rows=rows,
+                columns=columns,
+                acquisitions=acquisitions,
+                wells=[],
+                field_count=self.plate.field_count,
+                version=version,
+                name=name,
+            )
+        )

ngio/ome_zarr_meta/ngio_specs/_ngio_image.py

@@ -13,6 +13,10 @@ import numpy as np
 from pydantic import BaseModel
 
 from ngio.ome_zarr_meta.ngio_specs._axes import (
+    DefaultSpaceUnit,
+    DefaultTimeUnit,
+    SpaceUnits,
+    TimeUnits,
     canonical_axes,
 )
 from ngio.ome_zarr_meta.ngio_specs._channels import Channel, ChannelsMeta
@@ -21,17 +25,18 @@ from ngio.ome_zarr_meta.ngio_specs._pixel_size import PixelSize
 from ngio.utils import NgioValidationError, NgioValueError
 
 T = TypeVar("T")
-NgffVersion = Literal["0.4"]
+NgffVersions = Literal["0.4"]
+DefaultNgffVersion: Literal["0.4"] = "0.4"
 
 
 class ImageLabelSource(BaseModel):
     """Image label source model."""
 
-    version: NgffVersion
+    version: NgffVersions
     source: dict[str, str | None]
 
     @classmethod
-    def default_init(cls, version: NgffVersion) -> "ImageLabelSource":
+    def default_init(cls, version: NgffVersions) -> "ImageLabelSource":
         """Initialize the ImageLabelSource object."""
         return cls(version=version, source={"image": "../../"})
 
@@ -40,7 +45,7 @@ class AbstractNgioImageMeta:
     """Base class for ImageMeta and LabelMeta."""
 
     def __init__(
-        self, version: NgffVersion, name: str | None, datasets: list[Dataset]
+        self, version: NgffVersions, name: str | None, datasets: list[Dataset]
     ) -> None:
         """Initialize the ImageMeta object."""
         self._version = version
@@ -66,13 +71,13 @@ class AbstractNgioImageMeta:
         pixel_size: PixelSize,
         scaling_factors: Collection[float] | None = None,
         name: str | None = None,
-        version: NgffVersion = "0.4",
+        version: NgffVersions = DefaultNgffVersion,
     ):
         """Initialize the ImageMeta object."""
         axes = canonical_axes(
             axes_names,
-            space_units=pixel_size.space_unit,
-            time_units=pixel_size.time_unit,
+            space_units=pixel_size.space_unit,  # type: ignore[arg-type]
+            time_units=pixel_size.time_unit,  # type: ignore[arg-type]
         )
 
         px_size_dict = pixel_size.as_dict()
@@ -105,10 +110,33 @@ class AbstractNgioImageMeta:
             datasets=datasets,
         )
 
+    def to_units(
+        self,
+        *,
+        space_unit: SpaceUnits = DefaultSpaceUnit,
+        time_unit: TimeUnits = DefaultTimeUnit,
+    ):
+        """Convert the pixel size to the given units.
+
+        Args:
+            space_unit(str): The space unit to convert to.
+            time_unit(str): The time unit to convert to.
+        """
+        new_datasets = []
+        for dataset in self.datasets:
+            new_dataset = dataset.to_units(space_unit=space_unit, time_unit=time_unit)
+            new_datasets.append(new_dataset)
+
+        return type(self)(
+            version=self.version,
+            name=self.name,
+            datasets=new_datasets,
+        )
+
     @property
-    def version(self) -> NgffVersion:
+    def version(self) -> NgffVersions:
         """Version of the OME-NFF metadata used to build the object."""
-        return self._version
+        return self._version  # type: ignore[return-value]
 
     @property
     def name(self) -> str | None:
@@ -135,6 +163,16 @@ class AbstractNgioImageMeta:
         """List of paths of the datasets."""
         return [dataset.path for dataset in self.datasets]
 
+    @property
+    def space_unit(self) -> str | None:
+        """Get the space unit of the pixel size."""
+        return self.datasets[0].pixel_size.space_unit
+
+    @property
+    def time_unit(self) -> str | None:
+        """Get the time unit of the pixel size."""
+        return self.datasets[0].pixel_size.time_unit
+
     def _get_dataset_by_path(self, path: str) -> Dataset:
         """Get a dataset by its path."""
         for dataset in self.datasets:
@@ -331,7 +369,7 @@ class NgioLabelMeta(AbstractNgioImageMeta):
 
     def __init__(
         self,
-        version: NgffVersion,
+        version: NgffVersions,
         name: str | None,
         datasets: list[Dataset],
         image_label: ImageLabelSource | None = None,
@@ -370,7 +408,7 @@ class NgioImageMeta(AbstractNgioImageMeta):
 
     def __init__(
         self,
-        version: NgffVersion,
+        version: NgffVersions,
         name: str | None,
         datasets: list[Dataset],
         channels: ChannelsMeta | None = None,

ngio/ome_zarr_meta/ngio_specs/_pixel_size.py

@@ -5,7 +5,12 @@ from functools import total_ordering
 
 import numpy as np
 
-from ngio.ome_zarr_meta.ngio_specs import SpaceUnits, TimeUnits
+from ngio.ome_zarr_meta.ngio_specs import (
+    DefaultSpaceUnit,
+    DefaultTimeUnit,
+    SpaceUnits,
+    TimeUnits,
+)
 
 ################################################################################################
 #
@@ -33,8 +38,8 @@ class PixelSize:
         y: float,
         z: float,
         t: float = 1,
-        space_unit: SpaceUnits = SpaceUnits.micrometer,
-        time_unit: TimeUnits | None = TimeUnits.s,
+        space_unit: SpaceUnits | str | None = DefaultSpaceUnit,
+        time_unit: TimeUnits | str | None = DefaultTimeUnit,
     ):
         """Initialize the pixel size."""
         self.x = _validate_type(x, "x")
@@ -42,13 +47,8 @@ class PixelSize:
         self.z = _validate_type(z, "z")
         self.t = _validate_type(t, "t")
 
-        if not isinstance(space_unit, SpaceUnits):
-            raise TypeError("space_unit must be of type SpaceUnits.")
-        self.space_unit = space_unit
-
-        if time_unit is not None and not isinstance(time_unit, TimeUnits):
-            raise TypeError("time_unit must be of type TimeUnits.")
-        self.time_unit = time_unit
+        self._space_unit = space_unit
+        self._time_unit = time_unit
 
     def __repr__(self) -> str:
         """Return a string representation of the pixel size."""
@@ -74,13 +74,30 @@ class PixelSize:
         """Check if one pixel size is less than the other."""
         if not isinstance(other, PixelSize):
             raise TypeError("Can only compare PixelSize with PixelSize.")
-        ref = PixelSize(0, 0, 0, 0, self.space_unit, self.time_unit)
+        ref = PixelSize(
+            0,
+            0,
+            0,
+            0,
+            space_unit=self.space_unit,
+            time_unit=self.time_unit,  # type: ignore
+        )
         return self.distance(ref) < other.distance(ref)
 
     def as_dict(self) -> dict:
         """Return the pixel size as a dictionary."""
         return {"t": self.t, "z": self.z, "y": self.y, "x": self.x}
 
+    @property
+    def space_unit(self) -> SpaceUnits | str | None:
+        """Return the space unit."""
+        return self._space_unit
+
+    @property
+    def time_unit(self) -> TimeUnits | str | None:
+        """Return the time unit."""
+        return self._time_unit
+
     @property
     def tzyx(self) -> tuple[float, float, float, float]:
         """Return the voxel size in t, z, y, x order."""

ngio/ome_zarr_meta/v04/_custom_models.py

@@ -0,0 +1,18 @@
+from typing import Annotated
+
+from ome_zarr_models.v04.well import WellAttrs as WellAttrs04
+from ome_zarr_models.v04.well_types import WellImage as WellImage04
+from ome_zarr_models.v04.well_types import WellMeta as WellMeta04
+from pydantic import SkipValidation
+
+
+class CustomWellImage(WellImage04):
+    path: Annotated[str, SkipValidation]
+
+
+class CustomWellMeta(WellMeta04):
+    images: list[CustomWellImage]  # type: ignore[valid-type]
+
+
+class CustomWellAttrs(WellAttrs04):
+    well: CustomWellMeta  # type: ignore[valid-type]

ngio/ome_zarr_meta/v04/_v04_spec_utils.py

@@ -23,7 +23,6 @@ from ome_zarr_models.v04.multiscales import Multiscale as MultiscaleV04
 from ome_zarr_models.v04.omero import Channel as ChannelV04
 from ome_zarr_models.v04.omero import Omero as OmeroV04
 from ome_zarr_models.v04.omero import Window as WindowV04
-from ome_zarr_models.v04.well import WellAttrs as WellAttrsV04
 from pydantic import ValidationError
 
 from ngio.ome_zarr_meta.ngio_specs import (
@@ -41,6 +40,7 @@ from ngio.ome_zarr_meta.ngio_specs import (
     NgioWellMeta,
     default_channel_name,
 )
+from ngio.ome_zarr_meta.v04._custom_models import CustomWellAttrs as WellAttrsV04
 
 
 def _is_v04_image_meta(metadata: dict) -> ImageAttrsV04 | ValidationError:
@@ -321,7 +321,7 @@ def _ngio_to_v04_multiscale(name: str | None, datasets: list[Dataset]) -> Multis
             AxisV04(
                 name=axis.on_disk_name,
                 type=axis.axis_type.value if axis.axis_type is not None else None,
-                unit=axis.unit.value if axis.unit is not None else None,
+                unit=axis.unit if axis.unit is not None else None,
             )
         )
 

{ngio-0.2.1.dist-info → ngio-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngio
-Version: 0.2.1
+Version: 0.2.2
 Summary: Next Generation file format IO
 Project-URL: homepage, https://github.com/lorenzocerrone/ngio
 Project-URL: repository, https://github.com/lorenzocerrone/ngio