FIX: Do not allow filters to overwrite participant / session

Author: mgxd

niworkflows/utils/bids.py

@@ -226,6 +226,16 @@ def collect_data(
     >>> bids_root['t1w']  # doctest: +ELLIPSIS
     ['.../ds051/sub-01/anat/sub-01_run-01_T1w.nii.gz']
 
+    >>> bids_root, _ = collect_data(
+    ...     str(datadir / 'ds114'),
+    ...     '01',
+    ...     bids_validate=False,
+    ...     session_id='retest',
+    ...     bids_filters={'bold': {'session': 'madeup'}})  # doctest: +ELLIPSIS
+    Traceback (most recent call last):
+      ...
+    ValueError: Conflicting entities for "session" found: madeup - retest
+
     """
     if isinstance(bids_dir, BIDSLayout):
         layout = bids_dir
@@ -242,6 +252,22 @@ def collect_data(
     queries = queries or DEFAULT_BIDS_QUERIES
     bids_filters = bids_filters or {}
     for acq, entities in bids_filters.items():
+        # BIDS filters will not be able to override subject / session entities
+        if (
+            'subject' in entities
+            and participant_label
+            and participant_label != entities['subject']
+        ):
+            raise ValueError(
+                'Conflicting entities for "participant" found: '
+                f'{entities["subject"]} - {participant_label}'
+            )
+        if 'session' in entities and session_id and session_id != entities['session']:
+            raise ValueError(
+                'Conflicting entities for "session" found: '
+                f'{entities["session"]} - {session_id}'
+            )
+
         queries[acq].update(entities)
         for entity in list(layout_get_kwargs.keys()):
             if entity in entities: