From d7dc01e9b1e8716944e332771a492baa8f62237d Mon Sep 17 00:00:00 2001 From: zqt <1178747941@qq.com> Date: Sun, 7 Apr 2024 22:14:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20--api=20-w=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chatchat-server/chatchat/startup.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/chatchat-server/chatchat/startup.py b/chatchat-server/chatchat/startup.py index b6249261..be1bb744 100644 --- a/chatchat-server/chatchat/startup.py +++ b/chatchat-server/chatchat/startup.py @@ -82,7 +82,8 @@ def run_webui(model_platforms_shard: Dict, import sys from chatchat.server.utils import set_httpx_config from chatchat.configs import MODEL_PLATFORMS - MODEL_PLATFORMS.extend(model_platforms_shard['provider_platforms']) + if model_platforms_shard.get('provider_platforms'): + MODEL_PLATFORMS.extend(model_platforms_shard.get('provider_platforms')) logger.info(f"Webui MODEL_PLATFORMS: {MODEL_PLATFORMS}") set_httpx_config() @@ -241,14 +242,18 @@ async def start_main_server(): args.api = True args.api_worker = True args.webui = True - elif args.all_api: args.api = True args.api_worker = True args.webui = False - + elif args.api: + args.api = True + args.api_worker = False + args.webui = False if args.lite: - run_mode = "lite" + args.api = True + args.api_worker = False + args.webui = True dump_server_info(args=args) @@ -316,8 +321,11 @@ async def start_main_server(): dump_server_info(after_start=True, args=args) # 等待所有进程退出 - if p := processes.get("webui"): - p.join() + while processes: + for p in processes.values(): + p.join(2) + if not p.is_alive(): + processes.pop(p.name) except Exception as e: logger.error(e) logger.warning("Caught KeyboardInterrupt! Setting stop event...")