Update app.py

app.py

@@ -87,26 +87,51 @@ with st.container():
         st.metric("Average Response Time (s)", f"{metrics.avg_response_time():.2f}")
 
         if user_query:
-            print(f"New Query: {user_query}")
+            print(f"[QUERY] {user_query}")
             start_time = time.time()
             st.session_state.chat_history.append({"user": user_query})
 
-            # Use PySpur-compatible tool runner
-            try:
-                response = run_tool(user_query, model=selected_model, use_rag=rag_toggle)
-                routed_correctly = True
-            except Exception as e:
-                response = f"Error handling query: {str(e)}"
-                routed_correctly = False
-
-            st.session_state.chat_history[-1]["response"] = response
-            print(f"Response generated successfully for the query.")
-
-            end_time = time.time()
-            response_time = end_time - start_time
-            st.session_state.metrics.record_query(routed_correctly, response_time)
-            st.session_state.metrics.print_metrics_summary()
-            st.rerun()
+        try:
+            response, tool_used = run_tool(
+                user_query,
+                model=selected_model,
+                use_rag=rag_toggle
+            )
+            routed_correctly = True
+        except Exception as e:
+            response = f"Error handling query: {str(e)}"
+            tool_used = "ERROR"
+            routed_correctly = False
+
+        end_time = time.time()
+        response_time = end_time - start_time
+
+        # ✅ RECORD METRICS HERE (THIS IS THE CORRECT LOCATION)
+        st.session_state.metrics.record_query(
+            query=user_query,
+            model=selected_model,
+            use_rag=rag_toggle,
+            tool_name=tool_used,
+            routed_correctly=routed_correctly,
+            response_time=response_time
+        )
+
+        # Optional: print structured routing log
+        print(
+                f"""
+        === ROUTING EVENT ===
+        Query: {user_query}
+        Model: {selected_model}
+        RAG Enabled: {rag_toggle}
+        Tool Used: {tool_used}
+        Response Time: {response_time:.2f}s
+        Status: {'SUCCESS' if routed_correctly else 'FAILED'}
+        ====================
+        """
+        )
+
+        st.session_state.chat_history[-1]["response"] = response
+        st.rerun()
 
         # Clear button
         if st.button("Clear Chat History"):