Fix if condition if query value is None for tool-based evals (#4601)

* Ensure query param is not None for tool-related evaluators

* Remove trailing whitespace, bump versions.

* Fix condition

* fix condition

---------

Co-authored-by: Salma Elshafey <[email protected]>

Author: salma-elshafey

assets/evaluators/builtin/tool_call_accuracy/evaluator/_tool_call_accuracy.py

@@ -253,7 +253,7 @@ async def _do_eval(self, eval_input: Dict) -> Dict[str, Union[float, str]]:  # t
         :return: The evaluation result.
         :rtype: Dict
         """
-        if "query" not in eval_input:
+        if eval_input.get("query") is None:
             raise EvaluationException(
                 message=(
                     "Query is a required input to the Tool Call Accuracy evaluator."

assets/evaluators/builtin/tool_input_accuracy/evaluator/_tool_input_accuracy.py

@@ -485,7 +485,7 @@ async def _do_eval(self, eval_input: Dict) -> Dict[str, Union[float, str]]:
         :return: A dictionary containing the result of the evaluation.
         :rtype: Dict[str, Union[str, float]]
         """
-        if "query" not in eval_input:
+        if eval_input.get("query") is None:
             raise EvaluationException(
                 message=(
                     "Query is a required input to "
@@ -501,8 +501,7 @@ async def _do_eval(self, eval_input: Dict) -> Dict[str, Union[float, str]]:
             )
 
         # Format conversation history for cleaner evaluation
-        else:
-            eval_input["query"] = reformat_conversation_history(
+        eval_input["query"] = reformat_conversation_history(
                 eval_input["query"], logger, include_system_messages=True, include_tool_calls=True
             )
 

assets/evaluators/builtin/tool_selection/evaluator/_tool_selection.py

@@ -488,22 +488,21 @@ async def _do_eval(self, eval_input: Dict) -> Dict[str, Union[float, str]]:
         :return: A dictionary containing the result of the evaluation.
         :rtype: Dict[str, Union[str, float]]
         """
-        if "query" not in eval_input:
+        if eval_input.get("query") is None:
             raise EvaluationException(
                 message=(
                     "Query is a required input to the Tool Selection evaluator."
                 ),
                 internal_message=(
-                    "Query is a required inputto the Tool Selection evaluator."
+                    "Query is a required input to the Tool Selection evaluator."
                 ),
                 blame=ErrorBlame.USER_ERROR,
                 category=ErrorCategory.INVALID_VALUE,
                 target=ErrorTarget.TOOL_SELECTION_EVALUATOR,
             )
 
         # Format conversation history for cleaner evaluation
-        else:
-            eval_input["query"] = reformat_conversation_history(
+        eval_input["query"] = reformat_conversation_history(
                 eval_input["query"], logger, include_system_messages=True, include_tool_calls=True
             )