Support lists in bids_filter containing null or *

Author: tsalo

fmriprep/cli/parser.py

@@ -90,13 +90,24 @@ def _to_gb(value):
     def _drop_sub(value):
         return value[4:] if value.startswith("sub-") else value
 
-    def _filter_pybids_none_any(dct):
+    def _process_value(value):
         import bids
 
-        return {
-            k: bids.layout.Query.NONE if v is None else (bids.layout.Query.ANY if v == "*" else v)
-            for k, v in dct.items()
-        }
+        if value is None:
+            return bids.layout.Query.NONE
+        elif value == "*":
+            return bids.layout.Query.ANY
+        else:
+            return value
+
+    def _filter_pybids_none_any(dct):
+        d = {}
+        for k, v in dct.items():
+            if isinstance(v, list):
+                d[k] = [_process_value(val) for val in v]
+            else:
+                d[k] = _process_value(v)
+        return d
 
     def _bids_filter(value, parser):
         from json import JSONDecodeError, loads

fmriprep/config.py

@@ -493,12 +493,21 @@ def init(cls):
         if cls.bids_filters:
             from bids.layout import Query
 
+            def _process_value(value):
+                """Convert string with "Query" in it to Query object."""
+                if isinstance(value, list):
+                    return [_process_value(val) for val in value]
+                else:
+                    return (
+                        getattr(Query, value[7:-4])
+                        if not isinstance(value, Query) and "Query" in value
+                        else value
+                    )
+
             # unserialize pybids Query enum values
             for acq, filters in cls.bids_filters.items():
-                cls.bids_filters[acq] = {
-                    k: getattr(Query, v[7:-4]) if not isinstance(v, Query) and "Query" in v else v
-                    for k, v in filters.items()
-                }
+                for k, v in filters.items():
+                    cls.bids_filters[acq][k] = _process_value(v)
 
         if "all" in cls.debug:
             cls.debug = list(DEBUG_MODES)