ngio 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

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/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/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.dist-info → ngio-0.4.4.dist-info}/METADATA

@@ -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.dist-info → ngio-0.4.4.dist-info}/RECORD

@@ -20,8 +20,8 @@ ngio/images/__init__.py,sha256=9Whvt7GTiCgT_vXaEEqGnDaY1-UsRk3dhLTv091F_g4,1211
 ngio/images/_abstract_image.py,sha256=hrB9xn4MFRxnxE1d7HKnM8SXVPUGhMD9u32yBHTsFiU,18517
 ngio/images/_create.py,sha256=61cuco2jUK25WzOY-Sel9s931FtGPL2ut25L9W10bJ4,10171
 ngio/images/_create_synt_container.py,sha256=il_rr5_2KIQ5Xsskj2rb2fEm100ZErZq89aW06kn_7k,5444
-ngio/images/_image.py,sha256=1WQOI26ITn1R2raR9JWVEhp6nKBE3ntXXAQr7EMTOEo,33054
-ngio/images/_label.py,sha256=RIfXrLSKMQ-j8q-aaSiWeIwFEKdxAkQT1HbJNq4PJv0,11800
+ngio/images/_image.py,sha256=GDUmBhoTj9js7rC785g3__l_xSH1oKSgx2AAAr25OSM,33053
+ngio/images/_label.py,sha256=Se3ZpgXDArtLHPlx9pw8Rnr5pZ_sEkmbeMh9sU63ncg,11799
 ngio/images/_masked_image.py,sha256=YhbBzgPZMav6rX0WYue1BaxAzEIsfaQrxUIOK6ZWZcw,18848
 ngio/images/_ome_zarr_container.py,sha256=UJERXEgBkwclpLaHzWqUIQc6P-TG4zYuKuxPukJGa4Y,38433
 ngio/images/_table_ops.py,sha256=jFv_AMqoB4JBpoWsMtZppZVW7dAOC_u-JpfNm8b33kY,15292
@@ -40,7 +40,7 @@ ngio/ome_zarr_meta/__init__.py,sha256=tzxW2oVhfeMBVuv3XkcbOLzMnbDvUnie-AVsvSxRkd
 ngio/ome_zarr_meta/_meta_handlers.py,sha256=ctknNDT8jxwyvxQf9on5gW31H1tRRsnneO38GT2UXoE,25880
 ngio/ome_zarr_meta/ngio_specs/__init__.py,sha256=U2FqZR91Ob2N6CqKdyw-_Ll-wMgmGuPZGVRCr6wuRFY,1698
 ngio/ome_zarr_meta/ngio_specs/_axes.py,sha256=gNzxCddn53m9dlNJlV5CL-aQS-nGJrbCDGfAp5L97LY,16412
-ngio/ome_zarr_meta/ngio_specs/_channels.py,sha256=CVsbG52U31TaMdTj8XqvClUdBya2Ar3qBjDo_xhP-NM,16967
+ngio/ome_zarr_meta/ngio_specs/_channels.py,sha256=TDxIy-yVc2YaWPIFJRYnYwZbA8O5Ee_OiWppHYrEdpU,16647
 ngio/ome_zarr_meta/ngio_specs/_dataset.py,sha256=CrHnjVWBGYPqErKkHR-E2DKrE3DmGznXMkd3Y9Z4uYo,3434
 ngio/ome_zarr_meta/ngio_specs/_ngio_hcs.py,sha256=N1CGPOubwf0pvm8tiTnh-C1cOu9lToyDe3WagnEnPN4,17207
 ngio/ome_zarr_meta/ngio_specs/_ngio_image.py,sha256=XmqeffYRspBZmv8gCrfJvnykmBViWgDo2AtJJkR7OEs,15886
@@ -79,7 +79,7 @@ ngio/utils/_errors.py,sha256=pKQ12LUjQLYE1nUawemA5h7HsgznjaSvV1n2PQU33N0,759
 ngio/utils/_fractal_fsspec_store.py,sha256=RdcCFOgHexRKX9zZvJV5RI-5OPc7VOPS6q_IeRxm24I,1548
 ngio/utils/_logger.py,sha256=N5W0a_xwze4blS1MolidBkTMbjTbg8GPguJZNun3mAE,1392
 ngio/utils/_zarr_utils.py,sha256=GUOcAx02IcfrJ5tIdKu8ChtRUUaBbkkddW5jaCCYnS8,13797
-ngio-0.4.2.dist-info/METADATA,sha256=6cSiXSKGOPDF_YAnGvB2Y0OhOFeLGDXakuY7HKHUWHU,6095
-ngio-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ngio-0.4.2.dist-info/licenses/LICENSE,sha256=UgN_a1QCeNh9rZWfz-wORQFxE3elQzLWPQaoK6N6fxQ,1502
-ngio-0.4.2.dist-info/RECORD,,
+ngio-0.4.4.dist-info/METADATA,sha256=1yjBnjq6IURXZSApn3fLn31KBRWNLhTM6J4unvUrnHg,6117
+ngio-0.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ngio-0.4.4.dist-info/licenses/LICENSE,sha256=UgN_a1QCeNh9rZWfz-wORQFxE3elQzLWPQaoK6N6fxQ,1502
+ngio-0.4.4.dist-info/RECORD,,