Adjust tools resolution

Author: asimurka

docs/responses.md

@@ -841,4 +841,4 @@ User’s decision on an [mcp_approval_request](#mcp_approval_request): approve o
 
 ```json
 { "input": [{ "type": "mcp_approval_response", "approval_request_id": "mar_1", "approve": true }] }
-```
+```

src/app/endpoints/responses.py

@@ -247,15 +247,14 @@ async def responses_endpoint_handler(
         request.headers,
     )
 
-    #Build RAG context from Inline RAG sources
+    # Build RAG context from Inline RAG sources
     inline_rag_context = await build_rag_context(
         client,
         moderation_result.decision,
         input_text,
         vector_store_ids,
         responses_request.solr,
     )
-
     if moderation_result.decision == "passed":
         responses_request.input = append_inline_rag_context_to_responses_input(
             responses_request.input, inline_rag_context.context_text
@@ -676,7 +675,6 @@ async def handle_non_streaming_response(
             )
     else:
         try:
-            print("API Params: ", api_params.model_dump(exclude_none=True))
             api_response = cast(
                 OpenAIResponseObject,
                 await client.responses.create(

src/app/main.py

@@ -229,5 +229,5 @@ async def send_wrapper(message: Message) -> None:
 # RestApiMetricsMiddleware (registered last) is outermost.  This ensures metrics
 # always observe a status code — including 500s synthesised by the exception
 # middleware — rather than seeing a raw exception with no response.
-#app.add_middleware(GlobalExceptionMiddleware)
+app.add_middleware(GlobalExceptionMiddleware)
 app.add_middleware(RestApiMetricsMiddleware)

tests/e2e/features/responses.feature

@@ -429,7 +429,7 @@ Feature: Responses endpoint API tests
       And The body of the response contains Unable to connect to Llama Stack
 
 
-Scenario: Check if responses endpoint with tool_choice none answers knowledge question without file search usage
+  Scenario: Responses endpoint with tool_choice none answers knowledge question without file search usage
     Given The system is in default state
       And I set the Authorization header to Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6Ikpva
       And I capture the current token metrics
@@ -572,4 +572,27 @@ Scenario: Check if responses endpoint with tool_choice none answers knowledge qu
     """
     Then The status code of the response is 200
       And The responses output should not include an item with type "file_search_call"
-      And The token metrics should have increased
+      And The token metrics should have increased
+
+  Scenario: Required allowed_tools with invalid filter returns no tool invocations on knowledge question
+    Given The system is in default state
+      And I set the Authorization header to Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6Ikpva
+      And I capture the current token metrics
+    When I use "responses" to ask question with authorization header
+    """
+    {
+      "input": "What is the title of the article from Paul?",
+      "model": "{PROVIDER}/{MODEL}",
+      "stream": false,
+      "instructions": "You are an assistant. You MUST use the file_search tool to answer. Answer in lowercase.",
+      "tools": [],
+      "tool_choice": {
+        "type": "allowed_tools",
+        "mode": "required",
+        "tools": [{"non-existing": "tool"}]
+      }
+    }
+    """
+    Then The status code of the response is 200
+      And The responses output should not include any tool invocation item types
+      And The token metrics should have increased

tests/e2e/features/steps/llm_query_response.py

@@ -57,7 +57,9 @@ def responses_output_should_include_item_type(context: Context, item_type: str)
 
 
 @then('The responses output should not include an item with type "{item_type}"')
-def responses_output_should_not_include_item_type(context: Context, item_type: str) -> None:
+def responses_output_should_not_include_item_type(
+    context: Context, item_type: str
+) -> None:
     """Assert no ``output`` item has the given ``type``."""
     assert context.response is not None, "Request needs to be performed first"
     response_json = cast(dict[str, Any], context.response.json())