ngio 0.4.2__tar.gz → 0.4.4__tar.gz

{ngio-0.4.2 → ngio-0.4.4}/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [v0.4.4]
+
+### Bug Fixes
+
+- Fix bug in channel visualization when using hex colors with leading '#'.
+- Remove strict range check in channel window.
+
+## [v0.4.3]
+
+### Bug Fixes
+
+- Fix bug in deriving labels and image from OME-Zarr with non standard path names.
+- Add missing pillow dependency.
+- Update pixi workspace config.
+
 ## [v0.4.2]
 
 ### API Changes

{ngio-0.4.2 → ngio-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngio
-Version: 0.4.2
+Version: 0.4.4
 Summary: Next Generation file format IO
 Project-URL: homepage, https://github.com/BioVisionCenter/ngio
 Project-URL: repository, https://github.com/BioVisionCenter/ngio
@@ -23,6 +23,7 @@ Requires-Dist: filelock
 Requires-Dist: numpy
 Requires-Dist: ome-zarr-models
 Requires-Dist: pandas>=1.2.0
+Requires-Dist: pillow
 Requires-Dist: polars
 Requires-Dist: pooch
 Requires-Dist: pyarrow

{ngio-0.4.2 → ngio-0.4.4}/pyproject.toml

@@ -48,6 +48,7 @@ dependencies = [
     "pooch",
     "polars",
     "pyarrow",
+    "pillow",
 ]
 
 # https://peps.python.org/pep-0621/#dependencies-optional-dependencies
@@ -186,7 +187,7 @@ source = ["ngio"]
 [tool.check-manifest]
 ignore = [".pre-commit-config.yaml", ".ruff_cache/**/*", "tests/**/*"]
 
-[tool.pixi.project]
+[tool.pixi.workspace]
 channels = ["conda-forge"]
 platforms = ["osx-arm64", "linux-64", "win-64"]
 

{ngio-0.4.2 → ngio-0.4.4}/src/ngio/images/_image.py

@@ -801,7 +801,7 @@ def derive_image_container(
         pixelsize=pixel_size.x,
         z_spacing=pixel_size.z,
         time_spacing=pixel_size.t,
-        levels=ref_meta.levels,
+        levels=ref_meta.paths,
         yx_scaling_factor=ref_meta.yx_scaling(),
         z_scaling_factor=ref_meta.z_scaling(),
         time_unit=pixel_size.time_unit,

{ngio-0.4.2 → ngio-0.4.4}/src/ngio/images/_label.py

@@ -318,7 +318,7 @@ def derive_label(
         pixelsize=ref_image.pixel_size.x,
         z_spacing=ref_image.pixel_size.z,
         time_spacing=ref_image.pixel_size.t,
-        levels=ref_meta.levels,
+        levels=ref_meta.paths,
         yx_scaling_factor=ref_meta.yx_scaling(),
         z_scaling_factor=ref_meta.z_scaling(),
         time_unit=ref_image.pixel_size.time_unit,

{ngio-0.4.2 → ngio-0.4.4}/src/ngio/ome_zarr_meta/ngio_specs/_channels.py

@@ -102,6 +102,20 @@ def valid_hex_color(v: str) -> bool:
     return True
 
 
+def into_valid_hex_color(v: str) -> str:
+    """Convert a string into a valid hexadecimal color.
+
+    If the string is already a valid hexadecimal color, return it.
+    Otherwise, return a hexadecimal color based on the hash of the string.
+    """
+    # strip leading '#' if present
+    v = v.lstrip("#")
+    if valid_hex_color(v):
+        return v
+
+    return NgioColors.semi_random_pick(v.lower()).value
+
+
 class ChannelVisualisation(BaseModel):
     """Channel visualisation model.
 
@@ -135,13 +149,10 @@ class ChannelVisualisation(BaseModel):
         """
         if value is None:
             return NgioColors.semi_random_pick().value
-        if isinstance(value, str) and valid_hex_color(value):
-            return value
+        if isinstance(value, str):
+            return into_valid_hex_color(value)
         elif isinstance(value, NgioColors):
             return value.value
-        elif isinstance(value, str):
-            value_lower = value.lower()
-            return NgioColors.semi_random_pick(value_lower).value
         else:
             raise NgioValueError(f"Invalid color {value}.")
 
@@ -159,19 +170,6 @@ class ChannelVisualisation(BaseModel):
             data["end"] = start + 1
         return data
 
-    @model_validator(mode="after")
-    def check_model(self) -> "ChannelVisualisation":
-        """Check that the start and end values are within the min and max values."""
-        if self.start < self.min or self.start > self.max:
-            raise NgioValidationError(
-                f"Start value {self.start} is out of range [{self.min}, {self.max}]"
-            )
-        if self.end < self.min or self.end > self.max:
-            raise NgioValidationError(
-                f"End value {self.end} is out of range [{self.min}, {self.max}]"
-            )
-        return self
-
     @classmethod
     def default_init(
         cls,

{ngio-0.4.2 → ngio-0.4.4}/tests/unit/images/test_images.py

@@ -220,3 +220,24 @@ def test_zoom_virtual_axes(
     # Roi data should match exactly except for virtual axis
     assert img1_data.shape[1:] == img2_roi_data.shape[1:]
     img2.set_roi(roi=roi, patch=img2_roi_data, transforms=[zoom], axes_order="czyx")
+
+
+def test_derive_image_consistency(
+    tmp_path: Path,
+):
+    path1 = tmp_path / "image1.zarr"
+    ome_zarr = create_empty_ome_zarr(
+        store=path1,
+        shape=(3, 16, 16, 16),
+        axes_names="czyx",
+        xy_pixelsize=1.0,
+        levels=["s0", "s1", "s2"],
+    )
+    ome_zarr_der = ome_zarr.derive_image(tmp_path / "derived_image.zarr")
+    assert ome_zarr.channel_labels == ome_zarr_der.channel_labels
+    assert ome_zarr.levels_paths == ome_zarr_der.levels_paths
+    assert ome_zarr.space_unit == ome_zarr_der.space_unit
+    assert ome_zarr.time_unit == ome_zarr_der.time_unit
+
+    label = ome_zarr.derive_label("derived_label")
+    assert label.path == "s0"

{ngio-0.4.2 → ngio-0.4.4}/tests/unit/images/test_omezarr_container.py

@@ -296,3 +296,18 @@ def test_get_and_squeeze(tmp_path: Path):
     image.get_as_dask(
         channel_selection=ChannelSelectionModel(identifier="0", mode="index")
     )
+
+
+def test_derive_image_and_labels(tmp_path: Path):
+    # Testing for #116
+    store = tmp_path / "ome_zarr.zarr"
+    ome_zarr = create_empty_ome_zarr(
+        store,
+        shape=(3, 20, 30),
+        xy_pixelsize=0.5,
+        levels=1,
+        axes_names=["c", "y", "x"],
+        dtype="uint8",
+    )
+    derived_ome_zarr = ome_zarr.derive_image(tmp_path / "derived.zarr")
+    _ = derived_ome_zarr.derive_label("derived_label")