fixes for make verify

Author: thoraxe

src/app/endpoints/query.py

@@ -257,7 +257,7 @@ def retrieve_response(
         available_input_shields,
         available_output_shields,
         query_request.conversation_id,
-        query_request.no_tools,
+        query_request.no_tools or False,
     )
 
     # bypass tools and MCP servers if no_tools is True

src/app/endpoints/streaming_query.py

@@ -312,7 +312,7 @@ async def retrieve_response(
         available_input_shields,
         available_output_shields,
         query_request.conversation_id,
-        query_request.no_tools,
+        query_request.no_tools or False,
     )
 
     # bypass tools and MCP servers if no_tools is True

tests/unit/app/endpoints/test_query.py

@@ -1382,7 +1382,9 @@ def test_retrieve_response_no_tools_bypasses_mcp_and_rag(prepare_agent_mocks, mo
     )
 
 
-def test_retrieve_response_no_tools_false_preserves_functionality(prepare_agent_mocks, mocker):
+def test_retrieve_response_no_tools_false_preserves_functionality(
+    prepare_agent_mocks, mocker
+):
     """Test that retrieve_response preserves normal functionality when no_tools=False."""
     mock_client, mock_agent = prepare_agent_mocks
     mock_agent.create_turn.return_value.output_message.content = "LLM answer"
@@ -1489,7 +1491,9 @@ def test_get_agent_no_tools_no_parser(setup_configuration, prepare_agent_mocks,
     )
 
 
-def test_get_agent_no_tools_false_preserves_parser(setup_configuration, prepare_agent_mocks, mocker):
+def test_get_agent_no_tools_false_preserves_parser(
+    setup_configuration, prepare_agent_mocks, mocker
+):
     """Test get_agent function preserves tool_parser when no_tools=False."""
     mock_client, mock_agent = prepare_agent_mocks
     mock_agent.create_session.return_value = "new_session_id"
@@ -1545,14 +1549,14 @@ def test_get_agent_no_tools_false_preserves_parser(setup_configuration, prepare_
     )
 
 
-def test_no_tools_parameter_backward_compatibility(mocker):
+def test_no_tools_parameter_backward_compatibility():
     """Test that default behavior is unchanged when no_tools parameter is not specified."""
     # This test ensures that existing code that doesn't specify no_tools continues to work
     query_request = QueryRequest(query="What is OpenStack?")
-    
+
     # Verify default value
     assert query_request.no_tools is False
-    
+
     # Test that QueryRequest can be created without no_tools parameter
     query_request_minimal = QueryRequest(query="Simple query")
     assert query_request_minimal.no_tools is False

tests/unit/app/endpoints/test_streaming_query.py

@@ -22,6 +22,7 @@
     get_agent,
     _agent_cache,
 )
+
 from models.requests import QueryRequest, Attachment
 from models.config import ModelContextProtocolServer
 
@@ -1276,7 +1277,7 @@ async def test_streaming_query_endpoint_handler_no_tools_true(mocker):
     # Mock the streaming response
     mock_streaming_response = mocker.AsyncMock()
     mock_streaming_response.__aiter__.return_value = iter([])
-    
+
     mocker.patch(
         "app.endpoints.streaming_query.retrieve_response",
         return_value=(mock_streaming_response, "test_conversation_id"),
@@ -1315,7 +1316,7 @@ async def test_streaming_query_endpoint_handler_no_tools_false(mocker):
     # Mock the streaming response
     mock_streaming_response = mocker.AsyncMock()
     mock_streaming_response.__aiter__.return_value = iter([])
-    
+
     mocker.patch(
         "app.endpoints.streaming_query.retrieve_response",
         return_value=(mock_streaming_response, "test_conversation_id"),
@@ -1338,7 +1339,9 @@ async def test_streaming_query_endpoint_handler_no_tools_false(mocker):
 
 
 @pytest.mark.asyncio
-async def test_retrieve_response_no_tools_bypasses_mcp_and_rag(prepare_agent_mocks, mocker):
+async def test_retrieve_response_no_tools_bypasses_mcp_and_rag(
+    prepare_agent_mocks, mocker
+):
     """Test that retrieve_response bypasses MCP servers and RAG when no_tools=True."""
     mock_client, mock_agent = prepare_agent_mocks
     mock_agent.create_turn.return_value.output_message.content = "LLM answer"
@@ -1357,8 +1360,8 @@ async def test_retrieve_response_no_tools_bypasses_mcp_and_rag(prepare_agent_moc
     mock_config.mcp_servers = mcp_servers
     mocker.patch("app.endpoints.streaming_query.configuration", mock_config)
     mocker.patch(
-        "app.endpoints.streaming_query.get_agent", 
-        return_value=(mock_agent, "fake_session_id")
+        "app.endpoints.streaming_query.get_agent",
+        return_value=(mock_agent, "fake_session_id"),
     )
 
     query_request = QueryRequest(query="What is OpenStack?", no_tools=True)
@@ -1385,8 +1388,10 @@ async def test_retrieve_response_no_tools_bypasses_mcp_and_rag(prepare_agent_moc
     )
 
 
-@pytest.mark.asyncio 
-async def test_retrieve_response_no_tools_false_preserves_functionality(prepare_agent_mocks, mocker):
+@pytest.mark.asyncio
+async def test_retrieve_response_no_tools_false_preserves_functionality(
+    prepare_agent_mocks, mocker
+):
     """Test that retrieve_response preserves normal functionality when no_tools=False."""
     mock_client, mock_agent = prepare_agent_mocks
     mock_agent.create_turn.return_value.output_message.content = "LLM answer"
@@ -1405,8 +1410,8 @@ async def test_retrieve_response_no_tools_false_preserves_functionality(prepare_
     mock_config.mcp_servers = mcp_servers
     mocker.patch("app.endpoints.streaming_query.configuration", mock_config)
     mocker.patch(
-        "app.endpoints.streaming_query.get_agent", 
-        return_value=(mock_agent, "fake_session_id")
+        "app.endpoints.streaming_query.get_agent",
+        return_value=(mock_agent, "fake_session_id"),
     )
 
     query_request = QueryRequest(query="What is OpenStack?", no_tools=False)
@@ -1432,8 +1437,6 @@ async def test_retrieve_response_no_tools_false_preserves_functionality(prepare_
     }
     assert mock_agent.extra_headers == expected_extra_headers
 
-    # Verify that create_turn was called with RAG and MCP toolgroups
-    from app.endpoints.query import get_rag_toolgroups
     expected_toolgroups = get_rag_toolgroups(["VectorDB-1"]) + ["filesystem-server"]
     mock_agent.create_turn.assert_called_once_with(
         messages=[UserMessage(content="What is OpenStack?", role="user")],
@@ -1445,7 +1448,9 @@ async def test_retrieve_response_no_tools_false_preserves_functionality(prepare_
 
 
 @pytest.mark.asyncio
-async def test_get_agent_no_tools_no_parser(setup_configuration, prepare_agent_mocks, mocker):
+async def test_get_agent_no_tools_no_parser(
+    setup_configuration, prepare_agent_mocks, mocker
+):
     """Test get_agent function sets tool_parser=None when no_tools=True."""
     mock_client, mock_agent = prepare_agent_mocks
     mock_agent.create_session.return_value = "new_session_id"
@@ -1456,7 +1461,9 @@ async def test_get_agent_no_tools_no_parser(setup_configuration, prepare_agent_m
     )
 
     # Mock get_suid
-    mocker.patch("app.endpoints.streaming_query.get_suid", return_value="new_session_id")
+    mocker.patch(
+        "app.endpoints.streaming_query.get_suid", return_value="new_session_id"
+    )
 
     # Mock configuration
     mock_mcp_server = mocker.Mock()
@@ -1497,7 +1504,9 @@ async def test_get_agent_no_tools_no_parser(setup_configuration, prepare_agent_m
 
 
 @pytest.mark.asyncio
-async def test_get_agent_no_tools_false_preserves_parser(setup_configuration, prepare_agent_mocks, mocker):
+async def test_get_agent_no_tools_false_preserves_parser(
+    setup_configuration, prepare_agent_mocks, mocker
+):
     """Test get_agent function preserves tool_parser when no_tools=False."""
     mock_client, mock_agent = prepare_agent_mocks
     mock_agent.create_session.return_value = "new_session_id"
@@ -1508,11 +1517,15 @@ async def test_get_agent_no_tools_false_preserves_parser(setup_configuration, pr
     )
 
     # Mock get_suid
-    mocker.patch("app.endpoints.streaming_query.get_suid", return_value="new_session_id")
+    mocker.patch(
+        "app.endpoints.streaming_query.get_suid", return_value="new_session_id"
+    )
 
     # Mock GraniteToolParser
     mock_parser = mocker.Mock()
-    mock_granite_parser = mocker.patch("app.endpoints.streaming_query.GraniteToolParser")
+    mock_granite_parser = mocker.patch(
+        "app.endpoints.streaming_query.GraniteToolParser"
+    )
     mock_granite_parser.get_parser.return_value = mock_parser
 
     # Mock configuration