upgrade gradio

main.py

@@ -34,7 +34,7 @@ def encode_plugin_info(k, plugin)->str:
 
 def main():
     import gradio as gr
-    if gr.__version__ not in ['3.32.9', '3.32.10', '3.32.11']:
+    if gr.__version__ not in ['3.32.12']:
         raise ModuleNotFoundError("使用项目内置Gradio获取最优体验! 请运行 `pip install -r requirements.txt` 指令安装内置Gradio及其他依赖, 详情信息见requirements.txt.")
 
     # 一些基础工具
@@ -57,7 +57,7 @@ def main():
     # 如果WEB_PORT是-1, 则随机选取WEB端口
     PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT
     from check_proxy import get_current_version
-    from themes.theme import adjust_theme, advanced_css, theme_declaration, js_code_clear, js_code_reset, js_code_show_or_hide, js_code_show_or_hide_group2
+    from themes.theme import adjust_theme, advanced_css, theme_declaration, js_code_clear, js_code_show_or_hide, js_code_show_or_hide_group2
     from themes.theme import js_code_for_toggle_darkmode, js_code_for_persistent_cookie_init
     from themes.theme import load_dynamic_theme, to_cookie_str, from_cookie_str, assign_user_uuid
     title_html = f"<h1 align=\"center\">GPT 学术优化 {get_current_version()}</h1>{theme_declaration}"
@@ -106,7 +106,7 @@ def main():
             with gr_L2(scale=2, elem_id="gpt-chat"):
                 chatbot = gr.Chatbot(label=f"当前模型：{LLM_MODEL}", elem_id="gpt-chatbot")
                 if LAYOUT == "TOP-DOWN":  chatbot.style(height=CHATBOT_HEIGHT)
-                history, history_cache, history_cache_update = make_history_cache() # 定义 后端state（history）、前端（history_cache）、后端setter（history_cache_update）三兄弟
+                history, _, _ = make_history_cache() # 定义 后端state（history）、前端（history_cache）、后端setter（history_cache_update）三兄弟
             with gr_L2(scale=1, elem_id="gpt-panel"):
                 with gr.Accordion("输入区", open=True, elem_id="input-panel") as area_input_primary:
                     with gr.Row():
@@ -174,6 +174,7 @@ def main():
                         with gr.Accordion("点击展开“文件下载区”。", open=False) as area_file_up:
                             file_upload = gr.Files(label="任何文件, 推荐上传压缩文件(zip, tar)", file_count="multiple", elem_id="elem_upload")
 
+
         # 左上角工具栏定义
         from themes.gui_toolbar import define_gui_toolbar
         checkboxes, checkboxes_2, max_length_sl, theme_dropdown, system_prompt, file_upload_2, md_dropdown, top_p, temperature = \
@@ -184,6 +185,9 @@ def main():
         area_input_secondary, txt2, area_customize, _, resetBtn2, clearBtn2, stopBtn2 = \
             define_gui_floating_menu(customize_btns, functional, predefined_btns, cookies, web_cookie_cache)
         
+        # 浮动时间线定义
+        gr.Spark(label="", value="")
+
         # 插件二级菜单的实现
         from themes.gui_advanced_plugin_class import define_gui_advanced_plugin_class
         new_plugin_callback, route_switchy_bt_with_arg, usr_confirmed_arg = \
@@ -222,11 +226,11 @@ def main():
         multiplex_sel.select(
             None, [multiplex_sel], None, _js=f"""(multiplex_sel)=>run_multiplex_shift(multiplex_sel)""")
         cancel_handles.append(submit_btn.click(**predict_args))
-        resetBtn.click(None, None, [chatbot, history, status], _js=js_code_reset)   # 先在前端快速清除chatbot&status
+        resetBtn.click(None, None, [chatbot, history, status], _js="""(a,b,c)=>clear_conversation(a,b,c)""")   # 先在前端快速清除chatbot&status
-        resetBtn2.click(None, None, [chatbot, history, status], _js=js_code_reset)  # 先在前端快速清除chatbot&status
+        resetBtn2.click(None, None, [chatbot, history, status], _js="""(a,b,c)=>clear_conversation(a,b,c)""")  # 先在前端快速清除chatbot&status
-        reset_server_side_args = (lambda history: ([], [], "已重置", json.dumps(history)), [history], [chatbot, history, status, history_cache])
+        # reset_server_side_args = (lambda history: ([], [], "已重置"), [history], [chatbot, history, status])
-        resetBtn.click(*reset_server_side_args)    # 再在后端清除history，把history转存history_cache备用
+        # resetBtn.click(*reset_server_side_args)    # 再在后端清除history
-        resetBtn2.click(*reset_server_side_args)   # 再在后端清除history，把history转存history_cache备用
+        # resetBtn2.click(*reset_server_side_args)   # 再在后端清除history
         clearBtn.click(None, None, [txt, txt2], _js=js_code_clear)
         clearBtn2.click(None, None, [txt, txt2], _js=js_code_clear)
         if AUTO_CLEAR_TXT:

shared_utils/cookie_manager.py

@@ -77,16 +77,28 @@ def make_history_cache():
     # 定义 后端state（history）、前端（history_cache）、后端setter（history_cache_update）三兄弟
     import gradio as gr
     # 定义history的后端state
-    history = gr.State([])
+    # history = gr.State([])
-    # 定义history的一个孪生的前端存储区（隐藏）
+    history = gr.Textbox(visible=False, elem_id="history-ng")
-    history_cache = gr.Textbox(visible=False, elem_id="history_cache")
+    # # 定义history的一个孪生的前端存储区（隐藏）
-    # 定义history_cache->history的更新方法（隐藏）。在触发这个按钮时，会先执行js代码更新history_cache，然后再执行python代码更新history
+    # history_cache = gr.Textbox(visible=False, elem_id="history_cache")
-    def process_history_cache(history_cache):
+    # # 定义history_cache->history的更新方法（隐藏）。在触发这个按钮时，会先执行js代码更新history_cache，然后再执行python代码更新history
-        return json.loads(history_cache)
+    # def process_history_cache(history_cache):
-    # 另一种更简单的setter方法
+    #     return json.loads(history_cache)
-    history_cache_update = gr.Button("", elem_id="elem_update_history", visible=False).click(
+    # # 另一种更简单的setter方法
-        process_history_cache, inputs=[history_cache], outputs=[history])
+    # history_cache_update = gr.Button("", elem_id="elem_update_history", visible=False).click(
-    return history, history_cache, history_cache_update
+    #     process_history_cache, inputs=[history_cache], outputs=[history])
+    # # save history to history_cache
+    # def process_history_cache(history_cache):
+    #     return json.dumps(history_cache)
+    # # 定义history->history_cache的更新方法（隐藏）
+    # def sync_history_cache(history):
+    #     print("sync_history_cache", history)
+    #     return json.dumps(history)
+    # # history.change(sync_history_cache, inputs=[history], outputs=[history_cache])
+
+    # # history_cache_sync = gr.Button("", elem_id="elem_sync_history", visible=False).click(
+    # #     lambda history: (json.dumps(history)), inputs=[history_cache], outputs=[history])
+    return history, None, None
 
 
 

themes/common.js

@@ -391,6 +391,8 @@ function chatbotContentChanged(attempt = 1, force = false) {
 
                 // Now pass both the message element and the is_last_in_arr boolean to addCopyButton
                 addCopyButton(message, index, is_last_in_arr);
+
+                save_conversation_history();
             });
             // gradioApp().querySelectorAll('#gpt-chatbot .message-wrap .message.bot').forEach(addCopyButton);
         }, i === 0 ? 0 : 200);
@@ -854,8 +856,7 @@ function limit_scroll_position() {
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 function loadLive2D() {
-    if (document.querySelector(".waifu") )
+    if (document.querySelector(".waifu")) {
-    {
         $('.waifu').show();
     } else {
         try {
@@ -937,22 +938,140 @@ function gpt_academic_gradio_saveload(
     }
 }
 
+function update_conversation_metadata() {
+    // Create a conversation UUID and timestamp
+    const conversationId = crypto.randomUUID();
+    const timestamp = new Date().toISOString();
+    const conversationData = {
+        id: conversationId,
+        timestamp: timestamp
+    };
+    // Save to cookie
+    setCookie("conversation_metadata", JSON.stringify(conversationData), 2);
+    // read from cookie
+    let conversation_metadata = getCookie("conversation_metadata");
+    console.log("conversation_metadata", conversation_metadata);
+}
+
+// // Example schema for conversation data structure
+// const example_conversation = {
+//     metadata: {
+//         id: "550e8400-e29b-41d4-a716-446655440000", 
+//         timestamp: "2024-03-29T12:34:56.789Z"
+//     },
+//     conversation: [
+//         ["user", "Hello, how are you?"],
+//         ["assistant", "I'm doing well, thank you for asking! How can I help you today?"],
+//         ["user", "What is the weather like?"],
+//         ["assistant", "I don't have access to real-time weather information. You would need to check a weather service or look outside to know the current weather conditions."]
+//     ],
+//     preview: "A conversation about greetings and weather"
+// }
+
+// Helper function to generate conversation preview
+function generatePreview(conversation, maxLength = 100) {
+    if (!conversation || conversation.length === 0) return "";
+    // Join all messages with dash separator
+    const preview = conversation.join("\n");
+    if (preview.length <= maxLength) return preview;
+    return preview.substring(0, maxLength) + "...";
+}
+
+async function save_conversation_history() {
+    // 505030475
+    let chatbot = await get_data_from_gradio_component('gpt-chatbot');
+    let history = await get_data_from_gradio_component('history-ng');
+    let conversation_metadata = getCookie("conversation_metadata");
+    conversation_metadata = JSON.parse(conversation_metadata);
+    // console.log("conversation_metadata", conversation_metadata);
+    let conversation = {
+        timestamp: conversation_metadata.timestamp,
+        id: conversation_metadata.id,
+        metadata: conversation_metadata,
+        conversation: chatbot,
+        history: history,
+        preview: generatePreview(JSON.parse(history))
+    };
+
+    // Get existing conversation history from local storage
+    let conversation_history = [];
+    try {
+        const stored = localStorage.getItem('conversation_history');
+        if (stored) {
+            conversation_history = JSON.parse(stored);
+        }
+    } catch (e) {
+        // console.error('Error reading conversation history from localStorage:', e);
+    }
+
+    // Find existing conversation with same ID
+    const existingIndex = conversation_history.findIndex(c => c.id === conversation.id);
+
+    if (existingIndex >= 0) {
+        // Update existing conversation
+        conversation_history[existingIndex] = conversation;
+    } else {
+        // Add new conversation
+        conversation_history.push(conversation);
+    }
+
+    // Sort conversations by timestamp, newest first
+    conversation_history.sort((a, b) => {
+        const timeA = new Date(a.timestamp).getTime();
+        const timeB = new Date(b.timestamp).getTime();
+        return timeB - timeA;
+    });
+
+    // Save back to local storage
+    try {
+        localStorage.setItem('conversation_history', JSON.stringify(conversation_history));
+        const LOCAL_STORAGE_UPDATED = "gptac_conversation_history_updated";
+        window.dispatchEvent(
+            new CustomEvent(LOCAL_STORAGE_UPDATED, {
+                detail: conversation_history
+            })
+        );
+    } catch (e) {
+        console.error('Error saving conversation history to localStorage:', e);
+    }
+}
+
+function restore_chat_from_local_storage(event) {
+    let conversation = event.detail;
+    push_data_to_gradio_component(conversation.conversation, "gpt-chatbot", "obj");
+    push_data_to_gradio_component(conversation.history, "history-ng", "obj");
+    console.log("restore_chat_from_local_storage", conversation);
+}
+
+
+function clear_conversation(a, b, c) {
+    update_conversation_metadata();
+    let stopButton = document.getElementById("elem_stop");
+    stopButton.click();
+    // console.log("clear_conversation");
+    return reset_conversation(a, b);
+}
 
 function reset_conversation(a, b) {
     // console.log("js_code_reset");
     a = btoa(unescape(encodeURIComponent(JSON.stringify(a))));
     setCookie("js_previous_chat_cookie", a, 1);
+    b = btoa(unescape(encodeURIComponent(JSON.stringify(b))));
+    setCookie("js_previous_history_cookie", b, 1);
     gen_restore_btn();
     return [[], [], "已重置"];
 }
 
 // clear -> 将 history 缓存至 history_cache -> 点击复原 -> restore_previous_chat() -> 触发elem_update_history -> 读取 history_cache
 function restore_previous_chat() {
-    console.log("restore_previous_chat");
+    // console.log("restore_previous_chat");
     let chat = getCookie("js_previous_chat_cookie");
     chat = JSON.parse(decodeURIComponent(escape(atob(chat))));
     push_data_to_gradio_component(chat, "gpt-chatbot", "obj");
-    document.querySelector("#elem_update_history").click(); // in order to call set_history_gr_state, and send history state to server
+    let history = getCookie("js_previous_history_cookie");
+    history = JSON.parse(decodeURIComponent(escape(atob(history))));
+    push_data_to_gradio_component(history, "history-ng", "obj");
+    // document.querySelector("#elem_update_history").click(); // in order to call set_history_gr_state, and send history state to server
 }
 
 function gen_restore_btn() {
@@ -1010,8 +1129,7 @@ function gen_restore_btn() {
     `;
 
     // only add when not exist
-    if (!document.getElementById('recvButtonStyle'))
+    if (!document.getElementById('recvButtonStyle')) {
-    {
         document.head.appendChild(styleSheet);
     }
 
@@ -1033,8 +1151,7 @@ function gen_restore_btn() {
         document.body.removeChild(this);
     });
     // only add when not exist
-    if (!document.getElementById('recvButton'))
+    if (!document.getElementById('recvButton')) {
-    {
         document.body.appendChild(button);
     }
 
@@ -1043,7 +1160,7 @@ function gen_restore_btn() {
 }
 
 async function on_plugin_exe_complete(fn_name) {
-    console.log(fn_name);
+    // console.log(fn_name);
     if (fn_name === "保存当前的对话") {
         // get chat profile path
         let chatbot = await get_data_from_gradio_component('gpt-chatbot');
@@ -1237,11 +1354,9 @@ function register_plugin_init(key, base64String){
     // console.log('x')
     const stringData = atob(base64String);
     let guiJsonData = JSON.parse(stringData);
-    if (key in plugin_init_info_lib)
+    if (key in plugin_init_info_lib) {
-    {
     }
-    else
+    else {
-    {
         plugin_init_info_lib[key] = {};
     }
     plugin_init_info_lib[key].info = guiJsonData.Info;
@@ -1252,11 +1367,9 @@ function register_plugin_init(key, base64String){
     plugin_init_info_lib[key].arg_reminder = guiJsonData.ArgsReminder;
 }
 function register_advanced_plugin_init_code(key, code) {
-    if (key in plugin_init_info_lib)
+    if (key in plugin_init_info_lib) {
-    {
     }
-    else
+    else {
-    {
         plugin_init_info_lib[key] = {};
     }
     plugin_init_info_lib[key].secondary_menu_code = code;

themes/gui_floating_menu.py

@@ -1,7 +1,7 @@
 import gradio as gr
 
 def define_gui_floating_menu(customize_btns, functional, predefined_btns, cookies, web_cookie_cache):
-    with gr.Floating(init_x="20%", init_y="50%", visible=False, width="40%", drag="top") as area_input_secondary:
+    with gr.Floating(init_x="20%", init_y="50%", visible=False, width="40%", drag="top", elem_id="f_area_input_secondary") as area_input_secondary:
         with gr.Accordion("浮动输入区", open=True, elem_id="input-panel2"):
             with gr.Row() as row:
                 row.style(equal_height=True)
@@ -17,7 +17,7 @@ def define_gui_floating_menu(customize_btns, functional, predefined_btns, cookie
                     clearBtn2 = gr.Button("清除", elem_id="elem_clear2", variant="secondary", visible=False); clearBtn2.style(size="sm")
 
 
-    with gr.Floating(init_x="20%", init_y="50%", visible=False, width="40%", drag="top") as area_customize:
+    with gr.Floating(init_x="20%", init_y="50%", visible=False, width="40%", drag="top", elem_id="f_area_customize") as area_customize:
         with gr.Accordion("自定义菜单", open=True, elem_id="edit-panel"):
             with gr.Row() as row:
                 with gr.Column(scale=10):

themes/init.js

@@ -3,6 +3,8 @@ async function GptAcademicJavaScriptInit(dark, prompt, live2d, layout, tts) {
     audio_fn_init();
     minor_ui_adjustment();
     ButtonWithDropdown_init();
+    update_conversation_metadata();
+    window.addEventListener("gptac_restore_chat_from_local_storage", restore_chat_from_local_storage);
     
     // 加载欢迎页面
     const welcomeMessage = new WelcomeMessage();

themes/theme.py

@@ -92,15 +92,6 @@ js_code_for_persistent_cookie_init = """(web_cookie_cache, cookie) => {
 }
 """
 
-# 详见 themes/common.js
-js_code_reset = """
-(a,b,c)=>{
-    let stopButton = document.getElementById("elem_stop");
-    stopButton.click();
-    return reset_conversation(a,b);
-}
-"""
-
 
 js_code_clear = """
 (a,b)=>{

themes/welcome.js

@@ -193,7 +193,7 @@ class WelcomeMessage {
     async update() {
         // console.log('update')
         var page_width = document.documentElement.clientWidth;
-        const width_to_hide_welcome = 1200;
+        const width_to_hide_welcome = 1000;
         if (!await this.isChatbotEmpty() || page_width < width_to_hide_welcome) {
             if (this.visible) {
                 this.removeWelcome();

toolbox.py

@@ -8,6 +8,7 @@ import base64
 import gradio
 import shutil
 import glob
+import json
 import uuid
 from loguru import logger
 from functools import wraps
@@ -92,8 +93,9 @@ def ArgsGeneralWrapper(f):
     """
     def decorated(request: gradio.Request, cookies:dict, max_length:int, llm_model:str,
                   txt:str, txt2:str, top_p:float, temperature:float, chatbot:list,
-                  history:list, system_prompt:str, plugin_advanced_arg:dict, *args):
+                  json_history:str, system_prompt:str, plugin_advanced_arg:dict, *args):
         txt_passon = txt
+        history = json.loads(json_history) if json_history else []
         if txt == "" and txt2 != "": txt_passon = txt2
         # 引入一个有cookie的chatbot
         if request.username is not None:
@@ -148,10 +150,11 @@ def ArgsGeneralWrapper(f):
     return decorated
 
 
-def update_ui(chatbot:ChatBotWithCookies, history, msg="正常", **kwargs):  # 刷新界面
+def update_ui(chatbot:ChatBotWithCookies, history:list, msg:str="正常", **kwargs):  # 刷新界面
     """
     刷新用户界面
     """
+    assert isinstance(history, list), "history必须是一个list"
     assert isinstance(
         chatbot, ChatBotWithCookies
     ), "在传递chatbot的过程中不要将其丢弃。必要时, 可用clear将其清空, 然后用for+append循环重新赋值。"
@@ -175,10 +178,11 @@ def update_ui(chatbot:ChatBotWithCookies, history, msg="正常", **kwargs):  #
     else:
         chatbot_gr = chatbot
 
-    yield cookies, chatbot_gr, history, msg
+    json_history = json.dumps(history, ensure_ascii=False)
+    yield cookies, chatbot_gr, json_history, msg
 
 
-def update_ui_lastest_msg(lastmsg:str, chatbot:ChatBotWithCookies, history:list, delay=1, msg="正常"):  # 刷新界面
+def update_ui_lastest_msg(lastmsg:str, chatbot:ChatBotWithCookies, history:list, delay:float=1, msg:str="正常"):  # 刷新界面
     """
     刷新用户界面
     """