Update app.py

app.py

@@ -303,6 +303,9 @@ def build_knowledge_base(
     - Fallback to simple HTTP fetch if Firecrawl not available
     - Raw text
     - Files
+
+    Note: api_key is kept in the signature for symmetry and potential future use,
+    but not required for lexical-only indexing.
     """
     api_key = (api_key or "").strip()
     if not api_key:
@@ -355,17 +358,21 @@ def chat_with_rag(
     api_key: str,
     kb: List[Dict[str, Any]],
     system_prompt: str,
-    history: List[Dict[str, str]],
+    history_pairs: List[List[str]],
 ):
+    """
+    history_pairs: list of [user_str, assistant_str] pairs for the UI Chatbot.
+    We'll rebuild OpenAI messages from this each time.
+    """
     user_message = (user_message or "").strip()
     api_key = (api_key or "").strip()
     system_prompt = (system_prompt or "").strip()
 
     if not user_message:
-        return history, history, "❌ Please enter a question."
+        return history_pairs, history_pairs, "❌ Please enter a question."
 
     if not api_key:
-        return history, history, "❌ Please save your OpenAI API key first."
+        return history_pairs, history_pairs, "❌ Please save your OpenAI API key first."
 
     if not system_prompt:
         system_prompt = DEFAULT_SYSTEM_PROMPT
@@ -394,11 +401,11 @@ def chat_with_rag(
         )
         messages.append({"role": "system", "content": context_block})
 
-    # Add truncated history
-    recent_history = history[-10:] if history else []
-    for msg in recent_history:
-        if msg.get("role") in ("user", "assistant"):
-            messages.append(msg)
+    # Rebuild conversation history from pairs (last few turns)
+    recent_pairs = history_pairs[-5:] if history_pairs else []
+    for u, a in recent_pairs:
+        messages.append({"role": "user", "content": u})
+        messages.append({"role": "assistant", "content": a})
 
     # Current user message
     messages.append({"role": "user", "content": user_message})
@@ -410,20 +417,18 @@ def chat_with_rag(
             messages=messages,
             max_completion_tokens=900,  # GPT-5-compatible param
         )
-        answer = resp.choices[0].message.content
+        answer = resp.choices[0].message.content or ""
     except Exception as e:
         answer = f"⚠️ OpenAI API error: {e}"
 
-    new_history = history + [
-        {"role": "user", "content": user_message},
-        {"role": "assistant", "content": answer},
-    ]
+    # Update UI history as list of [user, assistant] pairs
+    new_history = history_pairs + [[user_message, answer]]
 
     return new_history, new_history, debug_retrieval
 
 
 def clear_chat():
-    return [], [], ""
+    return [], [], "Chat cleared."
 
 
 # -------------------- UI LAYOUT --------------------
@@ -444,7 +449,7 @@ with gr.Blocks(title="RAG Chatbot — GPT-5 + URLs / Files / Text + Firecrawl")
     api_key_state = gr.State("")
     firecrawl_key_state = gr.State("")
     kb_state = gr.State([])
-    chat_state = gr.State([])
+    chat_state = gr.State([])  # list of [user, assistant] pairs
 
     # default preset on load -> ZEN
     default_preset_name = "ZEN Sites Deep QA (zenai.world + AI Arena)"
@@ -515,9 +520,9 @@ with gr.Blocks(title="RAG Chatbot — GPT-5 + URLs / Files / Text + Firecrawl")
         with gr.Column(scale=2):
             gr.Markdown("### 💬 RAG Chat")
 
+            # Classic Chatbot format: list of [user, assistant] pairs
             chatbot = gr.Chatbot(
                 label="RAG Chatbot (GPT-5)",
-                type="messages",
                 height=450,
             )