Upload app.py

app.py

@@ -153,16 +153,7 @@ def _get_custom_css():
             [data-testid="stSidebarContent"] { padding-top: 1.5rem !important; }
             [data-testid="stVerticalBlock"] > div { gap: 0.2rem !important; }
             /* 聊天消息间距控制 */
-            [data-testid="stChatMessage"] {
-                margin-bottom: 0.1rem !important;
-                margin-top: 0.1rem !important;
-                padding-top: 0.5rem !important;
-                padding-bottom: 0.5rem !important;
-            }
-            /* 聊天消息内容区域顶部对齐头像 */
-            [data-testid="stChatMessageContent"] {
-                padding-top: 0.25rem !important;
-            }
+            [data-testid="stChatMessage"] { margin-bottom: 0.1rem !important; margin-top: 0.1rem !important; padding-top: 0.5rem !important; padding-bottom: 0.5rem !important; }
             /* 聊天消息内部 gap 归零 */
             [data-testid="stChatMessageContent"] > [data-testid="stVerticalBlock"] > div { gap: 0 !important; }
             /* 聊天消息内标题字体大小限制 */
@@ -256,7 +247,7 @@ def _get_custom_css():
             /* 主内容区域：限制在标题和搜索框之间 */
             .block-container {
                 position: fixed !important;
-                top: 3.5rem !important;
+                top: 7rem !important;
                 bottom: 7rem !important;
                 left: 0 !important;
                 right: 0 !important;
@@ -440,48 +431,33 @@ def _get_custom_css():
             
             /* 游客模式：标题区域 */
             body:has(.main-title-guest) .block-container {
-                top: 3.5rem !important;
+                top: 6.5rem !important;
             }
             @media (max-width: 768px) {
                 body:has(.main-title-guest) .block-container {
-                    top: 3.5rem !important;
+                    top: 6.5rem !important;
                     padding: 0.5rem !important;
                 }
             }
-
+            
             /* 登录模式：标题较矮，内容区 top 更小 */
             body:has(.main-title-user) .block-container {
-                top: 0 !important;
-                padding-top: 0 !important;
+                top: 6rem !important;
             }
             @media (max-width: 768px) {
                 body:has(.main-title-user) .block-container {
-                    top: 0 !important;
-                    padding-top: 0 !important;
+                    top: 4.5rem !important;
                     padding: 0.5rem !important;
                 }
             }
             
             /* 欢迎页：垂直居中，禁止滚动 */
-            .block-container:has(.welcome-marker):not(:has([data-testid="stChatMessage"])) {
+            .block-container:has(.welcome-marker) {
                 overflow: hidden !important;
                 display: flex !important;
                 align-items: center !important;
                 justify-content: center !important;
             }
-            /* 有聊天消息时：恢复滚动，隐藏欢迎页所有内容 */
-            .block-container:has([data-testid="stChatMessage"]) {
-                overflow-y: auto !important;
-            }
-            .block-container:has([data-testid="stChatMessage"]) .welcome-marker,
-            .block-container:has([data-testid="stChatMessage"]) .welcome-hint,
-            .block-container:has([data-testid="stChatMessage"]) div:has(> .welcome-marker) {
-                display: none !important;
-            }
-            /* 有消息时隐藏快捷问题按钮区域 */
-            .block-container:has([data-testid="stChatMessage"]) [data-testid="stHorizontalBlock"]:has([data-testid="stBaseButton-secondary"]):not(:has([data-testid="stPopover"])) {
-                display: none !important;
-            }
             
             /* 欢迎页文字颜色 - 浅色模式 */
             .welcome-marker {
@@ -494,16 +470,6 @@ def _get_custom_css():
                 color: #999 !important;
             }
 
-            /* 快捷问题按钮区域：延迟显示防止闪烁 */
-            .block-container:has(.welcome-marker) [data-testid="stHorizontalBlock"]:has([data-testid="stBaseButton-secondary"]):not(:has([data-testid="stPopover"])) {
-                animation: fadeInDelayed 0.3s ease-in-out;
-                animation-fill-mode: both;
-            }
-            @keyframes fadeInDelayed {
-                0%, 50% { opacity: 0; }
-                100% { opacity: 1; }
-            }
-
             /* 快捷问题按钮：无边框链接风格 */
             .block-container:has(.welcome-marker) [data-testid="stBaseButton-secondary"] {
                 background: transparent !important;
@@ -909,7 +875,7 @@ def _get_embedding_client():
             api_key=BAIDU_TOKEN,
             base_url="https://qianfan.baidubce.com/v2",
             default_headers={"appid": BAIDU_APP_ID},
-        ), "qwen3-embedding-0.6b"
+        ), "bge-large-zh"
     if OR_KEY:
         return OpenAI(
             api_key=OR_KEY,
@@ -1815,7 +1781,7 @@ def llm_answer(query, context_docs, selected_display_name, web_enabled, is_guest
                 messages=messages,
                 stream=True,
                 extra_headers=extra_h,
-                timeout=15,  # 缩短超时，加快失败切换
+                timeout=25,
             )
 
             full_text = ""
@@ -1823,9 +1789,6 @@ def llm_answer(query, context_docs, selected_display_name, web_enabled, is_guest
             for chunk in response:
                 if chunk.choices and chunk.choices[0].delta.content:
                     content = chunk.choices[0].delta.content
-                    # 过滤OpenRouter状态消息（connecting等）
-                    if content.strip().lower() in ("connecting", "connected", "waiting"):
-                        continue
                     full_text += content
                     has_content = True
                     yield content
@@ -1841,7 +1804,7 @@ def llm_answer(query, context_docs, selected_display_name, web_enabled, is_guest
             logger.warning(f"{label} 失败: {err_msg[:100]}")
             if "429" in err_msg:
                 st.toast(f"{label} 拥堵，切换备选...", icon="⏳")
-                time.sleep(0.8)  # 缩短等待
+                time.sleep(1.5)
             continue
 
     yield "❌ 抱歉，所有免费和收费线路均暂时不可用。"
@@ -1865,46 +1828,39 @@ if "messages" not in st.session_state:
 elif st.session_state.get("_chat_cleared"):
     # 用户主动清空，不从数据库恢复
     del st.session_state["_chat_cleared"]
-    st.session_state.pop("_has_chatted", None)  # 重置，允许显示欢迎页
-
-# 欢迎页占位（有消息时、生成中、快捷问题待处理时、已开始对话 都隐藏）
-_show_welcome = (
-    not st.session_state.messages
-    and not st.session_state.get("_generating")
-    and not st.session_state.get("_quick_question")
-    and not st.session_state.get("_has_chatted")  # 一旦开始对话就不再显示
-)
-if _show_welcome:
-    # 无消息且未生成中时显示欢迎页
-    st.markdown(
-        """
-        <div class="welcome-marker" style="text-align:center;">
-            <div style="font-size:48px; margin-bottom:12px;">🤖</div>
-            <div style="font-size:18px; font-weight:600; margin-bottom:8px;">欢迎使用智答 AI 助手</div>
-            <div style="font-size:14px; line-height:1.8; margin-bottom:20px;">
-                🌐 <b>联网模式</b> —— 大模型 + 网络搜索，实时回答<br>
-                📚 <b>知识库模式</b> —— 上传文档，基于私有知识回答
+
+# 欢迎页占位（有消息时隐藏）
+_welcome_hero = st.empty()
+if not st.session_state.messages:
+    # 无消息时显示欢迎页
+    with _welcome_hero.container():
+        st.markdown(
+            """
+            <div class="welcome-marker" style="text-align:center;">
+                <div style="font-size:48px; margin-bottom:12px;">🤖</div>
+                <div style="font-size:18px; font-weight:600; margin-bottom:8px;">欢迎使用智答 AI 助手</div>
+                <div style="font-size:14px; line-height:1.8; margin-bottom:20px;">
+                    🌐 <b>联网模式</b> —— 大模型 + 网络搜索，实时回答<br>
+                    📚 <b>知识库模式</b> —— 上传文档，基于私有知识回答
+                </div>
+                <div class="welcome-hint" style="font-size:13px; margin-bottom:12px;">💡 试试这些问题</div>
             </div>
-            <div class="welcome-hint" style="font-size:13px; margin-bottom:12px;">💡 试试这些问题</div>
-        </div>
-        """,
-        unsafe_allow_html=True,
-    )
-    # 快捷问题 - 电脑端横向3个，手机端通过CSS控制
-    _quick_questions = [
-        "今天有什么热点新闻",
-        "用Python写快速排序",
-        "解释RAG技术是什么",
-    ]
-    # 电脑端横向3列
-    _q_cols = st.columns(3)
-    for i, qq in enumerate(_quick_questions):
-        with _q_cols[i]:
-            if st.button(f"💬 {qq}", key=f"quick_q{i}", use_container_width=True, type="secondary"):
-                st.session_state["_quick_question"] = qq
-                st.session_state["_generating"] = True
-                st.session_state["_has_chatted"] = True  # 标记已开始对话
-                st.rerun()
+            """,
+            unsafe_allow_html=True,
+        )
+        # 快捷问题 - 电脑端横向3个，手机端通过CSS控制
+        _quick_questions = [
+            "今天有什么热点新闻",
+            "用Python写快速排序",
+            "解释RAG技术是什么",
+        ]
+        # 电脑端横向3列
+        _q_cols = st.columns(3)
+        for i, qq in enumerate(_quick_questions):
+            with _q_cols[i]:
+                if st.button(f"💬 {qq}", key=f"quick_q{i}", use_container_width=True, type="secondary"):
+                    st.session_state["_quick_question"] = qq
+                    st.rerun()
 
 
 @st.fragment
@@ -1922,7 +1878,6 @@ def _chat_fragment():
     # 检查快捷问题
     if st.session_state.get("_quick_question"):
         q = st.session_state.pop("_quick_question")
-        st.session_state["_generating"] = True  # 立即标记，防止欢迎页闪烁
 
     with chat_box:
         for m in st.session_state.messages:
@@ -1936,8 +1891,7 @@ def _chat_fragment():
                     st.markdown(m["content"])
 
         if q:
-            st.session_state["_generating"] = True
-            st.session_state["_has_chatted"] = True  # 标记已开始对话
+            _welcome_hero.empty()  # 发送消息后清空欢迎页
             st.session_state.messages.append({"role": "user", "content": q})
             if not IS_GUEST:
                 _save_chat_message(CURRENT_USER, "user", q)
@@ -1993,11 +1947,9 @@ def _chat_fragment():
                     )
                     if not IS_GUEST:
                         _save_chat_message(CURRENT_USER, "assistant", full_response, meta_info)
-                    st.session_state.pop("_generating", None)  # 清除生成标记
                 except Exception as e:
                     logger.error(f"模型调用异常: {e}")
                     response_container.error(f"❌ 抱歉，连接模型时出错了: {str(e)}")
-                    st.session_state.pop("_generating", None)  # 清除生成标记
 
 
 # =========================