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

Merge branch 'debug' into feature

Browse Source
This commit is contained in:
tcmofashi
2025-03-06 06:45:32 +08:00
parent fea3285d20 3897c9787a
commit 77076a505f
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/chat/bot.py
View File

@@ -119,7 +119,7 @@ class ChatBot:
willing_manager.change_reply_willing_sent(thinking_message.group_id) willing_manager.change_reply_willing_sent(thinking_message.group_id)
response, emotion = await self.gpt.generate_response(message) response,raw_content = await self.gpt.generate_response(message)
# if response is None: # if response is None:
# thinking_message.interupt=True # thinking_message.interupt=True
@@ -171,6 +171,13 @@ class ChatBot:
message_manager.add_message(message_set) message_manager.add_message(message_set)
bot_response_time = tinking_time_point bot_response_time = tinking_time_point
emotion = await self.gpt._get_emotion_tags(raw_content)
print(f"为 '{response}' 获取到的情感标签为：{emotion}")
valuedict={
'happy':0.5,'angry':-1,'sad':-0.5,'surprised':0.5,'disgusted':-1.5,'fearful':-0.25,'neutral':0.25
}
await relationship_manager.update_relationship_value(message.user_id, relationship_value=valuedict[emotion[0]])
if random() < global_config.emoji_chance: if random() < global_config.emoji_chance:
emoji_path = await emoji_manager.get_emoji_for_text(response) emoji_path = await emoji_manager.get_emoji_for_text(response)
if emoji_path: if emoji_path:

15
src/plugins/chat/llm_generator.py
View File

@@ -44,19 +44,15 @@ class ResponseGenerator:
print(f"+++++++++++++++++{global_config.BOT_NICKNAME}{self.current_model_type}思考中+++++++++++++++++") print(f"+++++++++++++++++{global_config.BOT_NICKNAME}{self.current_model_type}思考中+++++++++++++++++")
model_response = await self._generate_response_with_model(message, current_model) model_response = await self._generate_response_with_model(message, current_model)
raw_content=model_response
if model_response: if model_response:
print(f'{global_config.BOT_NICKNAME}的回复是：{model_response}') print(f'{global_config.BOT_NICKNAME}的回复是：{model_response}')
model_response, emotion = await self._process_response(model_response) model_response = await self._process_response(model_response)
if model_response: if model_response:
print(f"为 '{model_response}' 获取到的情感标签为：{emotion}")
valuedict={
'happy':0.5,'angry':-1,'sad':-0.5,'surprised':0.5,'disgusted':-1.5,'fearful':-0.25,'neutral':0.25
}
await relationship_manager.update_relationship_value(message.user_id, relationship_value=valuedict[emotion[0]])
return model_response, emotion return model_response ,raw_content
return None, [] return None,raw_content
async def _generate_response_with_model(self, message: Message, model: LLM_request) -> Optional[str]: async def _generate_response_with_model(self, message: Message, model: LLM_request) -> Optional[str]:
"""使用指定的模型生成回复""" """使用指定的模型生成回复"""
@@ -158,10 +154,9 @@ class ResponseGenerator:
if not content: if not content:
return None, [] return None, []
emotion_tags = await self._get_emotion_tags(content)
processed_response = process_llm_response(content) processed_response = process_llm_response(content)
return processed_response, emotion_tags return processed_response
class InitiativeMessageGenerate: class InitiativeMessageGenerate: