Update space

app.py

@@ -76,17 +76,20 @@ def handle_prepare(index, history):
     if 0 <= index < len(data):
         topic = data[index]["Topic"]
         prompt = f"Prepare a 10-minute reading on what I should know before the class for the topic: {topic}"
-        history = history if history else []
+        history = history or []
         history.append((prompt, None))
         return history
 
-def user_message(message, history, system_msg):
-    if message:
-        history = history or []
-        history.append((message, None))
-        return "", history
+def chat(message, history, system_msg):
+    history = history or []
+    history.append((message, None))
+    response = respond(message, history, system_msg)
+    history[-1] = (message, response)
     return "", history
 
+def clear_chat():
+    return [], []
+
 # Gradio App
 with gr.Blocks() as demo:
     with gr.Row():
@@ -113,20 +116,21 @@ with gr.Blocks() as demo:
             # Container for dynamic buttons
             buttons_container = gr.Column()
 
-            def clear_chat():
-                return [], []
+            def prepare_topic(index, history):
+                if 0 <= index < len(data):
+                    topic = data[index]["Topic"]
+                    prompt = f"Prepare a 10-minute reading for: {topic}"
+                    history = history or []
+                    history.append((prompt, None))
+                    return history
 
             submit.click(
-                user_message,
+                fn=chat,
                 inputs=[msg, chatbot, system_message],
                 outputs=[msg, chatbot]
-            ).then(
-                respond,
-                inputs=[lambda x: x[-1][0] if x else "", chatbot, system_message],
-                outputs=[chatbot]
             )
             
-            clear.click(clear_chat, None, [chatbot, msg])
+            clear.click(fn=clear_chat, outputs=[chatbot, msg])
 
             def update_buttons():
                 buttons_container.clear()
@@ -134,14 +138,17 @@ with gr.Blocks() as demo:
                     for i, row in enumerate(data):
                         btn = gr.Button(f"Prepare: {row['Topic']}")
                         btn.click(
-                            fn=handle_prepare,
-                            inputs=[gr.Number(value=i, visible=False), chatbot],
+                            fn=prepare_topic,
+                            inputs=[
+                                gr.Number(value=i, visible=False),
+                                chatbot
+                            ],
                             outputs=[chatbot]
                         ).then(
-                            respond,
+                            fn=respond,
                             inputs=[
-                                lambda: f"Prepare a 10-minute reading for: {data[i]['Topic']}",
-                                lambda x: x if x else [],
+                                gr.Textbox(value=f"Prepare a 10-minute reading for: {row['Topic']}", visible=False),
+                                chatbot,
                                 system_message
                             ],
                             outputs=[chatbot]