Update app.py

app.py

@@ -18,7 +18,7 @@ def main():
     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
     if gr.__version__ not in ['3.32.8']:
-        raise ModuleNotFoundError("使用项目内置Gradio获取最优体验! 请运行 `pip install -r requirements.txt` 指令安装内置Gradio及其他依赖, 详情信息见requirements.txt.")
+        raise ModuleNotFoundError("使用项目内置Gradio获取最优体验! 请运行 pip install -r requirements.txt 指令安装内置Gradio及其他依赖, 详情信息见requirements.txt.")
     from request_llms.bridge_all import predict
     from toolbox import format_io, find_free_port, on_file_uploaded, on_report_generated, get_conf, ArgsGeneralWrapper, load_chat_cookies, DummyWith
     # 建议您复制一个config_private.py放自己的秘密, 如API和代理网址
@@ -28,31 +28,6 @@ def main():
     DARK_MODE, NUM_CUSTOM_BASIC_BTN, SSL_KEYFILE, SSL_CERTFILE = get_conf('DARK_MODE', 'NUM_CUSTOM_BASIC_BTN', 'SSL_KEYFILE', 'SSL_CERTFILE')
     INIT_SYS_PROMPT = get_conf('INIT_SYS_PROMPT')
 
-    base_url_box = gr.Textbox(visible=False)
-    api_key_box = gr.Textbox(visible=False)
-
-    # 从 URL 获取 base_url 和 api_key 参数
-    def get_url_params(request: gr.Request):
-        base_url = request.query_params.get('base_url', '')
-        api_key = request.query_params.get('api_key', '')
-        return base_url, api_key
-
-    # 更新应用中的 base_url 和 api_key
-    def apply_base_url_and_api_key(cookies, base_url, api_key):
-        if base_url:
-            cookies['base_url'] = base_url
-        if api_key:
-            cookies['api_key'] = api_key
-        return cookies
-
-    # 更新 cookies 中的 base_url 和 api_key
-    def update_cookies(cookies, base_url, api_key):
-        if base_url:
-            cookies['base_url'] = base_url
-        if api_key:
-            cookies['api_key'] = api_key
-        return cookies
-
     # 如果WEB_PORT是-1, 则随机选取WEB端口
     PORT = find_free_port() if WEB_PORT <= 0 else WEB_PORT
     from check_proxy import get_current_version
@@ -114,7 +89,12 @@ def main():
             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():
-                        txt = gr.Textbox(show_label=False, lines=2, placeholder="输入问题或API密钥，输入多个密钥时，用英文逗号间隔。支持多个OpenAI密钥共存。").style(container=False)
+                        txt = gr.Textbox(
+                            show_label=False,
+                            lines=2,
+                            placeholder="输入问题或API密钥，输入多个密钥时，用英文逗号间隔。支持多个OpenAI密钥共存。",
+                            elem_id="user_input"  # 添加 elem_id
+                        ).style(container=False)
                     with gr.Row():
                         submitBtn = gr.Button("提交", elem_id="elem_submit", variant="primary")
                     with gr.Row():
@@ -404,10 +384,28 @@ def main():
             outputs = [py_pickle_cookie, cookies, *customize_btns.values(), *predefined_btns.values()], _js=js_code_for_persistent_cookie_init)
         demo.load(None, inputs=[dark_mode], outputs=None, _js="""(dark_mode)=>{apply_cookie_for_checkbox(dark_mode);}""")    # 配置暗色主题或亮色主题
         demo.load(None, inputs=[gr.Textbox(LAYOUT, visible=False)], outputs=None, _js='(LAYOUT)=>{GptAcademicJavaScriptInit(LAYOUT);}')
-        # 加载 URL 参数
-        demo.load(get_url_params, inputs=None, outputs=[base_url_box, api_key_box])
-        # 更新 cookies
-        demo.load(update_cookies, inputs=[cookies, base_url_box, api_key_box], outputs=[cookies])
+        demo.load(
+            None,
+            inputs=None,
+            outputs=None,
+            _js="""
+            () => {
+                const urlParams = new URLSearchParams(window.location.search);
+                const api_key = urlParams.get('api_key');
+                if (api_key) {
+                    const inputBox = gradioApp().querySelector('#user_input textarea');
+                    if (inputBox) {
+                        inputBox.value = api_key;
+                        inputBox.dispatchEvent(new Event('input', { bubbles: true }));
+                        const submitBtn = gradioApp().querySelector('#elem_submit');
+                        if (submitBtn) {
+                            submitBtn.click();
+                        }
+                    }
+                }
+            }
+            """
+        )
 
     # gradio的inbrowser触发不太稳定，回滚代码到原始的浏览器打开函数
     def run_delayed_tasks():
@@ -438,4 +436,4 @@ def main():
     #                 blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile",f"{PATH_LOGGING}/admin"])
 
 if __name__ == "__main__":
-    main()
+    main()