changed the model to Qwen3-1.7b and made it include its previous history

mcp_client.py

@@ -7,42 +7,17 @@ SYSTEM_PROMPT = """You are a helpful Formula 1 assistant and strategist. You hav
 Be concise and accurate in your responses. If you don't know something, use the available tools to find the information.
 In addition, you will be asked to act as a live race engineer strategist during a Formula 1 race, making crucial calls during the event."""
 
-def format_messages(history: List[List[str]], message: str) -> List[Dict[str, str]]:
-    """Format the conversation history and new message for the agent."""
-    messages = [{"role": "system", "content": SYSTEM_PROMPT}]
-    
-    # Add conversation history
-    for user_msg, bot_msg in history:
-        messages.append({"role": "user", "content": user_msg})
-        messages.append({"role": "assistant", "content": bot_msg})
-    
-    # Add the new message
-    messages.append({"role": "user", "content": message})
-    return messages
 
-def agent_chat(message: str, history: List[List[str]]) -> str:
-    """Handle chat messages with conversation history."""
+def agent_chat(message: str, history: list):
 
-    # Format messages with system prompt and history
-    formatted_messages = format_messages(history, message)
-    
-    # Convert messages to a single string with role indicators
-    chat_history = "\n".join(
-        f"{msg['role'].capitalize()}: {msg['content']}" 
-        for msg in formatted_messages[1:]  # Skip system prompt in the chat history
-    )
-    
-    # Include system prompt at the beginning
-    full_prompt = f"{SYSTEM_PROMPT}\n\n{chat_history}"
-    
-    # Get agent response
-    response = str(agent.run(full_prompt))
-    return response
+    # Manually compose messages: system prompt, then history, then current user message
+    message = f"{SYSTEM_PROMPT}\n{"\n".join([f"{x['role']}: {x['content']}" for x in history])}\nTask: {message}"
+    return agent.run(message, max_steps=5)
 
 
 if __name__ == "__main__":
 
-    only_list_tools = False # Set to True to only list tools (used for debugging)
+    list_tools = False # Set to True to only list tools (used for debugging)
     local_model = True # If you have Ollama installed, set this to True
     
     try:
@@ -51,10 +26,9 @@ if __name__ == "__main__":
             {"url": "https://agents-mcp-hackathon-f1-mcp-server.hf.space/gradio_api/mcp/sse", "transport": "sse"})
         tools = mcp_client.get_tools()
 
-        print("### MCP tools ### ")
-        print("\n".join(f"Tool {1+i}: {t.name}: {t.description}" for i,t in enumerate(tools)))
-
-        if only_list_tools:
+        if list_tools:
+            print("### MCP tools ### ")
+            print("\n".join(f"Tool {1+i}: {t.name}: {t.description}" for i,t in enumerate(tools)))
             mcp_client.disconnect()
             exit(0)
 
@@ -62,7 +36,7 @@ if __name__ == "__main__":
         # Define model
         if local_model:
             model = LiteLLMModel(
-                model_id="ollama_chat/qwen3:8b",
+                model_id="ollama_chat/qwen3:1.7b",
                 api_base="http://127.0.0.1:11434", # Default ollama server
                 num_ctx=32768,
             )
@@ -73,7 +47,7 @@ if __name__ == "__main__":
                 api_key=os.getenv("NEBIUS_API_KEY")
             )
 
-        agent = ToolCallingAgent(tools=[*tools], model=model)
+        agent = ToolCallingAgent(model=model, tools=[*tools])
 
 
         chat_interface = gr.ChatInterface(

todo.txt

@@ -2,5 +2,4 @@
     * Solution is to have a static json file that maps drivers for each season/year
 - Same applies for constructor championship standings but instead Constructor dropdown
     * Similar solution to above
-- Add driver comparison
-- simplify the mcp_client.py to single call.
+- Add driver comparison