Update app.py

app.py

@@ -6,7 +6,6 @@ import pandas as pd
 import openai
 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='🤖')
 # 自定义元素样式
@@ -14,11 +13,9 @@ st.markdown(css_code, unsafe_allow_html=True)
 
 if "initial_settings" not in st.session_state:
     # 历史聊天窗口
-    st.session_state["path"] = set_chats_path()
+    st.session_state["path"] = 'history_chats_file'
     st.session_state['history_chats'] = get_history_chats(st.session_state["path"])
     # ss参数初始化
-    st.session_state['pre_chat'] = None
-    st.session_state['if_chat_change'] = False
     st.session_state['error_info'] = ''
     st.session_state["current_chat_index"] = 0
     st.session_state['user_input_content'] = ''
@@ -36,9 +33,6 @@ with st.sidebar:
         key='current_chat' + st.session_state['history_chats'][st.session_state["current_chat_index"]],
         # on_change=current_chat_callback  # 此处不适合用回调，无法识别到窗口增减的变动
     )
-    if st.session_state['pre_chat'] != current_chat:
-        st.session_state['pre_chat'] = current_chat
-        st.session_state['if_chat_change'] = True
     st.write("---")
 
     c1, c2 = st.columns(2)
@@ -54,7 +48,6 @@ with st.sidebar:
         if len(st.session_state['history_chats']) == 1:
             chat_init = 'New Chat_' + str(uuid.uuid4())
             st.session_state['history_chats'].append(chat_init)
-            st.session_state['current_chat'] = chat_init
         pre_chat_index = st.session_state['history_chats'].index(current_chat)
         if pre_chat_index > 0:
             st.session_state["current_chat_index"] = st.session_state['history_chats'].index(current_chat) - 1
@@ -73,28 +66,27 @@ with st.sidebar:
     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']):
+if "history" + current_chat not in st.session_state:
     for key, value in load_data(st.session_state["path"], current_chat).items():
         if key == 'history':
             st.session_state[key + current_chat] = value
         else:
             for k, v in value.items():
-                st.session_state[k + current_chat + 'default'] = v
-    st.session_state['if_chat_change'] = False
-
+                st.session_state[k + current_chat + "value"] = v
 
 # 一键复制按钮
 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):
-    # 防止高频创建时组件尚未渲染完成，不影响正常写入
-    if "frequency_penalty" + current_chat in st.session_state:
+    if "apikey" in st.secrets:
         st.session_state["paras"] = {
             "temperature": st.session_state["temperature" + current_chat],
             "top_p": st.session_state["top_p" + current_chat],
@@ -110,6 +102,13 @@ def write_data(new_chat_name=current_chat):
                   st.session_state["paras"], st.session_state["contexts"])
 
 
+def callback_fun(arg):
+    # 连续快速点击新建与删除会触发错误回调，增加判断
+    if ("history" + current_chat in st.session_state) and ("frequency_penalty" + current_chat in st.session_state):
+        write_data()
+        st.session_state[arg + current_chat + "value"] = st.session_state[arg + current_chat]
+
+
 # 输入内容展示
 area_user_svg = st.empty()
 area_user_content = st.empty()
@@ -119,19 +118,27 @@ area_gpt_content = st.empty()
 # 报错展示
 area_error = st.empty()
 
+st.write("\n")
+st.write("\n")
 st.header('ChatGPT Assistant')
 tap_input, tap_context, tap_set = st.tabs(['💬 聊天', '🗒️ 预设', '⚙️ 设置'])
 
 with tap_context:
     set_context_list = list(set_context_all.keys())
-    context_select_index = set_context_list.index(st.session_state['context_select' + current_chat + "default"])
-    st.selectbox(label='选择上下文', options=set_context_list, key='context_select' + current_chat,
-                 index=context_select_index, on_change=write_data)
+    context_select_index = set_context_list.index(st.session_state['context_select' + current_chat + "value"])
+    st.selectbox(
+        label='选择上下文',
+        options=set_context_list,
+        key='context_select' + current_chat,
+        index=context_select_index,
+        on_change=callback_fun,
+        args=("context_select",))
     st.caption(set_context_all[st.session_state['context_select' + current_chat]])
-    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)
+
+    st.text_area(
+        label='补充或自定义上下文：', key="context_input" + current_chat,
+        value=st.session_state['context_input' + current_chat + "value"],
+        on_change=callback_fun, args=("context_input",))
 
 with tap_set:
     def clear_button_callback():
@@ -139,7 +146,17 @@ with tap_set:
         write_data()
 
 
-    st.button("清空聊天记录", use_container_width=True, on_click=clear_button_callback)
+    c1, c2 = st.columns(2)
+    with c1:
+        st.button("清空聊天记录", use_container_width=True, on_click=clear_button_callback)
+    with c2:
+        btn = st.download_button(
+            label="导出聊天记录",
+            data=download_history(st.session_state['history' + current_chat]),
+            file_name=f'{current_chat.split("_")[0]}.md',
+            mime="text/markdown",
+            use_container_width=True
+        )
 
     st.markdown("OpenAI API Key (可选)")
     st.text_input("OpenAI API Key (可选)", type='password', key='apikey_input', label_visibility='collapsed')
@@ -147,27 +164,30 @@ with tap_set:
         "此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,
-              key='context_level' + current_chat, help="表示每次会话中包含的历史对话次数，预设内容不计算在内。")
+    st.slider(
+        "Context Level", 0, 10,
+        st.session_state['context_level' + current_chat + "value"], 1,
+        on_change=callback_fun,
+        key='context_level' + current_chat, args=('context_level',),
+        help="表示每次会话中包含的历史对话次数，预设内容不计算在内。")
 
     st.markdown("模型参数：")
-    st.slider("Temperature", 0.0, 2.0, st.session_state["temperature" + current_chat + "default"], 0.1,
+    st.slider("Temperature", 0.0, 2.0, st.session_state["temperature" + current_chat + "value"], 0.1,
               help="""在0和2之间，应该使用什么样的采样温度？较高的值（如0.8）会使输出更随机，而较低的值（如0.2）则会使其更加集中和确定性。
-              我们一般建议只更改这个参数或top_p参数中的一个，而不要同时更改两个。""",
-              on_change=write_data, key='temperature' + current_chat)
-    st.slider("Top P", 0.1, 1.0, st.session_state["top_p" + current_chat + "default"], 0.1,
+          我们一般建议只更改这个参数或top_p参数中的一个，而不要同时更改两个。""",
+              on_change=callback_fun, key='temperature' + current_chat, args=('temperature',))
+    st.slider("Top P", 0.1, 1.0, st.session_state["top_p" + current_chat + "value"], 0.1,
               help="""一种替代采用温度进行采样的方法，称为“基于核心概率”的采样。在该方法中，模型会考虑概率最高的top_p个标记的预测结果。
-              因此，当该参数为0.1时，只有包括前10%概率质量的标记将被考虑。我们一般建议只更改这个参数或采样温度参数中的一个，而不要同时更改两个。""",
-              on_change=write_data, key='top_p' + current_chat)
+          因此，当该参数为0.1时，只有包括前10%概率质量的标记将被考虑。我们一般建议只更改这个参数或采样温度参数中的一个，而不要同时更改两个。""",
+              on_change=callback_fun, key='top_p' + current_chat, args=('top_p',))
     st.slider("Presence Penalty", -2.0, 2.0,
-              st.session_state["presence_penalty" + current_chat + "default"], 0.1,
+              st.session_state["presence_penalty" + current_chat + "value"], 0.1,
               help="""该参数的取值范围为-2.0到2.0。正值会根据新标记是否出现在当前生成的文本中对其进行惩罚，从而增加模型谈论新话题的可能性。""",
-              on_change=write_data, key='presence_penalty' + current_chat)
+              on_change=callback_fun, key='presence_penalty' + current_chat, args=('presence_penalty',))
     st.slider("Frequency Penalty", -2.0, 2.0,
-              st.session_state["frequency_penalty" + current_chat + "default"], 0.1,
+              st.session_state["frequency_penalty" + current_chat + "value"], 0.1,
               help="""该参数的取值范围为-2.0到2.0。正值会根据新标记在当前生成的文本中的已有频率对其进行惩罚，从而减少模型直接重复相同语句的可能性。""",
-              on_change=write_data, key='frequency_penalty' + current_chat)
+              on_change=callback_fun, key='frequency_penalty' + current_chat, args=('frequency_penalty',))
     st.caption("[官网参数说明](https://platform.openai.com/docs/api-reference/completions/create)")
 
 with tap_input:
@@ -177,14 +197,18 @@ with tap_input:
             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())
+                new_name = filename_correction(new_name)
                 st.session_state['history_chats'][current_chat_index] = new_name
                 st.session_state["current_chat_index"] = current_chat_index
                 # 写入新文件
                 write_data(new_name)
-
+                # 转移数据
+                st.session_state['history' + new_name] = st.session_state['history' + current_chat]
+                for item in ["context_select", "context_input", "context_level", *initial_content_all['paras']]:
+                    st.session_state[item + new_name + "value"] = st.session_state[item + current_chat + "value"]
+                remove_data(st.session_state["path"], current_chat)
 
 
     with st.form("input_form", clear_on_submit=True):
@@ -197,19 +221,22 @@ with tap_input:
         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['pre_user_input_content'] = url_correction(
+            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])
+
         context_level_tem = st.session_state['context_level' + current_chat]
-        history_tem = get_history_input(st.session_state["history" + current_chat], context_level_tem) + \
-                      [{"role": "user", "content": st.session_state['pre_user_input_content']}]
-        history_need_input = ([{"role": "system",
-                                "content": set_context_all[st.session_state['context_select' + current_chat]]}]
-                              + [{"role": "system",
-                                  "content": st.session_state['context_input' + current_chat]}]
-                              + history_tem)
+        history_need_input = (get_history_input(st.session_state["history" + current_chat], context_level_tem) +
+                              [{"role": "user", "content": st.session_state['pre_user_input_content']}])
+        for ctx in [st.session_state['context_input' + current_chat],
+                    set_context_all[st.session_state['context_select' + current_chat]]]:
+            if ctx != "":
+                history_need_input = [{"role": "system", "content": ctx}] + history_need_input
+
         paras_need_input = {
             "temperature": st.session_state["temperature" + current_chat],
             "top_p": st.session_state["top_p" + current_chat],
@@ -222,7 +249,7 @@ with tap_input:
                     openai.api_key = apikey
                 else:
                     openai.api_key = st.secrets["apikey"]
-                r = openai.ChatCompletion.create(model="gpt-3.5-turbo", messages=history_need_input, stream=True,
+                r = openai.ChatCompletion.create(model=model, messages=history_need_input, stream=True,
                                                  **paras_need_input)
             except (FileNotFoundError, KeyError):
                 area_error.error("缺失 OpenAI API Key，请在复制项目后配置Secrets，或者在设置中进行临时配置。"
@@ -261,7 +288,7 @@ if ("r" in st.session_state) and (current_chat == st.session_state["chat_of_r"])
         st.session_state["history" + current_chat].append(
             {"role": "user", "content": st.session_state['pre_user_input_content']})
         st.session_state["history" + current_chat].append(
-            {"role": "assistant", "content": st.session_state[current_chat + 'report']})
+            {"role": "assistant", "content": url_correction(st.session_state[current_chat + 'report'])})
         write_data()
 
     # 用户在网页点击stop时，ss某些情形下会暂时为空
@@ -269,6 +296,7 @@ if ("r" in st.session_state) and (current_chat == st.session_state["chat_of_r"])
         st.session_state.pop(current_chat + 'report')
     if 'r' in st.session_state:
         st.session_state.pop("r")
+        st.experimental_rerun()
 
 # 添加事件监听
 v1.html(js_code, height=0)