Added row filter value conversion to column dtype.

post-processing/post_processing.py

@@ -1,11 +1,11 @@
 import argparse
 import ast
 import errno
+import math
 import operator as op
 import os
 import re
 import traceback
-import math
 from functools import reduce
 from itertools import chain
 from pathlib import Path
@@ -278,9 +278,10 @@ def row_filter(self, filter, df: pd.DataFrame):
             mask = df[column].isnull() if operator == op.eq else df[column].notnull()
         else:
             try:
-                # FIXME: try to interpret the comparison value as whatever type the df column is
+                # interpret comparison value as column dtype
+                value = pd.Series(value, dtype=df[column].dtype).iloc[0]
                 mask = operator(df[column], value)
-            except TypeError as e:
+            except TypeError or ValueError as e:
                 e.args = (e.args[0] + " for column: \'{0}\' and value: \'{1}\'".format(column, value),)
                 raise
 

post-processing/test_post_processing.py

@@ -198,8 +198,8 @@ def test_high_level_script(run_sombrero):
 
     # check expected failure from invalid filter value type
     try:
-        post_.run_post_processing(sombrero_log_path, {"filters": [["flops_value", ">", "1"]], "series": [], "x_axis": {"value": "tasks", "units": {"custom": None}}, "y_axis": {"value": "flops_value", "units": {"column": "flops_unit"}}, "column_types": {"tasks": "int", "flops_value": "float", "flops_unit": "str"}})
-    except TypeError:
+        post_.run_post_processing(sombrero_log_path, {"filters": [["flops_value", ">", "v"]], "series": [], "x_axis": {"value": "tasks", "units": {"custom": None}}, "y_axis": {"value": "flops_value", "units": {"column": "flops_unit"}}, "column_types": {"tasks": "int", "flops_value": "float", "flops_unit": "str"}})
+    except ValueError:
         assert True
     else:
         assert False