junifer 0.0.4.dev119__py3-none-any.whl → 0.0.4.dev133__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.4.dev119'
-__version_tuple__ = version_tuple = (0, 0, 4, 'dev119')
+__version__ = version = '0.0.4.dev133'
+__version_tuple__ = version_tuple = (0, 0, 4, 'dev133')

junifer/data/__init__.py

@@ -8,6 +8,7 @@ from .coordinates import (
     list_coordinates,
     load_coordinates,
     register_coordinates,
+    get_coordinates,
 )
 from .parcellations import (
     list_parcellations,

junifer/data/coordinates.py

@@ -1,11 +1,12 @@
 """Provide functions for list of coordinates."""
 
 # Authors: Federico Raimondo <f.raimondo@fz-juelich.de>
+#          Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
 import typing
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import numpy as np
 import pandas as pd
@@ -57,7 +58,7 @@ def register_coordinates(
     voi_names: List[str],
     overwrite: Optional[bool] = False,
 ) -> None:
-    """Register coordinates.
+    """Register a custom user coordinates.
 
     Parameters
     ----------
@@ -73,6 +74,18 @@ def register_coordinates(
     overwrite : bool, optional
         If True, overwrite an existing list of coordinates with the same name.
         Does not apply to built-in coordinates (default False).
+
+    Raises
+    ------
+    ValueError
+        If the coordinates name is already registered and overwrite is set to
+        False or if the coordinates name is a built-in coordinates or if the
+        ``coordinates`` is not a 2D array or if coordinate value does not have
+        3 components or if the ``voi_names`` shape does not match the
+        ``coordinates`` shape.
+    TypeError
+        If ``coordinates`` is not a ``numpy.ndarray``.
+
     """
     if name in _available_coordinates:
         if isinstance(_available_coordinates[name], Path):
@@ -90,7 +103,8 @@ def register_coordinates(
 
     if not isinstance(coordinates, np.ndarray):
         raise_error(
-            f"Coordinates must be a numpy.ndarray, not {type(coordinates)}."
+            f"Coordinates must be a `numpy.ndarray`, not {type(coordinates)}.",
+            klass=TypeError,
         )
     if coordinates.ndim != 2:
         raise_error(
@@ -102,8 +116,8 @@ def register_coordinates(
         )
     if len(voi_names) != coordinates.shape[0]:
         raise_error(
-            f"Length of voi_names ({len(voi_names)}) does not match the "
-            f"number of coordinates ({coordinates.shape[0]})."
+            f"Length of `voi_names` ({len(voi_names)}) does not match the "
+            f"number of `coordinates` ({coordinates.shape[0]})."
         )
     _available_coordinates[name] = {
         "coords": coordinates,
@@ -112,16 +126,55 @@ def register_coordinates(
 
 
 def list_coordinates() -> List[str]:
-    """List all the available coordinates lists (VOIs).
+    """List all the available coordinates (VOIs).
 
     Returns
     -------
     list of str
         A list with all available coordinates names.
+
     """
     return sorted(_available_coordinates.keys())
 
 
+def get_coordinates(
+    coords: str,
+    target_data: Dict[str, Any],
+    extra_input: Optional[Dict[str, Any]] = None,
+) -> Tuple[ArrayLike, List[str]]:
+    """Get coordinates, tailored for the target image.
+
+    Parameters
+    ----------
+    coords : str
+        The name of the coordinates.
+    target_data : dict
+        The corresponding item of the data object to which the coordinates
+        will be applied.
+    extra_input : dict, optional
+        The other fields in the data object. Useful for accessing other data
+        kinds that needs to be used in the computation of coordinates
+        (default None).
+
+    Returns
+    -------
+    numpy.ndarray
+        The coordinates.
+    list of str
+        The names of the VOIs.
+
+    Raises
+    ------
+    ValueError
+        If ``extra_input`` is None when ``target_data``'s space is not MNI.
+
+    """
+    # Load the coordinates
+    seeds, labels = load_coordinates(name=coords)
+
+    return seeds, labels
+
+
 def load_coordinates(name: str) -> Tuple[ArrayLike, List[str]]:
     """Load coordinates.
 
@@ -137,14 +190,23 @@ def load_coordinates(name: str) -> Tuple[ArrayLike, List[str]]:
     list of str
         The names of the VOIs.
 
+    Raises
+    ------
+    ValueError
+        If ``name`` is invalid.
+
     Warns
     -----
     DeprecationWarning
         If ``Power`` is provided as the ``name``.
 
     """
+    # Check for valid coordinates name
     if name not in _available_coordinates:
-        raise_error(f"Coordinates {name} not found.")
+        raise_error(
+            f"Coordinates {name} not found. "
+            f"Valid options are: {list_coordinates()}"
+        )
 
     # Put up deprecation notice
     if name == "Power":
@@ -157,8 +219,10 @@ def load_coordinates(name: str) -> Tuple[ArrayLike, List[str]]:
             category=DeprecationWarning,
         )
 
+    # Load coordinates
     t_coord = _available_coordinates[name]
     if isinstance(t_coord, Path):
+        # Load via pandas
         df_coords = pd.read_csv(t_coord, sep="\t", header=None)
         coords = df_coords.iloc[:, [0, 1, 2]].to_numpy()
         names = list(df_coords.iloc[:, [3]].values[:, 0])
@@ -167,4 +231,5 @@ def load_coordinates(name: str) -> Tuple[ArrayLike, List[str]]:
         coords = typing.cast(ArrayLike, coords)
         names = t_coord["voi_names"]
         names = typing.cast(List[str], names)
+
     return coords, names

junifer/data/tests/test_coordinates.py

@@ -8,10 +8,13 @@ import pytest
 from numpy.testing import assert_array_equal
 
 from junifer.data.coordinates import (
+    get_coordinates,
     list_coordinates,
     load_coordinates,
     register_coordinates,
 )
+from junifer.datareader import DefaultDataReader
+from junifer.testing.datagrabbers import OasisVBMTestingDataGrabber
 
 
 def test_register_coordinates_built_in_check() -> None:
@@ -54,7 +57,7 @@ def test_register_coordinates_overwrite() -> None:
 
 def test_register_coordinates_valid_input() -> None:
     """Test coordinates registration check for valid input."""
-    with pytest.raises(ValueError, match=r"numpy.ndarray"):
+    with pytest.raises(TypeError, match=r"numpy.ndarray"):
         register_coordinates(
             name="MyList",
             coordinates=[1, 2],
@@ -105,3 +108,21 @@ def test_load_coordinates_nonexisting() -> None:
     """Test loading coordinates that not exist."""
     with pytest.raises(ValueError, match=r"not found"):
         load_coordinates("NonExisting")
+
+
+def test_get_coordinates() -> None:
+    """Test tailored coordinates fetch."""
+    reader = DefaultDataReader()
+    with OasisVBMTestingDataGrabber() as dg:
+        element = dg["sub-01"]
+        element_data = reader.fit_transform(element)
+        vbm_gm = element_data["VBM_GM"]
+        # Get tailored coordinates
+        tailored_coords, tailored_labels = get_coordinates(
+            coords="DMNBuckner", target_data=vbm_gm
+        )
+        # Get raw coordinates
+        raw_coords, raw_labels = load_coordinates("DMNBuckner")
+        # Both tailored and raw should be same for now
+        assert_array_equal(tailored_coords, raw_coords)
+        assert tailored_labels == raw_labels

junifer/markers/sphere_aggregation.py

@@ -7,7 +7,7 @@
 from typing import Any, ClassVar, Dict, List, Optional, Set, Union
 
 from ..api.decorators import register_marker
-from ..data import get_mask, load_coordinates
+from ..data import get_coordinates, get_mask
 from ..external.nilearn import JuniferNiftiSpheresMasker
 from ..stats import get_aggfunc_by_name
 from ..utils import logger, raise_error, warn_with_log
@@ -55,6 +55,12 @@ class SphereAggregation(BaseMarker):
         The name of the marker. By default, it will use KIND_SphereAggregation
         where KIND is the kind of data it was applied to (default None).
 
+    Raises
+    ------
+    ValueError
+        If ``time_method`` is specified for non-BOLD data or if
+        ``time_method_params`` is not None when ``time_method`` is None.
+
     """
 
     _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn", "numpy"}
@@ -118,6 +124,11 @@ class SphereAggregation(BaseMarker):
         str
             The storage type output by the marker.
 
+        Raises
+        ------
+        ValueError
+            If the ``input_type`` is invalid.
+
         """
 
         if input_type in ["VBM_GM", "VBM_WM", "fALFF", "GCOR", "LCOR"]:
@@ -125,7 +136,7 @@ class SphereAggregation(BaseMarker):
         elif input_type == "BOLD":
             return "timeseries"
         else:
-            raise ValueError(f"Unknown input kind for {input_type}")
+            raise_error(f"Unknown input kind for {input_type}")
 
     def compute(
         self,
@@ -155,6 +166,11 @@ class SphereAggregation(BaseMarker):
             * ``data`` : the actual computed values as a numpy.ndarray
             * ``col_names`` : the column labels for the computed values as list
 
+        Warns
+        -----
+        RuntimeWarning
+            If time aggregation is required but only time point is available.
+
         """
         t_input_img = input["data"]
         logger.debug(f"Sphere aggregation using {self.method}")
@@ -162,15 +178,25 @@ class SphereAggregation(BaseMarker):
         agg_func = get_aggfunc_by_name(
             self.method, func_params=self.method_params
         )
+
+        # Get seeds and labels tailored to target image
+        coords, labels = get_coordinates(
+            coords=self.coords,
+            target_data=input,
+            extra_input=extra_input,
+        )
+
         # Load mask
         mask_img = None
         if self.masks is not None:
             logger.debug(f"Masking with {self.masks}")
+            # Get tailored mask
             mask_img = get_mask(
                 masks=self.masks, target_data=input, extra_input=extra_input
             )
-        # Get seeds and labels
-        coords, out_labels = load_coordinates(name=self.coords)
+
+        # Initialize masker
+        logger.debug("Masking")
         masker = JuniferNiftiSpheresMasker(
             seeds=coords,
             radius=self.radius,
@@ -180,6 +206,8 @@ class SphereAggregation(BaseMarker):
         )
         # Fit and transform the marker on the data
         out_values = masker.fit_transform(t_input_img)
+
+        # Apply time dimension aggregation if required
         if self.time_method is not None:
             if out_values.shape[0] > 1:
                 logger.debug("Aggregating time dimension")
@@ -193,5 +221,5 @@ class SphereAggregation(BaseMarker):
                     "available."
                 )
         # Format the output
-        out = {"data": out_values, "col_names": out_labels}
+        out = {"data": out_values, "col_names": labels}
         return out

{junifer-0.0.4.dev119.dist-info → junifer-0.0.4.dev133.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 junifer/__init__.py,sha256=x1UR2jUcrUdm2HNl-3Qvyi4UUrU6ms5qm2qcmNY7zZk,391
-junifer/_version.py,sha256=Q_-FZFzlsFgJsOYYiliNsv6V9_LUpEPKEWnwNMotXoQ,428
+junifer/_version.py,sha256=H4AlzRmDL8gZspsFPWSrhtdTYzXK9ftnsDE7ckYan-c,428
 junifer/stats.py,sha256=KUX4jJcLWnlE34coet8EkdFypFd-td4Vtpx5LvlomVs,5879
 junifer/api/__init__.py,sha256=YILu9M7SC0Ri4CVd90fELH2OnK_gvCYAXCoqBNCFE8E,257
 junifer/api/cli.py,sha256=mgqSeZbW9DvdztGL3DRXM4SQS7saJ-v18K6FL8LaDVs,11915
@@ -36,8 +36,8 @@ junifer/configs/juseless/datagrabbers/tests/test_camcan_vbm.py,sha256=o0dzptS97p
 junifer/configs/juseless/datagrabbers/tests/test_ixi_vbm.py,sha256=8jxpNZelXwpJGvA5LOfpso2X8yt1chvERAYmv76hS_g,1252
 junifer/configs/juseless/datagrabbers/tests/test_ucla.py,sha256=e-jdvcZ9B0mka6_573JJU_cGwSaUV54U8X_n0UadtJY,3351
 junifer/configs/juseless/datagrabbers/tests/test_ukb_vbm.py,sha256=b9hjc1mgO--PSRC3id2EzzfE2yWNsuZ2UI47a6sfGZU,1025
-junifer/data/__init__.py,sha256=2H-kSQrc1w41m35SCzMBMcwTqauZ6wRDPhmqbl-iWo4,529
-junifer/data/coordinates.py,sha256=vals9pjwkEorw5rmvEOCOhkzz3biAfRKsNVQgJNRQWI,5485
+junifer/data/__init__.py,sha256=oUjOs8_M6fitNb44izxpXf3su1e4pG_vCdjwVYkjZjQ,550
+junifer/data/coordinates.py,sha256=8jwx3uN4rmmwTWfbwjtsXhTlWIBqXlGizKjwdPklNSk,7231
 junifer/data/masks.py,sha256=SYt2EJCUCw7KAl8nBK5fRFRonrfIVQn-DH6aQsnr7vE,11280
 junifer/data/parcellations.py,sha256=9W3cZBS1SS3Rc48-diMYMxuzO3oxQfrsWvnPnONGjDc,51172
 junifer/data/utils.py,sha256=K9quLIoWRmm2QFM8Rdy_5bYsWb_XhL0l5Uq_1Sie0kA,1274
@@ -62,7 +62,7 @@ junifer/data/VOIs/meta/extDMN_VOIs.txt,sha256=Ogx1QvqZcnXDM3ncF2ha78br8xwQ5wklSj
 junifer/data/masks/vickery-patil/CAT12_IXI555_MNI152_TMP_GS_GMprob0.2_clean.nii.gz,sha256=j6EY8EtRnUuRxeKgD65Q6B0GPEPIALKDJEIje1TfnAU,88270
 junifer/data/masks/vickery-patil/CAT12_IXI555_MNI152_TMP_GS_GMprob0.2_clean_3mm.nii.gz,sha256=crb_y7YO1vjjf2PwbRJUm8KamPK6fx1y0B_l-E3g8FY,12862
 junifer/data/masks/vickery-patil/GMprob0.2_cortex_3mm_NA_rm.nii.gz,sha256=jfMe_4H9XEnArYms5bSQbqS2V1_HbLHTfI5amQa_Pes,8700
-junifer/data/tests/test_coordinates.py,sha256=RCYOuaAjs2wqPeFHX-l9Bryt5Zw5mOIV0WpsH891RwA,3240
+junifer/data/tests/test_coordinates.py,sha256=UvB1BexiQUs9e_Lj8VrKGK3XiyukXhA2Tn_kW0wmrUA,4067
 junifer/data/tests/test_data_utils.py,sha256=Vy7x8zaHws5hmn92PKSv3H38hU2kamOpyaH6nG_NNpw,1086
 junifer/data/tests/test_masks.py,sha256=uhY3dm0CGbKTMs8hAMJxQx0KMcl9qmfaee3guBrdYas,13269
 junifer/data/tests/test_parcellations.py,sha256=XHNW_WrYuIfcbSZ04TexY2F2XwY9PqdKztC8HCE-nFU,34791
@@ -107,7 +107,7 @@ junifer/markers/base.py,sha256=Uuaz8MvdHOfAnRGpUf6ISWgbNWzkmHIMo6f30jlW7zY,6109
 junifer/markers/collection.py,sha256=u5DAWdEPsYK1Jmqob1FZgzOK_cm_8JXJ2CpSVxgamBY,4592
 junifer/markers/ets_rss.py,sha256=7fr6mmbMM5NKIDV6bUyyu-pwHJH56GwYv6oozK4EX6k,4557
 junifer/markers/parcel_aggregation.py,sha256=F059dbrow2v8MREm2l29mbPg2_PcSwfNalbUJOwaFsE,8420
-junifer/markers/sphere_aggregation.py,sha256=6is1hPIv0PV_iToZ5834RJsxI0HeuNcj4OUNXnbM-0o,7372
+junifer/markers/sphere_aggregation.py,sha256=bnX9aiHf8pon47QVA0BiFOZV1Bgpyy4doPh2K0Nl9OA,8027
 junifer/markers/utils.py,sha256=kqgnzFqu2BkFW-UcJA2TrtgCctUncIbersWFapxcXBg,3777
 junifer/markers/falff/__init__.py,sha256=QAUIVtaOFWDL7B8xFrDgsmRum7Q0DCENyDYD1cPMJmM,197
 junifer/markers/falff/falff_base.py,sha256=W6bwkEOtiBTNMow2OQlPWCtP5GLy75TlEWK-48_xGl8,6001
@@ -198,10 +198,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.4.dev119.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.4.dev119.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.4.dev119.dist-info/METADATA,sha256=H1G7jQ4AnQr8hN8ntw7Cn0Q2ihvpR8367-kITbMXAZE,6825
-junifer-0.0.4.dev119.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-junifer-0.0.4.dev119.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.4.dev119.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.4.dev119.dist-info/RECORD,,
+junifer-0.0.4.dev133.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.4.dev133.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.4.dev133.dist-info/METADATA,sha256=80MHorCb5IZa8m9SBXNaVmzFs5fMG5pPAWYwc_EJ1oI,6825
+junifer-0.0.4.dev133.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+junifer-0.0.4.dev133.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.4.dev133.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.4.dev133.dist-info/RECORD,,