Update space

app.py

@@ -12,10 +12,10 @@ data = []
 def respond(message, history, system_message):
     messages = [{"role": "system", "content": system_message}]
     for val in history:
-        if val[0]:
-            messages.append({"role": "user", "content": val[0]})
+        messages.append({"role": "user", "content": val[0]})
         if val[1]:
             messages.append({"role": "assistant", "content": val[1]})
+            
     messages.append({"role": "user", "content": message})
     
     response = ""
@@ -26,9 +26,9 @@ def respond(message, history, system_message):
         temperature=0.7,
         top_p=0.9,
     ):
-        token = message.choices[0].delta.content
-        response += token
-        yield response
+        if message.choices[0].delta.content is not None:
+            response += message.choices[0].delta.content
+            yield response
 
 def extract_table(url):
     global data
@@ -76,21 +76,17 @@ def extract_table(url):
     except Exception as e:
         return f"<p>Error: {str(e)}</p>"
 
-def add_text(history, text):
-    history = history + [(text, None)]
+def user_message(message, history):
+    history = history + [(message, None)]
     return history
 
 def bot(history, system_message):
-    if not history:
-        return history
-    
-    user_message = history[-1][0]
+    history_with_response = history.copy()
     response = ""
-    
-    for chunk in respond(user_message, history[:-1], system_message):
+    for chunk in respond(history[-1][0], history[:-1], system_message):
         response = chunk
-        history[-1] = (user_message, response)
-        yield history
+        history_with_response[-1] = (history[-1][0], response)
+        yield history_with_response
 
 def handle_prepare(index, history):
     try:
@@ -98,9 +94,10 @@ def handle_prepare(index, history):
         if 0 <= index < len(data):
             topic = data[index]["Topic"]
             message = f"Prepare a 10-minute reading for the topic: {topic}"
-            return add_text(history or [], message)
+            history = history + [(message, None)]
+            return history
     except:
-        return history or []
+        return history
 
 def clear_chat():
     return [], ""
@@ -122,7 +119,7 @@ with gr.Blocks() as demo:
             
         with gr.Column(scale=2):
             chatbot = gr.Chatbot()
-            msg = gr.Textbox(label="Message")
+            msg = gr.Textbox(label="Message", interactive=True)
             system_message = gr.Textbox(
                 value="Student class preparation companion.",
                 label="System message"
@@ -141,11 +138,11 @@ with gr.Blocks() as demo:
     
     # Submit button handler
     submit.click(
-        fn=add_text,
-        inputs=[chatbot, msg],
+        fn=user_message,
+        inputs=[msg, chatbot],
         outputs=chatbot,
     ).then(
-        fn=lambda: "",
+        fn=lambda: "",  # Clear input textbox
         outputs=msg,
     ).then(
         fn=bot,