Explicity catch 2D fields error

Author: jeromekelleher

tests/test_filter.py

@@ -260,6 +260,19 @@ def test_numpy_arithmetic_expressions_data(self, expr, data):
         evaled = eval(expr, npdata)
         nt.assert_array_equal(result, evaled)
 
+    @pytest.mark.parametrize(
+        ("expr", "data"),
+        [
+            ("a", {"a": [[1], [2], [3]]}),
+        ],
+    )
+    def test_numpy_2d_arithmetic_expressions_data(self, expr, data):
+        parser = filter_mod.make_bcftools_filter_parser(map_vcf_identifiers=False)
+        parsed = parser.parse_string(expr, parse_all=True)
+        npdata = numpify_values(data)
+        with pytest.raises(filter_mod.Unsupported2DFieldsError):
+            parsed[0].eval(npdata)
+
     @pytest.mark.parametrize(
         ("expr", "expected"),
         [

vcztools/filter.py

@@ -57,6 +57,11 @@ class UnsupportedFunctionsError(UnsupportedFilteringFeatureError):
     feature = "Function evaluation"
 
 
+class Unsupported2DFieldsError(UnsupportedFilteringFeatureError):
+    issue = "193"
+    feature = "2D INFO fields"
+
+
 # The parser and evaluation model here are based on the eval_arith example
 # in the pyparsing docs:
 # https://github.com/pyparsing/pyparsing/blob/master/examples/eval_arith.py
@@ -110,7 +115,10 @@ def __init__(self, mapper, tokens):
         logger.debug(f"Mapped {tokens[0]} to {self.field_name}")
 
     def eval(self, data):
-        return data[self.field_name]
+        value = np.asarray(data[self.field_name])
+        if len(value.shape) > 1:
+            raise Unsupported2DFieldsError()
+        return value
 
     def __repr__(self):
         return self.field_name