RYDE-WORK/Langchain-Chatchat
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/Langchain-Chatchat.git synced 2026-02-07 15:38:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复 --api -w命令

Browse Source
This commit is contained in:
zqt 2024-04-07 22:14:43 +08:00
parent 04723aeac1
commit d7dc01e9b1
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chatchat-server/chatchat/startup.py
View File

@ -82,7 +82,8 @@ def run_webui(model_platforms_shard: Dict,
import sys import sys
from chatchat.server.utils import set_httpx_config from chatchat.server.utils import set_httpx_config
from chatchat.configs import MODEL_PLATFORMS 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}") logger.info(f"Webui MODEL_PLATFORMS: {MODEL_PLATFORMS}")
set_httpx_config() set_httpx_config()
@ -241,14 +242,18 @@ async def start_main_server():
args.api = True args.api = True
args.api_worker = True args.api_worker = True
args.webui = True args.webui = True
elif args.all_api: elif args.all_api:
args.api = True args.api = True
args.api_worker = True args.api_worker = True
args.webui = False args.webui = False
elif args.api:
args.api = True
args.api_worker = False
args.webui = False
if args.lite: if args.lite:
run_mode = "lite" args.api = True
args.api_worker = False
args.webui = True
dump_server_info(args=args) dump_server_info(args=args)
@ -316,8 +321,11 @@ async def start_main_server():
dump_server_info(after_start=True, args=args) dump_server_info(after_start=True, args=args)
# 等待所有进程退出 # 等待所有进程退出
if p := processes.get("webui"): while processes:
p.join() for p in processes.values():
p.join(2)
if not p.is_alive():
processes.pop(p.name)
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
logger.warning("Caught KeyboardInterrupt! Setting stop event...") logger.warning("Caught KeyboardInterrupt! Setting stop event...")