Update app.py

app.py

@@ -1,8 +1,8 @@
 import os
 os.environ['no_proxy'] = '*'  # 避免代理网络产生意外污染
 
-help_menu_description = """
-Github源代码开源和更新[地址🚀](https://github.com/binary-husky/gpt_academic),
+help_menu_description = \
+"""Github源代码开源和更新[地址🚀](https://github.com/binary-husky/gpt_academic),
 感谢热情的[开发者们❤️](https://github.com/binary-husky/gpt_academic/graphs/contributors).
 </br></br>常见问题请查阅[项目Wiki](https://github.com/binary-husky/gpt_academic/wiki),
 如遇到Bug请前往[Bug反馈](https://github.com/binary-husky/gpt_academic/issues).
@@ -19,7 +19,7 @@ def main():
     import logging, uuid, traceback
 
     try:
-        # 安装 Gradio
+        # 安装指定版本的 Gradio
         subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'https://public.agent-matrix.com/publish/gradio-3.32.8-py3-none-any.whl'])
         import gradio as gr
         print(f"Gradio version: {gr.__version__}")
@@ -89,9 +89,13 @@ def main():
         predefined_btns = {}
         with gr.Blocks(title="GPT 学术优化", theme=set_theme, analytics_enabled=False, css=advanced_css) as demo:
             gr.HTML(title_html)
-            gr.HTML('''<center><a href="https://huggingface.co/spaces/qingxu98/gpt-academic?duplicate=true"><img src="https://bit.ly/3gLdBN6" alt="Duplicate Space"></a>请您打开此页面后务必点击上方的“复制空间”（Duplicate Space）按钮！<font color="#FF00FF">使用时，先在输入框填入API-KEY然后回车。</font><br/>切忌在“复制空间”（Duplicate Space）之前填入API_KEY或进行提问，否则您的API_KEY将极可能被空间所有者攫取！<br/>支持任意数量的OpenAI的密钥和API2D的密钥共存，例如输入"OpenAI密钥1,API2D密钥2"，然后提交，即可同时使用两种模型接口。</center>''')
+            gr.HTML('''<center><a href="https://huggingface.co/spaces/qingxu98/gpt-academic?duplicate=true"><img src="https://bit.ly/3gLdBN6" alt="Duplicate Space"></a>请您打开此页面后务必点击上方的“复制空间”（Duplicate Space）按钮！<font color="#FF00FF">使用时，先在输入框填入API-KEY然后回车键提交。</font><br/>切忌在“复制空间”（Duplicate Space）之前填入API_KEY或进行提问，否则您的API_KEY将极可能被空间所有者攫取！<br/>支持任意数量的OpenAI密钥和API2D密钥共存，例如输入"openai-key1,api2d-key2"，然后提交，即可同时使用两种模型接口。</center>''')
             secret_css, dark_mode, py_pickle_cookie = gr.Textbox(visible=False), gr.Textbox(DARK_MODE, visible=False), gr.Textbox(visible=False)
             cookies = gr.State(load_chat_cookies())
+
+            # 添加一个隐藏的 Textbox 用于存储 URL 参数
+            url_params = gr.Textbox(label="URL Parameters", visible=False)
+
             with gr_L1():
                 with gr_L2(scale=2, elem_id="gpt-chat"):
                     chatbot = gr.Chatbot(label=f"当前模型：{LLM_MODEL}", elem_id="gpt-chatbot")
@@ -115,34 +119,204 @@ def main():
                         with gr.Row():
                             status = gr.Markdown(f"Tip: 按Enter提交, 按Shift+Enter换行。当前模型: {LLM_MODEL} \n {proxy_info}", elem_id="state-panel")
 
-                    # 其他 UI 组件省略...
+                    with gr.Accordion("基础功能区", open=True, elem_id="basic-panel") as area_basic_fn:
+                        with gr.Row():
+                            for k in range(NUM_CUSTOM_BASIC_BTN):
+                                customize_btn = gr.Button("自定义按钮" + str(k+1), visible=False, variant="secondary", info_str=f'基础功能区: 自定义按钮')
+                                customize_btn.style(size="sm")
+                                customize_btns.update({"自定义按钮" + str(k+1): customize_btn})
+                            for k in functional:
+                                if ("Visible" in functional[k]) and (not functional[k]["Visible"]): continue
+                                variant = functional[k]["Color"] if "Color" in functional[k] else "secondary"
+                                functional[k]["Button"] = gr.Button(k, variant=variant, info_str=f'基础功能区: {k}')
+                                functional[k]["Button"].style(size="sm")
+                                predefined_btns.update({k: functional[k]["Button"]})
+                    with gr.Accordion("函数插件区", open=True, elem_id="plugin-panel") as area_crazy_fn:
+                        with gr.Row():
+                            gr.Markdown("插件可读取“输入区”文本/路径作为参数（上传文件自动修正路径）")
+                        with gr.Row(elem_id="input-plugin-group"):
+                            plugin_group_sel = gr.Dropdown(choices=all_plugin_groups, label='', show_label=False, value=DEFAULT_FN_GROUPS,
+                                                          multiselect=True, interactive=True, elem_classes='normal_mut_select').style(container=False)
+                        with gr.Row():
+                            for k, plugin in plugins.items():
+                                if not plugin.get("AsButton", True): continue
+                                visible = True if match_group(plugin['Group'], DEFAULT_FN_GROUPS) else False
+                                variant = plugins[k]["Color"] if "Color" in plugin else "secondary"
+                                info = plugins[k].get("Info", k)
+                                plugin['Button'] = plugins[k]['Button'] = gr.Button(k, variant=variant,
+                                    visible=visible, info_str=f'函数插件区: {info}').style(size="sm")
+                        with gr.Row():
+                            with gr.Accordion("更多函数插件", open=True):
+                                dropdown_fn_list = []
+                                for k, plugin in plugins.items():
+                                    if not match_group(plugin['Group'], DEFAULT_FN_GROUPS): continue
+                                    if not plugin.get("AsButton", True): dropdown_fn_list.append(k)     # 排除已经是按钮的插件
+                                    elif plugin.get('AdvancedArgs', False): dropdown_fn_list.append(k)  # 对于需要高级参数的插件，亦在下拉菜单中显示
+                                with gr.Row():
+                                    dropdown = gr.Dropdown(dropdown_fn_list, value=r"打开插件列表", label="", show_label=False).style(container=False)
+                                with gr.Row():
+                                    plugin_advanced_arg = gr.Textbox(show_label=True, label="高级参数输入区", visible=False,
+                                                                     placeholder="这里是特殊函数插件的高级参数输入区").style(container=False)
+                                with gr.Row():
+                                    switchy_bt = gr.Button(r"请先从插件列表中选择", variant="secondary").style(size="sm")
+                        with gr.Row():
+                            with gr.Accordion("点击展开“文件下载区”。", open=False) as area_file_up:
+                                file_upload = gr.Files(label="任何文件, 推荐上传压缩文件(zip, tar)", file_count="multiple", elem_id="elem_upload")
+
+            with gr.Floating(init_x="0%", init_y="0%", visible=True, width=None, drag="forbidden", elem_id="tooltip"):
+                with gr.Row():
+                    with gr.Tab("上传文件", elem_id="interact-panel"):
+                        gr.Markdown("请上传本地文件/压缩包供“函数插件区”功能调用。请注意: 上传文件后会自动把输入区修改为相应路径。")
+                        file_upload_2 = gr.Files(label="任何文件, 推荐上传压缩文件(zip, tar)", file_count="multiple", elem_id="elem_upload_float")
+
+                    with gr.Tab("更换模型", elem_id="interact-panel"):
+                        md_dropdown = gr.Dropdown(AVAIL_LLM_MODELS, value=LLM_MODEL, label="更换LLM模型/请求源").style(container=False)
+                        top_p = gr.Slider(minimum=0, maximum=1.0, value=1.0, step=0.01,interactive=True, label="Top-p (nucleus sampling)",)
+                        temperature = gr.Slider(minimum=0, maximum=2.0, value=1.0, step=0.01, interactive=True, label="Temperature",)
+                        max_length_sl = gr.Slider(minimum=256, maximum=1024*32, value=4096, step=128, interactive=True, label="Local LLM MaxLength",)
+                        system_prompt = gr.Textbox(show_label=True, lines=2, placeholder=f"System Prompt", label="System prompt", value=INIT_SYS_PROMPT)
+
+                    with gr.Tab("界面外观", elem_id="interact-panel"):
+                        theme_dropdown = gr.Dropdown(AVAIL_THEMES, value=THEME, label="更换UI主题").style(container=False)
+                        checkboxes = gr.CheckboxGroup(["基础功能区", "函数插件区", "浮动输入区", "输入清除键", "插件参数区"], value=["基础功能区", "函数插件区"], label="显示/隐藏功能区", elem_id='cbs').style(container=False)
+                        opt = ["自定义菜单"]
+                        value=[]
+                        if ADD_WAIFU: opt += ["添加Live2D形象"]; value += ["添加Live2D形象"]
+                        checkboxes_2 = gr.CheckboxGroup(opt, value=value, label="显示/隐藏自定义菜单", elem_id='cbsc').style(container=False)
+                        dark_mode_btn = gr.Button("切换界面明暗 ☀", variant="secondary").style(size="sm")
+                        dark_mode_btn.click(None, None, None, _js=js_code_for_toggle_darkmode)
+                    with gr.Tab("帮助", elem_id="interact-panel"):
+                        gr.Markdown(help_menu_description)
+
+            with gr.Floating(init_x="20%", init_y="50%", visible=False, width="40%", drag="top") as area_input_secondary:
+                with gr.Accordion("浮动输入区", open=True, elem_id="input-panel2"):
+                    with gr.Row() as row:
+                        row.style(equal_height=True)
+                        with gr.Column(scale=10):
+                            txt2 = gr.Textbox(show_label=False, placeholder="Input question here.",
+                                              elem_id='user_input_float', lines=8, label="输入区2").style(container=False)
+                        with gr.Column(scale=1, min_width=40):
+                            submitBtn2 = gr.Button("提交", variant="primary"); submitBtn2.style(size="sm")
+                            resetBtn2 = gr.Button("重置", variant="secondary"); resetBtn2.style(size="sm")
+                            stopBtn2 = gr.Button("停止", variant="secondary"); stopBtn2.style(size="sm")
+                            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.Accordion("自定义菜单", open=True, elem_id="edit-panel"):
+                    with gr.Row() as row:
+                        with gr.Column(scale=10):
+                            AVAIL_BTN = [btn for btn in customize_btns.keys()] + [k for k in functional]
+                            basic_btn_dropdown = gr.Dropdown(AVAIL_BTN, value="自定义按钮1", label="选择一个需要自定义基础功能区按钮").style(container=False)
+                            basic_fn_title = gr.Textbox(show_label=False, placeholder="输入新按钮名称", lines=1).style(container=False)
+                            basic_fn_prefix = gr.Textbox(show_label=False, placeholder="输入新提示前缀", lines=4).style(container=False)
+                            basic_fn_suffix = gr.Textbox(show_label=False, placeholder="输入新提示后缀", lines=4).style(container=False)
+                        with gr.Column(scale=1, min_width=70):
+                            basic_fn_confirm = gr.Button("确认并保存", variant="primary"); basic_fn_confirm.style(size="sm")
+                            basic_fn_clean   = gr.Button("恢复默认", variant="primary"); basic_fn_clean.style(size="sm")
 
-            # 定义从 URL 参数中提取 base_url 和 api_key 的函数
-            def extract_api_credentials(request: gr.Request, cookies):
+                            def assign_btn(persistent_cookie_, cookies_, basic_btn_dropdown_, basic_fn_title, basic_fn_prefix, basic_fn_suffix, clean_up=False):
+                                ret = {}
+                                # 读取之前的自定义按钮
+                                customize_fn_overwrite_ = cookies_['customize_fn_overwrite']
+                                # 更新新的自定义按钮
+                                customize_fn_overwrite_.update({
+                                    basic_btn_dropdown_:
+                                        {
+                                            "Title":basic_fn_title,
+                                            "Prefix":basic_fn_prefix,
+                                            "Suffix":basic_fn_suffix,
+                                        }
+                                    }
+                                )
+                                if clean_up:
+                                    customize_fn_overwrite_ = {}
+                                cookies_.update(customize_fn_overwrite_)    # 更新cookie
+                                visible = (not clean_up) and (basic_fn_title != "")
+                                if basic_btn_dropdown_ in customize_btns:
+                                    # 是自定义按钮，不是预定义按钮
+                                    ret.update({customize_btns[basic_btn_dropdown_]: gr.update(visible=visible, value=basic_fn_title)})
+                                else:
+                                    # 是预定义按钮
+                                    ret.update({predefined_btns[basic_btn_dropdown_]: gr.update(visible=visible, value=basic_fn_title)})
+                                ret.update({cookies: cookies_})
+                                try: persistent_cookie_ = from_cookie_str(persistent_cookie_)   # persistent cookie to dict
+                                except: persistent_cookie_ = {}
+                                persistent_cookie_["custom_bnt"] = customize_fn_overwrite_      # dict update new value
+                                persistent_cookie_ = to_cookie_str(persistent_cookie_)          # persistent cookie to dict
+                                ret.update({py_pickle_cookie: persistent_cookie_})             # write persistent cookie
+                                return ret
+
+                            # update btn
+                            h = basic_fn_confirm.click(assign_btn, [py_pickle_cookie, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix],
+                                                       [py_pickle_cookie, cookies, *customize_btns.values(), *predefined_btns.values()])
+                            h.then(None, [py_pickle_cookie], None, _js="""(py_pickle_cookie)=>{setCookie("py_pickle_cookie", py_pickle_cookie, 365);}""")
+                            # clean up btn
+                            h2 = basic_fn_clean.click(assign_btn, [py_pickle_cookie, cookies, basic_btn_dropdown, basic_fn_title, basic_fn_prefix, basic_fn_suffix, gr.State(True)],
+                                                       [py_pickle_cookie, cookies, *customize_btns.values(), *predefined_btns.values()])
+                            h2.then(None, [py_pickle_cookie], None, _js="""(py_pickle_cookie)=>{setCookie("py_pickle_cookie", py_pickle_cookie, 365);}""")
+
+                            def persistent_cookie_reload(persistent_cookie_, cookies_):
+                                ret = {}
+                                for k in customize_btns:
+                                    ret.update({customize_btns[k]: gr.update(visible=False, value="")})
+
+                                try: persistent_cookie_ = from_cookie_str(persistent_cookie_)    # persistent cookie to dict
+                                except: return ret
+
+                                customize_fn_overwrite_ = persistent_cookie_.get("custom_bnt", {})
+                                cookies_['customize_fn_overwrite'] = customize_fn_overwrite_
+                                ret.update({cookies: cookies_})
+
+                                for k,v in persistent_cookie_["custom_bnt"].items():
+                                    if v['Title'] == "": continue
+                                    if k in customize_btns: ret.update({customize_btns[k]: gr.update(visible=True, value=v['Title'])})
+                                    else: ret.update({predefined_btns[k]: gr.update(visible=True, value=v['Title'])})
+                                return ret
+
+            # 添加 JavaScript 来解析 URL 参数并设置到隐藏的 Textbox
+            url_param_js = """
+            <script>
+            window.onload = function() {
+                const params = new URLSearchParams(window.location.search);
+                let base_url = params.get('base_url') || '';
+                let api_key = params.get('api_key') || '';
+                let combined = `base_url=${encodeURIComponent(base_url)}&api_key=${encodeURIComponent(api_key)}`;
+                // 将解析后的参数设置到隐藏的 Textbox
+                const urlParamsTextbox = document.querySelector('input[aria-label="URL Parameters"]');
+                if (urlParamsTextbox) {
+                    urlParamsTextbox.value = combined;
+                }
+            }
+            </script>
+            """
+            gr.HTML(url_param_js)
+
+            # 定义从隐藏的 Textbox 中提取 base_url 和 api_key 的函数
+            def extract_api_credentials(url_params, cookies):
                 try:
-                    # 提取 URL 参数
-                    params = request.query_params
-                    base_url = params.get('base_url', None)
-                    api_key = params.get('api_key', None)
-                    
+                    # 解析 URL 参数
+                    parsed = dict(param.split('=') for param in url_params.split('&') if '=' in param)
+                    base_url = parsed.get('base_url', None)
+                    api_key = parsed.get('api_key', None)
+
                     print(f"Extracted base_url: {base_url}")
                     print(f"Extracted api_key: {api_key}")
-                    
+
                     # 更新 cookies 或应用程序状态
                     if base_url:
                         cookies['base_url'] = base_url
                     if api_key:
                         cookies['api_key'] = api_key  # 警告：通过 URL 传递 API 密钥是不安全的
-                    
+
                     return cookies
                 except Exception as e:
                     print(f"Error in extract_api_credentials: {e}")
                     return cookies
 
-            # 在应用加载时调用该函数，确保传递 gr.Request 对象
+            # 在应用加载时调用该函数，通过隐藏的 Textbox 获取 URL 参数
             demo.load(
                 fn=extract_api_credentials,
-                inputs=[gr.Request(), cookies],
+                inputs=[url_params, cookies],
                 outputs=[cookies]
             )
 
@@ -201,11 +375,11 @@ def main():
             md_dropdown.select(on_md_dropdown_changed, [md_dropdown], [chatbot] )
 
             def on_theme_dropdown_changed(theme, secret_css):
-                adjust_theme, css_part1, _, adjust_dynamic_theme = load_dynamic_theme(theme)
+                adjust_theme_func, css_part1, _, adjust_dynamic_theme = load_dynamic_theme(theme)
                 if adjust_dynamic_theme:
                     css_part2 = adjust_dynamic_theme._get_theme_css()
                 else:
-                    css_part2 = adjust_theme()._get_theme_css()
+                    css_part2 = adjust_theme_func()._get_theme_css()
                 return css_part2 + css_part1
 
             theme_handle = theme_dropdown.select(on_theme_dropdown_changed, [theme_dropdown, secret_css], [secret_css])
@@ -216,9 +390,9 @@ def main():
                 _js=js_code_for_css_changing
             )
             # 随变按钮的回调函数注册
-            def route(request: gr.Request, k, *args, **kwargs):
+            def route(k, *args, **kwargs):
                 if k in [r"打开插件列表", r"请先从插件列表中选择"]: return
-                yield from ArgsGeneralWrapper(plugins[k]["Function"])(request, *args, **kwargs)
+                return ArgsGeneralWrapper(plugins[k]["Function"])(*args, **kwargs)
             click_handle = switchy_bt.click(route,[switchy_bt, *input_combo], output_combo)
             click_handle.then(on_report_generated, [cookies, file_upload, chatbot], [cookies, file_upload, chatbot])
             cancel_handles.append(click_handle)
@@ -245,9 +419,7 @@ def main():
                     rad.feed(cookies['uuid'].hex, audio)
                 audio_mic.stream(deal_audio, inputs=[audio_mic, cookies])
 
-            # 定义从 URL 参数中提取 base_url 和 api_key 的函数（已定义上面）
-
-            # 应用加载时调用该函数（已修改传递 gr.Request）
+            # 定义从隐藏的 Textbox 中提取 base_url 和 api_key 的函数（已定义上面）
             # 已在上面调用
 
             # 启动 Gradio 的延迟任务
@@ -285,10 +457,5 @@ def main():
             #     demo.launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, favicon_path="docs/logo.png",
             #                 blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile",f"{PATH_LOGGING}/admin"])
 
-    except Exception as e:
-        print("Unhandled exception during application startup:")
-        traceback.print_exc()
-        sys.exit(1)
-
-if __name__ == "__main__":
-    main()
+    if __name__ == "__main__":
+        main()