Maintenance

e2e/features/activity_timeseries/test_activity_timeseries.py

@@ -3,40 +3,47 @@
 from typing import List
 
 from siibra.features.tabular.regional_timeseries_activity import RegionalBOLD
+from siibra.features.feature import CompoundFeature
 from e2e.util import check_duplicate
 
 jba_29 = siibra.parcellations["julich 2.9"]
 
 
+features = [
+    f
+    for Cls in siibra.features.feature.Feature.SUBCLASSES[RegionalBOLD]
+    for f in Cls.get_instances()
+]
+
+
 def test_id_unique():
-    features = siibra.features.get(jba_29, RegionalBOLD)
     duplicates = check_duplicate([f.id for f in features])
     assert len(duplicates) == 0
 
 
 def test_feature_unique():
-    features = siibra.features.get(jba_29, RegionalBOLD)
     duplicates = check_duplicate([f for f in features])
     assert len(duplicates) == 0
 
 
-# the get_table is a rather expensive operation
+# getting data is a rather expensive operation
 # only do once for the master list
-def test_timeseries_get_table():
-    features: List["RegionalBOLD"] = siibra.features.get(jba_29, "bold")
+def test_timeseries_get_data():
+    features: List["CompoundFeature"] = siibra.features.get(jba_29, "bold")
     assert len(features) > 0
-    for f in features:
-        assert isinstance(f, RegionalBOLD)
-        assert len(f.index) > 0
-        assert all(isinstance(subject, str) for subject in f.index)
-        for subject in f.index:
-            f.get_table(subject)
+    for cf in features:
+        assert isinstance(cf, CompoundFeature)
+        _ = cf.data
+        for f in cf.indices:
+            assert isinstance(f, RegionalBOLD)
+            assert isinstance(f.subject, str)
+            _ = f.data
 
 
 args = [(jba_29, "RegionalBOLD"), (jba_29, RegionalBOLD)]
 
 
 @pytest.mark.parametrize("concept,query_arg", args)
 def test_get_connectivity(concept, query_arg):
-    features: List["RegionalBOLD"] = siibra.features.get(concept, query_arg)
-    assert len(features) > 0, f"Expecting some features exist, but none exist."
+    features: List["CompoundFeature"] = siibra.features.get(concept, query_arg)
+    assert len(features) > 0, "Expecting some features exist, but none exist."

e2e/features/connectivity/test_connectivity.py

@@ -2,8 +2,10 @@
 import pytest
 from typing import List
 import sys
+from siibra.features.feature import CompoundFeature
 from siibra.features.connectivity.regional_connectivity import RegionalConnectivity
 from e2e.util import check_duplicate
+from zipfile import ZipFile
 
 pytestmark = pytest.mark.skipif(sys.platform == "win32", reason="Fails due to memory limitation issues on Windows on Github actions. (Passes on local machines.)")
 
@@ -24,23 +26,26 @@ def test_feature_unique():
     assert len(duplicates) == 0
 
 
-@pytest.mark.parametrize("f", features)
-def test_connectivity_get_matrix(f: RegionalConnectivity):
-    assert isinstance(f, RegionalConnectivity)
-    assert len(f.subjects) > 0
-    assert all(isinstance(subject, str) for subject in f.subjects)
-    matrix_df = f.data
+@pytest.mark.parametrize("cf", features)
+def test_connectivity_get_matrix(cf: CompoundFeature):
+    assert isinstance(cf, CompoundFeature)
+    assert all(isinstance(f, RegionalConnectivity) for f in cf)
+    assert len(cf.indices) > 0
+    matrix_df = cf.data  # get average
     assert all(matrix_df.index[i] == r for i, r in enumerate(matrix_df.columns))
-    for subject in f.subjects:
-        matrix_df = f.data(subject)
-        assert all(matrix_df.index[i] == r for i, r in enumerate(matrix_df.columns))
+    for index in cf.indices:
+        matrix_idx_df = cf[index].data
+        assert all(matrix_idx_df.index[i] == r for i, r in enumerate(matrix_idx_df.columns))
 
 
-jba_29 = siibra.parcellations["2.9"]
+jba_29 = siibra.parcellations["julich 2.9"]
+jba_3 = siibra.parcellations["julich 3"]
 
 args = [
     (jba_29, "StreamlineCounts"),
     (jba_29, "RegionalConnectivity"),
+    (jba_3, "RegionalConnectivity"),
+    (jba_3, "Anatomo"),
     (jba_29, RegionalConnectivity),
     (jba_29, "connectivity"),
     (jba_29, siibra.features.connectivity.StreamlineCounts),
@@ -55,10 +60,10 @@ def test_get_connectivity(concept, query_arg):
 
 
 def test_copy_is_returned():
-    feat: RegionalConnectivity = features[0]
+    feat: CompoundFeature = features[0]
 
     # retrieve matrix
-    matrix = feat.data(feat.subjects[0])
+    matrix = feat[feat.indices[0]].data
 
     # ensure new val to be put is different from prev val
     prev_val = matrix.iloc[0, 0]
@@ -67,15 +72,15 @@ def test_copy_is_returned():
     matrix.iloc[0, 0] = new_val
 
     # retrieve matrix again
-    matrix_again = feat.data(feat.subjects[0])
+    matrix_again = feat[feat.indices[0]].data
     assert matrix_again.iloc[0, 0] == prev_val
 
+
 def test_export():
     # for now, only test the first feature, given the ci resource concern
-    feat: RegionalConnectivity = features[0]
-    feat.export("file.zip")
-    from zipfile import ZipFile
-    z = ZipFile("file.zip")
-    filenames = [info.filename for info in z.filelist]
-    assert len(filenames) > len(feat.subjects) > 10
-    assert len([f for f in filenames if f.endswith(".csv")]) > 10
+    compoundfeat: CompoundFeature = features[0]
+    for feat in compoundfeat:
+        feat.export("file.zip")
+        z = ZipFile("file.zip")
+        filenames = [info.filename for info in z.filelist]
+        assert len([f for f in filenames if f.endswith(".csv")]) > 10

e2e/features/test_get.py

@@ -16,14 +16,42 @@ def test_get_instances(Cls: siibra.features.Feature):
         "lq0::EbrainsDataFeature::p:minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290::r:Area hOc1 (V1, 17, CalcS) left::https://nexus.humanbrainproject.org/v0/data/minds/core/dataset/v1.0.0/3ff328fa-f48f-474b-bd81-b5ee7ca230b6",
         None,
     ),
-    pytest.param(
-        "lq0::BigBrainIntensityProfile::p:minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290::r:Area hOc1 (V1, 17, CalcS)::f4380d69a9636d01398238b9ca602d29",
-        None,
-        marks=pytest.mark.xfail(
-            reason="BigBrainIntensityProfile ids are non deterministic... somehow..."
-        ),
-    ),
-    ("e715e1f7-2079-45c4-a67f-f76b102acfce--2db407e630b9eaefa014a5a7fd506207", None),
+    (
+        "cf0::BigBrainIntensityProfile::p:minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290::r:Area hOc1 (V1, 17, CalcS) left::nodsid::ff4271d32d8b6dd556e1ebaa91f09045",
+        None
+    ),  # CompoundFeature of 1579 BigBrainIntensityProfile features grouped by (Modified silver staining) anchored at Area hOc1 (V1, 17, CalcS) left with Set of 1579 points in the Bounding box from (-63.69,-59.94,-29.09) mm to (0.91,77.90,54.03)mm in BigBrain microscopic template (histology) space
+    (
+        "lq0::BigBrainIntensityProfile::p:minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290::r:Area hOc1 (V1, 17, CalcS) left::303197094c5227c245bec8ff34191522",
+        None
+    ),  # BigBrainIntensityProfile queried with Area hOc1 (V1, 17, CalcS) left JBA3 and anchored at Point in BigBrain microscopic template (histology) [-1.587149977684021,69.70700073242188,6.023950099945068]
+    (
+        "b08a7dbc-7c75-4ce7-905b-690b2b1e8957--0b464eccb6e8afa4be9fc7a3c814e927",
+        None
+    ),  # MRIVolumeOfInterest 'Fiber structures of a human hippocampus based on joint DMRI, 3D-PLI, and TPFM acquisitions (T2)' in space 'BigBrain microscopic template (histology)
+    (
+        "cf0::CellDensityProfile::p:minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290::r:Area hOc1 (V1, 17, CalcS) left::dc358cb8-2bbb-40f1-998c-356c9e13e4c6::cbc9f7824a81db1ba00deb53c84ec3f7",
+        None
+    ),  # CompoundFeature of 10 CellDensityProfile features grouped by (Segmented cell body density) anchored at Area hOc1 (V1, 17, CalcS) with Set of 10 points in the Bounding box from (-3.95,-65.80,-0.44) mm to (20.20,-42.70,9.71)mm in BigBrain microscopic template (histology) space
+    (
+        "dc358cb8-2bbb-40f1-998c-356c9e13e4c6--45a18a7f9c7610b65148136046689234",
+        None
+    ),  # CellDensityProfile (Segmented cell body density) anchored at Area hOc1 (V1, 17, CalcS) with Point in BigBrain microscopic template (histology) [13.53404426574707,-64.30000305175781,5.984400749206543]
+    (
+        "cf0::ReceptorDensityProfile::p:minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290::r:Area hOc1 (V1, 17, CalcS) left::e715e1f7-2079-45c4-a67f-f76b102acfce::a264817171736834d75fffec45ba1757",
+        None
+    ),  # CompoundFeature of 16 ReceptorDensityProfile features grouped by (Receptor density) anchored at Area hOc1 (V1, 17, CalcS)
+    (
+        "e715e1f7-2079-45c4-a67f-f76b102acfce--402ff9f8032f5b39bdbd1a9a1c4fe1c0",
+        None
+    ),  # ReceptorDensityProfile (AMPA (alpha-amino-3hydroxy-5-methyl-4isoxazolepropionic acid receptor) density) anchored at Area hOc1 (V1, 17, CalcS) for
+    (
+        "cf0::StreamlineCounts::p:minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-300::0f1ccc4a-9a11-4697-b43f-9c9c8ac543e6::6c085751ff0a92d47f967428720e1fe9",
+        None
+    ),  # CompoundFeature of 200 StreamlineCounts features grouped by (StreamlineCounts, HCP) anchored at Julich-Brain Cytoarchitectonic Atlas (v3.0.3)
+    (
+        "0f1ccc4a-9a11-4697-b43f-9c9c8ac543e6--5c040dd84fe23933624732e264d3d137",
+        None
+    )  # StreamlineCounts (StreamlineCounts) anchored at minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-300 with cohort HCP - 005
 ]
 
 
@@ -33,6 +61,9 @@ def test_get_instance(fid, foo):
     assert feat
 
 
+# this tests whether or not calling a live query caused proxy feature to be
+# added to subclasses. (It should not: causes memory leak and also increases
+# query time linearly)
 @pytest.mark.parametrize("fid,foo", ids)
 def test_subclass_count(fid, foo):
     len_before = len(siibra.features.Feature.SUBCLASSES[siibra.features.Feature])

examples/03_data_features/007_comparative_assessment.py

@@ -66,8 +66,10 @@
 # showing density distributions from the pial surface to the gray/white matter
 # boundary in individual tissue samples. For the receptor measurements, we
 # supply now an additional filter to choose only GABAB profiles.
+# (ReceptorDensityProfile CompoundFeature is indexed by receptors. List by
+# `indices` property.)
 modalities = [
-    (siibra.features.molecular.ReceptorDensityProfile, lambda p: "gabab" in p.receptor.lower()),
+    (siibra.features.molecular.ReceptorDensityProfile, lambda p: p['GABAB (gamma-aminobutyric acid receptor type B)']),
     (siibra.features.cellular.CellDensityProfile, lambda p: True),
     (siibra.features.cellular.BigBrainIntensityProfile, lambda p: True),
 ]
@@ -86,3 +88,5 @@
         p.plot(ax=axs[j, i], layercolor="darkblue")
         axs[j, i].set_ylim(0, ymax[j])
 f.tight_layout()
+
+# %%

examples/03_data_features/008_functional_timeseries.py

@@ -37,20 +37,20 @@
 features = siibra.features.get(jubrain, siibra.features.functional.RegionalBOLD)
 bold = features[0]
 print(f"Found {len(bold)} parcellation-based BOLD signals for {jubrain}.")
-print(f"RegionalBOLD features reflects {bold.modality} of {bold.filter_attributes['cohort']} cohort.")
 print(bold.name)
 print("\n" + bold.description)
 
-# Subjects are encoded via anonymized ids:
+# Subjects are encoded via anonymized ids and the CompoundFeature is indexed by
+# subject id and paradigm tuples.
 print(bold.indices)
 
 
 # %%
 # The parcellation-based functional data are provided as pandas DataFrames
-# with region objects as columns and indices as time step.
-subject = bold.indices[0]
-table = bold[subject].get_table()
-print(f"Timestep: {bold[subject].timestep}")
+# with region objects as columns and indices as time step. The index is of 
+# the table is a Timeseries.
+index = bold.indices[0]
+table = bold[index].data
 table[jubrain.get_region("hOc3v left")]
 
 # %%
@@ -63,7 +63,7 @@
     'Area 7A (SPL) left', 'Area 7A (SPL) right', 'CA1 (Hippocampus) left',
     'CA1 (Hippocampus) right', 'CA1 (Hippocampus) left', 'CA1 (Hippocampus) right'
 ]
-bold[subject].plot_carpet(regions=selected_regions)
+bold[index].plot_carpet(regions=selected_regions)
 # %%
 # Alternatively, we can visualize the mean signal strength per region:
-bold[subject].plot(regions=selected_regions)
+bold[index].plot(regions=selected_regions)

siibra/configuration/factory.py

@@ -483,18 +483,16 @@ def build_activity_timeseries(cls, spec):
             "anchor": cls.extract_anchor(spec),
             "description": spec.get("description", ""),
             "datasets": cls.extract_datasets(spec),
-            "timestep": spec.get("timestep", ("1 no_unit"))
+            "timestep": spec.get("timestep", ("1 timestep"))
         }
         paradigm = spec.get("paradigm")
         if paradigm:
             kwargs["paradigm"] = paradigm
-        files_indexed_by_subjects = spec.get("files_indexed_by", "subjects") == "subjects"
         timeseries_by_file = []
         for fkey, filename in files.items():
             kwargs.update({
                 "files": {fkey: filename},
-                "subject": fkey if files_indexed_by_subjects else "average",
-                "feature": None if files_indexed_by_subjects else fkey
+                "subject": fkey
             })
             timeseries_by_file.append(timeseries_cls(**kwargs))
         return timeseries_by_file

siibra/features/connectivity/regional_connectivity.py

@@ -51,7 +51,7 @@ def __init__(
         anchor: _anchor.AnatomicalAnchor,
         description: str = "",
         datasets: list = [],
-        subject: list = ["average"],
+        subject: str = "average",
         feature: str = None
     ):
         """
@@ -163,13 +163,13 @@ def _merge_instances(
             )
             for fname in instance._files.values()
         ]
-        compounded._matrix = instances[0]._arraylike_to_dataframe(
+        compounded._matrix = compounded._arraylike_to_dataframe(
             np.stack(all_arrays).mean(0)
         )
         return compounded
 
     @property
-    def data(self):
+    def data(self) -> pd.DataFrame:
         """
         Returns a matrix as a pandas dataframe.
 

siibra/features/feature.py

@@ -504,12 +504,18 @@ def _get_instance_by_id(cls, feature_id: str, **kwargs):
                 if f.id == fid or f.id == feature_id
             ][0]
         except ParseLiveQueryIdException:
-            return [
+            candidates = [
                 inst
                 for Cls in Feature.SUBCLASSES[Feature]
                 for inst in Cls.get_instances()
                 if inst.id == feature_id
-            ][0]
+            ]
+            if len(candidates) == 0:
+                raise NotFoundException(f"No feature instance wth {feature_id} found.")
+            if len(candidates) == 1:
+                return candidates[0]
+            else:
+                raise 
         except IndexError:
             raise NotFoundException
 

siibra/features/tabular/bigbrain_intensity_profile.py

@@ -64,8 +64,11 @@ def __init__(
         self.location = location
 
     @property
-    def filter_attributes(self) -> Dict[str, Union[str, int]]:
-        return {**super().filter_attributes, "location": self.location}
+    def filter_attributes(self) -> Dict[str, Union[str, point.Point]]:
+        return {
+            attr: getattr(self, attr)
+            for attr in ["modality", "location"]
+        }
 
     @property
     def subfeature_index(self) -> point.Point:

siibra/features/tabular/cell_density_profile.py

@@ -97,9 +97,8 @@ def __init__(
     @property
     def filter_attributes(self) -> Dict[str, Union[str, int]]:
         return {
-            **super().filter_attributes,
-            "section": self.section,
-            "patch": self.patch
+            attr: getattr(self, attr)
+            for attr in ["modality", "section", "patch"]
         }
 
     @property

siibra/features/tabular/cortical_profile.py

@@ -162,15 +162,15 @@ def data(self):
 
     @property
     def filter_attributes(self) -> Dict[str, Any]:
-        return {"modality": self.modality}
+        raise NotImplementedError
 
     @property
     def _compound_key(self):
         return (self.modality,)
 
     @property
     def subfeature_index(self) -> Tuple[str]:
-        return ("average",)
+        raise NotImplementedError
 
     @classmethod
     def _merge_instances(

siibra/features/tabular/receptor_density_profile.py

@@ -59,8 +59,11 @@ def __init__(
         self._unit_cached = None
 
     @property
-    def filter_attributes(self) -> Dict[str, Union[str, int]]:
-        return {**super().filter_attributes, "receptor": self.receptor}
+    def filter_attributes(self) -> Dict[str, Union[str, str]]:
+        return {
+            attr: getattr(self, attr)
+            for attr in ["modality", "receptor"]
+        }
 
     @property
     def subfeature_index(self) -> str:
@@ -83,6 +86,10 @@ def receptor(self):
             vocabularies.RECEPTOR_SYMBOLS[self.type]['receptor']['name'],
         )
 
+    @property
+    def name(self):
+        return super().name + f" for {self.type}"
+
     @property
     def neurotransmitter(self):
         return "{} ({})".format(