Update app.py

app.py

@@ -8,21 +8,63 @@ DEFAULT_SYSTEM_PROMPT = "You are a helpful assistant."
 
 HF_TOKEN = os.getenv("HF_TOKEN")
 if not HF_TOKEN:
-    raise RuntimeError("HF_TOKEN is missing. Add it in Space Settings → Secrets.")
+    raise RuntimeError("HF_TOKEN is missing. Add it in Space Settings → Secrets as HF_TOKEN.")
 
 HEADERS = {
     "Authorization": f"Bearer {HF_TOKEN}",
     "Content-Type": "application/json",
 }
 
-def build_messages(history, system_prompt, new_user_message):
-    messages = [{"role": "system", "content": (system_prompt.strip() or DEFAULT_SYSTEM_PROMPT)}]
-    for user_text, bot_text in history:
-        if user_text:
-            messages.append({"role": "user", "content": user_text})
-        if bot_text:
-            messages.append({"role": "assistant", "content": bot_text})
-    messages.append({"role": "user", "content": new_user_message})
+def _get_content(x):
+    """Extract text content from different Gradio message shapes."""
+    if isinstance(x, dict):
+        return x.get("content") or x.get("text") or x.get("value") or ""
+    return "" if x is None else str(x)
+
+def history_to_messages(history):
+    """
+    Supports multiple Gradio history formats:
+    1) [(user, bot), ...]
+    2) [{"role":"user","content":"..."}, {"role":"assistant","content":"..."}, ...]
+    3) other tuple/list shapes (take first two items)
+    """
+    messages = []
+
+    if not history:
+        return messages
+
+    # Format 2: list of dict messages
+    if isinstance(history, list) and isinstance(history[0], dict):
+        for h in history:
+            role = h.get("role") or h.get("from") or h.get("speaker")
+            content = _get_content(h)
+            if not role or content == "":
+                continue
+
+            role = role.lower()
+            if role in ("human", "user"):
+                role = "user"
+            elif role in ("bot", "assistant", "ai", "model"):
+                role = "assistant"
+
+            if role in ("system", "user", "assistant"):
+                messages.append({"role": role, "content": content})
+        return messages
+
+    # Format 1 (and variants): list of tuples/lists
+    if isinstance(history, list):
+        for item in history:
+            if isinstance(item, (list, tuple)):
+                # take first two values if more than 2 exist
+                user_text = _get_content(item[0]) if len(item) >= 1 else ""
+                bot_text = _get_content(item[1]) if len(item) >= 2 else ""
+
+                if user_text:
+                    messages.append({"role": "user", "content": user_text})
+                if bot_text:
+                    messages.append({"role": "assistant", "content": bot_text})
+            # if it's some other type, ignore safely
+
     return messages
 
 def call_router(messages, temperature=0.7, max_tokens=400):
@@ -33,19 +75,27 @@ def call_router(messages, temperature=0.7, max_tokens=400):
         "max_tokens": int(max_tokens),
     }
     resp = requests.post(ROUTER_URL, headers=HEADERS, json=payload, timeout=120)
+
     if resp.status_code != 200:
         try:
             err = resp.json()
         except Exception:
             err = resp.text
         raise RuntimeError(f"HTTP {resp.status_code}: {err}")
+
     data = resp.json()
     return data["choices"][0]["message"]["content"]
 
 def respond(message, history, system_prompt, temperature, max_tokens):
     try:
-        messages = build_messages(history, system_prompt, message)
+        user_msg = _get_content(message)
+
+        messages = [{"role": "system", "content": (system_prompt.strip() or DEFAULT_SYSTEM_PROMPT)}]
+        messages.extend(history_to_messages(history))
+        messages.append({"role": "user", "content": user_msg})
+
         return call_router(messages, temperature=temperature, max_tokens=max_tokens)
+
     except Exception as e:
         return f"⚠️ {type(e).__name__}: {e}"