junifer 0.0.6.dev505__py3-none-any.whl → 0.0.6.dev509__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.6.dev505'
-__version_tuple__ = version_tuple = (0, 0, 6, 'dev505')
+__version__ = version = '0.0.6.dev509'
+__version_tuple__ = version_tuple = (0, 0, 6, 'dev509')

junifer/data/coordinates/_coordinates.py

@@ -15,7 +15,7 @@ from numpy.typing import ArrayLike
 from ...utils import logger, raise_error
 from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
-from ..utils import JUNIFER_DATA_VERSION, get_dataset_path, get_native_warper
+from ..utils import JUNIFER_DATA_PARAMS, get_dataset_path, get_native_warper
 from ._ants_coordinates_warper import ANTsCoordinatesWarper
 from ._fsl_coordinates_warper import FSLCoordinatesWarper
 
@@ -287,7 +287,7 @@ class CoordinatesRegistry(BasePipelineDataRegistry, metaclass=Singleton):
                 get(
                     file_path=coords_file_path,
                     dataset_path=get_dataset_path(),
-                    tag=JUNIFER_DATA_VERSION,
+                    **JUNIFER_DATA_PARAMS,
                 ),
                 sep="\t",
                 header=None,

junifer/data/masks/_masks.py

@@ -28,7 +28,7 @@ from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
 from ..template_spaces import get_template
 from ..utils import (
-    JUNIFER_DATA_VERSION,
+    JUNIFER_DATA_PARAMS,
     closest_resolution,
     get_dataset_path,
     get_native_warper,
@@ -745,7 +745,7 @@ def _load_vickery_patil_mask(
     return get(
         file_path=Path(f"masks/Vickery-Patil/{mask_fname}"),
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
 
@@ -778,7 +778,7 @@ def _load_ukb_mask(name: str) -> Path:
     return get(
         file_path=Path(f"masks/UKB/{mask_fname}"),
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
 

junifer/data/parcellations/_parcellations.py

@@ -19,7 +19,7 @@ from ...utils import logger, raise_error, warn_with_log
 from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
 from ..utils import (
-    JUNIFER_DATA_VERSION,
+    JUNIFER_DATA_PARAMS,
     closest_resolution,
     get_dataset_path,
     get_native_warper,
@@ -639,13 +639,13 @@ def _retrieve_schaefer(
         file_path=path_prefix / f"Schaefer2018_{n_rois}Parcels_{yeo_networks}"
         f"Networks_order_FSLMNI152_{resolution}mm.nii.gz",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
     parcellation_label_path = get(
         file_path=path_prefix
         / f"Schaefer2018_{n_rois}Parcels_{yeo_networks}Networks_order.txt",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
     # Load labels
@@ -764,13 +764,13 @@ def _retrieve_tian(
         parcellation_img_path = get(
             file_path=parcellation_fname,
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=parcellation_fname_base_3T
             / f"Tian_Subcortex_S{scale}_3T_label.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         # Load labels
         labels = pd.read_csv(parcellation_label_path, sep=" ", header=None)[
@@ -783,7 +783,7 @@ def _retrieve_tian(
                 f"Tian_Subcortex_S{scale}_{magneticfield}.nii.gz"
             ),
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         # define 7T labels (b/c currently no labels file available for 7T)
         scale7Trois = {1: 16, 2: 34, 3: 54, 4: 62}
@@ -855,12 +855,12 @@ def _retrieve_suit(
     parcellation_img_path = get(
         file_path=path_prefix / f"SUIT_{space}Space_{resolution}mm.nii",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
     parcellation_label_path = get(
         file_path=path_prefix / f"SUIT_{space}Space_{resolution}mm.tsv",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
     # Load labels
@@ -938,20 +938,20 @@ def _retrieve_aicha(
     parcellation_img_path = get(
         file_path=path_prefix / "AICHA.nii",
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
     # Conditional label file fetch
     if version == 1:
         parcellation_label_path = get(
             file_path=path_prefix / "AICHA_vol1.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
     elif version == 2:
         parcellation_label_path = get(
             file_path=path_prefix / "AICHA_vol3.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
 
     # Load labels
@@ -1055,12 +1055,12 @@ def _retrieve_shen(
         parcellation_img_path = get(
             file_path=path_prefix / f"fconn_atlas_{n_rois}_{resolution}mm.nii",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=path_prefix / f"Group_seg{n_rois}_BAindexing_setA.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         labels = (
             pd.read_csv(
@@ -1077,14 +1077,14 @@ def _retrieve_shen(
             file_path=path_prefix
             / f"shen_{resolution}mm_268_parcellation.nii.gz",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         labels = list(range(1, 269))
     elif year == 2019:
         parcellation_img_path = get(
             file_path=path_prefix / "Shen_1mm_368_parcellation.nii.gz",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         labels = list(range(1, 369))
 
@@ -1174,13 +1174,13 @@ def _retrieve_yan(
                 f"{resolution}mm.nii.gz"
             ),
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=path_prefix
             / f"{n_rois}Parcels_Yeo2011_{yeo_networks}Networks_LUT.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
     elif kong_networks:
         # Check kong_networks value
@@ -1199,13 +1199,13 @@ def _retrieve_yan(
                 f"{resolution}mm.nii.gz"
             ),
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
         parcellation_label_path = get(
             file_path=path_prefix
             / f"{n_rois}Parcels_Kong2022_{kong_networks}Networks_LUT.txt",
             dataset_path=get_dataset_path(),
-            tag=JUNIFER_DATA_VERSION,
+            **JUNIFER_DATA_PARAMS,
         )
 
     # Load label file
@@ -1272,7 +1272,7 @@ def _retrieve_brainnetome(
             f"BNA-maxprob-thr{threshold}-{resolution}mm.nii.gz"
         ),
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
     # Load labels

junifer/data/template_spaces.py

@@ -12,7 +12,7 @@ from junifer_data import get
 from templateflow import api as tflow
 
 from ..utils import logger, raise_error
-from .utils import JUNIFER_DATA_VERSION, closest_resolution, get_dataset_path
+from .utils import JUNIFER_DATA_PARAMS, closest_resolution, get_dataset_path
 
 
 __all__ = ["get_template", "get_xfm"]
@@ -40,7 +40,7 @@ def get_xfm(src: str, dst: str) -> Path:  # pragma: no cover
     return get(
         file_path=xfm_file_path,
         dataset_path=get_dataset_path(),
-        tag=JUNIFER_DATA_VERSION,
+        **JUNIFER_DATA_PARAMS,
     )
 
 

junifer/data/utils.py

@@ -14,6 +14,8 @@ from ..utils import config, logger, raise_error
 
 
 __all__ = [
+    "JUNIFER_DATA_HEXSHA",
+    "JUNIFER_DATA_PARAMS",
     "JUNIFER_DATA_VERSION",
     "closest_resolution",
     "get_dataset_path",
@@ -24,6 +26,14 @@ __all__ = [
 # junifer-data version constant
 JUNIFER_DATA_VERSION = "1"
 
+# junifer-data hexsha constant
+JUNIFER_DATA_HEXSHA = "e9aecf7b5a2fff82de00d265e02afde42a448647"
+
+JUNIFER_DATA_PARAMS = {
+    "tag": JUNIFER_DATA_VERSION,
+    "hexsha": JUNIFER_DATA_HEXSHA,
+}
+
 
 def closest_resolution(
     resolution: Optional[Union[float, int]],

{junifer-0.0.6.dev505.dist-info → junifer-0.0.6.dev509.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: junifer
-Version: 0.0.6.dev505
+Version: 0.0.6.dev509
 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>
@@ -44,7 +44,7 @@ Requires-Dist: lapy<2.0.0,>=1.0.0
 Requires-Dist: lazy_loader==0.4
 Requires-Dist: importlib_metadata; python_version < "3.9"
 Requires-Dist: looseversion==1.3.0; python_version >= "3.12"
-Requires-Dist: junifer_data==1.1.0
+Requires-Dist: junifer_data==1.2.0
 Provides-Extra: all
 Requires-Dist: bctpy==0.6.0; extra == "all"
 Requires-Dist: neurokit2>=0.1.7; extra == "all"

{junifer-0.0.6.dev505.dist-info → junifer-0.0.6.dev509.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=DTERGyuHTczYxtYIjKleqS8wne_AfGBK-yJ7a0FH5xI,528
+junifer/_version.py,sha256=CkAS3Gj-HpHHFxpnRKoRpo78axXuDLo76O9uM1sPOe0,528
 junifer/conftest.py,sha256=PWYkkRDU8ly2lYwv7VBKMHje4et6HX7Yey3Md_I2KbA,613
 junifer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/stats.py,sha256=e9aaagMGtgpRfW3Wdpz9ocpnYld1IWylCDcjFUgX9Mk,6225
@@ -75,12 +75,12 @@ junifer/data/__init__.pyi,sha256=qYszjUYcbFi_2zO23MnbA2HhTW-Ad2oh1pqPQYd6yt0,542
 junifer/data/_dispatch.py,sha256=O524U1R4MtbGhGJsL0HSh9EqisapBFJWK7uupXrJuMg,6158
 junifer/data/pipeline_data_registry_base.py,sha256=G8bE3WTj4D_rKC4ZKZe6E48Sd96CGea1PS3SxmTgGK4,2010
 junifer/data/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-junifer/data/template_spaces.py,sha256=3qHlF-OdpnFezC4l3GrTtfv8PuA6nyY3RW_2MuWfPks,4665
-junifer/data/utils.py,sha256=c3o4RcaTrD24jhmwjVBKz6P2gCCKPMg9SbMvNLBFUZA,3712
+junifer/data/template_spaces.py,sha256=7LcQbUV_SWCic-TtETCejgat-BxxFDxZFm5z80rRZ-M,4661
+junifer/data/utils.py,sha256=a7Uv34iw10jmFGZWIucZjjEbrbOnFicWbpp_cXw9Ux4,3958
 junifer/data/coordinates/__init__.py,sha256=ffM8rwcHLgHAWixJbKrATrbUKzX940V1UF6RAxZdUMg,186
 junifer/data/coordinates/__init__.pyi,sha256=Z-Ti5XD3HigkZ8uYN6oYsLqw40-F1GvTVQ5QAy08Wng,88
 junifer/data/coordinates/_ants_coordinates_warper.py,sha256=5RWDC-nI3VG9lkSJ-_y_hlDtjPctKSJokQOp3v8ozwY,2956
-junifer/data/coordinates/_coordinates.py,sha256=ByGCaJ2Ftp5W2zDdFKLHCdIS0_Z5EOXMvScEfozYloo,13494
+junifer/data/coordinates/_coordinates.py,sha256=riTTgBuW6bde64KeqlS5c5C_BQgWpCX0vjlYN_vD138,13490
 junifer/data/coordinates/_fsl_coordinates_warper.py,sha256=5h7rwiPMYBQlA3sMZUImcpnNLLWvIp2-bAEaaHtzX9c,2409
 junifer/data/coordinates/VOIs/meta/AutobiographicalMemory_VOIs.txt,sha256=9af38naeL18Tlt_gy_ep6vyTAxOB336JYjbo5FvP8PQ,686
 junifer/data/coordinates/VOIs/meta/CogAC_VOIs.txt,sha256=Sr5_E712OLdeQRyUcDNM0wLBvZIyO6gc9Q7KkyJHX1A,398
@@ -106,7 +106,7 @@ junifer/data/masks/__init__.py,sha256=eEEhHglyVEx1LrqwXjq3cOmjf4sTsgBstRx5-k7zIQ
 junifer/data/masks/__init__.pyi,sha256=lcgr8gmWDPibC4RxnWBXb8DDpIkO73Aax09u6VXiJJI,114
 junifer/data/masks/_ants_mask_warper.py,sha256=JLK2Jh2AOAiv_NoUGhRoTBEhRFXPRXTDPmQGH9vBSok,5805
 junifer/data/masks/_fsl_mask_warper.py,sha256=YZOMlRgQ7_4shnXNc_05tmwDk5xHI-1wqle-RdNsJ34,2857
-junifer/data/masks/_masks.py,sha256=NA2Px_PUv0DDtFpLpYjJxSGo2ozTk-6bSNd16Cou1VA,28671
+junifer/data/masks/_masks.py,sha256=c30OPW01jfiZT4ExM2uZdoRvQ-VeTcXEk3R68EUDoHc,28664
 junifer/data/masks/tests/test_masks.py,sha256=W0bzRB5Bp-iGO44VtEmaf7BuT-joe_2tQI0lma5NQHA,16090
 junifer/data/masks/ukb/UKB_15K_GM_template.nii.gz,sha256=jcX1pDOrDsoph8cPMNFVKH5gZYio5G4rJNpOFXm9wJI,946636
 junifer/data/masks/vickery-patil/CAT12_IXI555_MNI152_TMP_GS_GMprob0.2_clean.nii.gz,sha256=j6EY8EtRnUuRxeKgD65Q6B0GPEPIALKDJEIje1TfnAU,88270
@@ -116,7 +116,7 @@ junifer/data/parcellations/__init__.py,sha256=6-Ysil3NyZ69V6rWx4RO15_d-iDKizfbHu
 junifer/data/parcellations/__init__.pyi,sha256=lhBHTbMDizzqUqVHrx2eyfPFodrTBgMFeTgxfESSkQ8,140
 junifer/data/parcellations/_ants_parcellation_warper.py,sha256=YUCJC0_wutGw7j_n9JRU3LCwm9Ttg5PIlJUgqejfRhs,5806
 junifer/data/parcellations/_fsl_parcellation_warper.py,sha256=JfJ022flg5OR48P4OAALVHHQgTVxdMBXT-fAqBl3nUM,2679
-junifer/data/parcellations/_parcellations.py,sha256=SbkXmyEG-ZY7QOlZYq15KULjzNJkp-jDRM9Au2R8Q5g,48625
+junifer/data/parcellations/_parcellations.py,sha256=meMSrOMQpY0wCyoOdIVsJcZb3uRLi4vqtDehOvXOyic,48567
 junifer/data/parcellations/tests/test_parcellations.py,sha256=Pf7klYabWikrvanYPlukq2GcVyFXDc_IVB2TgN_BU9c,36027
 junifer/data/tests/test_data_utils.py,sha256=136iGPjGecCxyqgUwU8VZMHoE6imcYJ0WNC32PDGK4g,1063
 junifer/data/tests/test_template_spaces.py,sha256=ZEicEcLqOJ-NpuBZ5SYh4yZ0xZRkhYHnYXiC_YSxjrY,3219
@@ -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.dev505.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.6.dev505.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.6.dev505.dist-info/METADATA,sha256=A8OE5bPou_SYMs3SNqLEHW0q4kS9nYjQcXR2742WS1I,8420
-junifer-0.0.6.dev505.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-junifer-0.0.6.dev505.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
-junifer-0.0.6.dev505.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.6.dev505.dist-info/RECORD,,
+junifer-0.0.6.dev509.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.6.dev509.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.6.dev509.dist-info/METADATA,sha256=o9w9CZ6cwLmLu1-YNiLlQyIsH3eULztgwjqyVjBfnIs,8420
+junifer-0.0.6.dev509.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+junifer-0.0.6.dev509.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
+junifer-0.0.6.dev509.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.6.dev509.dist-info/RECORD,,