From 9d2a774cb81c5e29cbe646dcdfe5427dd0e2e472 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 14 Apr 2025 15:05:01 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20=E8=87=AA=E5=8A=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/do_tool/tool_can_use/send_emoji.py | 5 +---- src/plugins/chat/utils.py | 8 ++++---- .../chat_module/think_flow_chat/think_flow_chat.py | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/do_tool/tool_can_use/send_emoji.py b/src/do_tool/tool_can_use/send_emoji.py index 090f301cf..9cd48f0e4 100644 --- a/src/do_tool/tool_can_use/send_emoji.py +++ b/src/do_tool/tool_can_use/send_emoji.py @@ -13,9 +13,7 @@ class SendEmojiTool(BaseTool): description = "当你觉得需要表达情感,或者帮助表达,可以使用这个工具发送表情包" parameters = { "type": "object", - "properties": { - "text": {"type": "string", "description": "要发送的表情包描述"} - }, + "properties": {"text": {"type": "string", "description": "要发送的表情包描述"}}, "required": ["text"], } @@ -25,4 +23,3 @@ class SendEmojiTool(BaseTool): "name": "send_emoji", "content": text, } - diff --git a/src/plugins/chat/utils.py b/src/plugins/chat/utils.py index b93ae8fd4..b4e2cb3c2 100644 --- a/src/plugins/chat/utils.py +++ b/src/plugins/chat/utils.py @@ -325,12 +325,12 @@ def random_remove_punctuation(text: str) -> str: def process_llm_response(text: str) -> List[str]: # 提取被 () 或 [] 包裹的内容 - pattern = re.compile(r'[\(\[].*?[\)\]]') + pattern = re.compile(r"[\(\[].*?[\)\]]") _extracted_contents = pattern.findall(text) # 去除 () 和 [] 及其包裹的内容 - cleaned_text = pattern.sub('', text) + cleaned_text = pattern.sub("", text) logger.debug(f"{text}去除括号处理后的文本: {cleaned_text}") - + # 对清理后的文本进行进一步处理 max_length = global_config.response_max_length * 2 max_sentence_num = global_config.response_max_sentence_num @@ -366,7 +366,7 @@ def process_llm_response(text: str) -> List[str]: if len(sentences) > max_sentence_num: logger.warning(f"分割后消息数量过多 ({len(sentences)} 条),返回默认回复") return [f"{global_config.BOT_NICKNAME}不知道哦"] - + # sentences.extend(extracted_contents) return sentences diff --git a/src/plugins/chat_module/think_flow_chat/think_flow_chat.py b/src/plugins/chat_module/think_flow_chat/think_flow_chat.py index 535b7ff44..2e3a74693 100644 --- a/src/plugins/chat_module/think_flow_chat/think_flow_chat.py +++ b/src/plugins/chat_module/think_flow_chat/think_flow_chat.py @@ -108,7 +108,7 @@ class ThinkFlowChat: message_manager.add_message(message_set) return first_bot_msg - async def _handle_emoji(self, message, chat, response, send_emoji = ""): + async def _handle_emoji(self, message, chat, response, send_emoji=""): """处理表情包""" if send_emoji: emoji_raw = await emoji_manager.get_emoji_for_text(send_emoji) @@ -305,7 +305,7 @@ class ThinkFlowChat: # 特殊判定:change_relationship if tool_name == "change_relationship": update_relationship = tool_data[0]["content"] - + if tool_name == "send_emoji": send_emoji = tool_data[0]["content"]