diff --git a/src/config/config.py b/src/config/config.py index be120f491..e99bb7d87 100644 --- a/src/config/config.py +++ b/src/config/config.py @@ -153,6 +153,7 @@ class BotConfig: "用一句话或几句话描述人格的一些侧面", ] ) + expression_style = "描述麦麦说话的表达风格,表达习惯" # identity identity_detail: List[str] = field( default_factory=lambda: [ @@ -360,6 +361,8 @@ class BotConfig: if config.INNER_VERSION in SpecifierSet(">=1.2.4"): config.personality_core = personality_config.get("personality_core", config.personality_core) config.personality_sides = personality_config.get("personality_sides", config.personality_sides) + if config.INNER_VERSION in SpecifierSet(">=1.7.0"): + config.expression_style = personality_config.get("expression_style", config.expression_style) def identity(parent: dict): identity_config = parent["identity"] diff --git a/src/plugins/heartFC_chat/expressors/exprssion_learner.py b/src/plugins/heartFC_chat/expressors/exprssion_learner.py index 4e84889f2..20dc81589 100644 --- a/src/plugins/heartFC_chat/expressors/exprssion_learner.py +++ b/src/plugins/heartFC_chat/expressors/exprssion_learner.py @@ -58,7 +58,6 @@ def init_prompt() -> None: """ Prompt(personality_expression_prompt, "personality_expression_prompt") -peronality = "情绪敏感,有时候有些搞怪幽默, 是一个女大学生,现在在读大二,你会刷贴吧" class ExpressionLearner: def __init__(self) -> None: @@ -230,7 +229,7 @@ class ExpressionLearner: # 构建prompt prompt = await global_prompt_manager.format_prompt( "personality_expression_prompt", - personality=peronality, + personality=global_config.expression_style, ) logger.info(f"个性表达方式提取prompt: {prompt}") response, _ = await self.express_learn_model.generate_response_async(prompt) diff --git a/src/plugins/heartFC_chat/heartflow_prompt_builder.py b/src/plugins/heartFC_chat/heartflow_prompt_builder.py index 00912e7f2..aef7487de 100644 --- a/src/plugins/heartFC_chat/heartflow_prompt_builder.py +++ b/src/plugins/heartFC_chat/heartflow_prompt_builder.py @@ -246,7 +246,9 @@ async def _build_prompt_focus( structured_info_prompt = "" # 从/data/expression/对应chat_id/expressions.json中读取表达方式 - learnt_expressions, personality_expressions = await expression_learner.get_expression_by_chat_id(chat_stream.stream_id) + learnt_expressions, personality_expressions = await expression_learner.get_expression_by_chat_id( + chat_stream.stream_id + ) language_habits = [] # 1. learnt_expressions加权随机选5条 if learnt_expressions: diff --git a/src/plugins/utils/chat_message_builder.py b/src/plugins/utils/chat_message_builder.py index a2c5621ce..1deec4a4f 100644 --- a/src/plugins/utils/chat_message_builder.py +++ b/src/plugins/utils/chat_message_builder.py @@ -247,12 +247,12 @@ async def _build_readable_messages_internal( last_end = m.end() new_content += content[last_end:] content = new_content - + target_str = "这是QQ的一个功能,用于提及某人,但没那么明显" if target_str in content: if random.random() < 0.6: content = content.replace(target_str, "") - + if content != "": message_details_raw.append((timestamp, person_name, content)) diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 303845f5f..00758d356 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -1,5 +1,5 @@ [inner] -version = "1.6.1" +version = "1.7.0" #----以下是给开发人员阅读的,如果你只是部署了麦麦,不需要阅读---- #如果你想要修改配置文件,请在修改后将version的值进行变更 @@ -43,6 +43,10 @@ personality_sides = [ "用一句话或几句话描述人格的一些细节", ]# 条数任意,不能为0, 该选项还在调试中,可能未完全生效 +# 表达方式 +expression_style = "描述麦麦说话的表达风格,表达习惯" + + [identity] #アイデンティティがない 生まれないらららら # 兴趣爱好 未完善,有些条目未使用 identity_detail = [