Update src/streamlit_app.py

src/streamlit_app.py

@@ -5,262 +5,159 @@ import os
 import json
 from streamlit_cookies_manager import EncryptedCookieManager
 
-# --- ИНИЦИАЛИЗАЦИЯ КУКИ ---
+# --- ИНИЦИАЛИЗАЦИЯ КУКИ (Улучшенная) ---
 cookies = EncryptedCookieManager(password="HiperDouble_Secret_2026_Key")
 if not cookies.ready():
-    # Вместо пустого экрана показываем статус
-    st.markdown("<h3 style='color:white; text-align:center; margin-top:50vh;'>🧬 Загрузка системы HiperDouble...</h3>", unsafe_allow_html=True)
+    st.markdown("<h3 style='color:white; text-align:center; margin-top:45vh;'>🧬 Инициализация памяти...</h3>", unsafe_allow_html=True)
     st.stop()
 
-# --- ПАРАМЕТРЫ GOOGLE ---
+# --- ПАРАМЕТРЫ ---
 CLIENT_ID = os.environ.get("GOOGLE_CLIENT_ID")
 CLIENT_SECRET = os.environ.get("GOOGLE_CLIENT_SECRET")
 host = st.context.headers.get("Host", "")
 REDIRECT_URI = f"https://{host}/" if host else ""
 
 def get_google_auth_url():
-    params = {
-        "client_id": CLIENT_ID,
-        "redirect_uri": REDIRECT_URI,
-        "response_type": "code",
-        "scope": "openid email profile",
-        "access_type": "offline",
-        "prompt": "select_account"
-    }
+    params = {"client_id": CLIENT_ID, "redirect_uri": REDIRECT_URI, "response_type": "code", "scope": "openid email profile", "access_type": "offline", "prompt": "select_account"}
     return f"https://accounts.google.com/o/oauth2/v2/auth?{'&'.join([f'{k}={v}' for k, v in params.items()])}"
 
-# --- ЛОГИКА АККАУНТА ---
-if "user_email" not in st.session_state or st.session_state.user_email is None:
+# --- ЛОГИКА СЕССИИ ---
+if "user_email" not in st.session_state:
     st.session_state.user_email = cookies.get("saved_email")
     st.session_state.user_name = cookies.get("saved_name", "Пользователь")
 
+# Обработка входа от Google
 if "code" in st.query_params and not st.session_state.user_email:
     try:
-        code = st.query_params["code"]
         res = requests.post("https://oauth2.googleapis.com/token", data={
-            "code": code, "client_id": CLIENT_ID, "client_secret": CLIENT_SECRET,
+            "code": st.query_params["code"], "client_id": CLIENT_ID, "client_secret": CLIENT_SECRET,
             "redirect_uri": REDIRECT_URI, "grant_type": "authorization_code"
         }).json()
         token = res.get("access_token")
         if token:
-            info = requests.get("https://www.googleapis.com/oauth2/v3/userinfo", 
-                                headers={"Authorization": f"Bearer {token}"}).json()
-            st.session_state.user_email = info.get("email")
-            st.session_state.user_name = info.get("name")
-            cookies["saved_email"] = info.get("email")
-            cookies["saved_name"] = info.get("name")
-            cookies.save()
-            st.rerun()
-    except:
-        pass
+            info = requests.get("https://www.googleapis.com/oauth2/v3/userinfo", headers={"Authorization": f"Bearer {token}"}).json()
+            st.session_state.user_email, st.session_state.user_name = info.get("email"), info.get("name")
+            cookies["saved_email"], cookies["saved_name"] = info.get("email"), info.get("name")
+            cookies.save(); st.rerun()
+    except: pass
 
 def logout():
-    # Безопасная очистка без ошибок кодирования
-    for k in ["saved_email", "saved_name"]:
-        if k in cookies:
-            cookies[k] = "" # Устанавливаем пустую строку вместо None
+    cookies["saved_email"], cookies["saved_name"] = "", ""
     cookies.save()
     st.session_state.user_email = None
-    st.session_state.user_name = "Пользователь"
     st.rerun()
 
-# --- РАБОТА С БД ---
-def get_db_path():
-    u_id = st.session_state.user_email.replace('@','_').replace('.','_') if st.session_state.user_email else 'guest'
-    return f"chats_db_{u_id}.json"
-
-def load_chats():
-    path = get_db_path()
-    if os.path.exists(path):
-        try:
-            with open(path, "r", encoding="utf-8") as f:
-                return json.load(f) or {"Чат 1": []}
-        except:
-            return {"Чат 1": []}
-    return {"Чат 1": []}
-
-def save_chats(chats):
-    with open(get_db_path(), "w", encoding="utf-8") as f:
-        json.dump(chats, f, ensure_ascii=False, indent=4)
-
-# --- КОНФИГ МОДЕЛЕЙ ---
-MODELS_CONFIG = {
-    "🌌 HiperAi v2.1 (Grew up)": {"engine": "groq", "key_name": "GROQ_API_KEY3", "model": "llama-3.3-70b-versatile", "identity": "HiperAI v2.1 Grew up."},
-    "🧠 HiperAI v2.3 (CORTEX)": {"engine": "groq", "key_name": "GROQ_API_KEY", "model": "llama-3.3-70b-versatile", "identity": "HiperAI v2.3 Cortex."},
-    "🔥 HiperAI v2.1 (ADULT)": {"engine": "groq", "key_name": "GROQ_API_KEY2", "model": "llama-3.1-8b-instant", "identity": "HiperAI v2.1 Adult."},
-    "🌐 HiperAI v2.2 (NETWORK)": {"engine": "groq", "key_name": "GROQ_API_KEY", "model": "llama-3.1-8b-instant", "identity": "HiperAI v2.2 Network."},
-    "👶 HiperAI v2.1 (BABY)": {"engine": "titan", "model": "titan-89m", "identity": "HiperAI v2.1 Baby."},
-    "🚀 HiperAI v2.0 (Test 1)": {"engine": "groq", "key_name": "GROQ_API_KEY", "model": "llama-3.3-70b-versatile", "identity": "HiperAI v2.0 Test."},
-    "✨ HiperAI v1.1.3 (Stable)": {"engine": "openai", "model": "gpt-4o-mini", "identity": "HiperAI v1.1.3."},
-}
-
-# --- ИНТЕРФЕЙС ---
+# --- СТИЛИ (CSS) ---
 st.set_page_config(page_title="HiperDouble AI", page_icon="🧬", layout="wide")
 
-if "chats" not in st.session_state: st.session_state.chats = load_chats()
-if "current_chat" not in st.session_state or st.session_state.current_chat not in st.session_state.chats:
-    st.session_state.current_chat = list(st.session_state.chats.keys())[0]
-if "edit_mode" not in st.session_state: st.session_state.edit_mode = None
-
-# --- СТИЛИ (CSS) ---
 st.markdown("""
 <style>
     html, body, [data-testid="stAppViewContainer"] {
         background: radial-gradient(circle at top right, #1a0b2e, #020205);
         background-attachment: fixed;
     }
-
     .main-title {
-        font-size: clamp(2rem, 8vw, 3.5rem);
-        font-weight: 900;
-        text-align: center;
+        font-size: clamp(2rem, 8vw, 3.5rem); font-weight: 900; text-align: center;
         background: linear-gradient(90deg, #00f2fe, #7367f0, #ff00cc, #00f2fe);
-        background-size: 200% auto;
-        -webkit-background-clip: text;
-        -webkit-text-fill-color: transparent;
-        animation: shine 4s linear infinite;
-        padding: 15px 0;
+        -webkit-background-clip: text; -webkit-text-fill-color: transparent;
+        animation: shine 4s linear infinite; padding: 15px 0;
     }
     @keyframes shine { to { background-position: 200% center; } }
-
-    /* ГЛАВНЫЙ ФИКС СКРОЛЛА: Сообщения растут вверх */
+    
     .main .block-container { 
-        display: flex !important;
-        flex-direction: column-reverse !important; 
-        padding-bottom: 200px !important; 
-        padding-top: 20px !important;
+        display: flex !important; flex-direction: column-reverse !important; 
+        padding-bottom: 220px !important; 
     }
-
-    /* ФИКСИРОВАННАЯ НИЖНЯЯ ПАНЕЛЬ */
     [data-testid="stBottom"] {
-        position: fixed !important;
-        bottom: 0px !important;
+        position: fixed !important; bottom: 0px !important;
         background: rgba(10, 10, 20, 0.96) !important;
-        backdrop-filter: blur(15px);
-        z-index: 1000 !important;
-        padding: 10px 5% 45px 5% !important;
+        z-index: 1000 !important; padding: 10px 5% 45px 5% !important;
         border-top: 1px solid rgba(115, 103, 240, 0.4);
     }
-
-    /* ПУЗЫРИ СООБЩЕНИЙ */
     .chat-bubble {
-        padding: 18px 22px;
-        border-radius: 22px;
-        margin-top: 15px;
-        background: rgba(255, 255, 255, 0.05);
-        border: 1px solid rgba(255, 255, 255, 0.1);
-        backdrop-filter: blur(8px);
-        color: #f0f0f0;
-        box-shadow: 0 4px 15px rgba(0,0,0,0.2);
-    }
-    .user-bubble { 
-        border-left: 5px solid #ff00cc; 
-        background: rgba(255, 0, 204, 0.07);
+        padding: 18px; border-radius: 20px; margin-top: 15px;
+        background: rgba(255, 255, 255, 0.05); border: 1px solid rgba(255, 255, 255, 0.1);
+        color: #f0f0f0; backdrop-filter: blur(10px);
     }
-
-    [data-testid="stSidebar"] { background-color: #080812 !important; }
+    .user-bubble { border-left: 5px solid #ff00cc; background: rgba(255, 0, 204, 0.07); }
     header, footer { visibility: hidden; }
 </style>
 """, unsafe_allow_html=True)
 
-# --- SIDEBAR ---
-with st.sidebar:
-    st.markdown("### 🧬 HiperDouble AI")
-    if st.session_state.user_email:
-        st.markdown(f"👤 **{st.session_state.user_name}**")
-        if st.button("🚪 Выйти", use_container_width=True): logout()
-    else:
-        st.markdown(f'<a href="{get_google_auth_url()}" target="_self" style="background-color: #4285F4; color: white; padding: 12px; text-decoration: none; border-radius: 8px; display: block; text-align: center;">Войти через Google</a>', unsafe_allow_html=True)
-        st.stop()
-    
-    st.markdown("---")
-    lang = st.radio("🌐", ["RU", "EN"], horizontal=True)
-    T = {"RU":{"new":"➕ Новый чат","clear":"🗑️ Очистить","mod":"🤖 Модель:","in":"Сообщение..."},
-         "EN":{"new":"➕ New Chat","clear":"🗑️ Clear","mod":"🤖 Model:","in":"Message..."}}[lang]
-    
-    selected_name = st.selectbox(T['mod'], list(MODELS_CONFIG.keys()))
-    cfg = MODELS_CONFIG[selected_name]
-    
-    if st.button(T['new'], use_container_width=True):
-        n = f"Чат {len(st.session_state.chats) + 1}"
-        st.session_state.chats[n] = []
-        save_chats(st.session_state.chats)
-        st.session_state.current_chat = n
-        st.rerun()
+# --- ПРОВЕРКА ВХОДА ---
+if not st.session_state.user_email:
+    st.markdown('<p class="main-title">HiperDouble AI</p>', unsafe_allow_html=True)
+    st.markdown(f"""
+        <div style="text-align: center; margin-top: 10vh;">
+            <h2 style="color: white;">Добро пожаловать</h2>
+            <p style="color: #aaa;">Для начала работы нужно войти в систему</p>
+            <a href="{get_google_auth_url()}" target="_self" 
+               style="background: #4285F4; color: white; padding: 15px 30px; 
+               text-decoration: none; border-radius: 10px; font-weight: bold; display: inline-block; margin-top: 20px;">
+               Войти через Google
+            </a>
+        </div>
+    """, unsafe_allow_html=True)
+    st.stop()
 
-    if st.button(T['clear'], use_container_width=True):
-        st.session_state.chats[st.session_state.current_chat] = []
-        save_chats(st.session_state.chats)
-        st.rerun()
+# --- ОСНОВНОЙ КОНТЕНТ (только если вошел) ---
 
-    st.markdown("---")
-    for chat_name in list(st.session_state.chats.keys()):
-        col_c, col_e, col_d = st.columns([0.6, 0.2, 0.2])
-        if col_c.button(f"💬 {chat_name[:12]}", key=f"s_{chat_name}"):
-            st.session_state.current_chat = chat_name
-            st.rerun()
-        if col_e.button("✏️", key=f"e_{chat_name}"):
-            st.session_state.edit_mode = chat_name
-        if col_d.button("🗑️", key=f"d_{chat_name}"):
-            if len(st.session_state.chats) > 1:
-                del st.session_state.chats[chat_name]
-                save_chats(st.session_state.chats)
-                st.session_state.current_chat = list(st.session_state.chats.keys())[0]
-                st.rerun()
-        
-        if st.session_state.edit_mode == chat_name:
-            new_n = st.text_input("Имя:", chat_name, key=f"in_{chat_name}")
-            if st.button("ОК", key=f"ok_{chat_name}"):
-                st.session_state.chats[new_n] = st.session_state.chats.pop(chat_name)
-                save_chats(st.session_state.chats)
-                st.session_state.edit_mode = None
-                st.session_state.current_chat = new_n
-                st.rerun()
+def load_chats():
+    u_id = st.session_state.user_email.replace('@','_').replace('.','_')
+    path = f"chats_db_{u_id}.json"
+    if os.path.exists(path):
+        try:
+            with open(path, "r", encoding="utf-8") as f: return json.load(f) or {"Чат 1": []}
+        except: return {"Чат 1": []}
+    return {"Чат 1": []}
 
-# --- ОСНОВНОЙ ЭКРАН ---
+def save_chats(chats):
+    u_id = st.session_state.user_email.replace('@','_').replace('.','_')
+    with open(f"chats_db_{u_id}.json", "w", encoding="utf-8") as f:
+        json.dump(chats, f, ensure_ascii=False, indent=4)
 
-# Поле ввода (закреплено в stBottom через CSS)
-u_input = st.chat_input(T['in'])
+MODELS_CONFIG = {
+    "🌌 HiperAi v2.1 (Grew up)": {"engine": "groq", "key_name": "GROQ_API_KEY3", "model": "llama-3.3-70b-versatile", "identity": "HiperAI v2.1 Grew up."},
+    "🧠 HiperAI v2.3 (CORTEX)": {"engine": "groq", "key_name": "GROQ_API_KEY", "model": "llama-3.3-70b-versatile", "identity": "HiperAI v2.3 Cortex."},
+    "🔥 HiperAI v2.1 (ADULT)": {"engine": "groq", "key_name": "GROQ_API_KEY2", "model": "llama-3.1-8b-instant", "identity": "HiperAI v2.1 Adult."},
+    "🌐 HiperAI v2.2 (NETWORK)": {"engine": "groq", "key_name": "GROQ_API_KEY", "model": "llama-3.1-8b-instant", "identity": "HiperAI v2.2 Network."},
+    "👶 HiperAI v2.1 (BABY)": {"engine": "titan", "model": "titan-89m", "identity": "HiperAI v2.1 Baby."},
+    "🚀 HiperAI v2.0 (Test 1)": {"engine": "groq", "key_name": "GROQ_API_KEY", "model": "llama-3.3-70b-versatile", "identity": "HiperAI v2.0 Test."},
+    "✨ HiperAI v1.1.3 (Stable)": {"engine": "openai", "model": "gpt-4o-mini", "identity": "HiperAI v1.1.3."},
+}
+
+if "chats" not in st.session_state: st.session_state.chats = load_chats()
+if "current_chat" not in st.session_state: st.session_state.current_chat = list(st.session_state.chats.keys())[0]
+
+with st.sidebar:
+    st.markdown(f"👤 **{st.session_state.user_name}**")
+    if st.button("🚪 Выйти", use_container_width=True): logout()
+    st.markdown("---")
+    sel_mod = st.selectbox("🤖 Модель:", list(MODELS_CONFIG.keys()))
+    cfg = MODELS_CONFIG[sel_mod]
+    if st.button("➕ Новый чат", use_container_width=True):
+        n = f"Чат {len(st.session_state.chats)+1}"; st.session_state.chats[n] = []; st.session_state.current_chat = n; save_chats(st.session_state.chats); st.rerun()
+
+# --- РЕНДЕР ЧАТА ---
+u_input = st.chat_input("Напишите сообщение...")
 
 if st.session_state.current_chat in st.session_state.chats:
-    # 1. НЕВИДИМЫЙ БЛОК-СТОПОР (снизу)
-    st.markdown("<div style='height: 25vh; min-height: 180px;'></div>", unsafe_allow_html=True)
-    
-    # 2. СООБЩЕНИЯ (column-reverse сам сделает новые сверху)
-    messages = st.session_state.chats[st.session_state.current_chat]
-    for m in messages:
-        role_label, bubble_style = ("Вы", "user-bubble") if m['role'] == 'user' else ("HiperAi", "")
-        st.markdown(f"<div class='chat-bubble {bubble_style}'><b>{role_label}:</b><br>{m['content']}</div>", unsafe_allow_html=True)
-    
-    # 3. ЗАГОЛОВОК (будет в самом верху)
+    st.markdown("<div style='height: 25vh;'></div>", unsafe_allow_html=True)
+    for m in st.session_state.chats[st.session_state.current_chat]:
+        role, style = ("Вы", "user-bubble") if m['role'] == 'user' else ("HiperAi", "")
+        st.markdown(f"<div class='chat-bubble {style}'><b>{role}:</b><br>{m['content']}</div>", unsafe_allow_html=True)
     st.markdown('<p class="main-title">HiperDouble AI</p>', unsafe_allow_html=True)
 
-# --- ЛОГИКА ОТПРАВКИ ---
 if u_input:
     st.session_state.chats[st.session_state.current_chat].append({"role": "user", "content": u_input})
     try:
         key = st.secrets.get(cfg["key_name"]) or os.environ.get(cfg["key_name"], "").strip()
-        if cfg["engine"] == "titan":
-            res_text = "Модель HiperAI Titan активна. Текстовый режим подтвержден."
-        elif cfg["engine"] == "openai":
-            client = OpenAI(api_key=st.secrets.get("OPENAI_API_KEY") or os.environ.get("OPENAI_API_KEY", ""))
-            r = client.chat.completions.create(model=cfg["model"], messages=[
-                {"role": "system", "content": cfg['identity']},
-                {"role": "user", "content": u_input}
-            ])
-            res_text = r.choices[0].message.content
-        else: # GROQ
-            resp = requests.post("https://api.groq.com/openai/v1/chat/completions",
-                json={
-                    "model": cfg["model"], 
-                    "messages": [{"role": "system", "content": cfg['identity']}] + st.session_state.chats[st.session_state.current_chat][-6:]
-                },
-                headers={"Authorization": f"Bearer {key}"}, timeout=25)
-            res_text = resp.json()['choices'][0]['message']['content']
-    except Exception as e:
-        res_text = f"⚠️ Ошибка связи с моделью. Попробуйте позже. ({str(e)})"
+        resp = requests.post("https://api.groq.com/openai/v1/chat/completions",
+            json={"model": cfg["model"], "messages": [{"role": "system", "content": cfg['identity']}] + st.session_state.chats[st.session_state.current_chat][-6:]},
+            headers={"Authorization": f"Bearer {key}"}, timeout=25).json()
+        res_text = resp['choices'][0]['message']['content']
+    except: res_text = "⚠️ Ошибка модели."
     
     st.session_state.chats[st.session_state.current_chat].append({"role": "assistant", "content": res_text})
-    save_chats(st.session_state.chats)
-    st.rerun()
+    save_chats(st.session_state.chats); st.rerun()