diff --git a/pilot/scene/base_chat.py b/pilot/scene/base_chat.py index dce25bec4..650235d63 100644 --- a/pilot/scene/base_chat.py +++ b/pilot/scene/base_chat.py @@ -179,31 +179,22 @@ class BaseChat(ABC): result = self.do_with_prompt_response(prompt_define_response) if hasattr(prompt_define_response, "thoughts"): - if hasattr(prompt_define_response.thoughts, "speak"): - self.current_message.add_view_message( - self.prompt_template.output_parser.parse_view_response( - prompt_define_response.thoughts.get("speak"), result - ) - ) - elif hasattr(prompt_define_response.thoughts, "reasoning"): - self.current_message.add_view_message( - self.prompt_template.output_parser.parse_view_response( - prompt_define_response.thoughts.get("reasoning"), result - ) - ) + if isinstance(prompt_define_response.thoughts, dict): + if "speak" in prompt_define_response.thoughts: + speak_to_user = prompt_define_response.thoughts.get("speak") + else: + speak_to_user = str(prompt_define_response.thoughts) else: - self.current_message.add_view_message( - self.prompt_template.output_parser.parse_view_response( - prompt_define_response.thoughts, result - ) - ) + if hasattr(prompt_define_response.thoughts, "speak"): + speak_to_user = prompt_define_response.thoughts.get("speak") + elif hasattr(prompt_define_response.thoughts, "reasoning"): + speak_to_user = prompt_define_response.thoughts.get("reasoning") + else: + speak_to_user = prompt_define_response.thoughts else: - self.current_message.add_view_message( - self.prompt_template.output_parser.parse_view_response( - prompt_define_response, result - ) - ) - + speak_to_user = prompt_define_response + view_message = self.prompt_template.output_parser.parse_view_response(speak_to_user, result) + self.current_message.add_view_message(view_message) except Exception as e: print(traceback.format_exc()) logger.error("model response parase faild！" + str(e)) diff --git a/pilot/scene/chat_db/professional_qa/out_parser.py b/pilot/scene/chat_db/professional_qa/out_parser.py index 0f7ccd791..0b8277d63 100644 --- a/pilot/scene/chat_db/professional_qa/out_parser.py +++ b/pilot/scene/chat_db/professional_qa/out_parser.py @@ -15,8 +15,5 @@ class NormalChatOutputParser(BaseOutputParser): def parse_prompt_response(self, model_out_text) -> T: return model_out_text - def parse_view_response(self, ai_text) -> str: - return super().parse_view_response(ai_text) - def get_format_instructions(self) -> str: pass diff --git a/pilot/scene/chat_execution/chat.py b/pilot/scene/chat_execution/chat.py index 27e79e3a5..464df9ba0 100644 --- a/pilot/scene/chat_execution/chat.py +++ b/pilot/scene/chat_execution/chat.py @@ -55,7 +55,7 @@ class ChatWithPlugin(BaseChat): def do_with_prompt_response(self, prompt_response): ## plugin command run - return execute_command(str(prompt_response), self.plugins_prompt_generator) + return execute_command(str(prompt_response.command.get('name')), prompt_response.command.get('args',{}), self.plugins_prompt_generator) def chat_show(self): super().chat_show() diff --git a/pilot/scene/chat_execution/out_parser.py b/pilot/scene/chat_execution/out_parser.py index ff5b6a0d7..f9796ef3d 100644 --- a/pilot/scene/chat_execution/out_parser.py +++ b/pilot/scene/chat_execution/out_parser.py @@ -23,8 +23,11 @@ class PluginChatOutputParser(BaseOutputParser): command, thoughts = response["command"], response["thoughts"] return PluginAction(command, thoughts) - def parse_view_response(self, ai_text) -> str: - return super().parse_view_response(ai_text) + def parse_view_response(self, speak, data) -> str: + ### tool out data to table view + print(f"parse_view_response:{speak},{str(data)}" ) + view_text = f"##### {speak}" + "\n" + str(data) + return view_text def get_format_instructions(self) -> str: pass diff --git a/pilot/scene/chat_knowledge/custom/out_parser.py b/pilot/scene/chat_knowledge/custom/out_parser.py index 0f7ccd791..0b8277d63 100644 --- a/pilot/scene/chat_knowledge/custom/out_parser.py +++ b/pilot/scene/chat_knowledge/custom/out_parser.py @@ -15,8 +15,5 @@ class NormalChatOutputParser(BaseOutputParser): def parse_prompt_response(self, model_out_text) -> T: return model_out_text - def parse_view_response(self, ai_text) -> str: - return super().parse_view_response(ai_text) - def get_format_instructions(self) -> str: pass diff --git a/pilot/scene/chat_knowledge/default/out_parser.py b/pilot/scene/chat_knowledge/default/out_parser.py index 0f7ccd791..0b8277d63 100644 --- a/pilot/scene/chat_knowledge/default/out_parser.py +++ b/pilot/scene/chat_knowledge/default/out_parser.py @@ -15,8 +15,5 @@ class NormalChatOutputParser(BaseOutputParser): def parse_prompt_response(self, model_out_text) -> T: return model_out_text - def parse_view_response(self, ai_text) -> str: - return super().parse_view_response(ai_text) - def get_format_instructions(self) -> str: pass diff --git a/pilot/scene/chat_knowledge/url/out_parser.py b/pilot/scene/chat_knowledge/url/out_parser.py index 0f7ccd791..0b8277d63 100644 --- a/pilot/scene/chat_knowledge/url/out_parser.py +++ b/pilot/scene/chat_knowledge/url/out_parser.py @@ -15,8 +15,5 @@ class NormalChatOutputParser(BaseOutputParser): def parse_prompt_response(self, model_out_text) -> T: return model_out_text - def parse_view_response(self, ai_text) -> str: - return super().parse_view_response(ai_text) - def get_format_instructions(self) -> str: pass diff --git a/pilot/server/webserver.py b/pilot/server/webserver.py index 515701255..af91fa4e9 100644 --- a/pilot/server/webserver.py +++ b/pilot/server/webserver.py @@ -246,7 +246,7 @@ def http_bot( state, selected, temperature, max_new_tokens, plugin_selector, mode, sql_mode, db_selector, url_input, knowledge_name ): - logger.info(f"User message send!{state.conv_id},{selected}") + logger.info(f"User message send!{state.conv_id},{selected},{plugin_selector},{mode},{sql_mode},{db_selector},{url_input}") if chat_mode_title['knowledge_qa'] == selected: scene: ChatScene = get_chat_mode(selected, mode) elif chat_mode_title['chat_use_plugin'] == selected: @@ -417,7 +417,6 @@ def build_single_model_ui(): value=dbs[0] if len(models) > 0 else "", interactive=True, show_label=True, - name="db_selector" ).style(container=False) sql_mode = gr.Radio( @@ -426,8 +425,7 @@ def build_single_model_ui(): get_lang_text("sql_generate_mode_none"), ], show_label=False, - value=get_lang_text("sql_generate_mode_none"), - name="sql_mode" + 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) @@ -444,12 +442,12 @@ def build_single_model_ui(): value="", interactive=True, show_label=True, - type="value", - name="plugin_selector" + type="value" ).style(container=False) def plugin_change(evt: gr.SelectData): # SelectData is a subclass of EventData print(f"You selected {evt.value} at {evt.index} from {evt.target}") + print(f"user plugin:{plugins_select_info().get(evt.value)}") return plugins_select_info().get(evt.value) plugin_selected = gr.Textbox(show_label=False, visible=False, placeholder="Selected") @@ -466,14 +464,13 @@ def build_single_model_ui(): ], show_label=False, value=llm_native_dialogue, - name="mode" ) vs_setting = gr.Accordion( get_lang_text("configure_knowledge_base"), open=False, visible=False ) mode.change(fn=change_mode, inputs=mode, outputs=vs_setting) - url_input = gr.Textbox(label=get_lang_text("url_input_label"), lines=1, interactive=True, visible=False, name="url_input") + url_input = gr.Textbox(label=get_lang_text("url_input_label"), lines=1, interactive=True, visible=False) def show_url_input(evt:gr.SelectData): if evt.value == url_knowledge_dialogue: return gr.update(visible=True) @@ -484,7 +481,7 @@ def build_single_model_ui(): with vs_setting: vs_name = gr.Textbox( - label=get_lang_text("new_klg_name"), lines=1, interactive=True, name = "vs_name" + 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: @@ -530,7 +527,7 @@ def build_single_model_ui(): gr.Markdown(learn_more_markdown) - params = [plugin_selector, mode, sql_mode, db_selector, url_input, vs_name] + params = [plugin_selected, mode, sql_mode, db_selector, url_input, vs_name] btn_list = [regenerate_btn, clear_btn] diff --git a/plugins/DB-GPT-Plugin-ByteBase.zip b/plugins/DB-GPT-Plugin-ByteBase.zip new file mode 100644 index 000000000..60ce2816d Binary files /dev/null and b/plugins/DB-GPT-Plugin-ByteBase.zip differ