junifer 0.0.3.dev143__py3-none-any.whl → 0.0.3.dev148__py3-none-any.whl

junifer/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.0.3.dev143'
-__version_tuple__ = version_tuple = (0, 0, 3, 'dev143')
+__version__ = version = '0.0.3.dev148'
+__version_tuple__ = version_tuple = (0, 0, 3, 'dev148')

junifer/data/parcellations.py

@@ -103,6 +103,21 @@ for year in (2013, 2015, 2019):
             "year": 2019,
             "n_rois": 368,
         }
+# Add Yan parcellation info
+for n_rois in range(100, 1001, 100):
+    # Add Yeo networks
+    for yeo_network in [7, 17]:
+        _available_parcellations[f"Yan{n_rois}xYeo{yeo_network}"] = {
+            "family": "Yan",
+            "n_rois": n_rois,
+            "yeo_networks": yeo_network,
+        }
+    # Add Kong networks
+    _available_parcellations[f"Yan{n_rois}xKong17"] = {
+        "family": "Yan",
+        "n_rois": n_rois,
+        "kong_networks": 17,
+    }
 
 
 def register_parcellation(
@@ -273,7 +288,7 @@ def _retrieve_parcellation(
 
     Parameters
     ----------
-    family : {"Schaefer", "SUIT", "Tian", "AICHA", "Shen"}
+    family : {"Schaefer", "SUIT", "Tian", "AICHA", "Shen", "Yan"}
         The name of the parcellation family.
     parcellations_dir : str or pathlib.Path, optional
         Path where the retrieved parcellations file are stored. The default
@@ -316,6 +331,13 @@ def _retrieve_parcellation(
             Number of ROIs to use. Can be ``50, 100, or 150`` for
             ``year = 2013`` but is fixed at ``268`` for ``year = 2015`` and at
             ``368`` for ``year = 2019``.
+    * Yan :
+        ``n_rois`` : {100, 200, 300, 400, 500, 600, 700, 800, 900, 1000}
+            Granularity of the parcellation to be used.
+        ``yeo_networks`` : {7, 17}, optional
+            Number of Yeo networks to use (default None).
+        ``kong_networks`` : {17}, optional
+            Number of Kong networks to use (default None).
 
     Returns
     -------
@@ -373,6 +395,12 @@ def _retrieve_parcellation(
             resolution=resolution,
             **kwargs,
         )
+    elif family == "Yan":
+        parcellation_fname, parcellation_labels = _retrieve_yan(
+            parcellations_dir=parcellations_dir,
+            resolution=resolution,
+            **kwargs,
+        )
     else:
         raise_error(
             f"The provided parcellation name {family} cannot be retrieved."
@@ -1089,6 +1117,188 @@ def _retrieve_shen(  # noqa: C901
     return parcellation_fname, labels
 
 
+def _retrieve_yan(
+    parcellations_dir: Path,
+    resolution: Optional[float] = None,
+    n_rois: Optional[int] = None,
+    yeo_networks: Optional[int] = None,
+    kong_networks: Optional[int] = None,
+) -> Tuple[Path, List[str]]:
+    """Retrieve Yan parcellation.
+
+    Parameters
+    ----------
+    parcellations_dir : pathlib.Path
+        The path to the parcellation data directory.
+    resolution : float, optional
+        The desired resolution of the parcellation to load. If it is not
+        available, the closest resolution will be loaded. Preferably, use a
+        resolution higher than the desired one. By default, will load the
+        highest one (default None). Available resolutions for this
+        parcellation are 1mm and 2mm.
+    n_rois : {100, 200, 300, 400, 500, 600, 700, 800, 900, 1000}, optional
+        Granularity of the parcellation to be used (default None).
+    yeo_networks : {7, 17}, optional
+        Number of Yeo networks to use (default None).
+    kong_networks : {17}, optional
+        Number of Kong networks to use (default None).
+
+    Returns
+    -------
+    pathlib.Path
+        File path to the parcellation image.
+    list of str
+        Parcellation labels.
+
+    Raises
+    ------
+    ValueError
+        If invalid value is provided for ``n_rois``, ``yeo_networks`` or
+        ``kong_networks`` or if there is a problem fetching the parcellation.
+
+    """
+    logger.info("Parcellation parameters:")
+    logger.info(f"\tresolution: {resolution}")
+    logger.info(f"\tn_rois: {n_rois}")
+    logger.info(f"\tyeo_networks: {yeo_networks}")
+    logger.info(f"\tkong_networks: {kong_networks}")
+
+    # Allow single network type
+    if (not yeo_networks and not kong_networks) or (
+        yeo_networks and kong_networks
+    ):
+        raise_error(
+            "Either one of `yeo_networks` or `kong_networks` need to be "
+            "specified."
+        )
+
+    # Check resolution
+    _valid_resolutions = [1, 2]
+    resolution = closest_resolution(resolution, _valid_resolutions)
+
+    # Check n_rois value
+    _valid_n_rois = list(range(100, 1001, 100))
+    if n_rois not in _valid_n_rois:
+        raise_error(
+            f"The parameter `n_rois` ({n_rois}) needs to be one of the "
+            f"following: {_valid_n_rois}"
+        )
+
+    if yeo_networks:
+        # Check yeo_networks value
+        _valid_yeo_networks = [7, 17]
+        if yeo_networks not in _valid_yeo_networks:
+            raise_error(
+                f"The parameter `yeo_networks` ({yeo_networks}) needs to be "
+                f"one of the following: {_valid_yeo_networks}"
+            )
+        # Define image and label file according to network
+        parcellation_fname = (
+            parcellations_dir
+            / "Yan_2023"
+            / (
+                f"{n_rois}Parcels_Yeo2011_{yeo_networks}Networks_FSLMNI152_"
+                f"{resolution}mm.nii.gz"
+            )
+        )
+        parcellation_lname = (
+            parcellations_dir
+            / "Yan_2023"
+            / f"{n_rois}Parcels_Yeo2011_{yeo_networks}Networks_LUT.txt"
+        )
+    elif kong_networks:
+        # Check kong_networks value
+        _valid_kong_networks = [17]
+        if kong_networks not in _valid_kong_networks:
+            raise_error(
+                f"The parameter `kong_networks` ({kong_networks}) needs to be "
+                f"one of the following: {_valid_kong_networks}"
+            )
+        # Define image and label file according to network
+        parcellation_fname = (
+            parcellations_dir
+            / "Yan_2023"
+            / (
+                f"{n_rois}Parcels_Kong2022_{kong_networks}Networks_FSLMNI152_"
+                f"{resolution}mm.nii.gz"
+            )
+        )
+        parcellation_lname = (
+            parcellations_dir
+            / "Yan_2023"
+            / f"{n_rois}Parcels_Kong2022_{kong_networks}Networks_LUT.txt"
+        )
+
+    # Check for existence of parcellation:
+    if not parcellation_fname.exists() and not parcellation_lname.exists():
+        logger.info(
+            "At least one of the parcellation files are missing, fetching."
+        )
+
+        # Set URL based on network
+        if yeo_networks:
+            img_url = (
+                "https://raw.githubusercontent.com/ThomasYeoLab/CBIG/"
+                "master/stable_projects/brain_parcellation/Yan2023_homotopic/"
+                f"parcellations/MNI/yeo{yeo_networks}/{n_rois}Parcels_Yeo2011"
+                f"_{yeo_networks}Networks_FSLMNI152_{resolution}mm.nii.gz"
+            )
+            label_url = (
+                "https://raw.githubusercontent.com/ThomasYeoLab/CBIG/"
+                "master/stable_projects/brain_parcellation/Yan2023_homotopic/"
+                f"parcellations/MNI/yeo{yeo_networks}/freeview_lut/{n_rois}"
+                f"Parcels_Yeo2011_{yeo_networks}Networks_LUT.txt"
+            )
+        elif kong_networks:
+            img_url = (
+                "https://raw.githubusercontent.com/ThomasYeoLab/CBIG/"
+                "master/stable_projects/brain_parcellation/Yan2023_homotopic/"
+                f"parcellations/MNI/kong17/{n_rois}Parcels_Kong2022"
+                f"_17Networks_FSLMNI152_{resolution}mm.nii.gz"
+            )
+            label_url = (
+                "https://raw.githubusercontent.com/ThomasYeoLab/CBIG/"
+                "master/stable_projects/brain_parcellation/Yan2023_homotopic/"
+                f"parcellations/MNI/kong17/freeview_lut/{n_rois}Parcels_"
+                "Kong2022_17Networks_LUT.txt"
+            )
+
+        # Initiate a session and make HTTP requests
+        session = requests.Session()
+        # Download parcellation file
+        logger.info(f"Downloading Yan 2023 parcellation from {img_url}")
+        try:
+            img_resp = session.get(img_url)
+            img_resp.raise_for_status()
+        except (ConnectionError, ReadTimeout, HTTPError) as err:
+            raise_error(
+                f"Failed to download Yan 2023 parcellation due to: {err}"
+            )
+        else:
+            parcellation_img_path = Path(parcellation_fname)
+            parcellation_img_path.parent.mkdir(parents=True, exist_ok=True)
+            parcellation_img_path.touch(exist_ok=True)
+            with open(parcellation_img_path, "wb") as f:
+                f.write(img_resp.content)
+        # Download label file
+        logger.info(f"Downloading Yan 2023 labels from {label_url}")
+        try:
+            label_resp = session.get(label_url)
+            label_resp.raise_for_status()
+        except (ConnectionError, ReadTimeout, HTTPError) as err:
+            raise_error(f"Failed to download Yan 2023 labels due to: {err}")
+        else:
+            parcellation_labels_path = Path(parcellation_lname)
+            parcellation_labels_path.touch(exist_ok=True)
+            with open(parcellation_labels_path, "wb") as f:
+                f.write(label_resp.content)
+
+    # Load label file
+    labels = pd.read_csv(parcellation_lname, sep=" ", header=None)[1].to_list()
+
+    return parcellation_fname, labels
+
+
 def merge_parcellations(
     parcellations_list: List["Nifti1Image"],
     parcellations_names: List[str],

junifer/data/tests/test_parcellations.py

@@ -21,6 +21,7 @@ from junifer.data.parcellations import (
     _retrieve_shen,
     _retrieve_suit,
     _retrieve_tian,
+    _retrieve_yan,
     list_parcellations,
     load_parcellation,
     merge_parcellations,
@@ -728,6 +729,204 @@ def test_retrieve_shen_incorrect_param_combo(
         )
 
 
+@pytest.mark.parametrize(
+    "resolution, n_rois, yeo_networks, kong_networks",
+    [
+        (1.0, 100, 7, None),
+        (1.0, 200, 7, None),
+        (1.0, 300, 7, None),
+        (1.0, 400, 7, None),
+        (1.0, 500, 7, None),
+        (1.0, 600, 7, None),
+        (1.0, 700, 7, None),
+        (1.0, 800, 7, None),
+        (1.0, 900, 7, None),
+        (1.0, 1000, 7, None),
+        (2.0, 100, 7, None),
+        (2.0, 200, 7, None),
+        (2.0, 300, 7, None),
+        (2.0, 400, 7, None),
+        (2.0, 500, 7, None),
+        (2.0, 600, 7, None),
+        (2.0, 700, 7, None),
+        (2.0, 800, 7, None),
+        (2.0, 900, 7, None),
+        (2.0, 1000, 7, None),
+        (1.0, 100, 17, None),
+        (1.0, 200, 17, None),
+        (1.0, 300, 17, None),
+        (1.0, 400, 17, None),
+        (1.0, 500, 17, None),
+        (1.0, 600, 17, None),
+        (1.0, 700, 17, None),
+        (1.0, 800, 17, None),
+        (1.0, 900, 17, None),
+        (1.0, 1000, 17, None),
+        (2.0, 100, 17, None),
+        (2.0, 200, 17, None),
+        (2.0, 300, 17, None),
+        (2.0, 400, 17, None),
+        (2.0, 500, 17, None),
+        (2.0, 600, 17, None),
+        (2.0, 700, 17, None),
+        (2.0, 800, 17, None),
+        (2.0, 900, 17, None),
+        (2.0, 1000, 17, None),
+        (1.0, 100, None, 17),
+        (1.0, 200, None, 17),
+        (1.0, 300, None, 17),
+        (1.0, 400, None, 17),
+        (1.0, 500, None, 17),
+        (1.0, 600, None, 17),
+        (1.0, 700, None, 17),
+        (1.0, 800, None, 17),
+        (1.0, 900, None, 17),
+        (1.0, 1000, None, 17),
+        (2.0, 100, None, 17),
+        (2.0, 200, None, 17),
+        (2.0, 300, None, 17),
+        (2.0, 400, None, 17),
+        (2.0, 500, None, 17),
+        (2.0, 600, None, 17),
+        (2.0, 700, None, 17),
+        (2.0, 800, None, 17),
+        (2.0, 900, None, 17),
+        (2.0, 1000, None, 17),
+    ],
+)
+def test_yan(
+    tmp_path: Path,
+    resolution: float,
+    n_rois: int,
+    yeo_networks: int,
+    kong_networks: int,
+) -> None:
+    """Test Yan parcellation.
+
+    Parameters
+    ----------
+    tmp_path : pathlib.Path
+        The path to the test directory.
+    resolution : float
+        The parametrized resolution values.
+    n_rois : int
+        The parametrized ROI count values.
+    yeo_networks : int
+        The parametrized Yeo networks values.
+    kong_networks : int
+        The parametrized Kong networks values.
+
+    """
+    parcellations = list_parcellations()
+    if yeo_networks:
+        parcellation_name = f"Yan{n_rois}xYeo{yeo_networks}"
+        assert parcellation_name in parcellations
+        parcellation_file = (
+            f"{n_rois}Parcels_Yeo2011_{yeo_networks}Networks_FSLMNI152_"
+            f"{int(resolution)}mm.nii.gz"
+        )
+    elif kong_networks:
+        parcellation_name = f"Yan{n_rois}xKong{kong_networks}"
+        assert parcellation_name in parcellations
+        parcellation_file = (
+            f"{n_rois}Parcels_Kong2022_{kong_networks}Networks_FSLMNI152_"
+            f"{int(resolution)}mm.nii.gz"
+        )
+    # Load parcellation
+    img, label, img_path = load_parcellation(
+        name=parcellation_name,  # type: ignore
+        parcellations_dir=tmp_path,
+        resolution=resolution,
+    )
+    assert img is not None
+    assert img_path.name == parcellation_file  # type: ignore
+    assert len(label) == n_rois
+    assert_array_equal(
+        img.header["pixdim"][1:4], 3 * [resolution]  # type: ignore
+    )
+
+
+def test_retrieve_yan_incorrect_networks(tmp_path: Path) -> None:
+    """Test retrieve Yan with incorrect networks.
+
+    Parameters
+    ----------
+    tmp_path : pathlib.Path
+        The path to the test directory.
+
+    """
+    with pytest.raises(
+        ValueError, match="Either one of `yeo_networks` or `kong_networks`"
+    ):
+        _retrieve_yan(
+            parcellations_dir=tmp_path,
+            n_rois=31418,
+            yeo_networks=100,
+            kong_networks=100,
+        )
+
+    with pytest.raises(
+        ValueError, match="Either one of `yeo_networks` or `kong_networks`"
+    ):
+        _retrieve_yan(
+            parcellations_dir=tmp_path,
+            n_rois=31418,
+            yeo_networks=None,
+            kong_networks=None,
+        )
+
+
+def test_retrieve_yan_incorrect_n_rois(tmp_path: Path) -> None:
+    """Test retrieve Yan with incorrect ROIs.
+
+    Parameters
+    ----------
+    tmp_path : pathlib.Path
+        The path to the test directory.
+
+    """
+    with pytest.raises(ValueError, match="The parameter `n_rois`"):
+        _retrieve_yan(
+            parcellations_dir=tmp_path,
+            n_rois=31418,
+            yeo_networks=7,
+        )
+
+
+def test_retrieve_yan_incorrect_yeo_networks(tmp_path: Path) -> None:
+    """Test retrieve Yan with incorrect Yeo networks.
+
+    Parameters
+    ----------
+    tmp_path : pathlib.Path
+        The path to the test directory.
+
+    """
+    with pytest.raises(ValueError, match="The parameter `yeo_networks`"):
+        _retrieve_yan(
+            parcellations_dir=tmp_path,
+            n_rois=100,
+            yeo_networks=27,
+        )
+
+
+def test_retrieve_yan_incorrect_kong_networks(tmp_path: Path) -> None:
+    """Test retrieve Yan with incorrect Kong networks.
+
+    Parameters
+    ----------
+    tmp_path : pathlib.Path
+        The path to the test directory.
+
+    """
+    with pytest.raises(ValueError, match="The parameter `kong_networks`"):
+        _retrieve_yan(
+            parcellations_dir=tmp_path,
+            n_rois=100,
+            kong_networks=27,
+        )
+
+
 def test_merge_parcellations() -> None:
     """Test merging parcellations."""
     # load some parcellations for testing

{junifer-0.0.3.dev143.dist-info → junifer-0.0.3.dev148.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.3.dev143
+Version: 0.0.3.dev148
 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.3.dev143.dist-info → junifer-0.0.3.dev148.dist-info}/RECORD

@@ -1,5 +1,5 @@
 junifer/__init__.py,sha256=x1UR2jUcrUdm2HNl-3Qvyi4UUrU6ms5qm2qcmNY7zZk,391
-junifer/_version.py,sha256=olDtxLKOmKgLHDvDY99j3vz88-h4YaG9P5KmtwpC44E,177
+junifer/_version.py,sha256=kvDO67P7RJ0LLRcQBePW7yJNV-eCAWLFpxAl-oBTn60,177
 junifer/stats.py,sha256=KUX4jJcLWnlE34coet8EkdFypFd-td4Vtpx5LvlomVs,5879
 junifer/api/__init__.py,sha256=YILu9M7SC0Ri4CVd90fELH2OnK_gvCYAXCoqBNCFE8E,257
 junifer/api/cli.py,sha256=epPGiMU9szF0Dbv-_ty3hxxWPUd8KM-gqQI10TJEl2Y,9843
@@ -35,7 +35,7 @@ junifer/configs/juseless/datagrabbers/tests/test_ukb_vbm.py,sha256=b9hjc1mgO--PS
 junifer/data/__init__.py,sha256=UKoiW2DfuNgWlpdqSVPWAED1tSMl9ygUHMsCnFXPp2A,507
 junifer/data/coordinates.py,sha256=mPiaOdw3HY5c_5geGiQbHjKCTvj2YVTXie0Y6HLFk_I,4896
 junifer/data/masks.py,sha256=oRvKzbm4Z4q3Dz1PdnsuS4t08x70s1fpbEgPeFKuy2Y,11277
-junifer/data/parcellations.py,sha256=r73CeNpGLYH6AGPvL_Zz2iLqXpZvoLkJZkNFz6bdMjM,40638
+junifer/data/parcellations.py,sha256=8br_1uc1iV_fOXjiX1q6Hh39nS2wdApzU4P09MZZBA4,48676
 junifer/data/utils.py,sha256=K9quLIoWRmm2QFM8Rdy_5bYsWb_XhL0l5Uq_1Sie0kA,1274
 junifer/data/VOIs/meta/CogAC_VOIs.txt,sha256=Sr5_E712OLdeQRyUcDNM0wLBvZIyO6gc9Q7KkyJHX1A,398
 junifer/data/VOIs/meta/CogAR_VOIs.txt,sha256=t3NLwEVUZTPP34p15SaB3UInLrQyK-7Qc4iLBuQlZu8,189
@@ -60,7 +60,7 @@ junifer/data/masks/vickery-patil/GMprob0.2_cortex_3mm_NA_rm.nii.gz,sha256=jfMe_4
 junifer/data/tests/test_coordinates.py,sha256=RCYOuaAjs2wqPeFHX-l9Bryt5Zw5mOIV0WpsH891RwA,3240
 junifer/data/tests/test_data_utils.py,sha256=Vy7x8zaHws5hmn92PKSv3H38hU2kamOpyaH6nG_NNpw,1086
 junifer/data/tests/test_masks.py,sha256=sJ_rXAPddQ_2SAGvew1FEEMcLwy0NEfQv8TsCvgA2pA,13266
-junifer/data/tests/test_parcellations.py,sha256=2diYT-a6cgXjEaK8iBZl6YUBcpb-VuhEpKmRtbsFSak,26923
+junifer/data/tests/test_parcellations.py,sha256=zAhIl2f1w6BEocSGujwZ-zveSFg8EBeQniRm_hoTxHs,32445
 junifer/datagrabber/__init__.py,sha256=xKMQMjqoWul13YluGTLLMBgKahUg5jJKi4phPih3XJU,634
 junifer/datagrabber/base.py,sha256=6JoIDBCWXCIQdjSg6OIbdrqbQKzV6_zBTk0Zs1Wj6_Y,4622
 junifer/datagrabber/datalad_base.py,sha256=dDaBiIePPP6-G4ycgBMxTcXxs4vkg-yDS3OBURK4VGs,10731
@@ -190,10 +190,10 @@ junifer/utils/fs.py,sha256=Jd9AoV2fIF7pT7KhXsn8T1O1fJ1_SFZgaFuOBAM7DG8,460
 junifer/utils/logging.py,sha256=phBwOFaK6ejqbSjkCSAkZhhdo4sr01GdVZmJIL8t-Lw,8994
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
-junifer-0.0.3.dev143.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.3.dev143.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.3.dev143.dist-info/METADATA,sha256=6O2BoR_dskpFuAoOxN9XhEvpCsI_Jx_-HwscibKUhio,6706
-junifer-0.0.3.dev143.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-junifer-0.0.3.dev143.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.3.dev143.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.3.dev143.dist-info/RECORD,,
+junifer-0.0.3.dev148.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.3.dev148.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.3.dev148.dist-info/METADATA,sha256=1P5_ZElKDMxF97PWTlPrNpGvCCv26szrvETPaIgy5UI,6706
+junifer-0.0.3.dev148.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+junifer-0.0.3.dev148.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.3.dev148.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.3.dev148.dist-info/RECORD,,