Update app.py

app.py

@@ -2,9 +2,9 @@ import gradio as gr
 from transformers import AutoModelForCausalLM, AutoTokenizer
 import torch
 import json
-import os
 from pathlib import Path
 from datetime import datetime
+import requests
 
 # === ЗАГРУЗКА МОДЕЛИ ===
 print("🚀 Загрузка модели...")
@@ -23,25 +23,21 @@ def get_history_path(username):
     return HISTORY_DIR / f"{username}.json"
 
 def load_history(username):
-    """Загружает историю чатов пользователя"""
     path = get_history_path(username)
     if path.exists():
         with open(path, "r", encoding="utf-8") as f:
             return json.load(f)
-    return {}  # {chat_id: {"title": str, "messages": [[user, ai], ...]}}
+    return {}
 
 def save_history(username, history_data):
-    """Сохраняет историю чатов пользователя"""
     path = get_history_path(username)
     with open(path, "w", encoding="utf-8") as f:
         json.dump(history_data, f, ensure_ascii=False, indent=2)
 
 def check_if_pro(token):
-    """Проверяет, является ли пользователь PRO-подписчиком"""
     if not token:
         return False
     try:
-        import requests
         response = requests.get(
             "https://huggingface.co/api/whoami-v2",
             headers={"Authorization": f"Bearer {token}"},
@@ -58,20 +54,23 @@ def check_if_pro(token):
 def generate_response(message, history, username, current_chat_id):
     if not username:
         gr.Warning("Пожалуйста, войдите через Hugging Face")
-        return history, history, gr.update(), current_chat_id
+        return history, gr.update(), current_chat_id
     
     if not message.strip():
-        return history, history, gr.update(), current_chat_id
+        return history, gr.update(), current_chat_id
     
-    # Добавляем сообщение пользователя
-    history = history + [[message, None]]
+    # Новый формат Gradio 6+: список словарей
+    history = history + [
+        {"role": "user", "content": message},
+    ]
     
-    # Формируем промпт
+    # Формируем промпт из всей истории
     prompt = ""
-    for user_msg, ai_msg in history:
-        prompt += f"Пользователь: {user_msg}\n"
-        if ai_msg:
-            prompt += f"AI: {ai_msg}\n"
+    for msg in history:
+        if msg["role"] == "user":
+            prompt += f"Пользователь: {msg['content']}\n"
+        elif msg["role"] == "assistant":
+            prompt += f"AI: {msg['content']}\n"
     prompt += "AI:"
     
     inputs = tokenizer(prompt, return_tensors="pt").to(device)
@@ -88,26 +87,27 @@ def generate_response(message, history, username, current_chat_id):
     response = tokenizer.decode(outputs[0], skip_special_tokens=True)
     ai_response = response.split("AI:")[-1].strip()
     
-    # Обновляем последнее сообщение
-    history[-1][1] = ai_response
+    # Добавляем ответ AI
+    history = history + [{"role": "assistant", "content": ai_response}]
     
     # Сохраняем в хранилище
-    history_data = load_history(username)
-    if current_chat_id not in history_data:
-        history_data[current_chat_id] = {
-            "title": message[:40] + ("..." if len(message) > 40 else ""),
-            "created": datetime.now().isoformat(),
-            "messages": []
-        }
-    history_data[current_chat_id]["messages"] = history
-    save_history(username, history_data)
+    if username and current_chat_id:
+        history_data = load_history(username)
+        if current_chat_id not in history_data:
+            history_data[current_chat_id] = {
+                "title": message[:40] + ("..." if len(message) > 40 else ""),
+                "created": datetime.now().isoformat(),
+                "messages": []
+            }
+        history_data[current_chat_id]["messages"] = history
+        save_history(username, history_data)
     
-    return history, history, gr.update(value=""), current_chat_id
+    return history, gr.update(value=""), current_chat_id
 
 # === УПРАВЛЕНИЕ ЧАТАМИ ===
 def new_chat(username):
     if not username:
-        return [], {}, None
+        return [], None, []
     chat_id = datetime.now().strftime("%Y%m%d_%H%M%S")
     history_data = load_history(username)
     history_data[chat_id] = {
@@ -116,13 +116,12 @@ def new_chat(username):
         "messages": []
     }
     save_history(username, history_data)
-    return [], history_data, chat_id
+    return [], chat_id, get_chat_list(username)
 
 def load_chat(chat_title, username, current_chat_id):
     if not username or not chat_title:
         return [], current_chat_id
     history_data = load_history(username)
-    # Находим chat_id по заголовку
     for cid, data in history_data.items():
         if data["title"] == chat_title:
             return data["messages"], cid
@@ -132,7 +131,6 @@ def get_chat_list(username):
     if not username:
         return []
     history_data = load_history(username)
-    # Сортируем по дате (новые сверху)
     sorted_chats = sorted(
         history_data.items(),
         key=lambda x: x[1].get("created", ""),
@@ -144,7 +142,6 @@ def delete_chat(chat_title, username):
     if not username or not chat_title:
         return [], {}, None, []
     history_data = load_history(username)
-    # Находим и удаляем чат
     for cid, data in list(history_data.items()):
         if data["title"] == chat_title:
             del history_data[cid]
@@ -152,54 +149,6 @@ def delete_chat(chat_title, username):
     save_history(username, history_data)
     return [], history_data, None, get_chat_list(username)
 
-# === ВХОД/ВЫХОД ===
-def login_event(request: gr.Request):
-    """Вызывается после успешного входа через OAuth"""
-    if request.username:
-        username = request.username
-        token = request.oauth_token.get("access_token") if request.oauth_token else None
-        is_pro = check_if_pro(token)
-        history_data = load_history(username)
-        chat_list = get_chat_list(username)
-        
-        # Создаем новый чат, если история пуста
-        current_chat_id = None
-        if not history_data:
-            chat_id = datetime.now().strftime("%Y%m%d_%H%M%S")
-            history_data[chat_id] = {
-                "title": "Новый чат",
-                "created": datetime.now().isoformat(),
-                "messages": []
-            }
-            save_history(username, history_data)
-            current_chat_id = chat_id
-            chat_list = get_chat_list(username)
-        
-        pro_badge = "👑 PRO" if is_pro else ""
-        return (
-            gr.update(visible=True),   # main_interface
-            gr.update(visible=False),  # login_screen
-            gr.update(value=f"👤 {username} {pro_badge}".strip()),  # user_info
-            [],                        # chatbot
-            history_data,              # state
-            current_chat_id,
-            chat_list,                 # список чатов
-            gr.update(visible=is_pro)  # PRO бейдж
-        )
-    return (gr.update(), gr.update(), gr.update(), [], {}, None, [], gr.update())
-
-def logout_event():
-    return (
-        gr.update(visible=False),
-        gr.update(visible=True),
-        "Не авторизован",
-        [],
-        {},
-        None,
-        [],
-        gr.update(visible=False)
-    )
-
 # === CSS ===
 CUSTOM_CSS = """
 .main-header {
@@ -210,10 +159,7 @@ CUSTOM_CSS = """
     margin-bottom: 20px;
     text-align: center;
 }
-.main-header h1 {
-    margin: 0;
-    font-size: 2em;
-}
+.main-header h1 { margin: 0; font-size: 2em; }
 .pro-badge {
     background: linear-gradient(135deg, #ffd700 0%, #ffed4e 100%);
     color: #333;
@@ -224,21 +170,6 @@ CUSTOM_CSS = """
     margin-left: 10px;
     box-shadow: 0 2px 8px rgba(255, 215, 0, 0.4);
 }
-.sidebar {
-    background: #f7f7f9;
-    padding: 15px;
-    border-radius: 12px;
-    height: calc(100vh - 200px);
-    overflow-y: auto;
-}
-.chat-item {
-    padding: 8px 12px;
-    margin: 4px 0;
-    background: white;
-    border-radius: 8px;
-    cursor: pointer;
-    border: 1px solid #e0e0e0;
-}
 .user-info {
     padding: 10px;
     background: white;
@@ -250,14 +181,14 @@ CUSTOM_CSS = """
 """
 
 # === ИНТЕРФЕЙС ===
-with gr.Blocks(css=CUSTOM_CSS, title="OpenAirAI-X Chat") as demo:
+with gr.Blocks(title="OpenAirAI-X Chat") as demo:
     
     # Состояния
+    username_state = gr.State("")
     history_state = gr.State({})
     current_chat_id_state = gr.State(None)
     
     with gr.Column(visible=False) as main_interface:
-        # Шапка
         gr.HTML("""
         <div class="main-header">
             <h1>🤖 OpenAirAI-X Chat</h1>
@@ -266,18 +197,15 @@ with gr.Blocks(css=CUSTOM_CSS, title="OpenAirAI-X Chat") as demo:
         """)
         
         with gr.Row():
-            # Боковая панель с историей
-            with gr.Column(scale=1, elem_classes="sidebar"):
+            # Боковая панель
+            with gr.Column(scale=1, min_width=250):
                 user_info = gr.Textbox(
                     label="Пользователь",
                     value="Не авторизован",
                     interactive=False,
                     elem_classes="user-info"
                 )
-                pro_badge = gr.HTML(
-                    '<div class="pro-badge">👑 PRO</div>',
-                    visible=False
-                )
+                pro_badge = gr.HTML('<div class="pro-badge">👑 PRO</div>', visible=False)
                 new_chat_btn = gr.Button("➕ Новый чат", variant="primary")
                 gr.Markdown("### 📚 История чатов")
                 chat_list = gr.Radio(
@@ -293,9 +221,8 @@ with gr.Blocks(css=CUSTOM_CSS, title="OpenAirAI-X Chat") as demo:
                 chatbot = gr.Chatbot(
                     label="Диалог",
                     height=500,
-                    type="tuples",
                     show_copy_button=True,
-                    avatar_images=(None, "https://huggingface.co/datasets/huggingface/badges/resolve/main/model-icon.png")
+                    type="messages"
                 )
                 with gr.Row():
                     msg_input = gr.Textbox(
@@ -326,71 +253,112 @@ with gr.Blocks(css=CUSTOM_CSS, title="OpenAirAI-X Chat") as demo:
         """)
         gr.LoginButton(value="🔑 Войти через Hugging Face", variant="primary")
     
-    # === ОБРАБОТЧИКИ СОБЫТИЙ ===
+    # === ОБРАБОТЧИКИ ===
     
-    # Вход
-    main_interface_ref = main_interface
-    login_screen_ref = login_screen
+    def handle_login(request: gr.Request):
+        if request.username:
+            username = request.username
+            token = request.oauth_token.get("access_token") if request.oauth_token else None
+            is_pro = check_if_pro(token)
+            history_data = load_history(username)
+            chat_list_choices = get_chat_list(username)
+            
+            current_chat_id = None
+            if not history_data:
+                chat_id = datetime.now().strftime("%Y%m%d_%H%M%S")
+                history_data[chat_id] = {
+                    "title": "Новый чат",
+                    "created": datetime.now().isoformat(),
+                    "messages": []
+                }
+                save_history(username, history_data)
+                current_chat_id = chat_id
+                chat_list_choices = get_chat_list(username)
+            
+            pro_badge_html = '<div class="pro-badge">👑 PRO</div>'
+            display_name = f"👤 {username}"
+            
+            return (
+                gr.update(visible=True),    # main_interface
+                gr.update(visible=False),   # login_screen
+                display_name,               # user_info
+                username,                   # username_state
+                history_data,               # history_state
+                current_chat_id,            # current_chat_id_state
+                chat_list_choices,          # chat_list
+                gr.update(visible=is_pro, value=pro_badge_html)
+            )
+        return (gr.update(), gr.update(), gr.update(), "", {}, None, [], gr.update())
+    
+    def handle_logout():
+        return (
+            gr.update(visible=False),
+            gr.update(visible=True),
+            "Не авторизован",
+            "",
+            {},
+            None,
+            [],
+            gr.update(visible=False)
+        )
     
-    # После OAuth
+    # При загрузке страницы проверяем авторизацию
     demo.load(
-        fn=lambda request: login_event(request) if request.username else (gr.update(), gr.update(), gr.update(), [], {}, None, [], gr.update()),
+        fn=handle_login,
         inputs=None,
-        outputs=[main_interface, login_screen, user_info, chatbot, history_state, current_chat_id_state, chat_list, pro_badge]
+        outputs=[main_interface, login_screen, user_info, username_state, 
+                 history_state, current_chat_id_state, chat_list, pro_badge]
     )
     
     # Отправка сообщения
     send_btn.click(
         fn=generate_response,
-        inputs=[msg_input, chatbot, user_info, current_chat_id_state],
-        outputs=[chatbot, chatbot, msg_input, current_chat_id_state]
+        inputs=[msg_input, chatbot, username_state, current_chat_id_state],
+        outputs=[chatbot, msg_input, current_chat_id_state]
     ).then(
-        fn=lambda username: get_chat_list(username),
-        inputs=[user_info],
+        fn=lambda u: get_chat_list(u),
+        inputs=[username_state],
         outputs=[chat_list]
     )
     
     msg_input.submit(
         fn=generate_response,
-        inputs=[msg_input, chatbot, user_info, current_chat_id_state],
-        outputs=[chatbot, chatbot, msg_input, current_chat_id_state]
+        inputs=[msg_input, chatbot, username_state, current_chat_id_state],
+        outputs=[chatbot, msg_input, current_chat_id_state]
     ).then(
-        fn=lambda username: get_chat_list(username),
-        inputs=[user_info],
+        fn=lambda u: get_chat_list(u),
+        inputs=[username_state],
         outputs=[chat_list]
     )
     
     # Новый чат
     new_chat_btn.click(
-        fn=lambda username: new_chat(username),
-        inputs=[user_info],
-        outputs=[chatbot, history_state, current_chat_id_state]
-    ).then(
-        fn=lambda username: get_chat_list(username),
-        inputs=[user_info],
-        outputs=[chat_list]
+        fn=new_chat,
+        inputs=[username_state],
+        outputs=[chatbot, current_chat_id_state, chat_list]
     )
     
     # Загрузка чата
     chat_list.change(
         fn=load_chat,
-        inputs=[chat_list, user_info, current_chat_id_state],
+        inputs=[chat_list, username_state, current_chat_id_state],
         outputs=[chatbot, current_chat_id_state]
     )
     
     # Удаление чата
     delete_chat_btn.click(
         fn=delete_chat,
-        inputs=[chat_list, user_info],
+        inputs=[chat_list, username_state],
         outputs=[chatbot, history_state, current_chat_id_state, chat_list]
     )
     
     # Выход
     logout_btn.click(
-        fn=logout_event,
+        fn=handle_logout,
         inputs=None,
-        outputs=[main_interface, login_screen, user_info, chatbot, history_state, current_chat_id_state, chat_list, pro_badge]
+        outputs=[main_interface, login_screen, user_info, username_state,
+                 history_state, current_chat_id_state, chat_list, pro_badge]
     )
 
-# Запуск
-demo.launch(server_name="0.0.0.0", server_port=7860)
+# Запуск с CSS
+demo.launch(server_name="0.0.0.0", server_port=7860, css=CUSTOM_CSS)