解决回复格式问题

app.py

@@ -15,7 +15,7 @@ MODEL_CONFIGS = {
         "filename": "llama-3.2-1b-instruct.Q4_K_M.gguf"
     },
     "3B Model (Datangtang/GGUF3B)": {
-        "repo_id": "Datangtang/GGUF3B",
+        "repo_id": "Datangtang/GGUF3B",   # FIXED typo here
         "filename": "llama-3.2-3b-instruct.Q4_K_M.gguf"
     }
 }
@@ -27,13 +27,13 @@ MODEL_CONFIGS = {
 def load_model(model_choice):
     global loaded_models, current_model_name
 
+    # Use cache
     if model_choice in loaded_models:
         print(f"Reusing already loaded model: {model_choice}")
         current_model_name = model_choice
         return loaded_models[model_choice]
 
     print(f"Downloading model: {model_choice}")
-
     cfg = MODEL_CONFIGS[model_choice]
 
     model_path = hf_hub_download(
@@ -65,36 +65,23 @@ def load_model(model_choice):
 
 
 # ----------------------------------------
-# Chat function
+# Chat function (works with Chatbot)
 # ----------------------------------------
 def chat(message, history, model_choice):
     llm = load_model(model_choice)
 
-    # System prompt
+    # Build conversation string
     conversation = "System: You are a helpful assistant.\n"
 
-    # Convert ChatInterface history (list of dicts) into text prompt
-    for msg in history[-3:]:
-        # ChatInterface format: {"role": "...", "content": "..."}
-        if isinstance(msg, dict):
-            role = msg.get("role")
-            content = msg.get("content", "")
-            if role == "user":
-                conversation += f"User: {content}\n"
-            elif role == "assistant":
-                conversation += f"Assistant: {content}\n"
-
-        # Safety: old tuple format
-        elif isinstance(msg, list) or isinstance(msg, tuple):
-            human, assistant = msg
-            conversation += f"User: {human}\n"
-            if assistant:
-                conversation += f"Assistant: {assistant}\n"
-
-    # Add current message
+    # Handle Chatbot list-of-lists format
+    for human, assistant in history[-3:]:
+        conversation += f"User: {human}\n"
+        if assistant:
+            conversation += f"Assistant: {assistant}\n"
+
     conversation += f"User: {message}\nAssistant:"
 
-    # Generate model response
+    # Call model
     response = llm(
         conversation,
         max_tokens=128,
@@ -103,33 +90,51 @@ def chat(message, history, model_choice):
         top_k=40,
         repeat_penalty=1.1,
         stop=["User:", "Assistant:"],
-        echo=False
+        echo=False,
     )
 
     return response["choices"][0]["text"].strip()
 
+
 # ----------------------------------------
-# Gradio UI
+# Gradio UI (Blocks + Chatbot)
 # ----------------------------------------
 with gr.Blocks() as demo:
 
     gr.Markdown("# 🦙 Datangtang GGUF Model Demo")
     gr.Markdown("Switch between **1B** and **3B** GGUF models in real-time.")
 
+    # Dropdown for model selection
     model_choice = gr.Dropdown(
         label="Select Model",
         choices=list(MODEL_CONFIGS.keys()),
         value="1B Model (Datangtang/GGUF1B)",
     )
 
-    chat_iface = gr.ChatInterface(
-        fn=lambda message, history: chat(message, history, model_choice.value),
-        examples=[
-            "Explain deep learning in one paragraph.",
-            "What is the difference between supervised and unsupervised learning?",
-            "Explain what a transformer model is.",
-        ],
-        cache_examples=False,
+    chatbot = gr.Chatbot()
+    msg_box = gr.Textbox(label="Type your message:")
+
+    # Add user message to chatbot
+    def user_send(message, history):
+        history = history + [[message, None]]
+        return history, ""
+
+    # Generate bot reply
+    def bot_reply(history, model_name):
+        user_msg = history[-1][0]
+        bot_msg = chat(user_msg, history[:-1], model_name)
+        history[-1][1] = bot_msg
+        return history
+
+    # Wire functions
+    msg_box.submit(
+        user_send,
+        [msg_box, chatbot],
+        [chatbot, msg_box]
+    ).then(
+        bot_reply,
+        [chatbot, model_choice],
+        chatbot
     )
 
     model_choice.change(
@@ -140,4 +145,4 @@ with gr.Blocks() as demo:
 
 
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch()