Update app.py

app.py

@@ -82,16 +82,13 @@ class ConversationManager:
 manager = ConversationManager()
 
 def get_model(dropdown, custom):
-    return custom if custom.strip() else dropdown
+    model = custom if custom.strip() else dropdown
+    return (model, model)  # Return a tuple (label, value)
 
 def chat(model1, model2, user_input, history, inserted_response=""):
-    try:
-        # Attempt to load models
-        manager.load_model(model1)
-        manager.load_model(model2)
-    except Exception as e:
-        return f"Error loading models: {str(e)}", ""
-
+    model1 = get_model(model1, model1_custom.value)[0]
+    model2 = get_model(model2, model2_custom.value)[0]
+    
     if not manager.conversation:
         manager.initial_prompt = user_input
         manager.clear_conversation()
@@ -131,6 +128,7 @@ def chat(model1, model2, user_input, history, inserted_response=""):
         current_model_index = (current_model_index + 1) % 2
     
     return history, "Conversation completed."
+
     
     models = [model1, model2]
     current_model_index = 0 if manager.current_model in ["User", "Model 2"] else 1
@@ -224,10 +222,10 @@ with gr.Blocks() as demo:
     
     with gr.Row():
         with gr.Column(scale=1):
-            model1_dropdown = gr.Dropdown(open_source_models, label="Model 1")
+            model1_dropdown = gr.Dropdown(choices=open_source_models, label="Model 1")
             model1_custom = gr.Textbox(label="Custom Model 1")
         with gr.Column(scale=1):
-            model2_dropdown = gr.Dropdown(open_source_models, label="Model 2")
+            model2_dropdown = gr.Dropdown(choices=open_source_models, label="Model 2")
             model2_custom = gr.Textbox(label="Custom Model 2")
     
     user_input = gr.Textbox(label="Initial prompt", lines=2)
@@ -250,6 +248,7 @@ with gr.Blocks() as demo:
 
     user_satisfaction_input = gr.Textbox(label="Are you satisfied with the result? (Yes/No)", visible=False)
 
+
     gr.Markdown("""
     ## Button Descriptions
     - **Pause**: Temporarily stops the conversation. The current model will finish its response.
@@ -269,8 +268,8 @@ with gr.Blocks() as demo:
     chat_output = start_btn.click(
         chat,
         inputs=[
-            gr.Dropdown(choices=lambda: [get_model(model1_dropdown.value, model1_custom.value)], value=lambda: get_model(model1_dropdown.value, model1_custom.value)),
-            gr.Dropdown(choices=lambda: [get_model(model2_dropdown.value, model2_custom.value)], value=lambda: get_model(model2_dropdown.value, model2_custom.value)),
+            model1_dropdown,
+            model2_dropdown,
             user_input,
             chat_history
         ],
@@ -290,8 +289,8 @@ with gr.Blocks() as demo:
     ).then(
         chat,
         inputs=[
-            gr.Dropdown(choices=lambda: [get_model(model1_dropdown.value, model1_custom.value)], value=lambda: get_model(model1_dropdown.value, model1_custom.value)),
-            gr.Dropdown(choices=lambda: [get_model(model2_dropdown.value, model2_custom.value)], value=lambda: get_model(model2_dropdown.value, model2_custom.value)),
+            model1_dropdown,
+            model2_dropdown,
             user_input,
             chat_history
         ],
@@ -302,8 +301,8 @@ with gr.Blocks() as demo:
     resume_btn.click(
         chat,
         inputs=[
-            gr.Dropdown(choices=lambda: [get_model(model1_dropdown.value, model1_custom.value)], value=lambda: get_model(model1_dropdown.value, model1_custom.value)),
-            gr.Dropdown(choices=lambda: [get_model(model2_dropdown.value, model2_custom.value)], value=lambda: get_model(model2_dropdown.value, model2_custom.value)),
+            model1_dropdown,
+            model2_dropdown,
             user_input,
             chat_history,
             inserted_response
@@ -315,8 +314,8 @@ with gr.Blocks() as demo:
     restart_btn.click(
         restart_conversation,
         inputs=[
-            gr.Dropdown(choices=lambda: [get_model(model1_dropdown.value, model1_custom.value)], value=lambda: get_model(model1_dropdown.value, model1_custom.value)),
-            gr.Dropdown(choices=lambda: [get_model(model2_dropdown.value, model2_custom.value)], value=lambda: get_model(model2_dropdown.value, model2_custom.value)),
+            model1_dropdown,
+            model2_dropdown,
             user_input
         ],
         outputs=[chat_history, current_response]
@@ -326,3 +325,4 @@ with gr.Blocks() as demo:
 
 if __name__ == "__main__":
     demo.launch()
+