junifer 0.0.6.dev311__py3-none-any.whl → 0.0.6.dev324__py3-none-any.whl

junifer/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.6.dev311'
-__version_tuple__ = version_tuple = (0, 0, 6, 'dev311')
+__version__ = version = '0.0.6.dev324'
+__version_tuple__ = version_tuple = (0, 0, 6, 'dev324')

junifer/markers/falff/_afni_falff.py

@@ -50,7 +50,7 @@ class AFNIALFF(metaclass=Singleton):
     @lru_cache(maxsize=None, typed=True)
     def compute(
         self,
-        data: "Nifti1Image",
+        input_path: Path,
         highpass: float,
         lowpass: float,
         tr: Optional[float],
@@ -59,8 +59,8 @@ class AFNIALFF(metaclass=Singleton):
 
         Parameters
         ----------
-        data : 4D Niimg-like object
-            Images to process.
+        input_path : pathlib.Path
+            Path to the input data.
         highpass : positive float
             Highpass cutoff frequency.
         lowpass : positive float
@@ -82,19 +82,17 @@ class AFNIALFF(metaclass=Singleton):
         """
         logger.debug("Creating cache for ALFF computation via AFNI")
 
-        # Create component-scoped tempdir
-        tempdir = WorkDirManager().get_tempdir(prefix="afni_alff+falff")
-
-        # Save target data to a component-scoped tempfile
-        nifti_in_file_path = tempdir / "input.nii"  # needs to be .nii
-        nib.save(data, nifti_in_file_path)
+        # Create element-scoped tempdir
+        element_tempdir = WorkDirManager().get_element_tempdir(
+            prefix="afni_lff"
+        )
 
         # Set 3dRSFC command
-        alff_falff_out_path_prefix = tempdir / "alff_falff"
+        lff_out_path_prefix = element_tempdir / "output"
         bp_cmd = [
             "3dRSFC",
-            f"-prefix {alff_falff_out_path_prefix.resolve()}",
-            f"-input {nifti_in_file_path.resolve()}",
+            f"-prefix {lff_out_path_prefix.resolve()}",
+            f"-input {input_path.resolve()}",
             f"-band {highpass} {lowpass}",
             "-no_rsfa -nosat -nodetrend",
         ]
@@ -104,49 +102,48 @@ class AFNIALFF(metaclass=Singleton):
         # Call 3dRSFC
         run_ext_cmd(name="3dRSFC", cmd=bp_cmd)
 
-        # Create element-scoped tempdir so that the ALFF and fALFF maps are
-        # available later as nibabel stores file path reference for
-        # loading on computation
-        element_tempdir = WorkDirManager().get_element_tempdir(
-            prefix="afni_alff_falff"
-        )
-
+        # Read header to get output suffix
+        niimg = nib.load(input_path)
+        header = niimg.header
+        sform_code = header.get_sform(coded=True)[1]
+        if sform_code == 4:
+            output_suffix = "tlrc"
+        else:
+            output_suffix = "orig"
+        # Set params suffix
         params_suffix = f"_{highpass}_{lowpass}_{tr}"
 
         # Convert alff afni to nifti
-        alff_afni_to_nifti_out_path = (
-            element_tempdir / f"alff{params_suffix}_output.nii"
+        alff_nifti_out_path = (
+            element_tempdir / f"output_alff{params_suffix}.nii"
         )  # needs to be .nii
         convert_alff_cmd = [
             "3dAFNItoNIFTI",
-            f"-prefix {alff_afni_to_nifti_out_path.resolve()}",
-            f"{alff_falff_out_path_prefix}_ALFF+orig.BRIK",
+            f"-prefix {alff_nifti_out_path.resolve()}",
+            f"{lff_out_path_prefix}_ALFF+{output_suffix}.BRIK",
         ]
         # Call 3dAFNItoNIFTI
         run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_alff_cmd)
 
         # Convert falff afni to nifti
-        falff_afni_to_nifti_out_path = (
-            element_tempdir / f"falff{params_suffix}_output.nii"
+        falff_nifti_out_path = (
+            element_tempdir / f"output_falff{params_suffix}.nii"
         )  # needs to be .nii
         convert_falff_cmd = [
             "3dAFNItoNIFTI",
-            f"-prefix {falff_afni_to_nifti_out_path.resolve()}",
-            f"{alff_falff_out_path_prefix}_fALFF+orig.BRIK",
+            f"-prefix {falff_nifti_out_path.resolve()}",
+            f"{lff_out_path_prefix}_fALFF+{output_suffix}.BRIK",
         ]
         # Call 3dAFNItoNIFTI
         run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_falff_cmd)
 
         # Load nifti
-        alff_data = nib.load(alff_afni_to_nifti_out_path)
-        falff_data = nib.load(falff_afni_to_nifti_out_path)
-
-        # Delete tempdir
-        WorkDirManager().delete_tempdir(tempdir)
+        alff_data = nib.load(alff_nifti_out_path)
+        falff_data = nib.load(falff_nifti_out_path)
 
         return (
             alff_data,
             falff_data,
-            alff_afni_to_nifti_out_path,
-            falff_afni_to_nifti_out_path,
-        )  # type: ignore
+            alff_nifti_out_path,
+            falff_nifti_out_path,
+        )

junifer/markers/falff/_junifer_falff.py

@@ -47,7 +47,7 @@ class JuniferALFF(metaclass=Singleton):
     @lru_cache(maxsize=None, typed=True)
     def compute(
         self,
-        data: "Nifti1Image",
+        input_path: Path,
         highpass: float,
         lowpass: float,
         tr: Optional[float],
@@ -56,8 +56,8 @@ class JuniferALFF(metaclass=Singleton):
 
         Parameters
         ----------
-        data : 4D Niimg-like object
-            Images to process.
+        input_path : pathlib.Path
+            Path to the input data.
         highpass : positive float
             Highpass cutoff frequency.
         lowpass : positive float
@@ -80,9 +80,10 @@ class JuniferALFF(metaclass=Singleton):
         logger.debug("Creating cache for ALFF computation via junifer")
 
         # Get scan data
-        niimg_data = data.get_fdata().copy()
+        niimg = nib.load(input_path)
+        niimg_data = niimg.get_fdata().copy()
         if tr is None:
-            tr = float(data.header["pixdim"][4])  # type: ignore
+            tr = float(niimg.header["pixdim"][4])  # type: ignore
             logger.info(f"`tr` not provided, using `tr` from header: {tr}")
 
         # Bandpass the data within the lowpass and highpass cutoff freqs
@@ -120,19 +121,17 @@ class JuniferALFF(metaclass=Singleton):
         # Calculate ALFF
         alff = numerator / np.sqrt(niimg_data.shape[-1])
         alff_data = nimg.new_img_like(
-            ref_niimg=data,
+            ref_niimg=niimg,
             data=alff,
         )
         falff_data = nimg.new_img_like(
-            ref_niimg=data,
+            ref_niimg=niimg,
             data=falff,
         )
 
-        # Create element-scoped tempdir so that the ALFF and fALFF maps are
-        # available later as nibabel stores file path reference for
-        # loading on computation
+        # Create element-scoped tempdir
         element_tempdir = WorkDirManager().get_element_tempdir(
-            prefix="junifer_alff+falff"
+            prefix="junifer_lff"
         )
         output_alff_path = element_tempdir / "output_alff.nii.gz"
         output_falff_path = element_tempdir / "output_falff.nii.gz"

junifer/markers/falff/falff_base.py

@@ -146,7 +146,7 @@ class ALFFBase(BaseMarker):
             estimator = JuniferALFF()
         # Compute ALFF + fALFF
         alff, falff, alff_path, falff_path = estimator.compute(  # type: ignore
-            data=input_data["data"],
+            input_path=input_data["path"],
             highpass=self.highpass,
             lowpass=self.lowpass,
             tr=self.tr,

junifer/markers/falff/tests/test_falff_spheres.py

@@ -69,7 +69,9 @@ def test_ALFFSpheres(caplog: pytest.LogCaptureFixture, tmp_path: Path) -> None:
             # Fit transform marker on data
             output = marker.fit_transform(element_data)
 
-            assert "Creating cache" in caplog.text
+            # Tests for ALFFParcels run before this with the same data and that
+            # should create the cache
+            assert "Calculating ALFF and fALFF" in caplog.text
 
             # Get BOLD output
             assert "BOLD" in output

junifer/markers/reho/_afni_reho.py

@@ -50,7 +50,7 @@ class AFNIReHo(metaclass=Singleton):
     @lru_cache(maxsize=None, typed=True)
     def compute(
         self,
-        data: "Nifti1Image",
+        input_path: Path,
         nneigh: int = 27,
         neigh_rad: Optional[float] = None,
         neigh_x: Optional[float] = None,
@@ -65,8 +65,8 @@ class AFNIReHo(metaclass=Singleton):
 
         Parameters
         ----------
-        data : 4D Niimg-like object
-            Images to process.
+        input_path : pathlib.Path
+            Path to the input data.
         nneigh : {7, 19, 27}, optional
             Number of voxels in the neighbourhood, inclusive. Can be:
 
@@ -128,19 +128,17 @@ class AFNIReHo(metaclass=Singleton):
         """
         logger.debug("Creating cache for ReHo computation via AFNI")
 
-        # Create component-scoped tempdir
-        tempdir = WorkDirManager().get_tempdir(prefix="afni_reho")
-
-        # Save target data to a component-scoped tempfile
-        nifti_in_file_path = tempdir / "input.nii"  # needs to be .nii
-        nib.save(data, nifti_in_file_path)
+        # Create element-scoped tempdir
+        element_tempdir = WorkDirManager().get_element_tempdir(
+            prefix="afni_reho"
+        )
 
         # Set 3dReHo command
-        reho_out_path_prefix = tempdir / "reho"
+        reho_out_path_prefix = element_tempdir / "output"
         reho_cmd = [
             "3dReHo",
             f"-prefix {reho_out_path_prefix.resolve()}",
-            f"-inset {nifti_in_file_path.resolve()}",
+            f"-inset {input_path.resolve()}",
         ]
         # Check ellipsoidal / cuboidal volume arguments
         if neigh_rad:
@@ -164,28 +162,28 @@ class AFNIReHo(metaclass=Singleton):
         # Call 3dReHo
         run_ext_cmd(name="3dReHo", cmd=reho_cmd)
 
-        # Create element-scoped tempdir so that the ReHo map is
-        # available later as nibabel stores file path reference for
-        # loading on computation
-        element_tempdir = WorkDirManager().get_element_tempdir(
-            prefix="afni_reho"
-        )
+        # Read header to get output suffix
+        niimg = nib.load(input_path)
+        header = niimg.header
+        sform_code = header.get_sform(coded=True)[1]
+        if sform_code == 4:
+            output_suffix = "tlrc"
+        else:
+            output_suffix = "orig"
+
         # Convert afni to nifti
-        reho_afni_to_nifti_out_path = (
+        reho_nifti_out_path = (
             element_tempdir / "output.nii"  # needs to be .nii
         )
         convert_cmd = [
             "3dAFNItoNIFTI",
-            f"-prefix {reho_afni_to_nifti_out_path.resolve()}",
-            f"{reho_out_path_prefix}+orig.BRIK",
+            f"-prefix {reho_nifti_out_path.resolve()}",
+            f"{reho_out_path_prefix}+{output_suffix}.BRIK",
         ]
         # Call 3dAFNItoNIFTI
         run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_cmd)
 
         # Load nifti
-        output_data = nib.load(reho_afni_to_nifti_out_path)
-
-        # Delete tempdir
-        WorkDirManager().delete_tempdir(tempdir)
+        output_data = nib.load(reho_nifti_out_path)
 
-        return output_data, reho_afni_to_nifti_out_path  # type: ignore
+        return output_data, reho_nifti_out_path

junifer/markers/reho/_junifer_reho.py

@@ -48,15 +48,15 @@ class JuniferReHo(metaclass=Singleton):
     @lru_cache(maxsize=None, typed=True)
     def compute(
         self,
-        data: "Nifti1Image",
+        input_path: Path,
         nneigh: int = 27,
     ) -> tuple["Nifti1Image", Path]:
         """Compute ReHo map.
 
         Parameters
         ----------
-        data : 4D Niimg-like object
-            Images to process.
+        input_path : pathlib.Path
+            Path to the input data.
         nneigh : {7, 19, 27, 125}, optional
             Number of voxels in the neighbourhood, inclusive. Can be:
 
@@ -89,7 +89,8 @@ class JuniferReHo(metaclass=Singleton):
         logger.debug("Creating cache for ReHo computation via junifer")
 
         # Get scan data
-        niimg_data = data.get_fdata()
+        niimg = nib.load(input_path)
+        niimg_data = niimg.get_fdata().copy()
         # Get scan dimensions
         n_x, n_y, n_z, _ = niimg_data.shape
 
@@ -119,7 +120,7 @@ class JuniferReHo(metaclass=Singleton):
         # after #299 is merged
         # Calculate whole brain mask
         mni152_whole_brain_mask = nmask.compute_brain_mask(
-            target_img=data,
+            target_img=niimg,
             threshold=0.5,
             mask_type="whole-brain",
         )
@@ -227,7 +228,7 @@ class JuniferReHo(metaclass=Singleton):
 
         # Create new image like target image
         output_data = nimg.new_img_like(
-            ref_niimg=data,
+            ref_niimg=niimg,
             data=reho_map,
             copy_header=False,
         )

junifer/markers/reho/reho_base.py

@@ -125,7 +125,7 @@ class ReHoBase(BaseMarker):
             estimator = JuniferReHo()
         # Compute reho
         reho_map, reho_map_path = estimator.compute(  # type: ignore
-            data=input_data["data"],
+            input_path=input_data["path"],
             **reho_params,
         )
 

junifer/preprocess/confounds/fmriprep_confound_remover.py

@@ -12,6 +12,7 @@ from typing import (
     Union,
 )
 
+import nibabel as nib
 import numpy as np
 import pandas as pd
 from nilearn import image as nimg
@@ -19,6 +20,7 @@ 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, raise_error
 from ..base import BasePreprocessor
@@ -539,9 +541,17 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
             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="fmriprep_confound_remover"
+        )
+
         # 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",
@@ -549,13 +559,21 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
                 target_data=input,
                 extra_input=extra_input,
             )
-            # Return the BOLD mask and link it to the BOLD data type dict;
+            # 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"],
                     }
                 }
@@ -566,7 +584,9 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
         logger.debug(f"\tstandardize: {self.standardize}")
         logger.debug(f"\tlow_pass: {self.low_pass}")
         logger.debug(f"\thigh_pass: {self.high_pass}")
-        input["data"] = nimg.clean_img(
+
+        # Deconfound data
+        cleaned_img = nimg.clean_img(
             imgs=bold_img,
             detrend=self.detrend,
             standardize=self.standardize,
@@ -576,5 +596,18 @@ class fMRIPrepConfoundRemover(BasePreprocessor):
             t_r=t_r,
             mask_img=mask_img,
         )
+        # Save deconfounded data
+        deconfounded_img_path = element_tempdir / "deconfounded_data.nii.gz"
+        nib.save(cleaned_img, deconfounded_img_path)
+
+        logger.debug("Updating `BOLD`")
+        input.update(
+            {
+                # Update path to sync with "data"
+                "path": deconfounded_img_path,
+                # Update data
+                "data": cleaned_img,
+            }
+        )
 
         return input, None

junifer/preprocess/smoothing/_afni_smoothing.py

@@ -4,7 +4,7 @@
 # License: AGPL
 
 from typing import (
-    TYPE_CHECKING,
+    Any,
     ClassVar,
     Union,
 )
@@ -16,10 +16,6 @@ from ...typing import Dependencies, ExternalDependencies
 from ...utils import logger, run_ext_cmd
 
 
-if TYPE_CHECKING:
-    from nibabel.nifti1 import Nifti1Image
-
-
 __all__ = ["AFNISmoothing"]
 
 
@@ -41,23 +37,23 @@ class AFNISmoothing:
 
     def preprocess(
         self,
-        data: "Nifti1Image",
+        input: dict[str, Any],
         fwhm: Union[int, float],
-    ) -> "Nifti1Image":
+    ) -> dict[str, Any]:
         """Preprocess using AFNI.
 
         Parameters
         ----------
-        data : Niimg-like object
-            Image(s) to preprocess.
+        input : dict
+            A single input from the Junifer Data object in which to preprocess.
         fwhm : int or float
             Smooth until the value. AFNI estimates the smoothing and then
             applies smoothing to reach ``fwhm``.
 
         Returns
         -------
-        Niimg-like object
-            The preprocessed image(s).
+        dict
+            The ``input`` dictionary with updated values.
 
         Notes
         -----
@@ -71,18 +67,18 @@ class AFNISmoothing:
         """
         logger.info("Smoothing using AFNI")
 
-        # Create component-scoped tempdir
-        tempdir = WorkDirManager().get_tempdir(prefix="afni_smoothing")
-
-        # Save target data to a component-scoped tempfile
-        nifti_in_file_path = tempdir / "input.nii"  # needs to be .nii
-        nib.save(data, nifti_in_file_path)
+        # Create element-scoped tempdir so that the output is
+        # available later as nibabel stores file path reference for
+        # loading on computation
+        element_tempdir = WorkDirManager().get_element_tempdir(
+            prefix="afni_smoothing"
+        )
 
         # Set 3dBlurToFWHM command
-        blur_out_path_prefix = tempdir / "blur"
+        blur_out_path_prefix = element_tempdir / "blur"
         blur_cmd = [
             "3dBlurToFWHM",
-            f"-input {nifti_in_file_path.resolve()}",
+            f"-input {input['path'].resolve()}",
             f"-prefix {blur_out_path_prefix.resolve()}",
             "-automask",
             f"-FWHM {fwhm}",
@@ -90,28 +86,34 @@ class AFNISmoothing:
         # Call 3dBlurToFWHM
         run_ext_cmd(name="3dBlurToFWHM", cmd=blur_cmd)
 
-        # Create element-scoped tempdir so that the blurred output is
-        # available later as nibabel stores file path reference for
-        # loading on computation
-        element_tempdir = WorkDirManager().get_element_tempdir(
-            prefix="afni_blur"
-        )
+        # Read header to get output suffix
+        header = input["data"].header
+        sform_code = header.get_sform(coded=True)[1]
+        if sform_code == 4:
+            output_suffix = "tlrc"
+        else:
+            output_suffix = "orig"
+
         # Convert afni to nifti
-        blur_afni_to_nifti_out_path = (
-            element_tempdir / "output.nii"  # needs to be .nii
+        blur_nifti_out_path = (
+            element_tempdir / "smoothed_data.nii"  # needs to be .nii
         )
         convert_cmd = [
             "3dAFNItoNIFTI",
-            f"-prefix {blur_afni_to_nifti_out_path.resolve()}",
-            f"{blur_out_path_prefix}+orig.BRIK",
+            f"-prefix {blur_nifti_out_path.resolve()}",
+            f"{blur_out_path_prefix}+{output_suffix}.BRIK",
         ]
         # Call 3dAFNItoNIFTI
         run_ext_cmd(name="3dAFNItoNIFTI", cmd=convert_cmd)
 
-        # Load nifti
-        output_data = nib.load(blur_afni_to_nifti_out_path)
-
-        # Delete tempdir
-        WorkDirManager().delete_tempdir(tempdir)
+        logger.debug("Updating smoothed data")
+        input.update(
+            {
+                # Update path to sync with "data"
+                "path": blur_nifti_out_path,
+                # Load nifti
+                "data": nib.load(blur_nifti_out_path),
+            }
+        )
 
-        return output_data  # type: ignore
+        return input

junifer/preprocess/smoothing/_fsl_smoothing.py

@@ -4,7 +4,7 @@
 # License: AGPL
 
 from typing import (
-    TYPE_CHECKING,
+    Any,
     ClassVar,
 )
 
@@ -15,10 +15,6 @@ from ...typing import Dependencies, ExternalDependencies
 from ...utils import logger, run_ext_cmd
 
 
-if TYPE_CHECKING:
-    from nibabel.nifti1 import Nifti1Image
-
-
 __all__ = ["FSLSmoothing"]
 
 
@@ -40,16 +36,16 @@ class FSLSmoothing:
 
     def preprocess(
         self,
-        data: "Nifti1Image",
+        input: dict[str, Any],
         brightness_threshold: float,
         fwhm: float,
-    ) -> "Nifti1Image":
+    ) -> dict[str, Any]:
         """Preprocess using FSL.
 
         Parameters
         ----------
-        data : Niimg-like object
-            Image(s) to preprocess.
+        input : dict
+            A single input from the Junifer Data object in which to preprocess.
         brightness_threshold : float
             Threshold to discriminate between noise and the underlying image.
             The value should be set greater than the noise level and less than
@@ -59,8 +55,8 @@ class FSLSmoothing:
 
         Returns
         -------
-        Niimg-like object
-            The preprocessed image(s).
+        dict
+            The ``input`` dictionary with updated values.
 
         Notes
         -----
@@ -76,24 +72,17 @@ class FSLSmoothing:
         """
         logger.info("Smoothing using FSL")
 
-        # Create component-scoped tempdir
-        tempdir = WorkDirManager().get_tempdir(prefix="fsl_smoothing")
-
-        # Save target data to a component-scoped tempfile
-        nifti_in_file_path = tempdir / "input.nii.gz"
-        nib.save(data, nifti_in_file_path)
-
         # Create element-scoped tempdir so that the output is
         # available later as nibabel stores file path reference for
         # loading on computation
         element_tempdir = WorkDirManager().get_element_tempdir(
             prefix="fsl_susan"
         )
-        susan_out_path = element_tempdir / "output.nii.gz"
+        susan_out_path = element_tempdir / "smoothed_data.nii.gz"
         # Set susan command
         susan_cmd = [
             "susan",
-            f"{nifti_in_file_path.resolve()}",
+            f"{input['path'].resolve()}",
             f"{brightness_threshold}",
             f"{fwhm}",
             "3",  # dimension
@@ -104,10 +93,14 @@ class FSLSmoothing:
         # Call susan
         run_ext_cmd(name="susan", cmd=susan_cmd)
 
-        # Load nifti
-        output_data = nib.load(susan_out_path)
-
-        # Delete tempdir
-        WorkDirManager().delete_tempdir(tempdir)
+        logger.debug("Updating smoothed data")
+        input.update(
+            {
+                # Update path to sync with "data"
+                "path": susan_out_path,
+                # Load nifti
+                "data": nib.load(susan_out_path),
+            }
+        )
 
-        return output_data  # type: ignore
+        return input

junifer/preprocess/smoothing/_nilearn_smoothing.py

@@ -4,23 +4,21 @@
 # License: AGPL
 
 from typing import (
-    TYPE_CHECKING,
+    Any,
     ClassVar,
     Literal,
     Union,
 )
 
+import nibabel as nib
 from nilearn import image as nimg
 from numpy.typing import ArrayLike
 
+from ...pipeline import WorkDirManager
 from ...typing import Dependencies
 from ...utils import logger
 
 
-if TYPE_CHECKING:
-    from nibabel.nifti1 import Nifti1Image
-
-
 __all__ = ["NilearnSmoothing"]
 
 
@@ -35,15 +33,15 @@ class NilearnSmoothing:
 
     def preprocess(
         self,
-        data: "Nifti1Image",
+        input: dict[str, Any],
         fwhm: Union[int, float, ArrayLike, Literal["fast"], None],
-    ) -> "Nifti1Image":
+    ) -> dict[str, Any]:
         """Preprocess using nilearn.
 
         Parameters
         ----------
-        data : Niimg-like object
-            Image(s) to preprocess.
+        input : dict
+            A single input from the Junifer Data object in which to preprocess.
         fwhm : scalar, ``numpy.ndarray``, tuple or list of scalar, "fast" or \
                None
             Smoothing strength, as a full-width at half maximum, in
@@ -61,9 +59,32 @@ class NilearnSmoothing:
 
         Returns
         -------
-        Niimg-like object
-            The preprocessed image(s).
+        dict
+            The ``input`` dictionary with updated values.
 
         """
         logger.info("Smoothing using nilearn")
-        return nimg.smooth_img(imgs=data, fwhm=fwhm)  # type: ignore
+
+        # Create element-scoped tempdir so that the output is
+        # available later as nibabel stores file path reference for
+        # loading on computation
+        element_tempdir = WorkDirManager().get_element_tempdir(
+            prefix="nilearn_smoothing"
+        )
+
+        smoothed_img = nimg.smooth_img(imgs=input["data"], fwhm=fwhm)
+
+        # Save smoothed output
+        smoothed_img_path = element_tempdir / "smoothed_data.nii.gz"
+        nib.save(smoothed_img, smoothed_img_path)
+
+        logger.debug("Updating smoothed data")
+        input.update(
+            {
+                # Update path to sync with "data"
+                "path": smoothed_img_path,
+                "data": smoothed_img,
+            }
+        )
+
+        return input

junifer/preprocess/smoothing/smoothing.py

@@ -164,12 +164,9 @@ class Smoothing(BasePreprocessor):
         elif self.using == "fsl":
             preprocessor = FSLSmoothing()
         # Smooth
-        output = preprocessor.preprocess(  # type: ignore
-            data=input["data"],
+        input = preprocessor.preprocess(
+            input=input,
             **self.smoothing_params,
         )
 
-        # Modify target data
-        input["data"] = output
-
         return input, None

junifer/preprocess/warping/_ants_warper.py

@@ -58,9 +58,7 @@ class ANTsWarper:
         Returns
         -------
         dict
-            The ``input`` dictionary with modified ``data`` and ``space`` key
-            values and new ``reference`` key whose value points to the
-            reference file used for warping.
+            The ``input`` dictionary with updated values.
 
         Raises
         ------
@@ -110,7 +108,7 @@ class ANTsWarper:
             run_ext_cmd(name="ResampleImage", cmd=resample_image_cmd)
 
             # Create a tempfile for warped output
-            apply_transforms_out_path = element_tempdir / "output.nii.gz"
+            apply_transforms_out_path = element_tempdir / "warped_data.nii.gz"
             # Set antsApplyTransforms command
             apply_transforms_cmd = [
                 "antsApplyTransforms",
@@ -126,14 +124,59 @@ class ANTsWarper:
             # Call antsApplyTransforms
             run_ext_cmd(name="antsApplyTransforms", cmd=apply_transforms_cmd)
 
-            # Load nifti
-            input["data"] = nib.load(apply_transforms_out_path)
-            # Save resampled reference path
-            input["reference"] = {"path": resample_image_out_path}
-            # Keep pre-warp space for further operations
-            input["prewarp_space"] = input["space"]
-            # Use reference input's space as warped input's space
-            input["space"] = extra_input["T1w"]["space"]
+            logger.debug("Updating warped data")
+            input.update(
+                {
+                    # Update path to sync with "data"
+                    "path": apply_transforms_out_path,
+                    # Load nifti
+                    "data": nib.load(apply_transforms_out_path),
+                    # Use reference input's space as warped input's space
+                    "space": extra_input["T1w"]["space"],
+                    # Save resampled reference path
+                    "reference": {"path": resample_image_out_path},
+                    # Keep pre-warp space for further operations
+                    "prewarp_space": input["space"],
+                }
+            )
+
+            # Check for data type's mask and warp if found
+            if input.get("mask") is not None:
+                # Create a tempfile for warped mask output
+                apply_transforms_mask_out_path = (
+                    element_tempdir / "warped_mask.nii.gz"
+                )
+                # Set antsApplyTransforms command
+                apply_transforms_mask_cmd = [
+                    "antsApplyTransforms",
+                    "-d 3",
+                    "-e 3",
+                    "-n 'GenericLabel[NearestNeighbor]'",
+                    f"-i {input['mask']['path'].resolve()}",
+                    # use resampled reference
+                    f"-r {input['reference']['path'].resolve()}",
+                    f"-t {warp_file_path.resolve()}",
+                    f"-o {apply_transforms_mask_out_path.resolve()}",
+                ]
+                # Call antsApplyTransforms
+                run_ext_cmd(
+                    name="antsApplyTransforms", cmd=apply_transforms_mask_cmd
+                )
+
+                logger.debug("Updating warped mask data")
+                input.update(
+                    {
+                        "mask": {
+                            # Update path to sync with "data"
+                            "path": apply_transforms_mask_out_path,
+                            # Load nifti
+                            "data": nib.load(apply_transforms_mask_out_path),
+                            # Use reference input's space as warped input
+                            # mask's space
+                            "space": extra_input["T1w"]["space"],
+                        }
+                    }
+                )
 
         # Template space warping
         else:
@@ -149,16 +192,15 @@ class ANTsWarper:
                 target_data=input,
                 extra_input=None,
             )
-
-            # Create component-scoped tempdir
-            tempdir = WorkDirManager().get_tempdir(prefix="ants_warper")
             # Save template
-            template_space_img_path = tempdir / f"{reference}_T1w.nii.gz"
+            template_space_img_path = (
+                element_tempdir / f"{reference}_T1w.nii.gz"
+            )
             nib.save(template_space_img, template_space_img_path)
 
             # Create a tempfile for warped output
             warped_output_path = element_tempdir / (
-                f"data_warped_from_{input['space']}_to_" f"{reference}.nii.gz"
+                f"warped_data_from_{input['space']}_to_{reference}.nii.gz"
             )
 
             # Set antsApplyTransforms command
@@ -175,14 +217,58 @@ class ANTsWarper:
             # Call antsApplyTransforms
             run_ext_cmd(name="antsApplyTransforms", cmd=apply_transforms_cmd)
 
-            # Delete tempdir
-            WorkDirManager().delete_tempdir(tempdir)
+            logger.debug("Updating warped data")
+            input.update(
+                {
+                    # Update path to sync with "data"
+                    "path": warped_output_path,
+                    # Load nifti
+                    "data": nib.load(warped_output_path),
+                    # Update warped input's space
+                    "space": reference,
+                    # Save reference path
+                    "reference": {"path": template_space_img_path},
+                    # Keep pre-warp space for further operations
+                    "prewarp_space": input["space"],
+                }
+            )
+
+            # Check for data type's mask and warp if found
+            if input.get("mask") is not None:
+                # Create a tempfile for warped mask output
+                apply_transforms_mask_out_path = element_tempdir / (
+                    f"warped_mask_from_{input['space']}_to_"
+                    f"{reference}.nii.gz"
+                )
+                # Set antsApplyTransforms command
+                apply_transforms_mask_cmd = [
+                    "antsApplyTransforms",
+                    "-d 3",
+                    "-e 3",
+                    "-n 'GenericLabel[NearestNeighbor]'",
+                    f"-i {input['mask']['path'].resolve()}",
+                    # use resampled reference
+                    f"-r {input['reference']['path'].resolve()}",
+                    f"-t {xfm_file_path.resolve()}",
+                    f"-o {apply_transforms_mask_out_path.resolve()}",
+                ]
+                # Call antsApplyTransforms
+                run_ext_cmd(
+                    name="antsApplyTransforms", cmd=apply_transforms_mask_cmd
+                )
 
-            # Modify target data
-            input["data"] = nib.load(warped_output_path)
-            # Keep pre-warp space for further operations
-            input["prewarp_space"] = input["space"]
-            # Update warped input's space
-            input["space"] = reference
+                logger.debug("Updating warped mask data")
+                input.update(
+                    {
+                        "mask": {
+                            # Update path to sync with "data"
+                            "path": apply_transforms_mask_out_path,
+                            # Load nifti
+                            "data": nib.load(apply_transforms_mask_out_path),
+                            # Update warped input mask's space
+                            "space": reference,
+                        }
+                    }
+                )
 
         return input

junifer/preprocess/warping/_fsl_warper.py

@@ -54,9 +54,7 @@ class FSLWarper:
         Returns
         -------
         dict
-            The ``input`` dictionary with modified ``data`` and ``space`` key
-            values and new ``reference`` key whose value points to the
-            reference file used for warping.
+            The ``input`` dictionary with updated values.
 
         Raises
         ------
@@ -100,26 +98,66 @@ class FSLWarper:
         run_ext_cmd(name="flirt", cmd=flirt_cmd)
 
         # Create a tempfile for warped output
-        applywarp_out_path = element_tempdir / "output.nii.gz"
+        applywarp_out_path = element_tempdir / "warped_data.nii.gz"
         # Set applywarp command
         applywarp_cmd = [
             "applywarp",
             "--interp=spline",
             f"-i {input['path'].resolve()}",
-            f"-r {flirt_out_path.resolve()}",  # use resampled reference
+            # use resampled reference
+            f"-r {flirt_out_path.resolve()}",
             f"-w {warp_file_path.resolve()}",
             f"-o {applywarp_out_path.resolve()}",
         ]
         # Call applywarp
         run_ext_cmd(name="applywarp", cmd=applywarp_cmd)
 
-        # Load nifti
-        input["data"] = nib.load(applywarp_out_path)
-        # Save resampled reference path
-        input["reference"] = {"path": flirt_out_path}
-        # Keep pre-warp space for further operations
-        input["prewarp_space"] = input["space"]
-        # Use reference input's space as warped input's space
-        input["space"] = extra_input["T1w"]["space"]
+        logger.debug("Updating warped data")
+        input.update(
+            {
+                # Update path to sync with "data"
+                "path": applywarp_out_path,
+                # Load nifti
+                "data": nib.load(applywarp_out_path),
+                # Use reference input's space as warped input's space
+                "space": extra_input["T1w"]["space"],
+                # Save resampled reference path
+                "reference": {"path": flirt_out_path},
+                # Keep pre-warp space for further operations
+                "prewarp_space": input["space"],
+            }
+        )
+
+        # Check for data type's mask and warp if found
+        if input.get("mask") is not None:
+            # Create a tempfile for warped mask output
+            applywarp_mask_out_path = element_tempdir / "warped_mask.nii.gz"
+            # Set applywarp command
+            applywarp_mask_cmd = [
+                "applywarp",
+                "--interp=nn",
+                f"-i {input['mask']['path'].resolve()}",
+                # use resampled reference
+                f"-r {input['reference']['path'].resolve()}",
+                f"-w {warp_file_path.resolve()}",
+                f"-o {applywarp_mask_out_path.resolve()}",
+            ]
+            # Call applywarp
+            run_ext_cmd(name="applywarp", cmd=applywarp_mask_cmd)
+
+            logger.debug("Updating warped mask data")
+            input.update(
+                {
+                    "mask": {
+                        # Update path to sync with "data"
+                        "path": applywarp_mask_out_path,
+                        # Load nifti
+                        "data": nib.load(applywarp_mask_out_path),
+                        # Use reference input's space as warped input mask's
+                        # space
+                        "space": extra_input["T1w"]["space"],
+                    }
+                }
+            )
 
         return input

{junifer-0.0.6.dev311.dist-info → junifer-0.0.6.dev324.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.6.dev311
+Version: 0.0.6.dev324
 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.6.dev311.dist-info → junifer-0.0.6.dev324.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=Um0qpMM5T1_-HjlNcQSFRjfl7t4PTi-Tmwj5GjnZBzM,428
+junifer/_version.py,sha256=Mek99XWm9XI8ealUwe-651JH0dQXcrlgJtYJdIejdA4,428
 junifer/conftest.py,sha256=PWYkkRDU8ly2lYwv7VBKMHje4et6HX7Yey3Md_I2KbA,613
 junifer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/stats.py,sha256=e9aaagMGtgpRfW3Wdpz9ocpnYld1IWylCDcjFUgX9Mk,6225
@@ -208,14 +208,14 @@ junifer/markers/complexity/tests/test_sample_entropy.py,sha256=rfbiguVq7CUwYIvYB
 junifer/markers/complexity/tests/test_weighted_perm_entropy.py,sha256=yDWKEaUbxrnrG6J2NlktLfwSBre5OuXd63kEof7t8PM,2373
 junifer/markers/falff/__init__.py,sha256=qxdx_3FsVrn7h3gtbocK0ZmvqZwPQZGKuVkPm31ejNM,217
 junifer/markers/falff/__init__.pyi,sha256=X-q2zBjUX0imQ37yN2Cg5gKfDvq8sh_9y2hRH4g5ufY,120
-junifer/markers/falff/_afni_falff.py,sha256=D_hhT-rfWXeIe-Pwh4pK2O7N9Q07VyMOUHeAz6Ooudo,4518
-junifer/markers/falff/_junifer_falff.py,sha256=TnZ6T8u0f0YitJ7KRk4gMcC1tv6UW8m4VVcvcjGRsL0,4450
-junifer/markers/falff/falff_base.py,sha256=XZcBfXA74tWrW--uCALkRLl1tB7toR3_HfzPJUblz8g,4909
+junifer/markers/falff/_afni_falff.py,sha256=PYkSOFMyaHoGYDvmBjKLW1ALyWBe7yI36JBqZ71ji2c,4223
+junifer/markers/falff/_junifer_falff.py,sha256=1PsavcopVjPtfmPZsnNi5ynl2GTfnCx9qjuKDb7YejE,4347
+junifer/markers/falff/falff_base.py,sha256=WtJTMRn_Vmv9RZaaeLeyZpCsQc8QgB3UqIPWsUI3Lh4,4915
 junifer/markers/falff/falff_parcels.py,sha256=sSb6QLaJKpL0GCTRWW3RnpOZCoy1f9lDLgJ0I_W_LlM,6017
 junifer/markers/falff/falff_spheres.py,sha256=GrakJYPB01y9BNBXM8WzWaae0mC-S06txiycvfBGcj0,6656
 junifer/markers/falff/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/markers/falff/tests/test_falff_parcels.py,sha256=Z3n1i8dkYbdXgouUjfIif9yLv5MubBEdrtAA-a6kRcc,4349
-junifer/markers/falff/tests/test_falff_spheres.py,sha256=-VLEvFaF8CMCN_7FLYCSfP7MMjy-gm1Zgu13je5Pku8,4373
+junifer/markers/falff/tests/test_falff_spheres.py,sha256=PGsxFjMxsH8HxIHVtdcQcX8suFa18ma_12Almknzn88,4503
 junifer/markers/functional_connectivity/__init__.py,sha256=dGTn69eS7a3rylMQh_wKlO28UmYGjsoDEGu4q5sgQFA,230
 junifer/markers/functional_connectivity/__init__.pyi,sha256=qfw6WVyE65u-5NZNi0xPa8zZVtkRfFvwyl4jHH2Xl00,539
 junifer/markers/functional_connectivity/crossparcellation_functional_connectivity.py,sha256=uLdVGywmL7qrzloh1YBL4g4tPiamA47MgHF2DQH0JTU,5733
@@ -233,10 +233,10 @@ junifer/markers/functional_connectivity/tests/test_functional_connectivity_parce
 junifer/markers/functional_connectivity/tests/test_functional_connectivity_spheres.py,sha256=A9OtFdndiSGOcPHH-QLPh6qoiD03A6KjM_emwxAlPg0,4145
 junifer/markers/reho/__init__.py,sha256=WZf4A0XaRThjl8SlFOhvTLUfhTHp5koLxZgowsgTSAE,211
 junifer/markers/reho/__init__.pyi,sha256=_aFb-Ry_EP2OMU6xRL4GlfuDpSl_egHllL-fz7vXjcE,118
-junifer/markers/reho/_afni_reho.py,sha256=YBqNYipZO8EFM4Jmek_A36zr9n4nTR0RVDPpxjJKLxM,6466
-junifer/markers/reho/_junifer_reho.py,sha256=86oBH8UtWsHJJGz2-uRXAjdGNHvaSV6Xu1v7-9AJqLs,9340
+junifer/markers/reho/_afni_reho.py,sha256=SOWR5y9AYKfw1wj2Z4Wy7ckMUVTmeS378bayvPPVqqo,6225
+junifer/markers/reho/_junifer_reho.py,sha256=14ObaRa2-0JzcoYLJyhnx4bgPCpTdciDXmrn9-gPv20,9387
 junifer/markers/reho/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-junifer/markers/reho/reho_base.py,sha256=Amji7hNtkT9D-teJ2tTzDsVHKRXETDwhICDKa8ZGehY,4071
+junifer/markers/reho/reho_base.py,sha256=Q88TbhIM4rQWdeQPLwwxwZ9DrR8l09orD1rdTkSYDtc,4077
 junifer/markers/reho/reho_parcels.py,sha256=UE1ia3uqbmTcZMc_FI625xVPLxBYvwpfrcvhekopbkI,6392
 junifer/markers/reho/reho_spheres.py,sha256=FCC2qncC85Kd82hg-MOu4T7NAKEkXHUaCcwC9taau9Y,6996
 junifer/markers/reho/tests/test_reho_parcels.py,sha256=bRtDi91qRcRYaRqqQjuSU6NuNz-KwLVCoTYo-e5VmsI,4075
@@ -280,22 +280,22 @@ junifer/preprocess/base.py,sha256=hARO4Yq9sQ8m2tATeuBmPMbI4BSnwNxLf2prF8Iq_Tk,66
 junifer/preprocess/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/preprocess/confounds/__init__.py,sha256=L3CquKcndFb2b8yVo-XLi-zsNCe8MMKUN41UOVdooWc,270
 junifer/preprocess/confounds/__init__.pyi,sha256=iC70cqcWNMX4JM42RcUgKb9YX8ciK8oVERdWWjo-13c,102
-junifer/preprocess/confounds/fmriprep_confound_remover.py,sha256=FXnNZrr1GUBqiSOboRrM-TqO9rNxne63wlUMPfnPE78,20368
+junifer/preprocess/confounds/fmriprep_confound_remover.py,sha256=Vw0ymmA8QppKY3GHdP8J9K6KyYUSbLGbBnwT-VpwXLw,21527
 junifer/preprocess/confounds/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/preprocess/confounds/tests/test_fmriprep_confound_remover.py,sha256=yZxCud9l8bW36Rsk63Fi1qWUpM9L4Wtd2-zZW-DjvZA,19949
 junifer/preprocess/smoothing/__init__.py,sha256=7aTwvAG522kA76QQwqxwY5zV_6asyPaaH2uSMTaKQls,216
 junifer/preprocess/smoothing/__init__.pyi,sha256=5sjw61Eyon9gE_SWoktND9raw6IkgqcT2rtGNhVV9EA,58
-junifer/preprocess/smoothing/_afni_smoothing.py,sha256=x5Dtv8z6NCXxWumOIAnW17YRswHsD31V_7hhBGIizss,3287
-junifer/preprocess/smoothing/_fsl_smoothing.py,sha256=Zra5dS3k8qm823GtbW4uQWkGdNEeu0scY5OP4PteI88,3045
-junifer/preprocess/smoothing/_nilearn_smoothing.py,sha256=1maeg6t_kWuxK98IFFAmW0MNwii6YSFkXPJHjZUjOEo,1965
+junifer/preprocess/smoothing/_afni_smoothing.py,sha256=4mdZk9YkA02wZ8rS6sbLnXL_7SIX7M0NwHPLckJgCmI,3325
+junifer/preprocess/smoothing/_fsl_smoothing.py,sha256=vIj1sUjysujjPErZH2T5G1GrcaZyAkuvzERBgx4SmDU,2856
+junifer/preprocess/smoothing/_nilearn_smoothing.py,sha256=bWljIiKX0dfIQmRo33Z-6WrCz05nMVAAroYaBsj2B1Q,2685
 junifer/preprocess/smoothing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-junifer/preprocess/smoothing/smoothing.py,sha256=I9NTnfnK84_rDCe7ycLZmWkSmKwYBlAfOPhFRSRxxfI,5366
+junifer/preprocess/smoothing/smoothing.py,sha256=wdOnPi8XkEqzOQdUNJ0yOm_uWi3H4DnTQhOL8z7dZDs,5281
 junifer/preprocess/smoothing/tests/test_smoothing.py,sha256=t1j3zEvJk5XLO4fzcb-wQyBMH-xuvR1k6WYm8zriwik,2390
 junifer/preprocess/tests/test_preprocess_base.py,sha256=-0rpe8QjqYES36H6MHuDs3cv_6upHBdVHnFMgQsmEX4,2571
 junifer/preprocess/warping/__init__.py,sha256=rzUUP7-6H_nygQ7a7TBZ4_RY7p0ELacosYsWQbSdVZk,214
 junifer/preprocess/warping/__init__.pyi,sha256=Drbqp8N3uprvXcKSxqdfj90fesz9XYVLgivhPnKAYcc,65
-junifer/preprocess/warping/_ants_warper.py,sha256=BHfweLDtq3J8NmgUFvA7bfWIN4kDvo0RiB1fNDJ71qw,6502
-junifer/preprocess/warping/_fsl_warper.py,sha256=yilHysV9t9bkBDK_eQzjROzlwhXStVzflCaEkxkwjlY,3798
+junifer/preprocess/warping/_ants_warper.py,sha256=Qk6piCuGPlfgGbH3zMVC5UHCoQ7iddYuc2vgsrqncGg,10163
+junifer/preprocess/warping/_fsl_warper.py,sha256=dH1xd3jTRPREzgdh98Dz_4o2gwdrOgc0h5wbARSSB98,5226
 junifer/preprocess/warping/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/preprocess/warping/space_warper.py,sha256=mf7SDu574R3TXNt82fqGl_hcEYx7SjXwz2TcmWObHQA,7706
 junifer/preprocess/warping/tests/test_space_warper.py,sha256=amFHtt-q7L7v9uL4cOvrmHEbUOGDhmoMHkLnKJ0dF7A,5543
@@ -341,10 +341,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=duO4ou365hxwa_kwihFtKPLaL6LC5XHiyhOijrrngbA,8009
-junifer-0.0.6.dev311.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.6.dev311.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.6.dev311.dist-info/METADATA,sha256=A3vcsrgSmtY_rzNE4oPkyed8tfX0qw2Iy93uo03avn0,8429
-junifer-0.0.6.dev311.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-junifer-0.0.6.dev311.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
-junifer-0.0.6.dev311.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.6.dev311.dist-info/RECORD,,
+junifer-0.0.6.dev324.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.6.dev324.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.6.dev324.dist-info/METADATA,sha256=a_1zgab7_sp4jn5_jM6ZrKnJXL1InFZpK9zj39EUtVY,8429
+junifer-0.0.6.dev324.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+junifer-0.0.6.dev324.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
+junifer-0.0.6.dev324.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.6.dev324.dist-info/RECORD,,