use the sessions's tools settings

Author: jkwatson

llm-service/app/services/chat/streaming_chat.py

@@ -194,6 +194,7 @@ def build_streamer(
         query_configuration,
         chat_messages,
         crew_events_queue=crew_events_queue,
+        session=session
     )
     return condensed_question, data_source_id, streaming_chat_response
 

llm-service/app/services/query/agents/crewai_querier.py

@@ -134,7 +134,7 @@ def assemble_crew(
         )
         research_tools.append(crewai_retriever_tool)
 
-    # Create a search tool if needed
+    # Create a search tool if needed # TODO: fix this because we don't use configuration.tools any more!
     search_tool = None
     if configuration.tools and "search" in configuration.tools:
         search_tool = SerperDevTool()

llm-service/app/services/query/querier.py

@@ -48,6 +48,7 @@
     poison_pill,
 )
 from .crew_events import CrewEvent
+from ..metadata_apis.session_metadata_api import Session
 
 if TYPE_CHECKING:
     from ..chat.utils import RagContext
@@ -118,13 +119,14 @@ def streaming_query(
     configuration: QueryConfiguration,
     chat_messages: list[ChatMessage],
     crew_events_queue: Queue[CrewEvent],
+    session: Session
 ) -> StreamingAgentChatResponse:
     mcp_tools: list[BaseTool] = []
     all_adapters: list[MCPServerAdapter] = []
 
     # Add adapters for each tool specified in the configuration
-    if configuration.tools:
-        for tool_name in configuration.tools:
+    if session.query_configuration and session.query_configuration.selected_tools:
+        for tool_name in session.query_configuration.selected_tools:
             try:
                 adapter = get_mcp_server_adapter(tool_name)
                 print(f"Adding adapter for tool: {adapter}")