diff --git a/apps/agentfabric/app.py b/apps/agentfabric/app.py index 20780cf6b..7dac1eba5 100644 --- a/apps/agentfabric/app.py +++ b/apps/agentfabric/app.py @@ -102,6 +102,7 @@ def check_uuid(uuid_str): create_chatbot = mgr.Chatbot( show_label=False, value=[[None, start_text]], + flushing=False, show_copy_button=True, llm_thinking_presets=[ qwen( @@ -375,10 +376,9 @@ def format_message_with_builder_cfg(_state, chatbot, builder_cfg, visible=True, value=format_cover_html(builder_cfg, bot_avatar_path)), user_chatbot: - mgr.Chatbot( + gr.update( visible=False, - avatar_images=get_avatar_image(bot_avatar, uuid_str), - _force_update=True), + avatar_images=get_avatar_image(bot_avatar, uuid_str)), user_chat_bot_suggest: gr.Dataset(components=[preview_chat_input], samples=suggestion) } @@ -443,7 +443,7 @@ def process_configuration(uuid_str, bot_avatar, name, description, bot_avatar, bot_avatar_path = save_avatar_image(bot_avatar, uuid_str) suggestions_filtered = [row for row in suggestions if row[0]] if len(suggestions_filtered) == 0: - suggestions_filtered == [['']] + suggestions_filtered = [['']] user_dir = get_user_dir(uuid_str) if knowledge_files is not None: new_knowledge_files = [ @@ -456,7 +456,6 @@ def process_configuration(uuid_str, bot_avatar, name, description, shutil.copy(src_file.name, dst_file) else: new_knowledge_files = [] - builder_cfg = { 'name': name, 'avatar': bot_avatar, @@ -511,16 +510,13 @@ def process_configuration(uuid_str, bot_avatar, name, description, visible=True, value=format_cover_html(builder_cfg, bot_avatar_path)), user_chatbot: - mgr.Chatbot( + gr.update( visible=False, - avatar_images=get_avatar_image(bot_avatar, uuid_str), - _force_update=True, - ), + avatar_images=get_avatar_image(bot_avatar, uuid_str)), + suggestion_input: [item[:] for item in suggestions_filtered], user_chat_bot_suggest: gr.Dataset( components=[preview_chat_input], samples=suggestions_filtered), - suggestion_input: - gr.DataFrame(value=suggestions_filtered) } # 配置 "Configure" 标签页的提交按钮功能 diff --git a/apps/agentfabric/appBot.py b/apps/agentfabric/appBot.py index 141179518..395246642 100644 --- a/apps/agentfabric/appBot.py +++ b/apps/agentfabric/appBot.py @@ -95,9 +95,20 @@ def send_message(chatbot, input, _state): # 将发送的消息添加到聊天历史 if 'user_agent' not in _state: init_user(_state) - + # 将发送的消息添加到聊天历史 + _uuid_str = check_uuid(uuid_str) user_agent = _state['user_agent'] - append_files = list(map(lambda f: f.path, input.files)) + append_files = [] + for file in input.files: + file_name = os.path.basename(file.path) + # covert xxx.json to xxx_uuid_str.json + file_name = file_name.replace('.', f'_{_uuid_str}.') + file_path = os.path.join(get_ci_dir(), file_name) + if not os.path.exists(file_path): + # make sure file path's directory exists + os.makedirs(os.path.dirname(file_path), exist_ok=True) + shutil.copy(file.path, file_path) + append_files.append(file_path) chatbot.append([{'text': input.text, 'files': input.files}, None]) yield { user_chatbot: chatbot, @@ -141,12 +152,12 @@ def send_message(chatbot, input, _state): chatbot[-1][1] = msg yield {user_chatbot: chatbot} - gr.on([user_chatbot_input.submit], - fn=send_message, - inputs=[user_chatbot, user_chatbot_input, state], - outputs=[user_chatbot, user_chatbot_input]) + gr.on([user_chatbot_input.submit], + fn=send_message, + inputs=[user_chatbot, user_chatbot_input, state], + outputs=[user_chatbot, user_chatbot_input]) demo.load(init_user, inputs=[state], outputs=[state]) -demo.queue(concurrency_count=10) -demo.launch(show_error=True) +demo.queue() +demo.launch(show_error=True, max_threads=10) diff --git a/apps/agentfabric/gradio_utils.py b/apps/agentfabric/gradio_utils.py index 7fedcbeac..8477ae23e 100644 --- a/apps/agentfabric/gradio_utils.py +++ b/apps/agentfabric/gradio_utils.py @@ -50,7 +50,7 @@ def format_cover_html(configuration, bot_avatar_path): return f"""
- +
{configuration.get("name", "")}
{configuration.get("description", "")}
diff --git a/apps/msgpt/gradio_chatbot.py b/apps/msgpt/gradio_chatbot.py index 7316ad008..f6d54cdd2 100644 --- a/apps/msgpt/gradio_chatbot.py +++ b/apps/msgpt/gradio_chatbot.py @@ -198,7 +198,7 @@ def process_exec_result(self, exec_result: str): return final_result match_audio = re.search( - r'