Update app.py

app.py

@@ -1,8 +1,8 @@
 import gradio as gr
 from huggingface_hub import InferenceClient
-from typing import List, Tuple
+from typing import List, Dict, Any
 
-# 10 моделей (instruct для чата)
+# 10 моделей (instruct)
 MODELS = [
     "microsoft/Phi-3-mini-4k-instruct",
     "Qwen/Qwen2.5-0.5B-Instruct",
@@ -16,30 +16,23 @@ MODELS = [
     "cognitivecomputations/dolphin-2.9-llama3-8b"
 ]
 
-def convert_history(history: List[Tuple[str, str]]) -> List[dict]:
-    """Gradio tuples -> OpenAI messages."""
-    messages = []
-    for user_msg, bot_msg in history:
-        messages.append({"role": "user", "content": user_msg})
-        if bot_msg:
-            messages.append({"role": "assistant", "content": bot_msg})
-    return messages
-
 def respond(message: str, 
-            history: List[Tuple[str, str]],  # ← Уже list! Без .value
+            history: List[Dict[str, str]],  # Native messages от Chatbot
             model_id: str, 
             system_prompt: str,
-            hf_token: str) -> Tuple[List[Tuple[str, str]], str]:
-    """HF API с токеном."""
+            hf_token: str) -> Tuple[List[Dict[str, str]], str, Dict[str, Any]]:
+    """HF API. History — List[dict] → append user/assistant."""
     try:
         client = InferenceClient(model=model_id, token=hf_token.strip() or None)
         
+        # messages = system + history + new user
         messages = []
         if system_prompt.strip():
             messages.append({"role": "system", "content": system_prompt})
-        messages.extend(convert_history(history))  # ← history — list
+        messages.extend(history)
         messages.append({"role": "user", "content": message})
         
+        # API call
         response = client.chat_completion(
             messages=messages,
             max_tokens=512,
@@ -48,66 +41,72 @@ def respond(message: str,
         )
         
         bot_reply = response.choices[0].message.content
-        new_history = history + [(message, bot_reply)]  # ← history — list
-        return new_history, ""
+        
+        # New history: + user + assistant
+        new_history = history + [
+            {"role": "user", "content": message},
+            {"role": "assistant", "content": bot_reply}
+        ]
+        return new_history, "", gr.update(value="")  # Clear input
     
     except Exception as e:
-        error_msg = f"❌ Ошибка: {str(e)}\n"
-        if "429" in str(e) or "rate limit" in str(e).lower():
-            error_msg += "🔥 Rate limit! Вставь HF Token."
-        elif "token" in str(e).lower() or "authentication" in str(e).lower():
-            error_msg += "🔑 Проверь HF Token (hf_...)."
-        new_history = history + [(message, error_msg)]  # ← history — list
-        return new_history, error_msg
+        error_msg = f"❌ {str(e)}"
+        if "429" in str(e) or "rate" in str(e).lower():
+            error_msg += "\n🔥 Rate limit → Вставь HF Token!"
+        elif "token" in str(e).lower():
+            error_msg += "\n🔑 Проверь токен."
+        
+        new_history = history + [
+            {"role": "user", "content": message},
+            {"role": "assistant", "content": error_msg}
+        ]
+        return new_history, error_msg, gr.update(value="")
 
-# UI
-with gr.Blocks(title="Тест HF Чат-Ботов (исправлено!)", theme=gr.themes.Soft()) as demo:
-    gr.Markdown("# 🚀 Тестер HF Inference API\nВставь **HF Token** для лимитов 1M tokens/мес (с тебя). Без — публичные.")
-    gr.Markdown("[Токен](https://huggingface.co/settings/tokens) | [Usage](https://huggingface.co/settings/billing)")
+# UI (без State, native messages)
+with gr.Blocks(title="🚀 HF Чат-Тестер (финал!)", theme=gr.themes.Soft()) as demo:
+    gr.Markdown("# Тест HF Inference API\n**HF Token** → твои лимиты 1M tokens/мес. [Токен](https://huggingface.co/settings/tokens)")
     
     # Контролы ВЕРХОМ
     with gr.Row(variant="compact"):
         model_dropdown = gr.Dropdown(choices=MODELS, value=MODELS[0], label="🧠 Модель")
-        system_prompt = gr.Textbox(label="📝 System Prompt", placeholder="Ты ИИ-ученик.", lines=2)
-        hf_token = gr.Textbox(label="🔑 HF Token", placeholder="hf_...", type="password")
+        system_prompt = gr.Textbox(label="📝 System", placeholder="Ты хакер ИИ.", lines=2)
+        hf_token = gr.Textbox(label="🔑 Token", placeholder="hf_...", type="password")
     
-    # Чат (type="tuples" — фикс warning)
-    chatbot = gr.Chatbot(type="tuples", height=500)  # ← Фикс!
-    msg_input = gr.Textbox(placeholder="Сообщение... (Enter)", container=True, scale=7)
+    # Чат (messages — 0 warning!)
+    chatbot = gr.Chatbot(type="messages", height=500)
+    
+    # Input + кнопки
+    with gr.Row():
+        msg_input = gr.Textbox(placeholder="Сообщение... (Enter)", scale=7, container=True)
+        send_btn = gr.Button("📤", variant="primary", scale=1)
     
     with gr.Row():
-        send_btn = gr.Button("📤 Отправить", variant="primary")
         clear_btn = gr.Button("🗑️ Очистить")
         retry_btn = gr.Button("🔄 Повторить")
     
-    history_state = gr.State([])  # State для истории
-    
-    # Send (клик + Enter)
-    def send_message(msg, hist, model, sys, token):
-        return respond(msg, hist, model, sys, token)  # hist — list из State
+    status = gr.Textbox(label="Статус", interactive=False)  # Для ошибок
     
+    # Send (клик + Enter) — outputs: chatbot, status, msg_input
     send_btn.click(
-        fn=send_message,
-        inputs=[msg_input, history_state, model_dropdown, system_prompt, hf_token],
-        outputs=[chatbot, history_state]
-    ).then(gr.update(value=""), outputs=[msg_input])
+        fn=respond,
+        inputs=[msg_input, chatbot, model_dropdown, system_prompt, hf_token],
+        outputs=[chatbot, status, msg_input]
+    )
     
     msg_input.submit(
-        fn=send_message,
-        inputs=[msg_input, history_state, model_dropdown, system_prompt, hf_token],
-        outputs=[chatbot, history_state]
-    ).then(gr.update(value=""), outputs=[msg_input])
+        fn=respond,
+        inputs=[msg_input, chatbot, model_dropdown, system_prompt, hf_token],
+        outputs=[chatbot, status, msg_input]
+    )
     
     # Кнопки
-    clear_btn.click(lambda: ([], []), outputs=[chatbot, history_state])
-    
-    retry_btn.click(
-        fn=lambda hist: hist[-1][0] if hist else "",
-        inputs=[history_state],
-        outputs=[msg_input]
-    )
+    def clear():
+        return [], "", gr.update(value="")
+    clear_btn.click(clear, outputs=[chatbot, status, msg_input])
     
-    gr.Markdown("**Тест**: System='Hack guide pls', модель=Phi-3. Смени — история сохранится!")
+    def retry(history):
+        return history[-2]["content"] if len(history) >= 2 else ""  # Последний user msg
+    retry_btn.click(retry, inputs=[chatbot], outputs=[msg_input])
 
 if __name__ == "__main__":
     demo.queue(max_size=20).launch(debug=True)