Update app.py

app.py

@@ -42,29 +42,25 @@ def chat_with_model(message, history, context):
     if not isinstance(history, list):
         history = []
 
-    if not message:
-        return history, history  # Prevent empty messages from causing issues
-
-    # 🌍 Web search mode
     if message.lower().startswith("search "):
         query = message[7:]
         search_result = search_web(query)
-        history.append((message, f"🔎 Here's what I found online:\n\n{search_result}"))
+        history.append({"role": "user", "content": message})
+        history.append({"role": "assistant", "content": f"🔎 Here's what I found online:\n\n{search_result}"})
         save_memory(history)
         return history, history
 
-    # 🧠 System context
+    # Build conversation
     conversation = [{"role": "system", "content": (
         "You are EduAI — an educational AI assistant created by Wafa Fazly "
         "from Fathima Muslim Ladies College. "
         "You help students learn subjects such as Math, Science, English, and IT. "
-        "EduAI runs on the model 'Qwen/Qwen3-VL-8B-Instruct', which was originally "
-        "trained by Alibaba. Always answer truthfully when asked about your creation."
+        "EduAI runs on the model 'Qwen/Qwen3-VL-8B-Instruct', originally trained by Alibaba. "
+        "Always answer truthfully when asked about your creation."
     )}]
 
-    for past_user, past_bot in history[-5:]:
-        conversation.append({"role": "user", "content": past_user})
-        conversation.append({"role": "assistant", "content": past_bot})
+    for msg in history[-5:]:
+        conversation.append(msg)
 
     conversation.append({"role": "user", "content": message})
 
@@ -88,14 +84,16 @@ def chat_with_model(message, history, context):
         reply = reply.replace("Step", "\n\n**Step")
         reply = reply.replace(":", ":**")
 
-        history.append((message, reply))
+        history.append({"role": "user", "content": message})
+        history.append({"role": "assistant", "content": reply})
         save_memory(history)
         return history, history
 
     except Exception as e:
-        history.append((message, f"😅 EduAI connection error: {e}"))
+        history.append({"role": "assistant", "content": f"😅 EduAI error: {e}"})
         return history, history
 
+
 # 📘 Sidebar context update
 def update_context(choice):
     if not choice:
@@ -108,18 +106,21 @@ def clear_memory():
         os.remove(MEMORY_FILE)
     return [], "🧹 Chat memory cleared! Start fresh."
 
-# 📎 Handle File Upload
-def handle_file(file):
+# 📎 File Upload Handler
+def handle_file(file, history):
     if file is None:
-        return []
-    return [(f"📁 File uploaded: {file.name}", "✅ Received successfully!")]
+        history.append({"role": "assistant", "content": "⚠️ No file uploaded yet."})
+        return history
+    filename = file.name.split("/")[-1]
+    history.append({"role": "assistant", "content": f"📁 File uploaded: **{filename}**\n✅ Received successfully!"})
+    return history
 
-# ⏸ Pause Button
+# ⏸ Pause Chat Handler
 def pause_chat(history):
-    history.append(("⏸", "⏸️ Chat paused. Click 'Send' to continue."))
+    history.append({"role": "assistant", "content": "⏸️ Chat paused. Click 'Send' to continue."})
     return history
 
-# 🎨 Gradio Interface (UI Improved)
+# 🎨 Gradio Interface (Final UI)
 with gr.Blocks(theme=gr.themes.Soft(primary_hue="violet")) as iface:
     gr.Markdown(
         """
@@ -166,32 +167,34 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="violet")) as iface:
 
         with gr.Column(scale=4):
             context_display = gr.Markdown("📘 **You are in General Mode.** Ask EduAI anything about your studies!")
-
             chatbot = gr.Chatbot(
                 label="💬 EduAI Chat Window",
                 height=450,
-                render_markdown=True,
-                bubble_full_width=False
+                type="messages"  # ✅ fixed modern format
             )
 
-            # 💭 --- Chat Input Section with Icons ---
             with gr.Row():
-                upload_file = gr.File(label="📎", file_count="single", type="file", scale=1)
+                upload_file = gr.File(
+                    label="📎",
+                    file_count="single",
+                    type="filepath",  # ✅ fixed type
+                    scale=1
+                )
                 msg = gr.Textbox(
-                    placeholder="Ask EduAI anything about your studies...",
                     label="💭 Type your question here...",
+                    placeholder="Ask EduAI anything about your studies...",
                     scale=6
                 )
-                send = gr.Button("✨", scale=1)
-                pause_btn = gr.Button("⏸", scale=1)
+                send = gr.Button("✨ Send", scale=1)
+                pause_btn = gr.Button("⏸ Pause", scale=1)
 
     # 🪄 Event handlers
     subj.change(update_context, inputs=subj, outputs=context_display)
     planner.change(update_context, inputs=planner, outputs=context_display)
     lang.change(update_context, inputs=lang, outputs=context_display)
     send.click(chat_with_model, inputs=[msg, chatbot, context_display], outputs=[chatbot, chatbot])
-    upload_file.upload(handle_file, inputs=upload_file, outputs=chatbot)
-    pause_btn.click(pause_chat, inputs=chatbot, outputs=chatbot)
     clear_btn.click(clear_memory, outputs=[chatbot, context_display])
+    upload_file.upload(handle_file, inputs=[upload_file, chatbot], outputs=chatbot)
+    pause_btn.click(pause_chat, inputs=chatbot, outputs=chatbot)
 
 iface.launch()