Merge pull request #826 from effigies/fix/none_in_query_list

RF/FIX: Decompose filter construction for special queries and lists

Author: effigies

bids/layout/layout.py

@@ -745,29 +745,45 @@ def _build_file_query(self, **kwargs):
             for name, val in filters.items():
                 tag_alias = aliased(Tag)
 
-                if isinstance(val, (list, tuple)) and len(val) == 1:
-                    val = val[0]
-
+                val_list = list(listify(val)) if val is not None else [None]
+                if not val_list:
+                    continue
+
+                none = any_ = False
+                if None in val_list:
+                    none = True
+                    val_list.remove(None)
+                if Query.NONE in val_list:
+                    none = True
+                    val_list.remove(Query.NONE)
+                if Query.ANY in val_list:
+                    any_ = True
+                    val_list.remove(Query.ANY)
+
+                if none and any_:
+                    # Always true, apply no filter
+                    continue
+
+                # Baseline, use join, start accumulating clauses
                 join_method = query.join
+                val_clauses = []
 
-                if val is None or val == Query.NONE:
+                # NONE and ANY get special treatment
+                if none:
                     join_method = query.outerjoin
-                    val_clause = tag_alias._value.is_(None)
-                elif val == Query.ANY:
-                    val_clause = tag_alias._value.isnot(None)
-                elif regex:
-                    if isinstance(val, (list, tuple)):
-                        val_clause = sa.or_(*[
-                            tag_alias._value.op('REGEXP')(str(v))
-                            for v in val
-                        ])
-                    else:
-                        val_clause = tag_alias._value.op('REGEXP')(str(val))
-                else:
-                    if isinstance(val, (list, tuple)):
-                        val_clause = tag_alias._value.in_(val)
-                    else:
-                        val_clause = tag_alias._value == val
+                    val_clauses.append(tag_alias._value.is_(None))
+                if any_:
+                    val_clauses.append(tag_alias._value.isnot(None))
+
+                # Any remaining values
+                if regex:
+                    val_clauses.extend([tag_alias._value.op('REGEXP')(str(v))
+                                        for v in val_list])
+                elif val_list:
+                    val_clauses.append(tag_alias._value.in_(val_list))
+
+                # Looking for intersection with list of vals, so use OR
+                val_clause = sa.or_(*val_clauses) if len(val_clauses) > 1 else val_clauses[0]
 
                 query = join_method(
                     tag_alias,

bids/layout/tests/test_layout.py

@@ -712,6 +712,19 @@ def test_get_with_invalid_filters(layout_ds005):
     l.get(**filters)
 
 
+def test_get_with_query_constants_in_match_list(layout_ds005):
+    l = layout_ds005
+    get1 = l.get(subject='12', run=1, suffix='bold')
+    get_none = l.get(subject='12', run=None, suffix='bold')
+    get_any = l.get(subject='12', run=Query.ANY, suffix='bold')
+    get1_and_none = l.get(subject='12', run=[None, 1], suffix='bold')
+    get1_and_any = l.get(subject='12', run=[Query.ANY, 1], suffix='bold')
+    get_none_and_any = l.get(subject='12', run=[Query.ANY, Query.NONE], suffix='bold')
+    assert set(get1_and_none) == set(get1) | set(get_none)
+    assert set(get1_and_any) == set(get1) | set(get_any)
+    assert set(get_none_and_any) == set(get_none) | set(get_any)
+
+
 def test_load_layout(layout_synthetic_nodb, db_dir):
     db_path = str(db_dir / 'tmp_db')
     layout_synthetic_nodb.save(db_path)