Fixed

app.py

@@ -20,6 +20,8 @@ def query_model(model_choice, user_question, max_length, preprompt, api_key=None
         response = model_opt(full_prompt, max_length=max_length, num_return_sequences=1)
         return response[0]['generated_text']
     elif model_choice == "OpenAI":
+        if not api_key:
+            return "API key is required for OpenAI."
         client = OpenAI(api_key=api_key)
         completion = client.chat.completions.create(
             model="gpt-3.5-turbo",
@@ -30,19 +32,23 @@ def query_model(model_choice, user_question, max_length, preprompt, api_key=None
         )
         return completion.choices[0].message.content
     elif model_choice == "Anthropic":
+        if not api_key:
+            return "API key is required for Anthropic."
         client = anthropic.Anthropic(api_key=api_key)
         message = client.messages.create(
             model="claude-2.1",
             max_tokens=1024,
             messages=[
-                {"role": "user", "content": full_prompt or "Hello"}  # Provide a default message if empty
+                {"role": "user", "content": full_prompt or "Hello"}
             ]
         )
         return message.content[0].text
     elif model_choice == "Gemini":
+        if not api_key:
+            return "API key is required for Gemini."
         genai.configure(api_key=api_key)
         model = genai.GenerativeModel('gemini-pro')
-        response = model.generate_content(full_prompt or "Hello")  # Provide a default message if empty
+        response = model.generate_content(full_prompt or "Hello")
         return response.text
     else:
         return "Invalid model selected."
@@ -60,11 +66,6 @@ def compete_models(user_question, max_length, preprompt, selected_models, api_ke
     
     with concurrent.futures.ThreadPoolExecutor() as executor:
         future_to_model = {
-            executor.submit(
-                model_map[model][0], 
-                full_prompt, 
-                max_length
-            ) if model in ["GPT-2", "OPT-350M"] else
             executor.submit(
                 model_map[model][0], 
                 model, 
@@ -128,13 +129,24 @@ with gr.Blocks() as demo:
                 outputs=[api_key, api_key_info]
             )
             
-            # ... (以下は変更なし)
+            def query_single_model(model_choice, user_question, max_length, preprompt, api_key, history):
+                if not model_choice:
+                    response = "Please select a model."
+                else:
+                    response = query_model(model_choice, user_question, max_length, preprompt, api_key)
+                history.append((user_question, response))
+                return history, ""
+            
+            query_button.click(
+                query_single_model,
+                inputs=[model_choice, user_question, max_length, preprompt, api_key, conversation_history],
+                outputs=[conversation_history, user_question]
+            )
         
         with gr.TabItem("Compete Mode"):
-            with gr.Row():
-                compete_max_length = gr.Slider(minimum=10, maximum=500, value=100, step=10, label="Max Length")
+            compete_max_length = gr.Slider(minimum=10, maximum=500, value=100, step=10, label="Max Length")
             compete_preprompt = gr.Textbox(label="Preprompt (optional)", lines=2, placeholder="Enter a preprompt here...")
-            compete_question = gr.Textbox(label="Enter your question", lines=2, placeholder="Type your question here...")  # この行を追加
+            compete_question = gr.Textbox(label="Enter your question", lines=2, placeholder="Type your question here...")
             
             with gr.Row():
                 with gr.Column():
@@ -165,8 +177,8 @@ with gr.Blocks() as demo:
                 selected_models = compete_models_local + compete_models_api
                 results = compete_models(compete_question, compete_max_length, compete_preprompt, selected_models, api_key_openai, api_key_anthropic, api_key_gemini)
                 new_row = [compete_question] + results
-                history = history.values.tolist() if history is not None else []
-                history.append(new_row)
+                history = history.to_dict('records') if history is not None else []
+                history.append(dict(zip(["Question", "GPT-2", "OPT-350M", "OpenAI", "Anthropic", "Gemini"], new_row)))
                 return history, ""
             
             compete_button.click(