careamics 0.0.5__py3-none-any.whl → 0.0.6__py3-none-any.whl

careamics/prediction_utils/prediction_outputs.py

@@ -1,6 +1,6 @@
 """Module containing functions to convert prediction outputs to desired form."""
 
-from typing import Any, List, Literal, Tuple, Union, overload
+from typing import Any, Literal, Union, overload
 
 import numpy as np
 from numpy.typing import NDArray
@@ -9,7 +9,7 @@ from ..config.tile_information import TileInformation
 from .stitch_prediction import stitch_prediction
 
 
-def convert_outputs(predictions: List[Any], tiled: bool) -> list[NDArray]:
+def convert_outputs(predictions: list[Any], tiled: bool) -> list[NDArray]:
     """
     Convert the Lightning trainer outputs to the desired form.
 
@@ -25,7 +25,7 @@ def convert_outputs(predictions: List[Any], tiled: bool) -> list[NDArray]:
     Returns
     -------
     list of numpy.ndarray or numpy.ndarray
-        List of arrays with the axes SC(Z)YX. If there is only 1 output it will not
+        list of arrays with the axes SC(Z)YX. If there is only 1 output it will not
         be in a list.
     """
     if len(predictions) == 0:
@@ -44,27 +44,27 @@ def convert_outputs(predictions: List[Any], tiled: bool) -> list[NDArray]:
 # for mypy
 @overload
 def combine_batches(  # numpydoc ignore=GL08
-    predictions: List[Any], tiled: Literal[True]
-) -> Tuple[List[NDArray], List[TileInformation]]: ...
+    predictions: list[Any], tiled: Literal[True]
+) -> tuple[list[NDArray], list[TileInformation]]: ...
 
 
 # for mypy
 @overload
 def combine_batches(  # numpydoc ignore=GL08
-    predictions: List[Any], tiled: Literal[False]
-) -> List[NDArray]: ...
+    predictions: list[Any], tiled: Literal[False]
+) -> list[NDArray]: ...
 
 
 # for mypy
 @overload
 def combine_batches(  # numpydoc ignore=GL08
-    predictions: List[Any], tiled: Union[bool, Literal[True], Literal[False]]
-) -> Union[List[NDArray], Tuple[List[NDArray], List[TileInformation]]]: ...
+    predictions: list[Any], tiled: Union[bool, Literal[True], Literal[False]]
+) -> Union[list[NDArray], tuple[list[NDArray], list[TileInformation]]]: ...
 
 
 def combine_batches(
-    predictions: List[Any], tiled: bool
-) -> Union[List[NDArray], Tuple[List[NDArray], List[TileInformation]]]:
+    predictions: list[Any], tiled: bool
+) -> Union[list[NDArray], tuple[list[NDArray], list[TileInformation]]]:
     """
     If predictions are in batches, they will be combined.
 
@@ -87,8 +87,8 @@ def combine_batches(
 
 
 def _combine_tiled_batches(
-    predictions: List[Tuple[NDArray, List[TileInformation]]]
-) -> Tuple[List[NDArray], List[TileInformation]]:
+    predictions: list[tuple[NDArray, list[TileInformation]]]
+) -> tuple[list[NDArray], list[TileInformation]]:
     """
     Combine batches from tiled output.
 
@@ -109,13 +109,13 @@ def _combine_tiled_batches(
     tile_infos = [
         tile_info for _, tile_info_list in predictions for tile_info in tile_info_list
     ]
-    prediction_tiles: List[NDArray] = _combine_array_batches(
+    prediction_tiles: list[NDArray] = _combine_array_batches(
         [preds for preds, _ in predictions]
     )
     return prediction_tiles, tile_infos
 
 
-def _combine_array_batches(predictions: List[NDArray]) -> List[NDArray]:
+def _combine_array_batches(predictions: list[NDArray]) -> list[NDArray]:
     """
     Combine batches of arrays.
 

careamics/prediction_utils/stitch_prediction.py

@@ -1,7 +1,7 @@
 """Prediction utility functions."""
 
 import builtins
-from typing import List, Union
+from typing import Union
 
 import numpy as np
 from numpy.typing import NDArray
@@ -11,9 +11,9 @@ from careamics.config.tile_information import TileInformation
 
 # TODO: why not allow input and output of torch.tensor ?
 def stitch_prediction(
-    tiles: List[np.ndarray],
-    tile_infos: List[TileInformation],
-) -> List[np.ndarray]:
+    tiles: list[np.ndarray],
+    tile_infos: list[TileInformation],
+) -> list[np.ndarray]:
     """
     Stitch tiles back together to form a full image(s).
 
@@ -54,8 +54,8 @@ def stitch_prediction(
 
 
 def stitch_prediction_single(
-    tiles: List[NDArray],
-    tile_infos: List[TileInformation],
+    tiles: list[NDArray],
+    tile_infos: list[TileInformation],
 ) -> NDArray:
     """
     Stitch tiles back together to form a full image.

careamics/transforms/__init__.py

@@ -1,14 +1,14 @@
 """Transforms that are used to augment the data."""
 
 __all__ = [
-    "get_all_transforms",
+    "Compose",
+    "Denormalize",
+    "ImageRestorationTTA",
     "N2VManipulate",
+    "Normalize",
     "XYFlip",
     "XYRandomRotate90",
-    "ImageRestorationTTA",
-    "Denormalize",
-    "Normalize",
-    "Compose",
+    "get_all_transforms",
 ]
 
 

careamics/transforms/compose.py

@@ -1,10 +1,10 @@
 """A class chaining transforms together."""
 
-from typing import Dict, List, Optional, Tuple, Union, cast
+from typing import Optional, Union, cast
 
 from numpy.typing import NDArray
 
-from careamics.config.transformations import TransformModel
+from careamics.config.transformations import NORM_AND_SPATIAL_UNION
 
 from .n2v_manipulate import N2VManipulate
 from .normalize import Normalize
@@ -20,7 +20,7 @@ ALL_TRANSFORMS = {
 }
 
 
-def get_all_transforms() -> Dict[str, type]:
+def get_all_transforms() -> dict[str, type]:
     """Return all the transforms accepted by CAREamics.
 
     Returns
@@ -37,7 +37,7 @@ class Compose:
 
     Parameters
     ----------
-    transform_list : List[TransformModel]
+    transform_list : list[TransformModel]
         A list of dictionaries where each dictionary contains the name of a
         transform and its parameters.
 
@@ -47,12 +47,12 @@ class Compose:
         A callable that applies the transforms to the input data.
     """
 
-    def __init__(self, transform_list: List[TransformModel]) -> None:
+    def __init__(self, transform_list: list[NORM_AND_SPATIAL_UNION]) -> None:
         """Instantiate a Compose object.
 
         Parameters
         ----------
-        transform_list : List[TransformModel]
+        transform_list : list[NORM_AND_SPATIAL_UNION]
             A list of dictionaries where each dictionary contains the name of a
             transform and its parameters.
         """
@@ -67,7 +67,7 @@ class Compose:
 
     def _chain_transforms(
         self, patch: NDArray, target: Optional[NDArray]
-    ) -> Tuple[Optional[NDArray], ...]:
+    ) -> tuple[Optional[NDArray], ...]:
         """Chain transforms on the input data.
 
         Parameters
@@ -79,7 +79,7 @@ class Compose:
 
         Returns
         -------
-        Tuple[np.ndarray, Optional[np.ndarray]]
+        tuple[np.ndarray, Optional[np.ndarray]]
             The output of the transformations.
         """
         params: Union[
@@ -103,7 +103,7 @@ class Compose:
         patch: NDArray,
         target: Optional[NDArray],
         **additional_arrays: NDArray,
-    ) -> Tuple[NDArray, Optional[NDArray], dict[str, NDArray]]:
+    ) -> tuple[NDArray, Optional[NDArray], dict[str, NDArray]]:
         """Chain transforms on the input data, with additional arrays.
 
         Parameters
@@ -118,7 +118,7 @@ class Compose:
 
         Returns
         -------
-        Tuple[np.ndarray, Optional[np.ndarray]]
+        tuple[np.ndarray, Optional[np.ndarray]]
             The output of the transformations.
         """
         params = {"patch": patch, "target": target, **additional_arrays}
@@ -131,7 +131,7 @@ class Compose:
 
     def __call__(
         self, patch: NDArray, target: Optional[NDArray] = None
-    ) -> Tuple[NDArray, ...]:
+    ) -> tuple[NDArray, ...]:
         """Apply the transforms to the input data.
 
         Parameters
@@ -143,11 +143,11 @@ class Compose:
 
         Returns
         -------
-        Tuple[np.ndarray, ...]
+        tuple[np.ndarray, ...]
             The output of the transformations.
         """
         # TODO: solve casting Compose.__call__ ouput
-        return cast(Tuple[NDArray, ...], self._chain_transforms(patch, target))
+        return cast(tuple[NDArray, ...], self._chain_transforms(patch, target))
 
     def transform_with_additional_arrays(
         self,

careamics/transforms/n2v_manipulate.py

@@ -1,6 +1,6 @@
 """N2V manipulation transform."""
 
-from typing import Any, Literal, Optional, Tuple
+from typing import Any, Literal, Optional
 
 import numpy as np
 from numpy.typing import NDArray
@@ -100,7 +100,7 @@ class N2VManipulate(Transform):
 
     def __call__(
         self, patch: NDArray, *args: Any, **kwargs: Any
-    ) -> Tuple[NDArray, NDArray, NDArray]:
+    ) -> tuple[NDArray, NDArray, NDArray]:
         """Apply the transform to the image.
 
         Parameters
@@ -114,7 +114,7 @@ class N2VManipulate(Transform):
 
         Returns
         -------
-        Tuple[np.ndarray, np.ndarray, np.ndarray]
+        tuple[np.ndarray, np.ndarray, np.ndarray]
             Masked patch, original patch, and mask.
         """
         masked = np.zeros_like(patch)

careamics/transforms/pixel_manipulation.py

@@ -5,7 +5,7 @@ Pixel manipulation is used in N2V and similar algorithm to replace the value of
 masked pixels.
 """
 
-from typing import Optional, Tuple
+from typing import Optional
 
 import numpy as np
 
@@ -107,7 +107,7 @@ def _odd_jitter_func(step: float, rng: np.random.Generator) -> np.ndarray:
 
 def _get_stratified_coords(
     mask_pixel_perc: float,
-    shape: Tuple[int, ...],
+    shape: tuple[int, ...],
     rng: Optional[np.random.Generator] = None,
 ) -> np.ndarray:
     """
@@ -121,7 +121,7 @@ def _get_stratified_coords(
     mask_pixel_perc : float
         Actual (quasi) percentage of masked pixels across the whole image. Used in
         calculating the distance between masked pixels across each axis.
-    shape : Tuple[int, ...]
+    shape : tuple[int, ...]
         Shape of the input patch.
     rng : np.random.Generator or None
         Random number generator.
@@ -242,7 +242,7 @@ def uniform_manipulate(
     remove_center: bool = True,
     struct_params: Optional[StructMaskParameters] = None,
     rng: Optional[np.random.Generator] = None,
-) -> Tuple[np.ndarray, np.ndarray]:
+) -> tuple[np.ndarray, np.ndarray]:
     """
     Manipulate pixels by replacing them with a neighbor values.
 
@@ -269,8 +269,8 @@ def uniform_manipulate(
 
     Returns
     -------
-    Tuple[np.ndarray]
-        Tuple containing the manipulated patch and the corresponding mask.
+    tuple[np.ndarray]
+        tuple containing the manipulated patch and the corresponding mask.
     """
     if rng is None:
         rng = np.random.default_rng()
@@ -322,7 +322,7 @@ def median_manipulate(
     subpatch_size: int = 11,
     struct_params: Optional[StructMaskParameters] = None,
     rng: Optional[np.random.Generator] = None,
-) -> Tuple[np.ndarray, np.ndarray]:
+) -> tuple[np.ndarray, np.ndarray]:
     """
     Manipulate pixels by replacing them with the median of their surrounding subpatch.
 
@@ -348,8 +348,8 @@ def median_manipulate(
 
     Returns
     -------
-    Tuple[np.ndarray]
-           Tuple containing the manipulated patch, the original patch and the mask.
+    tuple[np.ndarray]
+           tuple containing the manipulated patch, the original patch and the mask.
     """
     if rng is None:
         rng = np.random.default_rng()

careamics/transforms/xy_random_rotate90.py

@@ -1,6 +1,6 @@
 """Patch transform applying XY random 90 degrees rotations."""
 
-from typing import Optional, Tuple
+from typing import Optional
 
 import numpy as np
 from numpy.typing import NDArray
@@ -69,7 +69,7 @@ class XYRandomRotate90(Transform):
 
         Returns
         -------
-        Tuple[np.ndarray, Optional[np.ndarray]]
+        tuple[np.ndarray, Optional[np.ndarray]]
             Transformed patch and target.
         """
         if self.rng.random() > self.p:
@@ -90,7 +90,7 @@ class XYRandomRotate90(Transform):
 
         return patch_transformed, target_transformed, additional_transformed
 
-    def _apply(self, patch: NDArray, n_rot: int, axes: Tuple[int, int]) -> NDArray:
+    def _apply(self, patch: NDArray, n_rot: int, axes: tuple[int, int]) -> NDArray:
         """Apply the transform to the image.
 
         Parameters
@@ -99,7 +99,7 @@ class XYRandomRotate90(Transform):
             Image or image patch, 2D or 3D, shape C(Z)YX.
         n_rot : int
             Number of 90 degree rotations.
-        axes : Tuple[int, int]
+        axes : tuple[int, int]
             Axes along which to rotate the patch.
 
         Returns

careamics/utils/__init__.py

@@ -1,13 +1,13 @@
 """Utils module."""
 
 __all__ = [
-    "cwd",
-    "get_ram_size",
-    "check_path_exists",
     "BaseEnum",
-    "get_logger",
-    "get_careamics_home",
     "autocorrelation",
+    "check_path_exists",
+    "cwd",
+    "get_careamics_home",
+    "get_logger",
+    "get_ram_size",
 ]
 
 

careamics/utils/context.py

@@ -5,9 +5,10 @@ A convenience function to change the working directory in order to save data.
 """
 
 import os
+from collections.abc import Iterator
 from contextlib import contextmanager
 from pathlib import Path
-from typing import Iterator, Union
+from typing import Union
 
 
 def get_careamics_home() -> Path:

careamics/utils/logging.py

@@ -7,8 +7,9 @@ The methods are responsible for the in-console logger.
 import logging
 import sys
 import time
+from collections.abc import Generator
 from pathlib import Path
-from typing import Any, Dict, Generator, List, Optional, Union
+from typing import Any, Optional, Union
 
 LOGGERS: dict = {}
 
@@ -84,7 +85,7 @@ class ProgressBar:
         Zero-indexed current epoch, by default None.
     num_epochs : Optional[int], optional
         Total number of epochs, by default None.
-    stateful_metrics : Optional[List], optional
+    stateful_metrics : Optional[list], optional
         Iterable of string names of metrics that should *not* be averaged over time.
         Metrics in this list will be displayed as-is. All others will be averaged by
         the progress bar before display, by default None.
@@ -99,7 +100,7 @@ class ProgressBar:
         max_value: Optional[int] = None,
         epoch: Optional[int] = None,
         num_epochs: Optional[int] = None,
-        stateful_metrics: Optional[List] = None,
+        stateful_metrics: Optional[list] = None,
         always_stateful: bool = False,
         mode: str = "train",
     ) -> None:
@@ -114,7 +115,7 @@ class ProgressBar:
             Zero-indexed current epoch, by default None.
         num_epochs : Optional[int], optional
             Total number of epochs, by default None.
-        stateful_metrics : Optional[List], optional
+        stateful_metrics : Optional[list], optional
             Iterable of string names of metrics that should *not* be averaged over time.
             Metrics in this list will be displayed as-is. All others will be averaged by
             the progress bar before display, by default None.
@@ -145,8 +146,8 @@ class ProgressBar:
         self._seen_so_far = 0
         # We use a dict + list to avoid garbage collection
         # issues found in OrderedDict
-        self._values: Dict[Any, Any] = {}
-        self._values_order: List[Any] = []
+        self._values: dict[Any, Any] = {}
+        self._values_order: list[Any] = []
         self._start = time.time()
         self._last_update = 0.0
         self.spin = self.spinning_cursor() if self.max_value is None else None
@@ -158,7 +159,7 @@ class ProgressBar:
             self.message = "Denoising"
 
     def update(
-        self, current_step: int, batch_size: int = 1, values: Optional[List] = None
+        self, current_step: int, batch_size: int = 1, values: Optional[list] = None
     ) -> None:
         """
         Update the progress bar.
@@ -169,7 +170,7 @@ class ProgressBar:
             Index of the current step.
         batch_size : int, optional
             Batch size, by default 1.
-        values : Optional[List], optional
+        values : Optional[list], optional
             Updated metrics values, by default None.
         """
         values = values or []
@@ -263,7 +264,7 @@ class ProgressBar:
 
         self._last_update = now
 
-    def add(self, n: int, values: Optional[List] = None) -> None:
+    def add(self, n: int, values: Optional[list] = None) -> None:
         """
         Update the progress bar by n steps.
 
@@ -271,7 +272,7 @@ class ProgressBar:
         ----------
         n : int
             Number of steps to increase the progress bar with.
-        values : Optional[List], optional
+        values : Optional[list], optional
             Updated metrics values, by default None.
         """
         self.update(self._seen_so_far + n, 1, values=values)

careamics/utils/torch_utils.py

@@ -5,7 +5,7 @@ These functions are used to control certain aspects and behaviours of PyTorch.
 """
 
 import inspect
-from typing import Dict, Union
+from typing import Union
 
 import torch
 
@@ -27,12 +27,12 @@ def filter_parameters(
     ----------
     func : type
         Class object.
-    user_params : Dict
+    user_params : dict
         User provided parameters.
 
     Returns
     -------
-    Dict
+    dict
         Parameters matching `func`'s signature.
     """
     # Get the list of all default parameters
@@ -64,13 +64,13 @@ def get_optimizer(name: str) -> torch.optim.Optimizer:
     return getattr(torch.optim, name)
 
 
-def get_optimizers() -> Dict[str, str]:
+def get_optimizers() -> dict[str, str]:
     """
     Return the list of all optimizers available in torch.optim.
 
     Returns
     -------
-    Dict
+    dict
         Optimizers available in torch.optim.
     """
     optims = {}
@@ -106,13 +106,13 @@ def get_scheduler(
     return getattr(torch.optim.lr_scheduler, name)
 
 
-def get_schedulers() -> Dict[str, str]:
+def get_schedulers() -> dict[str, str]:
     """
     Return the list of all schedulers available in torch.optim.lr_scheduler.
 
     Returns
     -------
-    Dict
+    dict
         Schedulers available in torch.optim.lr_scheduler.
     """
     schedulers = {}

{careamics-0.0.5.dist-info → careamics-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: careamics
-Version: 0.0.5
+Version: 0.0.6
 Summary: Toolbox for running N2V and friends.
 Project-URL: homepage, https://careamics.github.io/
 Project-URL: repository, https://github.com/CAREamics/careamics
@@ -18,16 +18,16 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9
 Requires-Dist: bioimageio-core==0.7
 Requires-Dist: numpy<2.0.0
-Requires-Dist: pillow<=10.3.0
-Requires-Dist: psutil<=6.1
-Requires-Dist: pydantic<2.9,>=2.5
-Requires-Dist: pytorch-lightning<=2.4,>=2.2
+Requires-Dist: pillow<=11.1.0
+Requires-Dist: psutil<=6.1.1
+Requires-Dist: pydantic<2.11,>=2.5
+Requires-Dist: pytorch-lightning<=2.5.0.post0,>=2.2
 Requires-Dist: pyyaml!=6.0.0,<=6.0.2
-Requires-Dist: scikit-image<=0.23.2
-Requires-Dist: tifffile<=2024.8.30
-Requires-Dist: torch<=2.5,>=2.0
-Requires-Dist: torchvision<=0.20
-Requires-Dist: typer==0.12.3
+Requires-Dist: scikit-image<=0.25.0
+Requires-Dist: tifffile<=2025.1.10
+Requires-Dist: torch<=2.5.1,>=2.0
+Requires-Dist: torchvision<=0.20.1
+Requires-Dist: typer<=0.15.1,>=0.12.3
 Requires-Dist: zarr<3.0.0
 Provides-Extra: dev
 Requires-Dist: onnx; extra == 'dev'
@@ -40,7 +40,7 @@ Requires-Dist: careamics-portfolio; extra == 'examples'
 Requires-Dist: jupyter; extra == 'examples'
 Requires-Dist: matplotlib; extra == 'examples'
 Provides-Extra: tensorboard
-Requires-Dist: protobuf==3.20.3; extra == 'tensorboard'
+Requires-Dist: protobuf==5.29.1; extra == 'tensorboard'
 Requires-Dist: tensorboard; extra == 'tensorboard'
 Provides-Extra: wandb
 Requires-Dist: wandb; extra == 'wandb'