Update space

app.py

@@ -10,16 +10,16 @@ client = InferenceClient("meta-llama/Llama-3.2-3B-Instruct")
 data = []
 
 def respond(message, history, system_message):
-    # Ensure history is a list of tuples with user and assistant messages
     messages = [{"role": "system", "content": system_message}]
     for val in history:
-        messages.append({"role": "user", "content": val[0]})
-        if len(val) > 1 and val[1]:
+        if 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})
     
-    full_response = ""
+    response = ""
     for message in client.chat_completion(
         messages,
         max_tokens=2048,
@@ -28,8 +28,8 @@ def respond(message, history, system_message):
         top_p=0.9,
     ):
         if message.choices[0].delta.content is not None:
-            full_response += message.choices[0].delta.content
-            yield full_response
+            response += message.choices[0].delta.content
+            yield response
 
 def extract_table(url):
     global data
@@ -65,6 +65,7 @@ def extract_table(url):
                         <button onclick='
                             document.getElementById("prepare-topic").value = "{i}";
                             document.getElementById("prepare-topic").dispatchEvent(new Event("input"));
+                            document.getElementById("prepare-button").click();
                         '>
                             Prepare
                         </button>
@@ -76,30 +77,33 @@ def extract_table(url):
     except Exception as e:
         return f"<p>Error: {str(e)}</p>"
 
-def prepare_topic_action(topic_index, system_message):
+def add_text(history, text):
+    history = history + [(text, None)]
+    return history
+
+def generate_response(history, system_message):
+    if not history:
+        return history
+    
+    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:
-        # Convert index to integer
-        index = int(topic_index)
-        
-        # Validate index
+        index = int(index)
         if 0 <= index < len(data):
-            # Get the topic
             topic = data[index]["Topic"]
-            
-            # Prepare the message
-            prepare_message = f"Prepare a 10-minute reading for the topic: {topic}"
-            
-            # Generate response directly
-            full_response = ""
-            for chunk in respond(prepare_message, [], system_message):
-                full_response = chunk
-            
-            return prepare_message, full_response
-        else:
-            return "", ""
-    except Exception as e:
-        print(f"Error in prepare_topic_action: {e}")
-        return "", ""
+            date = data[index]["Date"]
+            message = f"Please prepare a 10-minute reading guide for the topic '{topic}' scheduled for {date}"
+            return history + [(message, None)]
+    except:
+        return history
+
+def clear_chat():
+    return [], ""
 
 # Gradio app
 with gr.Blocks() as demo:
@@ -112,12 +116,13 @@ with gr.Blocks() as demo:
             table_output = gr.HTML(label="Extracted Table")
             extract_btn = gr.Button("Extract Table")
             
-            # Hidden component for prepare functionality
+            # Hidden components for prepare functionality
             prepare_topic = gr.Textbox(value="", visible=False, elem_id="prepare-topic")
+            prepare_button = gr.Button("Prepare", visible=False, elem_id="prepare-button")
             
         with gr.Column(scale=2):
             chatbot = gr.Chatbot()
-            msg = gr.Textbox(label="Message", interactive=True)
+            msg = gr.Textbox(label="Message")
             system_message = gr.Textbox(
                 value="Student class preparation companion.",
                 label="System message"
@@ -134,43 +139,46 @@ with gr.Blocks() as demo:
         outputs=[table_output]
     )
     
-    # Prepare topic event handler
-    prepare_topic.change(
-        fn=prepare_topic_action,
-        inputs=[prepare_topic, system_message],
-        outputs=[msg, chatbot]
-    )
-    
     # Submit button handler
-    submit_event = submit.click(
-        fn=lambda message: ([(message, None)] if message else []),
-        inputs=[msg],
-        outputs=[chatbot],
-    ).then(
-        fn=lambda: "",  # Clear input textbox
-        outputs=[msg]
+    msg.submit(
+        fn=add_text,
+        inputs=[chatbot, msg],
+        outputs=chatbot
+    ).success(
+        fn=lambda: "",
+        outputs=msg
     ).then(
-        fn=lambda history, system_msg: list(respond(history[-1][0], history[:-1], system_msg)) if history else [],
+        fn=generate_response,
         inputs=[chatbot, system_message],
-        outputs=[chatbot]
+        outputs=chatbot
     )
     
-    # Enable message submission via enter key
-    msg.submit(
-        fn=lambda message: ([(message, None)] if message else []),
-        inputs=[msg],
-        outputs=[chatbot],
+    submit.click(
+        fn=add_text,
+        inputs=[chatbot, msg],
+        outputs=chatbot
+    ).success(
+        fn=lambda: "",
+        outputs=msg
     ).then(
-        fn=lambda: "",  # Clear input textbox
-        outputs=[msg]
+        fn=generate_response,
+        inputs=[chatbot, system_message],
+        outputs=chatbot
+    )
+    
+    # Prepare button handler
+    prepare_button.click(
+        fn=handle_prepare,
+        inputs=[prepare_topic, chatbot],
+        outputs=chatbot
     ).then(
-        fn=lambda history, system_msg: list(respond(history[-1][0], history[:-1], system_msg)) if history else [],
+        fn=generate_response,
         inputs=[chatbot, system_message],
-        outputs=[chatbot]
+        outputs=chatbot
     )
     
     # Clear button handler
-    clear.click(fn=lambda: [], outputs=[chatbot, msg])
+    clear.click(fn=clear_chat, outputs=[chatbot, msg])
 
 if __name__ == "__main__":
     demo.launch()