Update ui_components.py

ui_components.py

@@ -224,7 +224,7 @@ class UIComponents:
                         json_fmt["json_schema"]["strict"] = True
                     params["response_format"] = json_fmt
 
-                # tools
+                # tools (OpenAI-style tools are optional; only send tool_choice/tool_prompt if tools are provided)
                 tools = None
                 if tools_json and tools_json.strip():
                     try:
@@ -235,18 +235,17 @@ class UIComponents:
                             return gr.Markdown("❌ Tools must be a JSON array.", visible=True)
                     except Exception as e:
                         return gr.Markdown(f"❌ Invalid tools JSON: {e}", visible=True)
+
                 if tools is not None:
                     params["tools"] = tools
-
-                # tool_choice
-                if tool_choice in ("auto", "none", "required"):
-                    params["tool_choice"] = tool_choice
-                elif tool_choice == "function" and tool_function_name:
-                    params["tool_choice"] = {"type": "function", "function": {"name": tool_function_name}}
-
-                # tool_prompt
-                if tool_prompt and tool_prompt.strip():
-                    params["tool_prompt"] = tool_prompt.strip()
+                    # tool_choice (only valid when tools are present)
+                    if tool_choice in ("auto", "none", "required"):
+                        params["tool_choice"] = tool_choice
+                    elif tool_choice == "function" and tool_function_name:
+                        params["tool_choice"] = {"type": "function", "function": {"name": tool_function_name}}
+                    # tool_prompt (only meaningful when tools are present)
+                    if tool_prompt and tool_prompt.strip():
+                        params["tool_prompt"] = tool_prompt.strip()
                 self.mcp_client.set_generation_params(params)
                 return gr.Markdown("✅ Inference parameters updated.")
 
@@ -603,13 +602,30 @@ class UIComponents:
             outputs=[self.api_status, self.reasoning_group]
         )
         
-        # Connect chat
+        # Connect chat with streaming generator for incremental updates
+        def submit_message_stream(message, history):
+            if message and (message.get("text", "").strip() or message.get("files", [])):
+                converted_history = []
+                for msg in history:
+                    if isinstance(msg, dict):
+                        converted_history.append(ChatMessage(
+                            role=msg.get('role', 'assistant'),
+                            content=msg.get('content', ''),
+                            metadata=msg.get('metadata', None)
+                        ))
+                    else:
+                        converted_history.append(msg)
+                # Delegate to streaming generator in ChatHandler
+                yield from self.chat_handler.process_multimodal_message_stream(message, converted_history)
+                return
+            yield history, gr.MultimodalTextbox(value=None, interactive=False)
+
         chat_submit = self.chat_input.submit(
-            submit_message,
+            submit_message_stream,
             inputs=[self.chat_input, chatbot],
             outputs=[chatbot, self.chat_input]
         )
-        chat_submit.then(enable_input, None, [self.chat_input])
+        # No .then needed; generator yields a final interactive=True state
         
         # Connect server management with proper button state handling
         self.add_server_btn.click(