careamics 0.1.0rc5__tar.gz → 0.1.0rc6__tar.gz

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
         platform: [ubuntu-latest, macos-13, windows-latest]
 

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/.pre-commit-config.yaml

@@ -9,12 +9,12 @@ ci:
 
 repos:
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.16
+    rev: v0.18
     hooks:
       - id: validate-pyproject
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.3
+    rev: v0.4.7
     hooks:
       - id: ruff
         args: [--fix, --target-version, py38]
@@ -40,14 +40,14 @@ repos:
     hooks:
       - id: numpydoc-validation
 
-  # jupyter linting and formatting
-  - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.8.5
-    hooks:
-      - id: nbqa-ruff
-        args: [--fix]
-      - id: nbqa-black
-      #- id: nbqa-mypy
+  # # jupyter linting and formatting
+  # - repo: https://github.com/nbQA-dev/nbQA
+  #   rev: 1.8.5
+  #   hooks:
+  #     - id: nbqa-ruff
+  #       args: [--fix]
+  #     - id: nbqa-black
+  #     #- id: nbqa-mypy
 
   # strip out jupyter notebooks
   - repo: https://github.com/kynan/nbstripout

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: careamics
-Version: 0.1.0rc5
+Version: 0.1.0rc6
 Summary: Toolbox for running N2V and friends.
 Project-URL: homepage, https://careamics.github.io/
 Project-URL: repository, https://github.com/CAREamics/careamics
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Requires-Dist: bioimageio-core>=0.6.0

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/examples/2D/n2v/example_BSD68_lightning.ipynb

@@ -18,11 +18,7 @@
     "    CAREamicsPredictDataModule,\n",
     "    CAREamicsTrainDataModule,\n",
     ")\n",
-<<<<<<< Updated upstream
     "from careamics.lightning_prediction import CAREamicsPredictionLoop\n",
-=======
-    "from careamics.lightning_prediction import CAREamicsFiring\n",
->>>>>>> Stashed changes
     "from careamics.utils.metrics import psnr"
    ]
   },
@@ -172,11 +168,7 @@
     "train_data_module = CAREamicsTrainDataModule(\n",
     "    train_data=train_path,\n",
     "    val_data=val_path,\n",
-<<<<<<< Updated upstream
     "    data_type=\"tiff\",  # to use np.ndarray, set data_type to \"array\"\n",
-=======
-    "    data_type=\"tiff\",\n",
->>>>>>> Stashed changes
     "    patch_size=(64, 64),\n",
     "    axes=\"SYX\",\n",
     "    batch_size=128,\n",

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/pyproject.toml

@@ -33,6 +33,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "License :: OSI Approved :: BSD License",
     "Typing :: Typed",
 ]
@@ -73,7 +74,7 @@ repository = "https://github.com/CAREamics/careamics"
 line-length = 88
 target-version = "py38"
 src = ["src"]
-select = [
+lint.select = [
     "E",  # style errors
     "W",  # style warnings
     "F",  # flakes
@@ -86,7 +87,7 @@ select = [
     "A001", # flake8-builtins
     "RUF",  # ruff-specific rules
 ]
-ignore = [
+lint.ignore = [
     "D100", # Missing docstring in public module
     "D107", # Missing docstring in __init__
     "D203", # 1 blank line required before class docstring
@@ -103,13 +104,12 @@ ignore = [
     "UP006", # Replace typing.List by list, mandatory for py3.8
     "UP007", # Replace Union by |, mandatory for py3.9
 ]
-ignore-init-module-imports = true
 show-fixes = true
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/*.py" = ["D", "S"]
 "setup.py" = ["D"]
 

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/callbacks/hyperparameters_callback.py

@@ -1,3 +1,5 @@
+"""Callback saving CAREamics configuration as hyperparameters in the model."""
+
 from pytorch_lightning import LightningModule, Trainer
 from pytorch_lightning.callbacks import Callback
 
@@ -11,13 +13,18 @@ class HyperParametersCallback(Callback):
     This allows saving the configuration as dictionnary in the checkpoints, and
     loading it subsequently in a CAREamist instance.
 
+    Parameters
+    ----------
+    config : Configuration
+        CAREamics configuration to be saved as hyperparameter in the model.
+
     Attributes
     ----------
     config : Configuration
         CAREamics configuration to be saved as hyperparameter in the model.
     """
 
-    def __init__(self, config: Configuration):
+    def __init__(self, config: Configuration) -> None:
         """
         Constructor.
 
@@ -28,14 +35,14 @@ class HyperParametersCallback(Callback):
         """
         self.config = config
 
-    def on_train_start(self, trainer: Trainer, pl_module: LightningModule):
+    def on_train_start(self, trainer: Trainer, pl_module: LightningModule) -> None:
         """
         Update the hyperparameters of the model with the configuration on train start.
 
         Parameters
         ----------
         trainer : Trainer
-            PyTorch Lightning trainer.
+            PyTorch Lightning trainer, unused.
         pl_module : LightningModule
             PyTorch Lightning module.
         """

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/callbacks/progress_bar_callback.py

@@ -1,3 +1,5 @@
+"""Progressbar callback."""
+
 import sys
 from typing import Dict, Union
 
@@ -10,7 +12,13 @@ class ProgressBarCallback(TQDMProgressBar):
     """Progress bar for training and validation steps."""
 
     def init_train_tqdm(self) -> tqdm:
-        """Override this to customize the tqdm bar for training."""
+        """Override this to customize the tqdm bar for training.
+
+        Returns
+        -------
+        tqdm
+            A tqdm bar.
+        """
         bar = tqdm(
             desc="Training",
             position=(2 * self.process_position),
@@ -23,7 +31,13 @@ class ProgressBarCallback(TQDMProgressBar):
         return bar
 
     def init_validation_tqdm(self) -> tqdm:
-        """Override this to customize the tqdm bar for validation."""
+        """Override this to customize the tqdm bar for validation.
+
+        Returns
+        -------
+        tqdm
+            A tqdm bar.
+        """
         # The main progress bar doesn't exist in `trainer.validate()`
         has_main_bar = self.train_progress_bar is not None
         bar = tqdm(
@@ -37,7 +51,13 @@ class ProgressBarCallback(TQDMProgressBar):
         return bar
 
     def init_test_tqdm(self) -> tqdm:
-        """Override this to customize the tqdm bar for testing."""
+        """Override this to customize the tqdm bar for testing.
+
+        Returns
+        -------
+        tqdm
+            A tqdm bar.
+        """
         bar = tqdm(
             desc="Testing",
             position=(2 * self.process_position),
@@ -52,6 +72,19 @@ class ProgressBarCallback(TQDMProgressBar):
     def get_metrics(
         self, trainer: Trainer, pl_module: LightningModule
     ) -> Dict[str, Union[int, str, float, Dict[str, float]]]:
-        """Override this to customize the metrics displayed in the progress bar."""
+        """Override this to customize the metrics displayed in the progress bar.
+
+        Parameters
+        ----------
+        trainer : Trainer
+            The trainer object.
+        pl_module : LightningModule
+            The LightningModule object, unused.
+
+        Returns
+        -------
+        dict
+            A dictionary with the metrics to display in the progress bar.
+        """
         pbar_metrics = trainer.progress_bar_metrics
         return {**pbar_metrics}

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/careamist.py

@@ -18,13 +18,14 @@ from careamics.config import (
     create_inference_configuration,
     load_configuration,
 )
-from careamics.config.inference_model import TRANSFORMS_UNION
 from careamics.config.support import SupportedAlgorithm, SupportedData, SupportedLogger
+from careamics.dataset.dataset_utils import reshape_array
 from careamics.lightning_datamodule import CAREamicsTrainData
 from careamics.lightning_module import CAREamicsModule
 from careamics.lightning_prediction_datamodule import CAREamicsPredictData
 from careamics.lightning_prediction_loop import CAREamicsPredictionLoop
 from careamics.model_io import export_to_bmz, load_pretrained
+from careamics.transforms import Denormalize
 from careamics.utils import check_path_exists, get_logger
 
 from .callbacks import HyperParametersCallback
@@ -488,7 +489,6 @@ class CAREamist:
         tile_overlap: Tuple[int, ...] = (48, 48),
         axes: Optional[str] = None,
         data_type: Optional[Literal["tiff", "custom"]] = None,
-        transforms: Optional[List[TRANSFORMS_UNION]] = None,
         tta_transforms: bool = True,
         dataloader_params: Optional[Dict] = None,
         read_source_func: Optional[Callable] = None,
@@ -506,7 +506,6 @@ class CAREamist:
         tile_overlap: Tuple[int, ...] = (48, 48),
         axes: Optional[str] = None,
         data_type: Optional[Literal["array"]] = None,
-        transforms: Optional[List[TRANSFORMS_UNION]] = None,
         tta_transforms: bool = True,
         dataloader_params: Optional[Dict] = None,
         checkpoint: Optional[Literal["best", "last"]] = None,
@@ -521,7 +520,6 @@ class CAREamist:
         tile_overlap: Tuple[int, ...] = (48, 48),
         axes: Optional[str] = None,
         data_type: Optional[Literal["array", "tiff", "custom"]] = None,
-        transforms: Optional[List[TRANSFORMS_UNION]] = None,
         tta_transforms: bool = True,
         dataloader_params: Optional[Dict] = None,
         read_source_func: Optional[Callable] = None,
@@ -538,8 +536,6 @@ class CAREamist:
         configuration parameters will be used, with the `patch_size` instead of
         `tile_size`.
 
-        The default transforms are defined in the `InferenceModel` Pydantic model.
-
         Test-time augmentation (TTA) can be switched off using the `tta_transforms`
         parameter.
 
@@ -563,8 +559,6 @@ class CAREamist:
             Axes of the input data, by default None.
         data_type : Optional[Literal["array", "tiff", "custom"]], optional
             Type of the input data, by default None.
-        transforms : Optional[List[TRANSFORMS_UNION]], optional
-            List of transforms to apply to the data, by default None.
         tta_transforms : bool, optional
             Whether to apply test-time augmentation, by default True.
         dataloader_params : Optional[Dict], optional
@@ -608,7 +602,6 @@ class CAREamist:
                 tile_overlap=tile_overlap,
                 data_type=data_type,
                 axes=axes,
-                transforms=transforms,
                 tta_transforms=tta_transforms,
                 batch_size=batch_size,
             )
@@ -660,38 +653,41 @@ class CAREamist:
                     f"np.ndarray (got {type(source)})."
                 )
 
-    def export_to_bmz(
+    def _create_data_for_bmz(
         self,
-        path: Union[Path, str],
-        name: str,
-        authors: List[dict],
         input_array: Optional[np.ndarray] = None,
-        general_description: str = "",
-        channel_names: Optional[List[str]] = None,
-        data_description: Optional[str] = None,
-    ) -> None:
-        """Export the model to the BioImage Model Zoo format.
+    ) -> np.ndarray:
+        """Create data for BMZ export.
 
-        Input array must be of shape SC(Z)YX, with S and C singleton dimensions.
+        If no `input_array` is provided, this method checks if there is a prediction
+        datamodule, or a training data module, to extract a patch. If none exists,
+        then a random aray is created.
+
+        If there is a non-singleton batch dimension, this method returns only the first
+        element.
 
         Parameters
         ----------
-        path : Union[Path, str]
-            Path to save the model.
-        name : str
-            Name of the model.
-        authors : List[dict]
-            List of authors of the model.
         input_array : Optional[np.ndarray], optional
-            Input array for the model, must be of shape SC(Z)YX, by default None.
-        general_description : str
-            General description of the model, used in the metadata of the BMZ archive.
-        channel_names : Optional[List[str]], optional
-            Channel names, by default None.
-        data_description : Optional[str], optional
-            Description of the data, by default None.
+            Input array, by default None.
+
+        Returns
+        -------
+        np.ndarray
+            Input data for BMZ export.
+
+        Raises
+        ------
+        ValueError
+            If mean and std are not provided in the configuration.
         """
         if input_array is None:
+            if self.cfg.data_config.mean is None or self.cfg.data_config.std is None:
+                raise ValueError(
+                    "Mean and std cannot be None in the configuration in order to"
+                    "export to the BMZ format. Was the model trained?"
+                )
+
             # generate images, priority is given to the prediction data module
             if self.pred_datamodule is not None:
                 # unpack a batch, ignore masks or targets
@@ -699,19 +695,23 @@ class CAREamist:
 
                 # convert torch.Tensor to numpy
                 input_patch = input_patch.numpy()
+
+                # denormalize
+                denormalize = Denormalize(
+                    mean=self.cfg.data_config.mean, std=self.cfg.data_config.std
+                )
+                input_patch, _ = denormalize(input_patch)
+
             elif self.train_datamodule is not None:
                 input_patch, *_ = next(iter(self.train_datamodule.train_dataloader()))
                 input_patch = input_patch.numpy()
-            else:
-                if (
-                    self.cfg.data_config.mean is None
-                    or self.cfg.data_config.std is None
-                ):
-                    raise ValueError(
-                        "Mean and std cannot be None in the configuration in order to"
-                        "export to the BMZ format. Was the model trained?"
-                    )
 
+                # denormalize
+                denormalize = Denormalize(
+                    mean=self.cfg.data_config.mean, std=self.cfg.data_config.std
+                )
+                input_patch, _ = denormalize(input_patch)
+            else:
                 # create a random input array
                 input_patch = np.random.normal(
                     loc=self.cfg.data_config.mean,
@@ -721,11 +721,47 @@ class CAREamist:
                     np.newaxis, np.newaxis, ...
                 ]  # add S & C dimensions
         else:
-            input_patch = input_array
+            # potentially correct shape
+            input_patch = reshape_array(input_array, self.cfg.data_config.axes)
 
-        # if there is a batch dimension
+        # if this a batch
         if input_patch.shape[0] > 1:
-            input_patch = input_patch[0:1, ...]  # keep singleton dim
+            input_patch = input_patch[[0], ...]  # keep singleton dim
+
+        return input_patch
+
+    def export_to_bmz(
+        self,
+        path: Union[Path, str],
+        name: str,
+        authors: List[dict],
+        input_array: Optional[np.ndarray] = None,
+        general_description: str = "",
+        channel_names: Optional[List[str]] = None,
+        data_description: Optional[str] = None,
+    ) -> None:
+        """Export the model to the BioImage Model Zoo format.
+
+        Input array must be of shape SC(Z)YX, with S and C singleton dimensions.
+
+        Parameters
+        ----------
+        path : Union[Path, str]
+            Path to save the model.
+        name : str
+            Name of the model.
+        authors : List[dict]
+            List of authors of the model.
+        input_array : Optional[np.ndarray], optional
+            Input array for the model, must be of shape SC(Z)YX, by default None.
+        general_description : str
+            General description of the model, used in the metadata of the BMZ archive.
+        channel_names : Optional[List[str]], optional
+            Channel names, by default None.
+        data_description : Optional[str], optional
+            Description of the data, by default None.
+        """
+        input_patch = self._create_data_for_bmz(input_array)
 
         # axes need to be reformated for the export because reshaping was done in the
         # datamodule

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/algorithm_model.py

@@ -1,3 +1,5 @@
+"""Algorithm configuration."""
+
 from __future__ import annotations
 
 from pprint import pformat
@@ -17,9 +19,9 @@ class AlgorithmConfig(BaseModel):
     training algorithm: which algorithm, loss function, model architecture, optimizer,
     and learning rate scheduler to use.
 
-    Currently, we only support N2V and custom algorithms. The `n2v` algorithm is only
-    compatible with `n2v` loss and `UNet` architecture. The `custom` algorithm allows
-    you to register your own architecture and select it using its name as
+    Currently, we only support N2V, CARE, N2N and custom models. The `n2v` algorithm is
+    only compatible with `n2v` loss and `UNet` architecture. The `custom` algorithm
+    allows you to register your own architecture and select it using its name as
     `name` in the custom pydantic model.
 
     Attributes

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/architectures/architecture_model.py

@@ -1,3 +1,5 @@
+"""Base model for the various CAREamics architectures."""
+
 from typing import Any, Dict
 
 from pydantic import BaseModel
@@ -16,6 +18,11 @@ class ArchitectureModel(BaseModel):
         """
         Dump the model as a dictionary, ignoring the architecture keyword.
 
+        Parameters
+        ----------
+        **kwargs : Any
+            Additional keyword arguments from Pydantic BaseModel model_dump method.
+
         Returns
         -------
         dict[str, Any]

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/architectures/custom_model.py

@@ -1,3 +1,5 @@
+"""Custom architecture Pydantic model."""
+
 from __future__ import annotations
 
 from pprint import pformat
@@ -84,6 +86,11 @@ class CustomModel(ArchitectureModel):
         value : str
             Name of the custom model as registered using the `@register_model`
             decorator.
+
+        Returns
+        -------
+        str
+            The custom model name.
         """
         # delegate error to get_custom_model
         model = get_custom_model(value)
@@ -134,7 +141,7 @@ class CustomModel(ArchitectureModel):
 
         Parameters
         ----------
-        kwargs : Any
+        **kwargs : Any
             Additional keyword arguments from Pydantic BaseModel model_dump method.
 
         Returns

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/architectures/register_model.py

@@ -1,3 +1,5 @@
+"""Custom model registration utilities."""
+
 from typing import Callable
 
 from torch.nn import Module
@@ -53,7 +55,7 @@ def register_model(name: str) -> Callable:
         Parameters
         ----------
         model : Module
-            Module class to register
+            Module class to register.
 
         Returns
         -------

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/architectures/unet_model.py

@@ -1,3 +1,5 @@
+"""UNet Pydantic model."""
+
 from __future__ import annotations
 
 from typing import Literal

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/architectures/vae_model.py

@@ -1,3 +1,5 @@
+"""VAE Pydantic model."""
+
 from typing import Literal
 
 from pydantic import (

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/callback_model.py

@@ -1,4 +1,4 @@
-"""Checkpoint saving configuration."""
+"""Callback Pydantic models."""
 
 from __future__ import annotations
 
@@ -13,13 +13,7 @@ from pydantic import (
 
 
 class CheckpointModel(BaseModel):
-    """_summary_.
-
-    Parameters
-    ----------
-    BaseModel : _type_
-        _description_
-    """
+    """Checkpoint saving callback Pydantic model."""
 
     model_config = ConfigDict(
         validate_assignment=True,
@@ -46,13 +40,7 @@ class CheckpointModel(BaseModel):
 
 
 class EarlyStoppingModel(BaseModel):
-    """_summary_.
-
-    Parameters
-    ----------
-    BaseModel : _type_
-        _description_
-    """
+    """Early stopping callback Pydantic model."""
 
     model_config = ConfigDict(
         validate_assignment=True,

{careamics-0.1.0rc5 → careamics-0.1.0rc6}/src/careamics/config/configuration_example.py

@@ -1,3 +1,5 @@
+"""Example of configurations."""
+
 from .algorithm_model import AlgorithmConfig
 from .architectures import UNetModel
 from .configuration_model import Configuration
@@ -19,7 +21,7 @@ from .training_model import TrainingConfig
 
 
 def full_configuration_example() -> Configuration:
-    """Returns a dictionnary representing a full configuration example.
+    """Return a dictionnary representing a full configuration example.
 
     Returns
     -------
@@ -56,7 +58,7 @@ def full_configuration_example() -> Configuration:
                 "name": SupportedTransform.NORMALIZE.value,
             },
             {
-                "name": SupportedTransform.NDFLIP.value,
+                "name": SupportedTransform.XY_FLIP.value,
             },
             {
                 "name": SupportedTransform.XY_RANDOM_ROTATE90.value,