Update space

app.py

@@ -12,7 +12,8 @@ data = []
 def respond(message, history, system_message):
     messages = [{"role": "system", "content": system_message}]
     for val in history:
-        messages.append({"role": "user", "content": val[0]})
+        if val[0]:
+            messages.append({"role": "user", "content": val[0]})
         if val[1]:
             messages.append({"role": "assistant", "content": val[1]})
             
@@ -76,27 +77,19 @@ def extract_table(url):
     except Exception as e:
         return f"<p>Error: {str(e)}</p>"
 
-def user_message(message, history):
-    if message:
-        history = history + [(message, None)]
+def add_text(history, text):
+    history = history + [(text, None)]
     return history
 
-def bot(history, system_message):
-    if not history or history[-1][1] is not None:  # Skip if no history or last message already has a response
+def generate_response(history, system_message):
+    if not history:
         return history
     
-    history_with_response = history.copy()
     response = ""
-    
-    try:
-        for chunk in respond(history[-1][0], history[:-1], system_message):
-            response = chunk
-            history_with_response[-1] = (history[-1][0], response)
-            yield history_with_response
-    except Exception as e:
-        print(f"Error in bot: {e}")
-        history_with_response[-1] = (history[-1][0], "I apologize, but I encountered an error processing your request.")
-        yield history_with_response
+    for chunk in respond(history[-1][0], history[:-1], system_message):
+        response = chunk
+        history[-1] = (history[-1][0], response)
+        yield history
 
 def handle_prepare(index, history):
     try:
@@ -105,14 +98,9 @@ def handle_prepare(index, history):
             topic = data[index]["Topic"]
             date = data[index]["Date"]
             message = f"Please prepare a 10-minute reading guide for the topic '{topic}' scheduled for {date}"
-            
-            history = history or []
-            history = history + [(message, None)]
-            print(f"Prepare button clicked: {message}")
-            return history
-    except Exception as e:
-        print(f"Error in handle_prepare: {e}")
-        return history or []
+            return history + [(message, None)]
+    except:
+        return history
 
 def clear_chat():
     return [], ""
@@ -133,11 +121,8 @@ with gr.Blocks() as demo:
             prepare_button = gr.Button("Prepare", visible=False, elem_id="prepare-button")
             
         with gr.Column(scale=2):
-            chatbot = gr.Chatbot(
-                height=600,
-                bubble_full_width=False,
-            )
-            msg = gr.Textbox(label="Message", interactive=True)
+            chatbot = gr.Chatbot()
+            msg = gr.Textbox(label="Message")
             system_message = gr.Textbox(
                 value="Student class preparation companion.",
                 label="System message"
@@ -156,40 +141,40 @@ with gr.Blocks() as demo:
     
     # Submit button handler
     msg.submit(
-        fn=user_message,
-        inputs=[msg, chatbot],
-        outputs=chatbot,
-    ).then(
+        fn=add_text,
+        inputs=[chatbot, msg],
+        outputs=chatbot
+    ).success(
         fn=lambda: "",
-        outputs=msg,
+        outputs=msg
     ).then(
-        fn=bot,
+        fn=generate_response,
         inputs=[chatbot, system_message],
-        outputs=chatbot,
+        outputs=chatbot
     )
     
     submit.click(
-        fn=user_message,
-        inputs=[msg, chatbot],
-        outputs=chatbot,
-    ).then(
+        fn=add_text,
+        inputs=[chatbot, msg],
+        outputs=chatbot
+    ).success(
         fn=lambda: "",
-        outputs=msg,
+        outputs=msg
     ).then(
-        fn=bot,
+        fn=generate_response,
         inputs=[chatbot, system_message],
-        outputs=chatbot,
+        outputs=chatbot
     )
     
     # Prepare button handler
     prepare_button.click(
         fn=handle_prepare,
         inputs=[prepare_topic, chatbot],
-        outputs=chatbot,
+        outputs=chatbot
     ).then(
-        fn=bot,
+        fn=generate_response,
         inputs=[chatbot, system_message],
-        outputs=chatbot,
+        outputs=chatbot
     )
     
     # Clear button handler