Update app.py

app.py

@@ -8,44 +8,43 @@ openai.api_key = os.getenv("OPENAI_API_KEY")
 def chat_with_openai(user_input, history):
     if history is None:
         history = []
-    # OpenAI APIに送信するメッセージの構築
-    messages = []
-    for human, assistant in history:
-        messages.append({"role": "user", "content": human})
-        if assistant:
-            messages.append({"role": "assistant", "content": assistant})
-    messages.append({"role": "user", "content": user_input})
+
+    # ユーザーの入力を履歴に追加
+    history.append({"role": "user", "content": user_input})
 
     # OpenAI APIへのリクエスト
     response = openai.ChatCompletion.create(
         model="o1-preview",
-        messages=messages
+        messages=history
     )
+
     assistant_message = response['choices'][0]['message']['content']
 
-    # 履歴に新しいメッセージを追加
-    history.append((user_input, assistant_message))
+    # アシスタントの応答を履歴に追加
+    history.append({"role": "assistant", "content": assistant_message})
 
-    return history, history
+    # チャットボット用にメッセージを整形
+    messages = [
+        (history[i]["content"], history[i+1]["content"]) for i in range(0, len(history)-1, 2)
+    ]
+
+    return messages, history
 
 with gr.Blocks() as demo:
     chatbot = gr.Chatbot()
+
     state = gr.State([])
 
     with gr.Row():
-        with gr.Column(scale=8):
-            txt = gr.Textbox(
-                show_label=False,
-                placeholder="メッセージを入力してください...",
-                lines=1,
-                container=False
-            )
-        with gr.Column(scale=2, min_width=0):
-            btn = gr.Button("送信")
-
-    def on_submit(user_input, chat_history):
-        updated_history, updated_state = chat_with_openai(user_input, chat_history)
-        return updated_history, updated_state, ""
+        txt = gr.Textbox(
+            show_label=False,
+            placeholder="メッセージを入力してください..."
+        )
+        btn = gr.Button("送信")
+
+    def on_submit(user_input, history):
+        messages, updated_history = chat_with_openai(user_input, history)
+        return messages, updated_history, ""
 
     txt.submit(on_submit, [txt, state], [chatbot, state, txt])
     btn.click(on_submit, [txt, state], [chatbot, state, txt])