Update app.py

app.py

@@ -4,56 +4,14 @@ import uuid
 import copy
 import pandas as pd
 import openai
-import re
 from requests.models import ChunkedEncodingError
+from streamlit.components import v1
+from custom import css_code, js_code, set_context_all
 
 st.set_page_config(page_title='ChatGPT Assistant', layout='wide', page_icon='🤖')
-
 # 自定义元素样式
-# 第一个是减少侧边栏顶部空白，不同版本的st存在区别（此处适用1.19.0）
-st.markdown("""
-    <style>
-    div.css-da9rnt.e1fqkh3o4 {
-        padding-top: 1.5rem !important;
-        }
-    .avatar {
-        display: flex;
-        align-items: center;
-        gap: 10px;
-        pointer-events: none;
-        margin:10px;
-    }
-    .avatar svg {
-        width: 30px;
-        height: 30px;
-    }
-    .avatar h2 {
-        font-size: 20px;
-        margin: 0px;
-    } 
+st.markdown(css_code, unsafe_allow_html=True)
 
-    .content-div {
-        padding: 5px 20px;
-        margin: 5px;
-        text-align: left;
-        border-radius: 10px;
-        border: none;
-        line-height: 1.6;   
-        font-size:17px; 
-        }
-    .content-div p{
-        padding: 4px;
-        margin : 2px;
-    } 
-    #chat-window{
-        padding: 10px 0px;
-        text-decoration: none;
-    }
-    #chat-window:hover{
-        color: blue;
-    }
-    </style>
-""", unsafe_allow_html=True)
 if "initial_settings" not in st.session_state:
     # 历史聊天窗口
     st.session_state["path"] = set_chats_path()
@@ -62,8 +20,8 @@ if "initial_settings" not in st.session_state:
     st.session_state['pre_chat'] = None
     st.session_state['if_chat_change'] = False
     st.session_state['error_info'] = ''
-    st.session_state['user_input_content'] = ''
     st.session_state["current_chat_index"] = 0
+    st.session_state['user_input_content'] = ''
     # 设置完成
     st.session_state["initial_settings"] = True
 
@@ -83,13 +41,16 @@ with st.sidebar:
         st.session_state['if_chat_change'] = True
     st.write("---")
 
+    c1, c2 = st.columns(2)
 
-    def create_chat_button_callback():
+    create_chat_button = c1.button('新建', use_container_width=True, key='create_chat_button')
+    if create_chat_button:
         st.session_state['history_chats'] = ['New Chat_' + str(uuid.uuid4())] + st.session_state['history_chats']
         st.session_state["current_chat_index"] = 0
+        st.experimental_rerun()
 
-
-    def delete_chat_button_callback():
+    delete_chat_button = c2.button('删除', use_container_width=True, key='delete_chat_button')
+    if delete_chat_button:
         if len(st.session_state['history_chats']) == 1:
             chat_init = 'New Chat_' + str(uuid.uuid4())
             st.session_state['history_chats'].append(chat_init)
@@ -101,20 +62,17 @@ with st.sidebar:
             st.session_state["current_chat_index"] = 0
         st.session_state['history_chats'].remove(current_chat)
         remove_data(st.session_state["path"], current_chat)
-
-
-    c1, c2 = st.columns(2)
-    create_chat_button = c1.button('新建', use_container_width=True, key='create_chat_button',
-                                   on_click=create_chat_button_callback)
-    delete_chat_button = c2.button('删除', use_container_width=True, key='delete_chat_button',
-                                   on_click=delete_chat_button_callback)
-
-    st.write("\n")
-    st.write("\n")
-    # 此处href与下文的st.header内容相对应，跳转锚点
-    st.markdown("<a href='#chatgpt-assistant' id='chat-window'>➡️ 直达输入区</a>",unsafe_allow_html=True)
-
-
+        st.experimental_rerun()
+
+    for i in range(5):
+        st.write("\n")
+    st.caption("""
+    - 双击页面可直接定位输入栏
+    - Ctrl + Enter 可快捷提交问题
+    """)
+    st.markdown('<a href="https://github.com/PierXuY/ChatGPT-Assistant" target="_blank" rel="ChatGPT-Assistant">'
+                '<img src="https://badgen.net/badge/icon/GitHub?icon=github&amp;label=ChatGPT Assistant" alt="GitHub">'
+                '</a>', unsafe_allow_html=True)
 # 加载数据
 if ("history" + current_chat not in st.session_state) or (st.session_state['if_chat_change']):
     for key, value in load_data(st.session_state["path"], current_chat).items():
@@ -127,27 +85,29 @@ if ("history" + current_chat not in st.session_state) or (st.session_state['if_c
 
 
 # 一键复制按钮
-st.markdown('<center><a href="https://huggingface.co/spaces/Pearx/ChatGPT-Assistant?duplicate=true">'
-            '<img src="https://bit.ly/3gLdBN6" alt="Duplicate Space"></a><center>', unsafe_allow_html=True)
+st.markdown('<center>< a href="https://huggingface.co/spaces/Pearx/ChatGPT-Assistant?duplicate=true">'
+            '<img src="https://bit.ly/3gLdBN6" alt="Duplicate Space"></ a><center>', unsafe_allow_html=True)
 # 对话展示
 show_messages(st.session_state["history" + current_chat])
 
 
 # 数据写入文件
 def write_data(new_chat_name=current_chat):
-    st.session_state["paras"] = {
-        "temperature": st.session_state["temperature" + current_chat],
-        "top_p": st.session_state["top_p" + current_chat],
-        "presence_penalty": st.session_state["presence_penalty" + current_chat],
-        "frequency_penalty": st.session_state["frequency_penalty" + current_chat],
-    }
-    st.session_state["contexts"] = {
-        "context_select": st.session_state["context_select" + current_chat],
-        "context_input": st.session_state["context_input" + current_chat],
-        "context_level": st.session_state["context_level" + current_chat],
-    }
-    save_data(st.session_state["path"], new_chat_name, st.session_state["history" + current_chat],
-              st.session_state["paras"], st.session_state["contexts"])
+    # 防止高频创建时组件尚未渲染完成，不影响正常写入
+    if "frequency_penalty" + current_chat in st.session_state:
+        st.session_state["paras"] = {
+            "temperature": st.session_state["temperature" + current_chat],
+            "top_p": st.session_state["top_p" + current_chat],
+            "presence_penalty": st.session_state["presence_penalty" + current_chat],
+            "frequency_penalty": st.session_state["frequency_penalty" + current_chat],
+        }
+        st.session_state["contexts"] = {
+            "context_select": st.session_state["context_select" + current_chat],
+            "context_input": st.session_state["context_input" + current_chat],
+            "context_level": st.session_state["context_level" + current_chat],
+        }
+        save_data(st.session_state["path"], new_chat_name, st.session_state["history" + current_chat],
+                  st.session_state["paras"], st.session_state["contexts"])
 
 
 # 输入内容展示
@@ -159,7 +119,6 @@ area_gpt_content = st.empty()
 # 报错展示
 area_error = st.empty()
 
-st.write("\n")
 st.header('ChatGPT Assistant')
 tap_input, tap_context, tap_set = st.tabs(['💬 聊天', '🗒️ 预设', '⚙️ 设置'])
 
@@ -169,23 +128,27 @@ with tap_context:
     st.selectbox(label='选择上下文', options=set_context_list, key='context_select' + current_chat,
                  index=context_select_index, on_change=write_data)
     st.caption(set_context_all[st.session_state['context_select' + current_chat]])
-    st.text_area(label='补充或自定义上下文：', key="context_input" + current_chat,
-                 value=st.session_state['context_input' + current_chat + "default"],
-                 on_change=write_data)
+    context_input = st.text_area(label='补充或自定义上下文：', key="context_input" + current_chat,
+                                 value=st.session_state['context_input' + current_chat + "default"],
+                                 on_change=write_data)
+    st.caption(context_input)
 
 with tap_set:
     def clear_button_callback():
         st.session_state['history' + current_chat] = copy.deepcopy(initial_content_history)
         write_data()
 
+
     st.button("清空聊天记录", use_container_width=True, on_click=clear_button_callback)
 
     st.markdown("OpenAI API Key (可选)")
     st.text_input("OpenAI API Key (可选)", type='password', key='apikey_input', label_visibility='collapsed')
-    st.caption("此Key仅在当前网页有效，且优先级高于Secrets中的配置，仅自己可用，他人无法共享。[官网获取](https://platform.openai.com/account/api-keys)")
+    st.caption(
+        "此Key仅在当前网页有效，且优先级高于Secrets中的配置，仅自己可用，他人无法共享。[官网获取](https://platform.openai.com/account/api-keys)")
 
     st.markdown("包含对话次数：")
-    st.slider("Context Level", 0, 10, st.session_state['context_level' + current_chat + "default"], 1, on_change=write_data,
+    st.slider("Context Level", 0, 10, st.session_state['context_level' + current_chat + "default"], 1,
+              on_change=write_data,
               key='context_level' + current_chat, help="表示每次会话中包含的历史对话次数，预设内容不计算在内。")
 
     st.markdown("模型参数：")
@@ -208,57 +171,34 @@ with tap_set:
     st.caption("[官网参数说明](https://platform.openai.com/docs/api-reference/completions/create)")
 
 with tap_input:
-    def get_history_input(history, level):
-        df_history = pd.DataFrame(history)
-        df_system = df_history.query('role=="system"')
-        df_input = df_history.query('role!="system"')
-        df_input = df_input[-level * 2:]
-        res = pd.concat([df_system, df_input], ignore_index=True).to_dict('records')
-        return res
-
-
-    def remove_hashtag_space(text):
-        res = re.sub(r"(#+)\s*", r"\1", text)
-        return res
-
-
-    def extract_chars(text, num):
-        char_num = 0
-        chars = ''
-        for char in text:
-            # 汉字算两个字符
-            if '\u4e00' <= char <= '\u9fff':
-                char_num += 2
-            else:
-                char_num += 1
-            chars += char
-            if char_num >= num:
-                break
-        return chars
-
-
-    def user_input_area_callback():
-        # 清空输入框
-        st.session_state['user_input_content'] = (remove_hashtag_space(st.session_state['user_input_area'])
-                                                  .replace('\n', '\n\n'))
-        st.session_state['user_input_area'] = ''
-
-        # 修改窗口名称
-        user_input_content = st.session_state['user_input_content']
-        df_history = pd.DataFrame(st.session_state["history" + current_chat])
-        if len(df_history.query('role!="system"')) == 0:
-            remove_data(st.session_state["path"], current_chat)
-            current_chat_index = st.session_state['history_chats'].index(current_chat)
-            new_name = extract_chars(user_input_content, 18) + '_' + str(uuid.uuid4())
-            st.session_state['history_chats'][current_chat_index] = new_name
-            st.session_state["current_chat_index"] = current_chat_index
-            # 写入新文件
-            write_data(new_name)
-
-
-    st.text_area("**输入：**", key="user_input_area", on_change=user_input_area_callback)
-    if st.session_state['user_input_content'].strip() != '':
-        st.session_state['pre_user_input_content'] = st.session_state['user_input_content']
+    def input_callback():
+        if st.session_state['user_input_area'] != "":
+            # 修改窗口名称
+            user_input_content = st.session_state['user_input_area']
+            df_history = pd.DataFrame(st.session_state["history" + current_chat])
+            if len(df_history.query('role!="system"')) == 0:
+                remove_data(st.session_state["path"], current_chat)
+                current_chat_index = st.session_state['history_chats'].index(current_chat)
+                new_name = extract_chars(user_input_content, 18) + '_' + str(uuid.uuid4())
+                st.session_state['history_chats'][current_chat_index] = new_name
+                st.session_state["current_chat_index"] = current_chat_index
+                # 写入新文件
+                write_data(new_name)
+
+
+
+    with st.form("input_form", clear_on_submit=True):
+        user_input = st.text_area("**输入：**", key="user_input_area")
+        submitted = st.form_submit_button("确认提交", use_container_width=True, on_click=input_callback)
+    if submitted:
+        st.session_state['user_input_content'] = user_input
+
+    if st.session_state['user_input_content'] != '':
+        if 'r' in st.session_state:
+            st.session_state.pop("r")
+            st.session_state[current_chat + 'report'] = ""
+        st.session_state['pre_user_input_content'] = (remove_hashtag_right__space(st.session_state['user_input_content']
+                                                                                  .replace('\n', '\n\n')))
         st.session_state['user_input_content'] = ''
         show_each_message(st.session_state['pre_user_input_content'], 'user',
                           [area_user_svg.markdown, area_user_content.markdown])
@@ -328,4 +268,7 @@ if ("r" in st.session_state) and (current_chat == st.session_state["chat_of_r"])
     if current_chat + 'report' in st.session_state:
         st.session_state.pop(current_chat + 'report')
     if 'r' in st.session_state:
-        st.session_state.pop("r")
+        st.session_state.pop("r")
+
+# 添加事件监听
+v1.html(js_code, height=0)