Update app.py

app.py

@@ -75,8 +75,7 @@ def chat_fn(user_message, chat_history, image, state):
     # Prepare messages for API
     messages = []
     for turn in chat_history:
-        messages.append({"role": "user", "content": turn[0]})
-        messages.append({"role": "assistant", "content": turn[1]})
+        messages.append({"role": turn["role"], "content": turn["content"]})
     # Add current user message
     if image is not None:
         # Image attached: send as multimodal input
@@ -86,13 +85,15 @@ def chat_fn(user_message, chat_history, image, state):
             {"type": "input_image", "image_url": f"data:image/jpeg;base64,{base64_img}"}
         ]
         messages.append({"role": "user", "content": content})
+        chat_history.append({"role": "user", "content": f"{user_message}\n[Image attached]"})
     else:
         messages.append({"role": "user", "content": user_message})
+        chat_history.append({"role": "user", "content": user_message})
     # Call OpenAI Responses API
     try:
         response = openai_responses_api(api_key, messages)
         output_text = response.get("output_text", "")
-        chat_history.append((user_message, output_text))
+        chat_history.append({"role": "assistant", "content": output_text})
         state["previous_response_id"] = response.get("id")
         return chat_history, state, gr.update(visible=False), ""
     except Exception as e:
@@ -124,9 +125,7 @@ def image_analysis_fn(image, state):
 def export_chat(chat_history):
     """Export chat history as JSON."""
     import json
-    chat_json = []
-    for user, bot in chat_history:
-        chat_json.append({"user": user, "bot": bot})
+    chat_json = chat_history
     return gr.File.update(value=("chat_history.json", json.dumps(chat_json, indent=2)), visible=True)
 
 def show_iframe(space_url):
@@ -149,8 +148,6 @@ with gr.Blocks(theme=gr.themes.Soft(), css=".footer {text-align: center; font-si
         api_key_box = gr.Textbox(label="Enter your OpenAI API Key", type="password", placeholder="sk-...", show_label=True)
         api_key_btn = gr.Button("Submit")
         api_key_error = gr.Markdown("", visible=False)
-    def _hide_api_key_row():
-        return gr.update(visible=False)
     api_key_box.submit(set_api_key, [api_key_box, state], [api_key_row, api_key_error, state])
     api_key_btn.click(set_api_key, [api_key_box, state], [api_key_row, api_key_error, state])
 
@@ -158,7 +155,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css=".footer {text-align: center; font-si
     with gr.Tabs():
         # --- Chat Tab ---
         with gr.Tab("💬 Chatbot"):
-            chatbot = gr.Chatbot(label="Chatbot", height=400)
+            chatbot = gr.Chatbot(label="Chatbot", height=400, type="messages")
             with gr.Row():
                 user_input = gr.Textbox(label="Your message", placeholder="Type your message here...", scale=4)
                 image_input = gr.Image(type="filepath", label="Attach image (optional)", scale=1)
@@ -182,9 +179,6 @@ with gr.Blocks(theme=gr.themes.Soft(), css=".footer {text-align: center; font-si
             image_error = gr.Markdown("", visible=False)
             analyze_btn.click(image_analysis_fn, [image_upload, state], [image_result, api_key_error, image_error])
 
-    # --- Theme Toggle ---
-    gr.ThemeSwitcher()
-
     # --- Footer ---
     gr.Markdown(f"<div class='footer'>{FOOTER}</div>")