From b9570e395e92ef4ba9d40c39b1eaefc1531976e5 Mon Sep 17 00:00:00 2001 From: xuyuan23 <643854343@qq.com> Date: Sun, 28 May 2023 18:27:20 +0800 Subject: [PATCH] use tool 'black' to check and reformated files --- pilot/language/lang_content_mapping.py | 9 ++--- pilot/language/translation_handler.py | 4 -- pilot/server/webserver.py | 52 +++++++++++++++++++++----- 3 files changed, 46 insertions(+), 19 deletions(-) diff --git a/pilot/language/lang_content_mapping.py b/pilot/language/lang_content_mapping.py index b76621df1..88cc92ffd 100644 --- a/pilot/language/lang_content_mapping.py +++ b/pilot/language/lang_content_mapping.py @@ -1,4 +1,3 @@ - ## 短期内在该文件中配置，长期考虑将会存储在默认的数据库中存储，并可以支持多种语言的配置 lang_dicts = { @@ -32,7 +31,7 @@ lang_dicts = { "add_folder": "添加文件夹", "send": "发送", "regenerate": "重新生成", - "clear_box": "清理" + "clear_box": "清理", }, "en": { "unique_id": "English Content", @@ -64,10 +63,10 @@ lang_dicts = { "add_folder": "Add folder", "send": "Send", "regenerate": "Regenerate", - "clear_box": "Clear" - } + "clear_box": "Clear", + }, } + def get_lang_content(key, language="zh"): return lang_dicts.get(language, {}).get(key, "") - diff --git a/pilot/language/translation_handler.py b/pilot/language/translation_handler.py index 28075c680..0a46d09ab 100644 --- a/pilot/language/translation_handler.py +++ b/pilot/language/translation_handler.py @@ -1,12 +1,8 @@ - from pilot.configs.config import Config from pilot.language.lang_content_mapping import get_lang_content CFG = Config() - def get_lang_text(key): return get_lang_content(key, CFG.LANGUAGE) - - diff --git a/pilot/server/webserver.py b/pilot/server/webserver.py index 403852c88..fde6fd540 100644 --- a/pilot/server/webserver.py +++ b/pilot/server/webserver.py @@ -89,9 +89,18 @@ DB_SETTINGS = { llm_native_dialogue = get_lang_text("knowledge_qa_type_llm_native_dialogue") -default_knowledge_base_dialogue = get_lang_text("knowledge_qa_type_default_knowledge_base_dialogue") -add_knowledge_base_dialogue = get_lang_text("knowledge_qa_type_add_knowledge_base_dialogue") -knowledge_qa_type_list = [llm_native_dialogue, default_knowledge_base_dialogue, add_knowledge_base_dialogue] +default_knowledge_base_dialogue = get_lang_text( + "knowledge_qa_type_default_knowledge_base_dialogue" +) +add_knowledge_base_dialogue = get_lang_text( + "knowledge_qa_type_add_knowledge_base_dialogue" +) +knowledge_qa_type_list = [ + llm_native_dialogue, + default_knowledge_base_dialogue, + add_knowledge_base_dialogue, +] + def get_simlar(q): docsearch = knownledge_tovec_st(os.path.join(DATASETS_DIR, "plan.md")) @@ -522,7 +531,9 @@ def build_single_model_ui(): state = gr.State() gr.Markdown(notice_markdown, elem_id="notice_markdown") - with gr.Accordion(get_lang_text("model_control_param"), open=False, visible=False) as parameter_row: + with gr.Accordion( + get_lang_text("model_control_param"), open=False, visible=False + ) as parameter_row: temperature = gr.Slider( minimum=0.0, maximum=1.0, @@ -554,19 +565,36 @@ def build_single_model_ui(): show_label=True, ).style(container=False) - sql_mode = gr.Radio([get_lang_text("sql_generate_mode_direct"), get_lang_text("sql_generate_mode_none")], show_label=False, value=get_lang_text("sql_generate_mode_none")) + sql_mode = gr.Radio( + [ + get_lang_text("sql_generate_mode_direct"), + get_lang_text("sql_generate_mode_none"), + ], + show_label=False, + value=get_lang_text("sql_generate_mode_none"), + ) sql_vs_setting = gr.Markdown(get_lang_text("sql_vs_setting")) sql_mode.change(fn=change_sql_mode, inputs=sql_mode, outputs=sql_vs_setting) tab_qa = gr.TabItem(get_lang_text("knowledge_qa"), elem_id="QA") with tab_qa: mode = gr.Radio( - [llm_native_dialogue, default_knowledge_base_dialogue, add_knowledge_base_dialogue], show_label=False, value=llm_native_dialogue + [ + llm_native_dialogue, + default_knowledge_base_dialogue, + add_knowledge_base_dialogue, + ], + show_label=False, + value=llm_native_dialogue, + ) + vs_setting = gr.Accordion( + get_lang_text("configure_knowledge_base"), open=False ) - vs_setting = gr.Accordion(get_lang_text("configure_knowledge_base"), open=False) mode.change(fn=change_mode, inputs=mode, outputs=vs_setting) with vs_setting: - vs_name = gr.Textbox(label=get_lang_text("new_klg_name"), lines=1, interactive=True) + vs_name = gr.Textbox( + label=get_lang_text("new_klg_name"), lines=1, interactive=True + ) vs_add = gr.Button(get_lang_text("add_as_new_klg")) with gr.Column() as doc2vec: gr.Markdown(get_lang_text("add_file_to_klg")) @@ -579,7 +607,9 @@ def build_single_model_ui(): show_label=False, ) - load_file_button = gr.Button(get_lang_text("upload_and_load_to_klg")) + load_file_button = gr.Button( + get_lang_text("upload_and_load_to_klg") + ) with gr.Tab(get_lang_text("upload_folder")): folder_files = gr.File( label=get_lang_text("add_folder"), @@ -587,7 +617,9 @@ def build_single_model_ui(): file_count="directory", show_label=False, ) - load_folder_button = gr.Button(get_lang_text("upload_and_load_to_klg")) + load_folder_button = gr.Button( + get_lang_text("upload_and_load_to_klg") + ) with gr.Blocks(): chatbot = grChatbot(elem_id="chatbot", visible=False).style(height=550)