Update src/streamlit_app.py

src/streamlit_app.py

@@ -13,23 +13,10 @@ from llama_cpp import Llama
 from streamlit_cookies_manager import EncryptedCookieManager
 
 # --- НАСТРОЙКА КУК (ВАЖНО) ---
-# Укажи любой сложный пароль для шифрования кук
-cookies = EncryptedCookieManager(password="HiperDoubleSecretKey123")
+cookies = EncryptedCookieManager(password="HiperDoubleSecretKey123_Unique")
 if not cookies.ready():
     st.stop()
 
-# --- ПРОВЕРКА СОХРАНЕННОГО ВХОДА ---
-if "user_email" not in st.session_state:
-    # Пытаемся достать email из памяти браузера
-    st.session_state.user_email = cookies.get("saved_email")
-    st.session_state.user_name = cookies.get("saved_name", "Пользователь")
-
-# --- В ФУНКЦИИ ОБРАБОТКИ GOOGLE (ТАМ ГДЕ ПОЛУЧАЕМ INFO) ---
-# После строки st.session_state.user_email = info.get("email") добавь:
-cookies["saved_email"] = info.get("email")
-cookies["saved_name"] = info.get("name")
-cookies.save() # Записываем в память телефона
-
 # --- КОНФИГ GOOGLE АВТОРИЗАЦИИ ---
 CLIENT_ID = os.environ.get("GOOGLE_CLIENT_ID")
 CLIENT_SECRET = os.environ.get("GOOGLE_CLIENT_SECRET")
@@ -38,27 +25,24 @@ 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"
+        "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:
-    st.session_state.user_email = None
+# Проверка: если в сессии пусто, пробуем взять из КУК
+if "user_email" not in st.session_state or st.session_state.user_email is None:
+    st.session_state.user_email = cookies.get("saved_email")
+    st.session_state.user_name = cookies.get("saved_name", "Пользователь")
 
-# Обработка ответа от Google
+# Обработка ответа от 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,
-            "redirect_uri": REDIRECT_URI,
+            "code": code, "client_id": CLIENT_ID,
+            "client_secret": CLIENT_SECRET, "redirect_uri": REDIRECT_URI,
             "grant_type": "authorization_code"
         }).json()
         token = res.get("access_token")
@@ -66,15 +50,17 @@ if "code" in st.query_params and not st.session_state.user_email:
             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
 
 # --- ФИКС АЙДИ ПОЛЬЗОВАТЕЛЯ ---
 def get_user_id():
-    # Приоритет Google Auth для приватности
     if st.session_state.user_email:
         return st.session_state.user_email.replace("@", "_").replace(".", "_")
-    
     for header in ["X-Huggingface-User-User", "X-Repo-Guest-Name", "X-Forwarded-User"]:
         user = st.context.headers.get(header)
         if user: return user
@@ -160,15 +146,7 @@ def generate_llama_stream(prompt, system_prompt):
         f"<|start_header_id|>user<|end_header_id|>\n\n{prompt}<|eot_id|>"
         f"<|start_header_id|>assistant<|end_header_id|>\n\n"
     )
-    
-    stream = llm(
-        formatted_prompt,
-        max_tokens=512,
-        stop=["<|eot_id|>", "User:", "AI:"],
-        stream=True,
-        temperature=0.6,
-        repeat_penalty=1.2
-    )
+    stream = llm(formatted_prompt, max_tokens=512, stop=["<|eot_id|>", "User:", "AI:"], stream=True, temperature=0.6, repeat_penalty=1.2)
     for chunk in stream:
         if "choices" in chunk and len(chunk["choices"]) > 0:
             yield chunk["choices"][0]["text"]
@@ -234,7 +212,6 @@ st.markdown("<style>[data-testid='stAppViewContainer'] { background: #050508; co
 with st.sidebar:
     st.title("🧬 HiperDouble")
     
-    # Блок авторизации
     if not st.session_state.user_email:
         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; font-weight: bold;">Войти через Google</a>', unsafe_allow_html=True)
         st.stop()
@@ -242,6 +219,9 @@ with st.sidebar:
         st.write(f"Аккаунт: **{st.session_state.user_name}**")
         if st.button("Выйти"):
             st.session_state.user_email = None
+            cookies["saved_email"] = None
+            cookies["saved_name"] = None
+            cookies.save()
             st.rerun()
 
     lang = st.radio("🌐 Language:", ["RU", "EN"], horizontal=True)
@@ -309,27 +289,20 @@ if run_btn and user_input:
         with st.chat_message("assistant"):
             resp_placeholder = st.empty()
             final_text = ""
-
             if cfg["engine"] == "llama":
                 for chunk in generate_llama_stream(user_input, full_sys):
                     final_text += chunk
                     resp_placeholder.markdown(final_text + "▌")
                 resp_placeholder.markdown(final_text)
-            
             elif cfg["engine"] == "titan":
                 final_text = generate_titan(user_input)
                 resp_placeholder.markdown(final_text)
-            
             elif cfg["engine"] == "groq":
-                key_name = cfg.get("key_name", "GROQ_API_KEY")
-                key = os.environ.get(key_name, "").strip()
+                key = os.environ.get(cfg.get("key_name", "GROQ_API_KEY"), "").strip()
                 resp = requests.post("https://api.groq.com/openai/v1/chat/completions",
                     json={"model": cfg["model"], "messages": [{"role": "system", "content": full_sys}, {"role": "user", "content": full_prompt}]},
                     headers={"Authorization": f"Bearer {key}"}, timeout=25).json()
-                if 'choices' in resp:
-                    final_text = resp['choices'][0]['message']['content']
-                else:
-                    st.error(f"Error ({key_name}): {resp.get('error', {}).get('message', 'Unknown')}")
+                final_text = resp['choices'][0]['message']['content'] if 'choices' in resp else "Ошибка"
                 resp_placeholder.markdown(final_text)
             else:
                 client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY", "").strip())
@@ -342,7 +315,6 @@ if run_btn and user_input:
             st.session_state.chats[st.session_state.current_chat].append({"role": "assistant", "content": final_text})
             save_chats(st.session_state.chats)
             st.rerun()
-            
     except Exception as e: st.error(f"Error: {e}")
 
 st.write("---")