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

rufffffff

Browse Source
This commit is contained in:
明天好像没什么
2025-11-01 21:10:01 +08:00
committed by Windpicker-owo
parent 05daf869d1
commit ff6dc542e1
50 changed files with 742 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/built_in/affinity_flow_chatter/chat_stream_impression_tool.py
View File

@@ -7,12 +7,8 @@
import json
from typing import Any, ClassVar
from sqlalchemy import select
from src.common.database.compatibility import get_db_session
from src.common.database.core.models import ChatStreams
from src.common.database.api.crud import CRUDBase
from src.common.database.utils.decorators import cached
from src.common.database.core.models import ChatStreams
from src.common.logger import get_logger
from src.config.config import model_config
from src.llm_models.utils_model import LLMRequest
@@ -358,14 +354,14 @@ class ChatStreamImpressionTool(BaseTool):
"stream_interest_score": impression.get("stream_interest_score", 0.5),
}
)
# 使缓存失效
from src.common.database.optimization.cache_manager import get_cache
from src.common.database.utils.decorators import generate_cache_key
cache = await get_cache()
await cache.delete(generate_cache_key("stream_impression", stream_id))
await cache.delete(generate_cache_key("chat_stream", stream_id))
logger.info(f"聊天流印象已更新到数据库: {stream_id}")
else:
error_msg = f"聊天流 {stream_id} 不存在于数据库中，无法更新印象"

2
src/plugins/built_in/affinity_flow_chatter/proactive_thinking_event.py
View File

@@ -64,7 +64,7 @@ class ProactiveThinkingReplyHandler(BaseEventHandler):
from src.chat.message_receive.chat_stream import get_chat_manager
chat_manager = get_chat_manager()
chat_stream = await chat_manager.get_stream(stream_id)
if chat_stream:
stream_config = chat_stream.get_raw_id()
if not proactive_thinking_scheduler._check_whitelist_blacklist(stream_config):

13
src/plugins/built_in/affinity_flow_chatter/proactive_thinking_executor.py
View File

@@ -7,13 +7,10 @@ import json
from datetime import datetime
from typing import Any, Literal
from sqlalchemy import select
from src.chat.express.expression_selector import expression_selector
from src.chat.utils.prompt import Prompt
from src.common.database.compatibility import get_db_session
from src.common.database.core.models import ChatStreams
from src.common.database.api.crud import CRUDBase
from src.common.database.core.models import ChatStreams
from src.common.database.utils.decorators import cached
from src.common.logger import get_logger
from src.config.config import global_config, model_config
@@ -208,7 +205,7 @@ class ProactiveThinkingPlanner:
# 3. 获取bot人设和时间信息
individuality = Individuality()
bot_personality = await individuality.get_personality_block()
# 构建时间信息块
time_block = f"当前时间是 {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
@@ -624,11 +621,11 @@ async def execute_proactive_thinking(stream_id: str):
from src.chat.message_receive.chat_stream import get_chat_manager
chat_manager = get_chat_manager()
chat_stream = await chat_manager.get_stream(stream_id)
if chat_stream:
# 使用 ChatStream 的 get_raw_id() 方法获取配置字符串
stream_config = chat_stream.get_raw_id()
# 执行白名单/黑名单检查
if not proactive_thinking_scheduler._check_whitelist_blacklist(stream_config):
logger.debug(f"聊天流 {stream_id} ({stream_config}) 未通过白名单/黑名单检查，跳过主动思考")
@@ -637,7 +634,7 @@ async def execute_proactive_thinking(stream_id: str):
logger.warning(f"无法获取聊天流 {stream_id} 的信息，跳过白名单检查")
except Exception as e:
logger.warning(f"白名单检查时出错: {e}，继续执行")
# 0.2 检查安静时段
if proactive_thinking_scheduler._is_in_quiet_hours():
logger.debug("安静时段，跳过")