Remove Unneeded Special Handling of OpenAPI Tool Calls

Author: m7md7sien

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

@@ -1086,14 +1086,6 @@ def _extract_needed_tool_definitions(self, tool_calls, tool_definitions):
         built_in_definitions = _get_needed_built_in_definitions(tool_calls)
         needed_tool_definitions.extend(built_in_definitions)
 
-        # OpenAPI tool is a collection of functions, so we need to expand it
-        tool_definitions_expanded = list(
-            chain.from_iterable(
-                tool.get("functions", []) if tool.get("type") == "openapi" else [tool]
-                for tool in needed_tool_definitions
-            )
-        )
-
         # Validate that all tool calls have corresponding definitions
         for tool_call in tool_calls:
             if isinstance(tool_call, dict):
@@ -1107,7 +1099,7 @@ def _extract_needed_tool_definitions(self, tool_calls, tool_definitions):
                     elif tool_name:
                         # This is a regular function tool from converter or built-in tool from agent v2
                         tool_definition_exists = any(
-                            tool.get("name") == tool_name for tool in tool_definitions_expanded
+                            tool.get("name") == tool_name for tool in needed_tool_definitions
                         )
                         if not tool_definition_exists:
                             raise EvaluationException(

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

@@ -633,14 +633,6 @@ def _extract_needed_tool_definitions(
     built_in_definitions = _get_needed_built_in_tool_definitions(tool_calls)
     needed_tool_definitions.extend(built_in_definitions)
 
-    # OpenAPI tool is a collection of functions, so we need to expand it
-    tool_definitions_expanded = list(
-        chain.from_iterable(
-            tool.get("functions", []) if tool.get("type") == "openapi" else [tool]
-            for tool in needed_tool_definitions
-        )
-    )
-
     # Validate that all tool calls have corresponding definitions
     for tool_call in tool_calls:
         if isinstance(tool_call, dict):
@@ -653,7 +645,7 @@ def _extract_needed_tool_definitions(
                     continue
                 elif tool_name:
                     # This is a regular function tool from converter or built-in tool from agent v2
-                    tool_definition_exists = any(tool.get("name") == tool_name for tool in tool_definitions_expanded)
+                    tool_definition_exists = any(tool.get("name") == tool_name for tool in needed_tool_definitions)
                     if not tool_definition_exists:
                         raise EvaluationException(
                             message=f"Tool definition for {tool_name} not found",

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

@@ -731,14 +731,6 @@ def _extract_needed_tool_definitions(
     built_in_definitions = _get_needed_built_in_tool_definitions(tool_calls)
     needed_tool_definitions.extend(built_in_definitions)
 
-    # OpenAPI tool is a collection of functions, so we need to expand it
-    tool_definitions_expanded = list(
-        chain.from_iterable(
-            tool.get("functions", []) if tool.get("type") == "openapi" else [tool]
-            for tool in needed_tool_definitions
-        )
-    )
-
     # Validate that all tool calls have corresponding definitions
     for tool_call in tool_calls:
         if isinstance(tool_call, dict):
@@ -751,7 +743,7 @@ def _extract_needed_tool_definitions(
                     continue
                 elif tool_name:
                     # This is a regular function tool from converter or built-in tool from agent v2
-                    tool_definition_exists = any(tool.get("name") == tool_name for tool in tool_definitions_expanded)
+                    tool_definition_exists = any(tool.get("name") == tool_name for tool in needed_tool_definitions)
                     if not tool_definition_exists:
                         raise EvaluationException(
                             message=f"Tool definition for {tool_name} not found",

assets/evaluators/tests/test_evaluators_behavior/test_tool_selection_evaluator_behavior.py

@@ -73,8 +73,11 @@ class TestToolSelectionEvaluatorBehavior(BaseToolCallEvaluatorBehaviorTest, Base
         "tool_definitions": data.FABRIC_TOOL_DEFINITIONS,
     }
 
-    # OpenAPI: ToolSelection flow is not called (no extractable tool calls)
-    # Expected flow inputs not used since the test will not reach flow assertion
+    test_openapi_expected_flow_inputs = {
+        "query": data.OPENAPI_EXPECTED_FLOW_QUERY,
+        "tool_calls": ["weather_GetCurrentWeather"],
+        "tool_definitions": data.OPENAPI_TOOL_DEFINITIONS,
+    }
 
     test_web_search_expected_flow_inputs = {
         "query": data.WEB_SEARCH_EXPECTED_FLOW_QUERY,
@@ -116,15 +119,3 @@ class TestToolSelectionEvaluatorBehavior(BaseToolCallEvaluatorBehaviorTest, Base
     is_tool_definition_required = True
 
     evaluator_type = ToolSelectionEvaluator
-
-    def test_openapi(self):
-        """OpenAPI: ToolSelection flow is not called (no extractable tool calls)."""
-        results, flow_mock = self._run_evaluation_and_return_mocked_flow(
-            query=data.OPENAPI_QUERY,
-            response=data.OPENAPI_RESPONSE,
-            tool_definitions=data.OPENAPI_TOOL_DEFINITIONS,
-        )
-        result_data = self._extract_and_print_result(results, "OpenAPI")
-        self.assert_not_applicable(result_data)
-        assert flow_mock is not None, "Flow mock should be set when use_mocking=True"
-        flow_mock.assert_not_called()