Update app.py

app.py

@@ -25,28 +25,33 @@ def respond(
     
     # Build conversation history
     for human_msg, assistant_msg in chat_history:
-        if human_msg:
-            messages.append({"role": "user", "content": human_msg})
-        if assistant_msg:
-            messages.append({"role": "assistant", "content": assistant_msg})
+        messages.append({"role": "user", "content": human_msg})
+        messages.append({"role": "assistant", "content": assistant_msg})
     
     messages.append({"role": "user", "content": message})
     response = ""
     
     try:
-        for message in client.chat_completion(
+        # Add user message to history immediately
+        chat_history = chat_history + [(message, None)]
+        yield chat_history
+        
+        for token_data in client.chat_completion(
             messages,
             max_tokens=max_tokens,
             stream=True,
             temperature=temperature,
             top_p=top_p,
         ):
-            token = message.choices[0].delta.content
+            token = token_data.choices[0].delta.content
             response += token
-            chat_history = chat_history + [(message, response)]
+            # Update the last assistant message
+            chat_history[-1] = (message, response)
             yield chat_history
+            
     except Exception as e:
-        chat_history = chat_history + [(message, f"Error: {str(e)}")]
+        error_msg = f"Error: {str(e)}"
+        chat_history[-1] = (message, error_msg)
         yield chat_history
 
 def create_chat_interface():
@@ -67,32 +72,42 @@ def create_chat_interface():
     with gr.Blocks(theme=gr.themes.Soft()) as demo:
         gr.Markdown("# 🤖 Advanced AI Chatbot")
         
+        chatbot = gr.Chatbot(
+            height=600,
+            show_label=False,
+            container=True,
+        )
+        
         with gr.Row():
-            with gr.Column(scale=3):
-                chatbot = gr.Chatbot(
-                    height=600,
-                    show_label=False,
-                    container=True,
-                    scale=2,
-                    type="messages"  # Set type to messages format
-                )
+            with gr.Column(scale=4):
                 msg = gr.Textbox(
                     show_label=False,
                     placeholder="Type your message here...",
                     container=False
                 )
                 
-            with gr.Column(scale=1):
-                with gr.Accordion("Settings", open=False):
-                    system_msg = gr.Textbox(
-                        label="System Message",
-                        value=default_system,
-                        lines=3
-                    )
-                    model = gr.Dropdown(
-                        choices=models,
-                        value=models[0],
-                        label="Model"
+            with gr.Column(scale=1, min_width=100):
+                send = gr.Button("Send")
+        
+        with gr.Accordion("Settings", open=False):
+            system_msg = gr.Textbox(
+                label="System Message",
+                value=default_system,
+                lines=3
+            )
+            model = gr.Dropdown(
+                choices=models,
+                value=models[0],
+                label="Model"
+            )
+            with gr.Row():
+                with gr.Column():
+                    temperature = gr.Slider(
+                        minimum=0.1,
+                        maximum=2.0,
+                        value=0.7,
+                        step=0.1,
+                        label="Temperature"
                     )
                     max_tokens = gr.Slider(
                         minimum=50,
@@ -101,13 +116,7 @@ def create_chat_interface():
                         step=1,
                         label="Max Tokens"
                     )
-                    temperature = gr.Slider(
-                        minimum=0.1,
-                        maximum=2.0,
-                        value=0.7,
-                        step=0.1,
-                        label="Temperature"
-                    )
+                with gr.Column():
                     top_p = gr.Slider(
                         minimum=0.1,
                         maximum=1.0,
@@ -115,28 +124,33 @@ def create_chat_interface():
                         step=0.1,
                         label="Top P"
                     )
-                
-                with gr.Row():
                     clear = gr.Button("Clear Chat")
-                    stop = gr.Button("Stop")
 
-        # Initialize chat history
-        state = gr.State([])
-        
         # Handle sending messages
         msg.submit(
             respond,
-            [msg, state, system_msg, max_tokens, temperature, top_p, model],
-            [state],
-            api_name="chat"
+            [msg, chatbot, system_msg, max_tokens, temperature, top_p, model],
+            [chatbot]
         ).then(
-            lambda x: "", 
-            [msg], 
-            [msg]
+            lambda: "",
+            None,
+            msg,
+            queue=False
+        )
+
+        send.click(
+            respond,
+            [msg, chatbot, system_msg, max_tokens, temperature, top_p, model],
+            [chatbot]
+        ).then(
+            lambda: "",
+            None,
+            msg,
+            queue=False
         )
         
         # Clear chat history
-        clear.click(lambda: [], None, state, queue=False)
+        clear.click(lambda: None, None, chatbot, queue=False)
         
         # Example prompts
         gr.Examples(
@@ -147,14 +161,13 @@ def create_chat_interface():
             ],
             inputs=msg
         )
-    print(demo)
+
     return demo
 
 # Create and launch the interface
 if __name__ == "__main__":
     demo = create_chat_interface()
     demo.queue()
-    # Disable SSR and sharing for Spaces
     demo.launch(
         share=False,  # Disable sharing on Spaces
-    )
+    )