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

feat：表达方式现在可以选择在不同群互通

Browse Source
This commit is contained in:
SengokuCola
2025-06-21 17:14:18 +08:00
parent 248161a754
commit 9bbc48ecd3
6 changed files with 76 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/chat/express/exprssion_learner.py
View File

@@ -69,7 +69,7 @@ class ExpressionLearner:
# TODO: API-Adapter修改标记
self.express_learn_model: LLMRequest = LLMRequest(
model=global_config.model.replyer_1,
temperature=0.1,
temperature=0.2,
request_type="expressor.learner",
)
@@ -78,18 +78,62 @@ class ExpressionLearner:
读取/data/expression/learnt/{chat_id}/expressions.json和/data/expression/personality/expressions.json
返回(learnt_expressions, personality_expressions)
"""
learnt_style_file = os.path.join("data", "expression", "learnt_style", str(chat_id), "expressions.json")
learnt_grammar_file = os.path.join("data", "expression", "learnt_grammar", str(chat_id), "expressions.json")
personality_file = os.path.join("data", "expression", "personality", "expressions.json")
expression_groups = global_config.expression.expression_groups
chat_ids_to_load = [chat_id]
# 获取当前chat_id的类型
chat_stream = get_chat_manager().get_stream(chat_id)
platform = chat_stream.platform
if chat_stream and chat_stream.group_info:
current_chat_type = "group"
typed_chat_id = f"{platform}:{chat_stream.group_info.group_id}:{current_chat_type}"
else:
typed_chat_id = f"{platform}:{chat_stream.user_info.user_id}:{current_chat_type}"
logger.info(f"正在为 {typed_chat_id} 查找互通组...")
found_group = None
for group in expression_groups:
# logger.info(f"正在检查互通组: {group}")
# logger.info(f"当前chat_id: {typed_chat_id}")
if typed_chat_id in group:
found_group = group
# logger.info(f"找到互通组: {group}")
break
if not found_group:
logger.info(f"未找到互通组，仅加载 {chat_id} 的表达方式")
if found_group:
# 从带类型的id中解析出原始id
parsed_ids = []
for item in found_group:
try:
platform, id, type = item.split(":")
chat_id = get_chat_manager().get_stream_id(platform, id, type == "group")
parsed_ids.append(chat_id)
except Exception:
logger.warning(f"无法解析互通组中的ID: {item}")
chat_ids_to_load = parsed_ids
logger.info(f"将要加载以下id的表达方式: {chat_ids_to_load}")
learnt_style_expressions = []
learnt_grammar_expressions = []
for id_to_load in chat_ids_to_load:
learnt_style_file = os.path.join("data", "expression", "learnt_style", str(id_to_load), "expressions.json")
learnt_grammar_file = os.path.join(
"data", "expression", "learnt_grammar", str(id_to_load), "expressions.json"
)
if os.path.exists(learnt_style_file):
with open(learnt_style_file, "r", encoding="utf-8") as f:
learnt_style_expressions.extend(json.load(f))
if os.path.exists(learnt_grammar_file):
with open(learnt_grammar_file, "r", encoding="utf-8") as f:
learnt_grammar_expressions.extend(json.load(f))
personality_file = os.path.join("data", "expression", "personality", "expressions.json")
personality_expressions = []
if os.path.exists(learnt_style_file):
with open(learnt_style_file, "r", encoding="utf-8") as f:
learnt_style_expressions = json.load(f)
if os.path.exists(learnt_grammar_file):
with open(learnt_grammar_file, "r", encoding="utf-8") as f:
learnt_grammar_expressions = json.load(f)
if os.path.exists(personality_file):
with open(personality_file, "r", encoding="utf-8") as f:
personality_expressions = json.load(f)

17
src/chat/focus_chat/info_processors/expression_selector_processor.py
View File

@@ -101,7 +101,7 @@ class ExpressionSelectorProcessor(BaseProcessor):
self.subheartflow_id = subheartflow_id
self.last_selection_time = 0
self.selection_interval = 60 # 1分钟间隔
self.selection_interval = 40 # 1分钟间隔
self.cached_expressions = [] # 缓存上一次选择的表达方式
# 表达方式选择模式
@@ -158,16 +158,11 @@ class ExpressionSelectorProcessor(BaseProcessor):
try:
# 根据模式选择表达方式
if self.selection_mode == "llm":
# LLM模式：调用LLM选择15个，然后随机选5个
selected_expressions = await self._select_suitable_expressions_llm(chat_info)
cache_size = len(selected_expressions) if selected_expressions else 0
mode_desc = f"LLM模式（已缓存{cache_size}个）"
else:
# 随机模式：直接随机选择5个
selected_expressions = await self._select_suitable_expressions_random(chat_info)
cache_size = len(selected_expressions) if selected_expressions else 0
mode_desc = f"随机模式（已缓存{cache_size}个）"
# LLM模式：调用LLM选择15个，然后随机选5个
selected_expressions = await self._select_suitable_expressions_llm(chat_info)
cache_size = len(selected_expressions) if selected_expressions else 0
mode_desc = f"LLM模式（已缓存{cache_size}个）"
if selected_expressions:
# 缓存选择的表达方式

2
src/chat/focus_chat/info_processors/relationship_processor.py
View File

@@ -154,7 +154,7 @@ class RelationshipProcessor(BaseProcessor):
self.person_engaged_cache: Dict[str, List[Dict[str, any]]] = {}
# 持久化存储文件路径
self.cache_file_path = os.path.join("data", f"relationship_cache_{self.subheartflow_id}.pkl")
self.cache_file_path = os.path.join("data", "relationship", f"relationship_cache_{self.subheartflow_id}.pkl")
# 最后处理的消息时间，避免重复处理相同消息
current_time = time.time()

2
src/chat/normal_chat/normal_chat.py
View File

@@ -87,7 +87,7 @@ class NormalChat:
self.person_engaged_cache: Dict[str, List[Dict[str, any]]] = {}
# 持久化存储文件路径
self.cache_file_path = os.path.join("data", f"relationship_cache_{self.stream_id}.pkl")
self.cache_file_path = os.path.join("data", "relationship", f"relationship_cache_{self.stream_id}.pkl")
# 最后处理的消息时间，避免重复处理相同消息
self.last_processed_message_time = 0.0