Update app.py

app.py

@@ -48,41 +48,47 @@ assistant_end = tokenizer.encode_special("<|assistant_end|>")
 
 
 def normalize_history(history):
-    """将 Gradio 传入的 history 统一转换为 [(user, assistant), ...] 格式"""
+    """将 history 统一转换为 [(user_msg, assistant_msg), ...] 格式，并确保消息为字符串"""
     if not history:
         return []
-    
-    # 处理 messages 格式（列表 of dicts，每个 dict 有 "role" 和 "content"）
+
+    # ------------------ 处理 messages 格式 (列表 of dicts) ------------------
     if isinstance(history[0], dict):
         pairs = []
         user_msg = None
         for msg in history:
             role = msg.get("role")
             content = msg.get("content", "")
+            # 将 content 强制转为字符串
+            if not isinstance(content, str):
+                content = str(content) if content is not None else ""
+
             if role == "user":
-                if user_msg is not None:          # 上一条 user 没有 assistant，补 None
+                if user_msg is not None:
                     pairs.append([user_msg, None])
                 user_msg = content
             elif role == "assistant":
                 if user_msg is not None:
                     pairs.append([user_msg, content])
                     user_msg = None
-                else:                              # 孤立 assistant，补空 user
-                    pairs.append([None, content])
-        if user_msg is not None:                   # 最后一条是 user，无 assistant
+                else:  # 孤立 assistant，补空 user
+                    pairs.append(["", content])
+        if user_msg is not None:
             pairs.append([user_msg, None])
         return pairs
-    
-    # 处理 tuples 格式（列表 of list/tuple），确保每个元素长度为2
+
+    # ------------------ 处理 tuples 格式 (列表 of list/tuple) ------------------
     normalized = []
     for turn in history:
         if isinstance(turn, (list, tuple)):
-            if len(turn) >= 2:
-                normalized.append([turn[0], turn[1]])
-            elif len(turn) == 1:
-                normalized.append([turn[0], None])
-            else:
-                normalized.append([None, None])   # 空轮次，忽略或警告
+            # 取前两个元素，多余忽略；不足补 None
+            user = turn[0] if len(turn) > 0 else None
+            assistant = turn[1] if len(turn) > 1 else None
+
+            # 强制转为字符串
+            user = str(user) if user is not None else ""
+            assistant = str(assistant) if assistant is not None else ""
+            normalized.append([user, assistant])
         else:
             # 忽略非列表/元组类型（通常不会出现）
             continue
@@ -102,6 +108,7 @@ def chat(message, history, temperature, max_tokens, top_k):
 
 
     for user_msg, assistant_msg in history:
+        user_text = user_msg if isinstance(user_msg, str) else str(user_msg) if user_msg is not None else ""
         tokens.append(user_start)
         tokens.extend(tokenizer.encode(user_msg))
         tokens.append(user_end)