diff --git a/main.py b/main.py index 39ad9aeb..98f0a545 100644 --- a/main.py +++ b/main.py @@ -58,7 +58,7 @@ def main(): 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_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 js_code_for_toggle_darkmode from themes.theme import load_dynamic_theme, to_cookie_str, from_cookie_str, assign_user_uuid title_html = f"

GPT 学术优化 {get_current_version()}

{theme_declaration}" @@ -330,7 +330,7 @@ def main(): from shared_utils.cookie_manager import load_web_cookie_cache__fn_builder load_web_cookie_cache = load_web_cookie_cache__fn_builder(customize_btns, cookies, predefined_btns) app_block.load(load_web_cookie_cache, inputs = [web_cookie_cache, cookies], - outputs = [web_cookie_cache, cookies, *customize_btns.values(), *predefined_btns.values()], _js=js_code_for_persistent_cookie_init) + outputs = [web_cookie_cache, cookies, *customize_btns.values(), *predefined_btns.values()], _js="""persistent_cookie_init""") app_block.load(None, inputs=[], outputs=None, _js=f"""()=>GptAcademicJavaScriptInit("{DARK_MODE}","{INIT_SYS_PROMPT}","{ADD_WAIFU}","{LAYOUT}","{TTS_TYPE}")""") # 配置暗色主题或亮色主题 app_block.load(None, inputs=[], outputs=None, _js="""()=>{REP}""".replace("REP", register_advanced_plugin_init_arr)) diff --git a/themes/common.js b/themes/common.js index 31ac535a..13158931 100644 --- a/themes/common.js +++ b/themes/common.js @@ -923,12 +923,12 @@ function gpt_academic_gradio_saveload( if (save_or_load === "load") { let value = getCookie(cookie_key); if (value) { - console.log('加载cookie', elem_id, value) + // console.log('加载cookie', elem_id, value) push_data_to_gradio_component(value, elem_id, load_type); } else { if (load_default) { - console.log('加载cookie的默认值', elem_id, load_default_value) + // console.log('加载cookie的默认值', elem_id, load_default_value) push_data_to_gradio_component(load_default_value, elem_id, load_type); } } @@ -950,7 +950,7 @@ function update_conversation_metadata() { setCookie("conversation_metadata", JSON.stringify(conversationData), 2); // read from cookie let conversation_metadata = getCookie("conversation_metadata"); - console.log("conversation_metadata", conversation_metadata); + // console.log("conversation_metadata", conversation_metadata); } // // Example schema for conversation data structure @@ -1040,7 +1040,7 @@ 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); + // console.log("restore_chat_from_local_storage", conversation); // Create a conversation UUID and timestamp const conversationId = conversation.id; @@ -1053,7 +1053,7 @@ function restore_chat_from_local_storage(event) { setCookie("conversation_metadata", JSON.stringify(conversationData), 2); // read from cookie let conversation_metadata = getCookie("conversation_metadata"); - console.log("conversation_metadata", conversation_metadata); + // console.log("conversation_metadata", conversation_metadata); } @@ -1193,8 +1193,8 @@ async function on_plugin_exe_complete(fn_name) { } let href = get_href(may_have_chat_profile_info); if (href) { - const cleanedHref = href.replace('file=', ''); // /home/fuqingxu/chatgpt_academic/gpt_log/default_user/chat_history/GPT-Academic对话存档2024-04-12-00-35-06.html - console.log(cleanedHref); + const cleanedHref = href.replace('file=', ''); // gpt_log/default_user/chat_history/GPT-Academic对话存档2024-04-12-00-35-06.html + // console.log(cleanedHref); } } @@ -1492,3 +1492,8 @@ async function run_multiplex_shift(multiplex_sel) { __type__: 'update' }, "elem_submit_visible", "obj"); } + + +async function persistent_cookie_init(web_cookie_cache, cookie) { + return [localStorage.getItem('web_cookie_cache'), cookie]; +} \ No newline at end of file diff --git a/themes/gui_floating_menu.py b/themes/gui_floating_menu.py index 614d9d97..11e14909 100644 --- a/themes/gui_floating_menu.py +++ b/themes/gui_floating_menu.py @@ -35,9 +35,9 @@ def define_gui_floating_menu(customize_btns, functional, predefined_btns, cookie # update btn h = basic_fn_confirm.click(assign_btn, [web_cookie_cache, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix], [web_cookie_cache, cookies, *customize_btns.values(), *predefined_btns.values()]) - h.then(None, [web_cookie_cache], None, _js="""(web_cookie_cache)=>{setCookie("web_cookie_cache", web_cookie_cache, 365);}""") + h.then(None, [web_cookie_cache], None, _js="""(web_cookie_cache)=>{localStorage.setItem("web_cookie_cache", web_cookie_cache);}""") # clean up btn h2 = basic_fn_clean.click(assign_btn, [web_cookie_cache, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix, gr.State(True)], [web_cookie_cache, cookies, *customize_btns.values(), *predefined_btns.values()]) - h2.then(None, [web_cookie_cache], None, _js="""(web_cookie_cache)=>{setCookie("web_cookie_cache", web_cookie_cache, 365);}""") + h2.then(None, [web_cookie_cache], None, _js="""(web_cookie_cache)=>{localStorage.setItem("web_cookie_cache", web_cookie_cache);}""") return area_input_secondary, txt2, area_customize, submitBtn2, resetBtn2, clearBtn2, stopBtn2 \ No newline at end of file diff --git a/themes/theme.py b/themes/theme.py index 96c3eed6..4ad83e8d 100644 --- a/themes/theme.py +++ b/themes/theme.py @@ -87,12 +87,6 @@ js_code_for_toggle_darkmode = """() => { }""" -js_code_for_persistent_cookie_init = """(web_cookie_cache, cookie) => { - return [getCookie("web_cookie_cache"), cookie]; -} -""" - - js_code_clear = """ (a,b)=>{ return ["", ""];