Merge branch 'dev' into plugin
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
from src.manager.mood_manager import mood_manager
|
||||
import enum
|
||||
|
||||
|
||||
@@ -12,6 +11,3 @@ class ChatStateInfo:
|
||||
def __init__(self):
|
||||
self.chat_status: ChatState = ChatState.NORMAL
|
||||
self.current_state_time = 120
|
||||
|
||||
self.mood_manager = mood_manager
|
||||
self.mood = self.mood_manager.get_mood_prompt()
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from src.chat.memory_system.Hippocampus import hippocampus_manager
|
||||
from src.config.config import global_config
|
||||
import asyncio
|
||||
from src.chat.message_receive.message import MessageRecv
|
||||
from src.chat.message_receive.storage import MessageStorage
|
||||
from src.chat.heart_flow.heartflow import heartflow
|
||||
@@ -12,6 +13,7 @@ import traceback
|
||||
from typing import Tuple
|
||||
|
||||
from src.person_info.relationship_manager import get_relationship_manager
|
||||
from src.mood.mood_manager import mood_manager
|
||||
|
||||
|
||||
logger = get_logger("chat")
|
||||
@@ -105,6 +107,9 @@ class HeartFCMessageReceiver:
|
||||
interested_rate, is_mentioned = await _calculate_interest(message)
|
||||
subheartflow.add_message_to_normal_chat_cache(message, interested_rate, is_mentioned)
|
||||
|
||||
chat_mood = mood_manager.get_mood_by_chat_id(subheartflow.chat_id)
|
||||
asyncio.create_task(chat_mood.update_mood_by_message(message, interested_rate))
|
||||
|
||||
# 3. 日志记录
|
||||
mes_name = chat.group_info.group_name if chat.group_info else "私聊"
|
||||
# current_time = time.strftime("%H:%M:%S", time.localtime(message.message_info.time))
|
||||
|
||||
@@ -26,8 +26,6 @@ class SubHeartflow:
|
||||
|
||||
Args:
|
||||
subheartflow_id: 子心流唯一标识符
|
||||
mai_states: 麦麦状态信息实例
|
||||
hfc_no_reply_callback: HFChatting 连续不回复时触发的回调
|
||||
"""
|
||||
# 基础属性,两个值是一样的
|
||||
self.subheartflow_id = subheartflow_id
|
||||
|
||||
Reference in New Issue
Block a user