junifer 0.0.7.dev95__py3-none-any.whl → 0.0.7.dev105__py3-none-any.whl

junifer/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.7.dev95'
-__version_tuple__ = version_tuple = (0, 0, 7, 'dev95')
+__version__ = version = '0.0.7.dev105'
+__version_tuple__ = version_tuple = (0, 0, 7, 'dev105')

junifer/pipeline/pipeline_component_registry.py

@@ -76,6 +76,7 @@ class PipelineComponentRegistry(metaclass=Singleton):
                 "SpaceWarper": "SpaceWarper",
                 "fMRIPrepConfoundRemover": "fMRIPrepConfoundRemover",
                 "TemporalSlicer": "TemporalSlicer",
+                "TemporalFilter": "TemporalFilter",
             },
             "marker": {
                 "ALFFParcels": "ALFFParcels",

junifer/preprocess/__init__.pyi

@@ -4,6 +4,7 @@ __all__ = [
     "SpaceWarper",
     "Smoothing",
     "TemporalSlicer",
+    "TemporalFilter",
 ]
 
 from .base import BasePreprocessor
@@ -11,3 +12,4 @@ from .confounds import fMRIPrepConfoundRemover
 from .warping import SpaceWarper
 from .smoothing import Smoothing
 from ._temporal_slicer import TemporalSlicer
+from ._temporal_filter import TemporalFilter

junifer/preprocess/_temporal_filter.py

@@ -0,0 +1,240 @@
+"""Provide class for temporal filtering."""
+
+# Authors: Federico Raimondo <f.raimondo@fz-juelich.de>
+#          Leonard Sasse <l.sasse@fz-juelich.de>
+#          Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+from typing import (
+    Any,
+    ClassVar,
+    Optional,
+    Union,
+)
+
+import nibabel as nib
+from nilearn import image as nimg
+from nilearn._utils.niimg_conversions import check_niimg_4d
+
+from ..api.decorators import register_preprocessor
+from ..data import get_data
+from ..pipeline import WorkDirManager
+from ..typing import Dependencies
+from ..utils import logger
+from .base import BasePreprocessor
+
+
+__all__ = ["TemporalFilter"]
+
+
+@register_preprocessor
+class TemporalFilter(BasePreprocessor):
+    """Class for temporal filtering.
+
+    Temporal filtering is based on :func:`nilearn.image.clean_img`.
+
+    Parameters
+    ----------
+    detrend : bool, optional
+        If True, detrending will be applied on timeseries (default True).
+    standardize : bool, optional
+        If True, returned signals are set to unit variance (default True).
+    low_pass : float, optional
+        Low cutoff frequencies, in Hertz. If None, no filtering is applied
+        (default None).
+    high_pass : float, optional
+        High cutoff frequencies, in Hertz. If None, no filtering is
+        applied (default None).
+    t_r : float, optional
+        Repetition time, in second (sampling period).
+        If None, it will use t_r from nifti header (default None).
+    masks : str, dict or list of dict or str, optional
+        The specification of the masks to apply to regions before extracting
+        signals. Check :ref:`Using Masks <using_masks>` for more details.
+        If None, will not apply any mask (default None).
+
+    """
+
+    _DEPENDENCIES: ClassVar[Dependencies] = {"numpy", "nilearn"}
+
+    def __init__(
+        self,
+        detrend: bool = True,
+        standardize: bool = True,
+        low_pass: Optional[float] = None,
+        high_pass: Optional[float] = None,
+        t_r: Optional[float] = None,
+        masks: Union[str, dict, list[Union[dict, str]], None] = None,
+    ) -> None:
+        """Initialize the class."""
+        self.detrend = detrend
+        self.standardize = standardize
+        self.low_pass = low_pass
+        self.high_pass = high_pass
+        self.t_r = t_r
+        self.masks = masks
+
+        super().__init__(on="BOLD", required_data_types=["BOLD"])
+
+    def get_valid_inputs(self) -> list[str]:
+        """Get valid data types for input.
+
+        Returns
+        -------
+        list of str
+            The list of data types that can be used as input for this
+            preprocessor.
+
+        """
+        return ["BOLD"]
+
+    def get_output_type(self, input_type: str) -> str:
+        """Get output type.
+
+        Parameters
+        ----------
+        input_type : str
+            The input to the preprocessor.
+
+        Returns
+        -------
+        str
+            The data type output by the preprocessor.
+
+        """
+        # Does not add any new keys
+        return input_type
+
+    def _validate_data(
+        self,
+        input: dict[str, Any],
+    ) -> None:
+        """Validate input data.
+
+        Parameters
+        ----------
+        input : dict
+            Dictionary containing the ``BOLD`` data from the
+            Junifer Data object.
+
+        Raises
+        ------
+        ValueError
+            If ``"data"`` is not 4D
+
+        """
+        # BOLD must be 4D niimg
+        check_niimg_4d(input["data"])
+
+    def preprocess(
+        self,
+        input: dict[str, Any],
+        extra_input: Optional[dict[str, Any]] = None,
+    ) -> tuple[dict[str, Any], Optional[dict[str, dict[str, Any]]]]:
+        """Preprocess.
+
+        Parameters
+        ----------
+        input : dict
+            A single input from the Junifer Data object to preprocess.
+        extra_input : dict, optional
+            The other fields in the Junifer Data object.
+
+        Returns
+        -------
+        dict
+            The computed result as dictionary. If `self.masks` is not None,
+            then the target data computed mask is updated for further steps.
+        None
+            Extra "helper" data types as dictionary to add to the Junifer Data
+            object.
+
+        """
+        # Validate data
+        self._validate_data(input)
+
+        # Get BOLD data
+        bold_img = input["data"]
+        # Set t_r
+        t_r = self.t_r
+        if t_r is None:
+            logger.info("No `t_r` specified, using t_r from NIfTI header")
+            t_r = bold_img.header.get_zooms()[3]  # type: ignore
+            logger.info(
+                f"Read t_r from NIfTI header: {t_r}",
+            )
+
+        # Create element-specific tempdir for storing generated data
+        # and / or mask
+        element_tempdir = WorkDirManager().get_element_tempdir(
+            prefix="temporal_filter"
+        )
+
+        # Set mask data
+        mask_img = None
+        if self.masks is not None:
+            # Generate mask
+            logger.debug(f"Masking with {self.masks}")
+            mask_img = get_data(
+                kind="mask",
+                names=self.masks,
+                target_data=input,
+                extra_input=extra_input,
+            )
+            # Save generated mask for use later
+            generated_mask_img_path = element_tempdir / "generated_mask.nii.gz"
+            nib.save(mask_img, generated_mask_img_path)
+
+            # Save BOLD mask and link it to the BOLD data type dict;
+            # this allows to use "inherit" down the pipeline
+            logger.debug("Setting `BOLD.mask`")
+            input.update(
+                {
+                    "mask": {
+                        # Update path to sync with "data"
+                        "path": generated_mask_img_path,
+                        # Update data
+                        "data": mask_img,
+                        # Should be in the same space as target data
+                        "space": input["space"],
+                    }
+                }
+            )
+
+        signal_clean_kwargs = {}
+
+        # Clean image
+        logger.info("Temporal filter image using nilearn")
+        logger.debug(f"\tdetrend: {self.detrend}")
+        logger.debug(f"\tstandardize: {self.standardize}")
+        logger.debug(f"\tlow_pass: {self.low_pass}")
+        logger.debug(f"\thigh_pass: {self.high_pass}")
+        logger.debug(f"\tt_r: {self.t_r}")
+
+        cleaned_img = nimg.clean_img(
+            imgs=bold_img,
+            detrend=self.detrend,
+            standardize=self.standardize,
+            low_pass=self.low_pass,
+            high_pass=self.high_pass,
+            t_r=t_r,
+            mask_img=mask_img,
+            **signal_clean_kwargs,
+        )
+        # Fix t_r as nilearn messes it up
+        cleaned_img.header["pixdim"][4] = t_r
+        # Save filtered data
+        filtered_data_path = element_tempdir / "filtered_data.nii.gz"
+        nib.save(cleaned_img, filtered_data_path)
+
+        logger.debug("Updating `BOLD`")
+        input.update(
+            {
+                # Update path to sync with "data"
+                "path": filtered_data_path,
+                # Update data
+                "data": cleaned_img,
+            }
+        )
+
+        return input, None

junifer/preprocess/tests/test_temporal_filter.py

@@ -0,0 +1,99 @@
+"""Provide tests for TemporalFilter."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+from typing import Optional
+
+import pytest
+
+from junifer.datareader import DefaultDataReader
+from junifer.preprocess import TemporalFilter
+from junifer.testing.datagrabbers import PartlyCloudyTestingDataGrabber
+
+
+@pytest.mark.parametrize(
+    "detrend, standardize, low_pass, high_pass, t_r, masks",
+    (
+        [
+            True,
+            True,
+            None,
+            None,
+            None,
+            None,
+        ],
+        [
+            False,
+            True,
+            0.1,
+            None,
+            None,
+            "compute_brain_mask",
+        ],
+        [
+            True,
+            False,
+            None,
+            0.08,
+            None,
+            "compute_background_mask",
+        ],
+        [
+            False,
+            False,
+            None,
+            None,
+            2,
+            None,
+        ],
+        [
+            True,
+            True,
+            0.1,
+            0.08,
+            2,
+            "compute_brain_mask",
+        ],
+    ),
+)
+def test_TemporalFilter(
+    detrend: bool,
+    standardize: bool,
+    low_pass: Optional[float],
+    high_pass: Optional[float],
+    t_r: Optional[float],
+    masks: Optional[str],
+) -> None:
+    """Test TemporalFilter.
+
+    Parameters
+    ----------
+    detrend : bool
+        The parametrized detrending flag.
+    standardize : bool
+        The parametrized standardization flag.
+    low_pass : float or None
+        The parametrized low pass value.
+    high_pass : float or None
+        The parametrized high pass value.
+    t_r : float or None
+        The parametrized repetition time.
+    masks : str or None
+        The parametrized mask.
+
+    """
+    with PartlyCloudyTestingDataGrabber() as dg:
+        # Read data
+        element_data = DefaultDataReader().fit_transform(dg["sub-01"])
+        # Preprocess data
+        output = TemporalFilter(
+            detrend=detrend,
+            standardize=standardize,
+            low_pass=low_pass,
+            high_pass=high_pass,
+            t_r=t_r,
+            masks=masks,
+        ).fit_transform(element_data)
+
+        assert isinstance(output, dict)

{junifer-0.0.7.dev95.dist-info → junifer-0.0.7.dev105.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: junifer
-Version: 0.0.7.dev95
+Version: 0.0.7.dev105
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

{junifer-0.0.7.dev95.dist-info → junifer-0.0.7.dev105.dist-info}/RECORD

@@ -1,6 +1,6 @@
 junifer/__init__.py,sha256=2McgH1yNue6Z1V26-uN_mfMjbTcx4CLhym-DMBl5xA4,266
 junifer/__init__.pyi,sha256=SsTvgq2Dod6UqJN96GH1lCphH6hJQQurEJHGNhHjGUI,508
-junifer/_version.py,sha256=engVxAmzTt-PVcgI0gU2Xna6ChVkV4BLs_yEYh5R5MM,526
+junifer/_version.py,sha256=jFH3nrzs5AspealBCIydRQVFvENTPE2XjxPHECcRoME,528
 junifer/conftest.py,sha256=PWYkkRDU8ly2lYwv7VBKMHje4et6HX7Yey3Md_I2KbA,613
 junifer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/stats.py,sha256=e9aaagMGtgpRfW3Wdpz9ocpnYld1IWylCDcjFUgX9Mk,6225
@@ -242,7 +242,7 @@ junifer/onthefly/tests/test_read_transform.py,sha256=Ed6gtj8bsD11fe0Y1AxG2JndtIT
 junifer/pipeline/__init__.py,sha256=rxKQGRwc6_sts1KhVIcVVpuXeiFABf11mQQ2h5jgA3U,194
 junifer/pipeline/__init__.pyi,sha256=hhcvNcABhtLaUQiZdTjo5sMWC3rtDkwVshL0sxD5JAE,399
 junifer/pipeline/marker_collection.py,sha256=1Kmf5f0E2MFhDpO9OBui046b_6h1u9U64AdEqrxso-o,5377
-junifer/pipeline/pipeline_component_registry.py,sha256=zSbIeubzvXFhv_CIQaAsGy_fFrGs43EJeerQUtr1TlA,9465
+junifer/pipeline/pipeline_component_registry.py,sha256=N80XfOZB33tscuqUlrri0r8sMUGVkPL6Li01Of70qrA,9517
 junifer/pipeline/pipeline_step_mixin.py,sha256=oXfJh27yifHs1V3V_tMPCanRiHX1ggOVIbHTvMzq3cY,7853
 junifer/pipeline/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/pipeline/update_meta_mixin.py,sha256=yzGCx8AUbc9mMnWKRu4qaIXTBBSIxtNlGH5zIQIUvzM,1812
@@ -254,7 +254,8 @@ junifer/pipeline/tests/test_pipeline_step_mixin.py,sha256=KCdhFdThm9TGkUvhGzQF3z
 junifer/pipeline/tests/test_update_meta_mixin.py,sha256=po7mWGmXCkZUi201zqgtTm7-A1HKjBgUgqMglMvedqc,1338
 junifer/pipeline/tests/test_workdir_manager.py,sha256=_rXlGb_PUQJBVgV1PWmwjFvTW971MkEbyDDY9dLfJAY,4051
 junifer/preprocess/__init__.py,sha256=91D43p254il88g-7sSN64M7HsCvwytYoiTS_GLEr37Y,342
-junifer/preprocess/__init__.pyi,sha256=77mlHjZXhHOsWd37deAq6d0PIdoCeme4cPGC8jk3Fmw,321
+junifer/preprocess/__init__.pyi,sha256=TM84ia0HAOO9Tt7yTnZVRa1PTE6-F6pnHXcM0ijqVe4,388
+junifer/preprocess/_temporal_filter.py,sha256=_tvoCvTBOD7WgeaoR9RqxltfKD_vLQBKPTFYxsFzf2s,7241
 junifer/preprocess/_temporal_slicer.py,sha256=clZdDwGZrw656JYuK5eVvml54WxNVCQ2EOTbnsHhwnQ,7160
 junifer/preprocess/base.py,sha256=hARO4Yq9sQ8m2tATeuBmPMbI4BSnwNxLf2prF8Iq_Tk,6662
 junifer/preprocess/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -272,6 +273,7 @@ junifer/preprocess/smoothing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 junifer/preprocess/smoothing/smoothing.py,sha256=wdOnPi8XkEqzOQdUNJ0yOm_uWi3H4DnTQhOL8z7dZDs,5281
 junifer/preprocess/smoothing/tests/test_smoothing.py,sha256=IYL-IaRYIuhOU7jGixgNuT-ed_i6q9gmDhK-ZpXAGeU,2389
 junifer/preprocess/tests/test_preprocess_base.py,sha256=-0rpe8QjqYES36H6MHuDs3cv_6upHBdVHnFMgQsmEX4,2571
+junifer/preprocess/tests/test_temporal_filter.py,sha256=ZgEDIGqpFX3dGGKOJAf1vhvg2Q4xWR1aP6MADuPUdro,2227
 junifer/preprocess/tests/test_temporal_slicer.py,sha256=bbt6kxOM-Bv_s9iPn4wrf2YxpA64xO2S0kgRYUEeBNo,4061
 junifer/preprocess/warping/__init__.py,sha256=rzUUP7-6H_nygQ7a7TBZ4_RY7p0ELacosYsWQbSdVZk,214
 junifer/preprocess/warping/__init__.pyi,sha256=Drbqp8N3uprvXcKSxqdfj90fesz9XYVLgivhPnKAYcc,65
@@ -322,10 +324,10 @@ junifer/utils/tests/test_config.py,sha256=7ltIXuwb_W4Mv_1dxQWyiyM10XgUAfsWKV6D_i
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
 junifer/utils/tests/test_logging.py,sha256=W4tFKmaf8_CxnWZ-o_-XxM7DQbhGG18RsLZJk8bZelI,8163
-junifer-0.0.7.dev95.dist-info/licenses/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.7.dev95.dist-info/licenses/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.7.dev95.dist-info/METADATA,sha256=ldts4m1p0zPk8UArf0VD6dxgbByhI6BIjddw_wkIU8c,8387
-junifer-0.0.7.dev95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-junifer-0.0.7.dev95.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
-junifer-0.0.7.dev95.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.7.dev95.dist-info/RECORD,,
+junifer-0.0.7.dev105.dist-info/licenses/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.7.dev105.dist-info/licenses/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.7.dev105.dist-info/METADATA,sha256=y9qwZWakS8Oc_XurJ3dN1hQ-ndxPyy5BdikbsZsaIG8,8388
+junifer-0.0.7.dev105.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+junifer-0.0.7.dev105.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
+junifer-0.0.7.dev105.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.7.dev105.dist-info/RECORD,,