gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

防止关键词和regex重复匹配

Browse Source
This commit is contained in:
HexatomicRing
2025-04-11 10:35:34 +08:00
parent 360406efde
commit 157f2bc044
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/chat_module/reasoning_chat/reasoning_prompt_builder.py
View File

@@ -115,17 +115,18 @@ class PromptBuilder:
f"检测到以下关键词之一：{rule.get('keywords', [])}，触发反应：{rule.get('reaction', '')}" f"检测到以下关键词之一：{rule.get('keywords', [])}，触发反应：{rule.get('reaction', '')}"
) )
keywords_reaction_prompt += rule.get("reaction", "") + "，" keywords_reaction_prompt += rule.get("reaction", "") + "，"
for pattern in rule.get("regex", []): else:
result = pattern.search(message_txt) for pattern in rule.get("regex", []):
if result: result = pattern.search(message_txt)
reaction = rule.get('reaction', '') if result:
for name, content in result.groupdict().items(): reaction = rule.get('reaction', '')
reaction = reaction.replace(f'[{name}]', content) for name, content in result.groupdict().items():
logger.info( reaction = reaction.replace(f'[{name}]', content)
f"匹配到以下正则表达式：{pattern}，触发反应：{reaction}" logger.info(
) f"匹配到以下正则表达式：{pattern}，触发反应：{reaction}"
keywords_reaction_prompt += reaction + "，" )
break keywords_reaction_prompt += reaction + "，"
break
# 中文高手(新加的好玩功能) # 中文高手(新加的好玩功能)
prompt_ger = "" prompt_ger = ""

23
src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py
View File

@@ -61,17 +61,18 @@ class PromptBuilder:
f"检测到以下关键词之一：{rule.get('keywords', [])}，触发反应：{rule.get('reaction', '')}" f"检测到以下关键词之一：{rule.get('keywords', [])}，触发反应：{rule.get('reaction', '')}"
) )
keywords_reaction_prompt += rule.get("reaction", "") + "，" keywords_reaction_prompt += rule.get("reaction", "") + "，"
for pattern in rule.get("regex", []): else:
result = pattern.search(message_txt) for pattern in rule.get("regex", []):
if result: result = pattern.search(message_txt)
reaction = rule.get('reaction', '') if result:
for name, content in result.groupdict().items(): reaction = rule.get('reaction', '')
reaction = reaction.replace(f'[{name}]', content) for name, content in result.groupdict().items():
logger.info( reaction = reaction.replace(f'[{name}]', content)
f"匹配到以下正则表达式：{pattern}，触发反应：{reaction}" logger.info(
) f"匹配到以下正则表达式：{pattern}，触发反应：{reaction}"
keywords_reaction_prompt += reaction + "，" )
break keywords_reaction_prompt += reaction + "，"
break
# 中文高手(新加的好玩功能) # 中文高手(新加的好玩功能)
prompt_ger = "" prompt_ger = ""