From 89de49f31ee5e3ff34d8f9a7f0daa91d2a13847f Mon Sep 17 00:00:00 2001 From: qingxu fu <505030475@qq.com> Date: Wed, 30 Aug 2023 16:00:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F=E5=91=BD?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E6=95=B4=E7=90=86=E9=85=8D=E7=BD=AE=E6=B8=85?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 20 +++++++++++++++++--- main.py | 8 ++++---- request_llm/bridge_chatglmft.py | 10 +++++----- toolbox.py | 4 ++-- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/config.py b/config.py index 3664c15..20e5d8d 100644 --- a/config.py +++ b/config.py @@ -67,8 +67,10 @@ WEB_PORT = -1 # 如果OpenAI不响应（网络卡顿、代理失败、KEY失效），重试的次数限制 MAX_RETRY = 2 + # 插件分类默认选项 -default_plugin = ['学术优化', '多功能插件', '代码解析'] +DEFAULT_FN_GROUPS = ['学术优化', '多功能插件', '代码解析'] + # 模型选择是 (注意: LLM_MODEL是默认选中的模型, 它*必须*被包含在AVAIL_LLM_MODELS列表中 ) LLM_MODEL = "gpt-3.5-turbo" # 可选 ↓↓↓ @@ -85,7 +87,7 @@ BAIDU_CLOUD_QIANFAN_MODEL = 'ERNIE-Bot' # 可选 "ERNIE-Bot"(文心一言), " # 如果使用ChatGLM2微调模型，请把 LLM_MODEL="chatglmft"，并在此处指定模型路径 -ChatGLM_PTUNING_CHECKPOINT = "" # 例如"/home/hmp/ChatGLM2-6B/ptuning/output/6b-pt-128-1e-2/checkpoint-100" +CHATGLM_PTUNING_CHECKPOINT = "" # 例如"/home/hmp/ChatGLM2-6B/ptuning/output/6b-pt-128-1e-2/checkpoint-100" # 本地LLM模型如ChatGLM的执行方式 CPU/GPU @@ -101,7 +103,7 @@ CONCURRENT_COUNT = 100 AUTO_CLEAR_TXT = False -# 色彩主体，可选 ["Default", "Chuanhu-Small-and-Beautiful"] +# 色彩主题，可选 ["Default", "Chuanhu-Small-and-Beautiful"] THEME = "Chuanhu-Small-and-Beautiful" @@ -215,6 +217,18 @@ ALLOW_RESET_CONFIG = False ├── NEWBING_STYLE └── NEWBING_COOKIES + +用户图形界面布局依赖关系示意图 +│ +├── CHATBOT_HEIGHT 对话窗的高度 +├── CODE_HIGHLIGHT 代码高亮 +├── LAYOUT 窗口布局 +├── DARK_MODE 暗色模式 / 亮色模式 +├── DEFAULT_FN_GROUPS 插件分类默认选项 +├── THEME 色彩主题 +├── AUTO_CLEAR_TXT 是否在提交时自动清空输入框 +├── ADD_WAIFU 加一个live2d装饰 + 插件在线服务配置依赖关系示意图 diff --git a/main.py b/main.py index 4ecb2f7..ced4177 100644 --- a/main.py +++ b/main.py @@ -34,7 +34,7 @@ def main(): # 高级函数插件 from crazy_functional import get_crazy_functions - default_plugin, = get_conf('default_plugin') + DEFAULT_FN_GROUPS, = get_conf('DEFAULT_FN_GROUPS') crazy_fns_role = get_crazy_functions() crazy_classification = [i for i in crazy_fns_role] crazy_fns = {} @@ -93,7 +93,7 @@ def main(): with gr.Row(): gr.Markdown("插件可读取“输入区”文本/路径作为参数（上传文件自动修正路径）") plugin_dropdown = gr.Dropdown(choices=crazy_classification, label='选择插件分类', - value=default_plugin, + value=DEFAULT_FN_GROUPS, multiselect=True, interactive=True, elem_classes='normal_mut_select' ).style(container=False) @@ -101,7 +101,7 @@ def main(): for role in crazy_fns_role: for k in crazy_fns_role[role]: if not crazy_fns_role[role][k].get("AsButton", True): continue - if role not in default_plugin: + if role not in DEFAULT_FN_GROUPS: variant = crazy_fns_role[role][k]["Color"] if "Color" in crazy_fns_role[role][ k] else "secondary" crazy_fns_role[role][k]['Button'] = gr.Button(k, variant=variant, @@ -115,7 +115,7 @@ def main(): with gr.Accordion("更多函数插件", open=True): dropdown_fn_list = [] for role in crazy_fns_role: - if role in default_plugin: + if role in DEFAULT_FN_GROUPS: for k in crazy_fns_role[role]: if not crazy_fns_role[role][k].get("AsButton", True): dropdown_fn_list.append(k) diff --git a/request_llm/bridge_chatglmft.py b/request_llm/bridge_chatglmft.py index 4e21c98..71af942 100644 --- a/request_llm/bridge_chatglmft.py +++ b/request_llm/bridge_chatglmft.py @@ -63,9 +63,9 @@ class GetGLMFTHandle(Process): # if not os.path.exists(conf): raise RuntimeError('找不到微调模型信息') # with open(conf, 'r', encoding='utf8') as f: # model_args = json.loads(f.read()) - ChatGLM_PTUNING_CHECKPOINT, = get_conf('ChatGLM_PTUNING_CHECKPOINT') - assert os.path.exists(ChatGLM_PTUNING_CHECKPOINT), "找不到微调模型检查点" - conf = os.path.join(ChatGLM_PTUNING_CHECKPOINT, "config.json") + CHATGLM_PTUNING_CHECKPOINT, = get_conf('CHATGLM_PTUNING_CHECKPOINT') + assert os.path.exists(CHATGLM_PTUNING_CHECKPOINT), "找不到微调模型检查点" + conf = os.path.join(CHATGLM_PTUNING_CHECKPOINT, "config.json") with open(conf, 'r', encoding='utf8') as f: model_args = json.loads(f.read()) if 'model_name_or_path' not in model_args: @@ -78,9 +78,9 @@ class GetGLMFTHandle(Process): config.pre_seq_len = model_args['pre_seq_len'] config.prefix_projection = model_args['prefix_projection'] - print(f"Loading prefix_encoder weight from {ChatGLM_PTUNING_CHECKPOINT}") + print(f"Loading prefix_encoder weight from {CHATGLM_PTUNING_CHECKPOINT}") model = AutoModel.from_pretrained(model_args['model_name_or_path'], config=config, trust_remote_code=True) - prefix_state_dict = torch.load(os.path.join(ChatGLM_PTUNING_CHECKPOINT, "pytorch_model.bin")) + prefix_state_dict = torch.load(os.path.join(CHATGLM_PTUNING_CHECKPOINT, "pytorch_model.bin")) new_prefix_state_dict = {} for k, v in prefix_state_dict.items(): if k.startswith("transformer.prefix_encoder."): diff --git a/toolbox.py b/toolbox.py index 73e3e8d..6da2347 100644 --- a/toolbox.py +++ b/toolbox.py @@ -1001,7 +1001,7 @@ def get_plugin_default_kwargs(): chatbot = ChatBotWithCookies(llm_kwargs) # txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, web_port - default_plugin_kwargs = { + DEFAULT_FN_GROUPS_kwargs = { "main_input": "./README.md", "llm_kwargs": llm_kwargs, "plugin_kwargs": {}, @@ -1010,7 +1010,7 @@ def get_plugin_default_kwargs(): "system_prompt": "You are a good AI.", "web_port": WEB_PORT } - return default_plugin_kwargs + return DEFAULT_FN_GROUPS_kwargs def get_chat_default_kwargs(): """