Losita/mai-bot
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:将relation获取变为工具

Browse Source
This commit is contained in:
SengokuCola
2025-09-17 21:17:52 +08:00
parent ddf4fb1bce
commit a932ca695a
13 changed files with 103 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/chat/replyer/group_generator.py
View File

@@ -702,9 +702,9 @@ class DefaultReplyer:
self._time_and_run_task(
self.build_expression_habits(chat_talking_prompt_short, target), "expression_habits"
),
self._time_and_run_task(
self.build_relation_info(chat_talking_prompt_short, sender, person_list_short), "relation_info"
),
# self._time_and_run_task(
# self.build_relation_info(chat_talking_prompt_short, sender, person_list_short), "relation_info"
# ),
# self._time_and_run_task(self.build_memory_block(message_list_before_short, target), "memory_block"),
self._time_and_run_task(
self.build_tool_info(chat_talking_prompt_short, sender, target, enable_tool=enable_tool), "tool_info"
@@ -745,7 +745,7 @@ class DefaultReplyer:
expression_habits_block, selected_expressions = results_dict["expression_habits"]
expression_habits_block: str
selected_expressions: List[int]
relation_info: str = results_dict["relation_info"]
# relation_info: str = results_dict["relation_info"]
# memory_block: str = results_dict["memory_block"]
tool_info: str = results_dict["tool_info"]
prompt_info: str = results_dict["prompt_info"] # 直接使用格式化后的结果
@@ -786,7 +786,7 @@ class DefaultReplyer:
tool_info_block=tool_info,
knowledge_prompt=prompt_info,
# memory_block=memory_block,
relation_info_block=relation_info,
# relation_info_block=relation_info,
extra_info_block=extra_info_block,
identity=personality_prompt,
action_descriptions=actions_info,
@@ -806,7 +806,7 @@ class DefaultReplyer:
tool_info_block=tool_info,
knowledge_prompt=prompt_info,
# memory_block=memory_block,
relation_info_block=relation_info,
# relation_info_block=relation_info,
extra_info_block=extra_info_block,
identity=personality_prompt,
action_descriptions=actions_info,
@@ -856,9 +856,9 @@ class DefaultReplyer:
)
# 并行执行2个构建任务
(expression_habits_block, _), relation_info, personality_prompt = await asyncio.gather(
(expression_habits_block, _), personality_prompt = await asyncio.gather(
self.build_expression_habits(chat_talking_prompt_half, target),
self.build_relation_info(chat_talking_prompt_half, sender, []),
# self.build_relation_info(chat_talking_prompt_half, sender, []),
self.build_personality_prompt(),
)
@@ -909,7 +909,7 @@ class DefaultReplyer:
return await global_prompt_manager.format_prompt(
template_name,
expression_habits_block=expression_habits_block,
relation_info_block=relation_info,
# relation_info_block=relation_info,
chat_target=chat_target_1,
time_block=time_block,
chat_info=chat_talking_prompt_half,

34
src/chat/replyer/private_generator.py
View File

@@ -216,25 +216,25 @@ class PrivateReplyer:
traceback.print_exc()
return False, llm_response
async def build_relation_info(self, chat_content: str, sender: str):
if not global_config.relationship.enable_relationship:
return ""
# async def build_relation_info(self, chat_content: str, sender: str):
# if not global_config.relationship.enable_relationship:
# return ""
if not sender:
return ""
# if not sender:
# return ""
if sender == global_config.bot.nickname:
return ""
# if sender == global_config.bot.nickname:
# return ""
# 获取用户ID
person = Person(person_name=sender)
if not is_person_known(person_name=sender):
logger.warning(f"未找到用户 {sender} 的ID，跳过信息提取")
return f"你完全不认识{sender}，不理解ta的相关信息。"
# # 获取用户ID
# person = Person(person_name=sender)
# if not is_person_known(person_name=sender):
# logger.warning(f"未找到用户 {sender} 的ID，跳过信息提取")
# return f"你完全不认识{sender}，不理解ta的相关信息。"
sender_relation = await person.build_relationship(chat_content)
# sender_relation = await person.build_relationship(chat_content)
return f"{sender_relation}"
# return f"{sender_relation}"
async def build_expression_habits(self, chat_history: str, target: str) -> Tuple[str, List[int]]:
# sourcery skip: for-append-to-extend
@@ -724,9 +724,9 @@ class PrivateReplyer:
)
# 并行执行2个构建任务
(expression_habits_block, _), relation_info, personality_prompt = await asyncio.gather(
(expression_habits_block, _), personality_prompt = await asyncio.gather(
self.build_expression_habits(chat_talking_prompt_half, target),
self.build_relation_info(chat_talking_prompt_half, sender),
# self.build_relation_info(chat_talking_prompt_half, sender),
self.build_personality_prompt(),
)
@@ -777,7 +777,7 @@ class PrivateReplyer:
return await global_prompt_manager.format_prompt(
template_name,
expression_habits_block=expression_habits_block,
relation_info_block=relation_info,
# relation_info_block=relation_info,
chat_target=chat_target_1,
time_block=time_block,
chat_info=chat_talking_prompt_half,

8
src/chat/replyer/prompt/replyer_prompt.py
View File

@@ -12,7 +12,7 @@ def init_replyer_prompt():
Prompt(
"""{knowledge_prompt}{relation_info_block}{tool_info_block}{extra_info_block}
"""{knowledge_prompt}{tool_info_block}{extra_info_block}
{expression_habits_block}
你正在qq群里聊天，下面是群里正在聊的内容:
@@ -33,7 +33,7 @@ def init_replyer_prompt():
Prompt(
"""{knowledge_prompt}{relation_info_block}{tool_info_block}{extra_info_block}
"""{knowledge_prompt}{tool_info_block}{extra_info_block}
{expression_habits_block}
你正在qq群里聊天，下面是群里正在聊的内容:
@@ -54,7 +54,7 @@ def init_replyer_prompt():
Prompt(
"""{knowledge_prompt}{relation_info_block}{tool_info_block}{extra_info_block}
"""{knowledge_prompt}{tool_info_block}{extra_info_block}
{expression_habits_block}
你正在和{sender_name}聊天，这是你们之前聊的内容:
@@ -73,7 +73,7 @@ def init_replyer_prompt():
Prompt(
"""{knowledge_prompt}{relation_info_block}{tool_info_block}{extra_info_block}
"""{knowledge_prompt}{tool_info_block}{extra_info_block}
{expression_habits_block}
你正在和{sender_name}聊天，这是你们之前聊的内容:

2
src/chat/replyer/prompt/rewrite_prompt.py
View File

@@ -13,8 +13,6 @@ def init_rewrite_prompt():
Prompt(
"""
{expression_habits_block}
{relation_info_block}
{chat_target}
{time_block}
{chat_info}