Better error handling in select_values

JeffersonLab · Nov 17, 2023 · fcc3e4d · fcc3e4d
1 parent 4f1a012
commit fcc3e4d
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/python/rcdb/provider.py b/python/rcdb/provider.py
@@ -788,8 +788,16 @@ def select_runs(self, search_str="", run_min=0, run_max=sys.maxsize, sort_desc=F
             if isinstance(value, Condition):
                 value = (value,)
             run = value[0].run
-            if eval(compiled_search_eval):
-                sel_runs.append(run)
+            try:
+                if eval(compiled_search_eval):
+                    sel_runs.append(run)
+            except Exception as ex:
+                message = 'Error evaluating search query.\n' \
+                          + '  Query: <<"{}">>, \n'.format(search_eval) \
+                          + '  Names: {}, \n'.format(names) \
+                          + '  Values: {} \n'.format(values) \
+                          + '  Error ({}): {}'.format(type(ex), ex)
+                raise QueryEvaluationError(msg=message)
 
         selection_sw.stop()
         result = RunSelectionResult(sel_runs, self)
@@ -971,7 +979,7 @@ def select_values(self, val_names=None, search_str="", run_min=0, run_max=sys.ma
                           + '  Query: <<"{}">>, \n'.format(search_eval) \
                           + '  Names: {}, \n'.format(names) \
                           + '  Values: {} \n'.format(values) \
-                          + '  Error: {}'.format(ex)
+                          + '  Error ({}): {}'.format(type(ex), ex)
                 raise QueryEvaluationError(msg=message)
 
         selection_sw.stop()