From 1dcc2873d2168ad2d3d70afcb453ac1695fbdf02 Mon Sep 17 00:00:00 2001 From: binary-husky Date: Sun, 28 May 2023 20:23:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DGradio=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B3=84=E9=9C=B2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 85b38e1..458f840 100644 --- a/main.py +++ b/main.py @@ -197,7 +197,9 @@ def main(): threading.Thread(target=warm_up_modules, name="warm-up", daemon=True).start() auto_opentab_delay() - demo.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, favicon_path="docs/logo.png") + demo.queue(concurrency_count=CONCURRENT_COUNT).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"]) # 如果需要在二级路径下运行 # CUSTOM_PATH, = get_conf('CUSTOM_PATH') From 897695d29fd76c3cc244f5fb96b24090b03518c3 Mon Sep 17 00:00:00 2001 From: binary-husky Date: Sun, 28 May 2023 20:25:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=9A=84=E6=96=87=E4=BB=B6=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 458f840..c94e654 100644 --- a/main.py +++ b/main.py @@ -198,8 +198,9 @@ def main(): auto_opentab_delay() demo.queue(concurrency_count=CONCURRENT_COUNT).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"]) + server_name="0.0.0.0", server_port=PORT, + favicon_path="docs/logo.png", auth=AUTHENTICATION, + blocked_paths=["config.py","config_private.py","docker-compose.yml","Dockerfile"]) # 如果需要在二级路径下运行 # CUSTOM_PATH, = get_conf('CUSTOM_PATH') @@ -207,7 +208,8 @@ def main(): # from toolbox import run_gradio_in_subpath # run_gradio_in_subpath(demo, auth=AUTHENTICATION, port=PORT, custom_path=CUSTOM_PATH) # else: - # demo.launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, favicon_path="docs/logo.png") + # 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"]) if __name__ == "__main__": main() From 03aa2ee115e7610bf748e2910a67a8d8dda4e4b9 Mon Sep 17 00:00:00 2001 From: w_xiaolizu Date: Mon, 29 May 2023 11:27:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=A5=E5=BA=93prompt=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E4=BB=8Estrip=E6=9B=BF=E6=8D=A2=E4=B8=BA=E6=AD=A3?= =?UTF-8?q?=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __main__.py | 3 ++- func_box.py | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/__main__.py b/__main__.py index 4a1988e..231fd83 100644 --- a/__main__.py +++ b/__main__.py @@ -383,7 +383,8 @@ class ChatBot(ChatBotFrame): # Start self.auto_opentab_delay() - demo.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION) + demo.queue(concurrency_count=CONCURRENT_COUNT).launch(server_name="0.0.0.0", server_port=PORT, auth=AUTHENTICATION, + blocked_paths=["config.py", "config_private.py", "docker-compose.yml", "Dockerfile"]) def check_proxy_free(): diff --git a/func_box.py b/func_box.py index 83d303d..c300b9a 100644 --- a/func_box.py +++ b/func_box.py @@ -481,8 +481,9 @@ def thread_write_chat(chatbot): """ private_key = toolbox.get_conf('private_key')[0] chat_title = chatbot[0][0].split() - i_say = chatbot[-1][0].strip('
/div

/p') - gpt_result = chatbot[-1][1].strip('

/div

/p') + + i_say = re.sub(r'^

|<\/p><\/div>$', '', chatbot[-1][0]) + gpt_result = re.sub(r'^

|<\/p><\/div>$', '', chatbot[-1][1]) if private_key in chat_title: SqliteHandle(f'ai_private_{chat_title[-2]}').inset_prompt({i_say: gpt_result}) else: @@ -543,4 +544,4 @@ class JsonHandle: if __name__ == '__main__': - print(JsonHandle('/Users/kilig/Job/Python-project/academic_gpt/test.json').load()) + pass \ No newline at end of file