junifer 0.0.6.dev116__py3-none-any.whl → 0.0.6.dev119__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.dev116'
-__version_tuple__ = version_tuple = (0, 0, 6, 'dev116')
+__version__ = version = '0.0.6.dev119'
+__version_tuple__ = version_tuple = (0, 0, 6, 'dev119')

junifer/data/template_spaces.py

@@ -6,9 +6,10 @@
 from pathlib import Path
 from typing import Any, Dict, Optional, Union
 
-import httpx
+import datalad.api as dl
 import nibabel as nib
 import numpy as np
+from datalad.support.exceptions import IncompleteResultsError
 from templateflow import api as tflow
 
 from ..utils import logger, raise_error
@@ -41,61 +42,82 @@ def get_xfm(
     Raises
     ------
     RuntimeError
-        If there is a problem fetching files.
+        If there is a problem cloning the xfm dataset or
+        if there is a problem fetching the xfm file.
 
     """
+    # Set default path for storage
     if xfms_dir is None:
         xfms_dir = Path().home() / "junifer" / "data" / "xfms"
-        logger.debug(f"Creating xfm directory at: {xfms_dir.resolve()}")
-        # Create default junifer data directory if not present
-        xfms_dir.mkdir(exist_ok=True, parents=True)
+
     # Convert str to Path
-    elif not isinstance(xfms_dir, Path):
+    if not isinstance(xfms_dir, Path):
         xfms_dir = Path(xfms_dir)
 
-    # Set local file prefix
-    xfm_file_prefix = f"{src}_to_{dst}"
-    # Set local file dir
-    xfm_file_dir = xfms_dir / xfm_file_prefix
-    # Create local directory if not present
-    xfm_file_dir.mkdir(exist_ok=True, parents=True)
-    # Set file name with extension
-    xfm_file = f"{src}_to_{dst}_Composite.h5"
-    # Set local file path
-    xfm_file_path = xfm_file_dir / xfm_file
-    # Check if the file exists
-    if xfm_file_path.exists():
-        logger.info(
-            f"Found existing xfm file for {src} to {dst} at "
-            f"{xfm_file_path.resolve()}"
+    # Check if the template xfms dataset is installed at storage path
+    is_installed = dl.Dataset(xfms_dir).is_installed()
+    # Use existing dataset
+    if is_installed:
+        logger.debug(
+            f"Found existing template xfms dataset at: {xfms_dir.resolve()}"
         )
-        return xfm_file_path
-
-    # Set URL
-    url = (
-        "https://gin.g-node.org/juaml/human-template-xfms/raw/main/xfms/"
-        f"{xfm_file_prefix}/{xfm_file}"
-    )
-    # Create the file before proceeding
-    xfm_file_path.touch()
-
-    logger.info(f"Downloading xfm file for {src} to {dst} from {url}")
-    # Steam response
-    with httpx.stream("GET", url) as resp:
+        # Set dataset
+        dataset = dl.Dataset(xfms_dir)
+    # Clone a fresh copy
+    else:
+        logger.debug(f"Cloning template xfms dataset to: {xfms_dir.resolve()}")
+        # Clone dataset
         try:
-            resp.raise_for_status()
-        except httpx.HTTPError as exc:
+            dataset = dl.clone(
+                "https://github.com/juaml/human-template-xfms.git",
+                path=xfms_dir,
+                result_renderer="disabled",
+            )
+        except IncompleteResultsError as e:
             raise_error(
-                f"Error response {exc.response.status_code} while "
-                f"requesting {exc.request.url!r}",
+                msg=f"Failed to clone dataset: {e.failed}",
                 klass=RuntimeError,
             )
         else:
-            with open(xfm_file_path, "ab") as f:
-                for chunk in resp.iter_bytes():
-                    f.write(chunk)
+            logger.debug(
+                f"Successfully cloned template xfms dataset to: "
+                f"{xfms_dir.resolve()}"
+            )
 
-    return xfm_file_path
+    # Set file path to retrieve
+    xfm_file_path = (
+        xfms_dir / "xfms" / f"{src}_to_{dst}" / f"{src}_to_{dst}_Composite.h5"
+    )
+
+    # Retrieve file
+    try:
+        got = dataset.get(xfm_file_path, result_renderer="disabled")
+    except IncompleteResultsError as e:
+        raise_error(
+            msg=f"Failed to get file from dataset: {e.failed}",
+            klass=RuntimeError,
+        )
+    else:
+        file_path = Path(got[0]["path"])
+        # Conditional logging based on file fetch
+        status = got[0]["status"]
+        if status == "ok":
+            logger.info(
+                f"Successfully fetched xfm file for {src} to {dst} at "
+                f"{file_path.resolve()}"
+            )
+            return file_path
+        elif status == "notneeded":
+            logger.info(
+                f"Found existing xfm file for {src} to {dst} at "
+                f"{file_path.resolve()}"
+            )
+            return file_path
+        else:
+            raise_error(
+                f"Failed to fetch xfm file for {src} to {dst} at "
+                f"{file_path.resolve()}"
+            )
 
 
 def get_template(

{junifer-0.0.6.dev116.dist-info → junifer-0.0.6.dev119.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.6.dev116
+Version: 0.0.6.dev119
 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.dev116.dist-info → junifer-0.0.6.dev119.dist-info}/RECORD

@@ -1,6 +1,6 @@
 junifer/__init__.py,sha256=2McgH1yNue6Z1V26-uN_mfMjbTcx4CLhym-DMBl5xA4,266
 junifer/__init__.pyi,sha256=A6Janz0-4ad7zQiLsIo-jnUkpHJjzGTt_KcVsJJLSDM,454
-junifer/_version.py,sha256=hwZhTBj69Hs5D0mpZrArfQX9sBRikpFw295nNR-bjrY,428
+junifer/_version.py,sha256=Ss_ycuJWyNfXUOB3I8ssC4qO_enDi_q0nprYs06gkOk,428
 junifer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/stats.py,sha256=BjQb2lfTGDP9l4UuQYmJFcJJNRfbJDGlNvC06SJaDDE,6237
 junifer/api/__init__.py,sha256=aAXW_KAEGQ8aAP5Eni2G1R4MWBF7UgjKOgM6akLuJco,252
@@ -75,7 +75,7 @@ junifer/data/coordinates.py,sha256=1HH2Kz5nzZKN6-wJRmYotPH76fPaL1yYbCt8AhONogk,1
 junifer/data/masks.py,sha256=omKOJLnUpmI1yVUkckWy9HhzbFZuYbYdOyr49xFvEwU,21640
 junifer/data/parcellations.py,sha256=mw1xa6yFWAaVktTkkpCt2ZgSUapZbPwloN2UoPdLzdg,65490
 junifer/data/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-junifer/data/template_spaces.py,sha256=7I2Hgy-Wh-Uqm_vOvpYQ5H9CFg1Qn5YRX4QU-HZAloc,5796
+junifer/data/template_spaces.py,sha256=9uZuFztBGNZk3mhUI2h0oQMajjx6Wv31Fx11pGlDI20,6510
 junifer/data/utils.py,sha256=dIdhCJMJHoXsjTjEMi2b-NXyCiSKsFZQt-5Ca00Obd4,1330
 junifer/data/VOIs/meta/AutobiographicalMemory_VOIs.txt,sha256=9af38naeL18Tlt_gy_ep6vyTAxOB336JYjbo5FvP8PQ,686
 junifer/data/VOIs/meta/CogAC_VOIs.txt,sha256=Sr5_E712OLdeQRyUcDNM0wLBvZIyO6gc9Q7KkyJHX1A,398
@@ -321,10 +321,10 @@ junifer/utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.dev116.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.6.dev116.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.6.dev116.dist-info/METADATA,sha256=M0l1c7ePF_90X00b6ipVuKpgWWoWSHhq6Q2mYhP8r2Q,8448
-junifer-0.0.6.dev116.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-junifer-0.0.6.dev116.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
-junifer-0.0.6.dev116.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.6.dev116.dist-info/RECORD,,
+junifer-0.0.6.dev119.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.6.dev119.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.6.dev119.dist-info/METADATA,sha256=HHq5pP3yHkhHSdybSMHEMqYtQDTslO9eGj38TA8GK3s,8448
+junifer-0.0.6.dev119.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+junifer-0.0.6.dev119.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
+junifer-0.0.6.dev119.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.6.dev119.dist-info/RECORD,,