ui test

app.py

@@ -29,30 +29,49 @@ def start_ochat_server():
 start_ochat_server()
 
 # Function to send a message to the ochat server and get a response
-def chat_with_ochat(message):
+def chat_with_ochat(message, history):
     url = "http://0.0.0.0:18888/v1/chat/completions"
     headers = {"Content-Type": "application/json"}
+
+    # Convert history to the expected format
+    messages = [{"role": "user" if i % 2 == 0 else "system", "content": msg}
+                for i, (user_msg, bot_msg) in enumerate(history) for msg in [user_msg, bot_msg] if msg]
+
+    # Append the latest user message
+    messages.append({"role": "user", "content": message})
+
     data = {
         "model": "openchat_3.5",
-        "messages": [{"role": "user", "content": message}]
+        "messages": messages
     }
 
     try:
         response = requests.post(url, json=data, headers=headers)
         if response.status_code == 200:
+            # Extract the latest bot response
             return response.json()['choices'][0]['message']['content']
         else:
             return f"Error: Server responded with status code {response.status_code}"
     except requests.RequestException as e:
         return f"Error: {e}"
 
-# Create a Gradio Interface
-iface = gr.Interface(
-    fn=chat_with_ochat, 
-    inputs="text", 
-    outputs="text",
-    title="ochat Chat Interface",
-    description="Type your message and get a response from the ochat server."
-)
 
-iface.launch()
+with gr.Blocks() as demo:
+    chatbot = gr.Chatbot()
+    msg = gr.Textbox()
+    clear = gr.Button("Clear")
+
+    def user(user_message, history):
+        return "", history + [[user_message, None]]
+
+    def bot(history):
+        response = chat_with_ochat(history[-1][0], history)
+        history[-1][1] = response
+        return history
+
+    msg.submit(user, [msg, chatbot], [msg, chatbot], queue=False).then(
+        bot, chatbot, chatbot
+    )
+    clear.click(lambda: None, None, chatbot, queue=False)
+
+demo.launch()