Update app.py

app.py

@@ -740,13 +740,13 @@ class ConversationManager:
 
 conversation_manager = ConversationManager()
 
-def chat_function(message: str, history: List[Tuple[str, str]], conversation_id: str, num_results: int, max_chars: int, time_range: str, language: str, category: str, engines: List[str], safesearch: int, method: str, llm_temperature: float, model: str, use_pydf2: bool):
+def chat_function(message, history, conversation_id, num_results, max_chars, time_range, language, category, engines, safesearch, method, llm_temperature, model, use_pydf2):
     if not conversation_id:
         conversation_id = conversation_manager.create_conversation(message[:30] + "...")
     
     conversation = conversation_manager.get_conversation(conversation_id)
     if not conversation:
-        return "Error: Conversation not found", conversation_id
+        return "Error: Conversation not found", conversation_id, conversation_manager.get_conversation_list()
     
     conversation.add_message("user", message)
     
@@ -774,13 +774,16 @@ def chat_function(message: str, history: List[Tuple[str, str]], conversation_id:
         )
     
     conversation.add_message("assistant", response)
-    return response, conversation_id
+    history.append((message, response))
+    return history, conversation_id, conversation_manager.get_conversation_list()
 
-def load_conversation(conversation_id: str):
+def load_conversation(evt: gr.SelectData):
+    conversation_id = evt.value['id']
     conversation = conversation_manager.get_conversation(conversation_id)
     if not conversation:
         return [], ""
-    return conversation.messages, conversation.title
+    history = [(msg["content"], msg["content"]) if msg["role"] == "user" else (None, msg["content"]) for msg in conversation.messages]
+    return history, conversation.title, conversation_id
 
 # Create the Gradio interface
 with gr.Blocks(theme=gr.themes.Soft()) as iface:
@@ -788,10 +791,11 @@ with gr.Blocks(theme=gr.themes.Soft()) as iface:
     
     with gr.Row():
         with gr.Column(scale=1):
-            conversation_list = gr.List(
-                conversation_manager.get_conversation_list(),
+            conversation_list = gr.Dataframe(
+                headers=["id", "title"],
+                datatype=["str", "str"],
                 label="Conversations",
-                render=False
+                interactive=False
             )
         
         with gr.Column(scale=3):
@@ -817,30 +821,24 @@ with gr.Blocks(theme=gr.themes.Soft()) as iface:
         model = gr.Dropdown(["huggingface", "groq", "mistral"], value="mistral", label="LLM Model")
         use_pydf2 = gr.Checkbox(label="Use PyPDF2 for PDF scraping", value=False)
 
-    def user(user_message, history):
-        return "", history + [[user_message, None]]
-
-    def bot(history, conversation_id, num_results, max_chars, time_range, language, category, engines, safesearch, method, llm_temperature, model, use_pydf2):
-        user_message = history[-1][0]
-        bot_message, new_conversation_id = chat_function(
+    def bot(user_message, history, conversation_id, num_results, max_chars, time_range, language, category, engines, safesearch, method, llm_temperature, model, use_pydf2):
+        return chat_function(
             user_message, history, conversation_id, num_results, max_chars, time_range,
             language, category, engines, safesearch, method, llm_temperature, model, use_pydf2
         )
-        history[-1][1] = bot_message
-        return history, new_conversation_id, conversation_manager.get_conversation_list()
 
-    send.click(user, [msg, chatbot], [msg, chatbot], queue=False).then(
+    send.click(
         bot,
-        [chatbot, conversation_id, num_results, max_chars, time_range, language, category, engines, safesearch, method, llm_temperature, model, use_pydf2],
+        [msg, chatbot, conversation_id, num_results, max_chars, time_range, language, category, engines, safesearch, method, llm_temperature, model, use_pydf2],
         [chatbot, conversation_id, conversation_list]
     )
 
-    msg.submit(user, [msg, chatbot], [msg, chatbot], queue=False).then(
+    msg.submit(
         bot,
-        [chatbot, conversation_id, num_results, max_chars, time_range, language, category, engines, safesearch, method, llm_temperature, model, use_pydf2],
+        [msg, chatbot, conversation_id, num_results, max_chars, time_range, language, category, engines, safesearch, method, llm_temperature, model, use_pydf2],
         [chatbot, conversation_id, conversation_list]
     )
 
-    conversation_list.select(load_conversation, [conversation_list], [chatbot, conversation_id])
+    conversation_list.select(load_conversation, None, [chatbot, msg, conversation_id])
 
 iface.launch(share=True)