better；移除无用内容，独立mute action
This commit is contained in:
SengokuCola
@@ -10,12 +10,11 @@ from src.chat.utils.prompt_builder import global_prompt_manager
|
||||
from src.common.logger import get_logger
|
||||
from src.chat.utils.timer_calculator import Timer
|
||||
from src.chat.focus_chat.focus_loop_info import FocusLoopInfo
|
||||
from src.chat.planner_actions.planner_focus import ActionPlanner
|
||||
from src.chat.planner_actions.planner import ActionPlanner
|
||||
from src.chat.planner_actions.action_modifier import ActionModifier
|
||||
from src.chat.planner_actions.action_manager import ActionManager
|
||||
from src.config.config import global_config
|
||||
from src.chat.focus_chat.hfc_performance_logger import HFCPerformanceLogger
|
||||
from src.chat.focus_chat.hfc_version_manager import get_hfc_version
|
||||
from src.person_info.relationship_builder_manager import relationship_builder_manager
|
||||
from src.chat.focus_chat.hfc_utils import CycleDetail
|
||||
|
||||
@@ -87,8 +86,8 @@ class HeartFChatting:
|
||||
|
||||
# 初始化性能记录器
|
||||
# 如果没有指定版本号，则使用全局版本管理器的版本号
|
||||
actual_version = get_hfc_version()
|
||||
self.performance_logger = HFCPerformanceLogger(chat_id, actual_version)
|
||||
|
||||
self.performance_logger = HFCPerformanceLogger(chat_id)
|
||||
|
||||
logger.info(
|
||||
f"{self.log_prefix} HeartFChatting 初始化完成，消息疲惫阈值: {self._message_threshold}条（基于exit_focus_threshold={global_config.chat.exit_focus_threshold}计算，仅在auto模式下生效）"
|
||||
|
||||
@@ -11,11 +11,11 @@ class HFCPerformanceLogger:
|
||||
"""HFC性能记录管理器"""
|
||||
|
||||
# 版本号常量，可在启动时修改
|
||||
INTERNAL_VERSION = "v1.0.0"
|
||||
INTERNAL_VERSION = "v7.0.0"
|
||||
|
||||
def __init__(self, chat_id: str, version: str = None):
|
||||
def __init__(self, chat_id: str):
|
||||
self.chat_id = chat_id
|
||||
self.version = version or self.INTERNAL_VERSION
|
||||
self.version = self.INTERNAL_VERSION
|
||||
self.log_dir = Path("log/hfc_loop")
|
||||
self.session_start_time = datetime.now()
|
||||
|
||||
|
||||
@@ -1,185 +0,0 @@
|
||||
"""
|
||||
HFC性能记录版本号管理器
|
||||
|
||||
用于管理HFC性能记录的内部版本号，支持：
|
||||
1. 默认版本号设置
|
||||
2. 启动时版本号配置
|
||||
3. 版本号验证和格式化
|
||||
"""
|
||||
|
||||
import os
|
||||
import re
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
from src.common.logger import get_logger
|
||||
|
||||
logger = get_logger("hfc_version")
|
||||
|
||||
|
||||
class HFCVersionManager:
|
||||
"""HFC版本号管理器"""
|
||||
|
||||
# 默认版本号
|
||||
DEFAULT_VERSION = "v6.0.0"
|
||||
|
||||
# 当前运行时版本号
|
||||
_current_version: Optional[str] = None
|
||||
|
||||
@classmethod
|
||||
def set_version(cls, version: str) -> bool:
|
||||
"""
|
||||
设置当前运行时版本号
|
||||
|
||||
参数:
|
||||
version: 版本号字符串，格式如 v1.0.0 或 1.0.0
|
||||
|
||||
返回:
|
||||
bool: 设置是否成功
|
||||
"""
|
||||
try:
|
||||
validated_version = cls._validate_version(version)
|
||||
if validated_version:
|
||||
cls._current_version = validated_version
|
||||
logger.info(f"HFC性能记录版本已设置为: {validated_version}")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"无效的版本号格式: {version}")
|
||||
return False
|
||||
except Exception as e:
|
||||
logger.error(f"设置版本号失败: {e}")
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
def get_version(cls) -> str:
|
||||
"""
|
||||
获取当前版本号
|
||||
|
||||
返回:
|
||||
str: 当前版本号
|
||||
"""
|
||||
if cls._current_version:
|
||||
return cls._current_version
|
||||
|
||||
# 尝试从环境变量获取
|
||||
env_version = os.getenv("HFC_PERFORMANCE_VERSION")
|
||||
if env_version:
|
||||
if cls.set_version(env_version):
|
||||
return cls._current_version
|
||||
|
||||
# 返回默认版本号
|
||||
return cls.DEFAULT_VERSION
|
||||
|
||||
@classmethod
|
||||
def auto_generate_version(cls, base_version: str = None) -> str:
|
||||
"""
|
||||
自动生成版本号（基于时间戳）
|
||||
|
||||
参数:
|
||||
base_version: 基础版本号，如果不提供则使用默认版本
|
||||
|
||||
返回:
|
||||
str: 生成的版本号
|
||||
"""
|
||||
if not base_version:
|
||||
base_version = cls.DEFAULT_VERSION
|
||||
|
||||
# 提取基础版本号的主要部分
|
||||
base_match = re.match(r"v?(\d+\.\d+)", base_version)
|
||||
if base_match:
|
||||
base_part = base_match.group(1)
|
||||
else:
|
||||
base_part = "1.0"
|
||||
|
||||
# 添加时间戳
|
||||
timestamp = datetime.now().strftime("%Y%m%d_%H%M")
|
||||
generated_version = f"v{base_part}.{timestamp}"
|
||||
|
||||
cls.set_version(generated_version)
|
||||
logger.info(f"自动生成版本号: {generated_version}")
|
||||
|
||||
return generated_version
|
||||
|
||||
@classmethod
|
||||
def _validate_version(cls, version: str) -> Optional[str]:
|
||||
"""
|
||||
验证版本号格式
|
||||
|
||||
参数:
|
||||
version: 待验证的版本号
|
||||
|
||||
返回:
|
||||
Optional[str]: 验证后的版本号，失败返回None
|
||||
"""
|
||||
if not version or not isinstance(version, str):
|
||||
return None
|
||||
|
||||
version = version.strip()
|
||||
|
||||
# 支持的格式：
|
||||
# v1.0.0, 1.0.0, v1.0, 1.0, v1.0.0.20241222_1530 等
|
||||
patterns = [
|
||||
r"^v?(\d+\.\d+\.\d+)$", # v1.0.0 或 1.0.0
|
||||
r"^v?(\d+\.\d+)$", # v1.0 或 1.0
|
||||
r"^v?(\d+\.\d+\.\d+\.\w+)$", # v1.0.0.build 或 1.0.0.build
|
||||
r"^v?(\d+\.\d+\.\w+)$", # v1.0.build 或 1.0.build
|
||||
]
|
||||
|
||||
for pattern in patterns:
|
||||
match = re.match(pattern, version)
|
||||
if match:
|
||||
# 确保版本号以v开头
|
||||
if not version.startswith("v"):
|
||||
version = "v" + version
|
||||
return version
|
||||
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
def reset_version(cls):
|
||||
"""重置版本号为默认值"""
|
||||
cls._current_version = None
|
||||
logger.info("HFC版本号已重置为默认值")
|
||||
|
||||
@classmethod
|
||||
def get_version_info(cls) -> dict:
|
||||
"""
|
||||
获取版本信息
|
||||
|
||||
返回:
|
||||
dict: 版本相关信息
|
||||
"""
|
||||
current = cls.get_version()
|
||||
return {
|
||||
"current_version": current,
|
||||
"default_version": cls.DEFAULT_VERSION,
|
||||
"is_custom": current != cls.DEFAULT_VERSION,
|
||||
"env_version": os.getenv("HFC_PERFORMANCE_VERSION"),
|
||||
"timestamp": datetime.now().isoformat(),
|
||||
}
|
||||
|
||||
|
||||
# 全局函数，方便使用
|
||||
def set_hfc_version(version: str) -> bool:
|
||||
"""设置HFC性能记录版本号"""
|
||||
return HFCVersionManager.set_version(version)
|
||||
|
||||
|
||||
def get_hfc_version() -> str:
|
||||
"""获取当前HFC性能记录版本号"""
|
||||
return HFCVersionManager.get_version()
|
||||
|
||||
|
||||
def auto_generate_hfc_version(base_version: str = None) -> str:
|
||||
"""自动生成HFC版本号"""
|
||||
return HFCVersionManager.auto_generate_version(base_version)
|
||||
|
||||
|
||||
def reset_hfc_version():
|
||||
"""重置HFC版本号"""
|
||||
HFCVersionManager.reset_version()
|
||||
|
||||
|
||||
# 在模块加载时显示当前版本信息
|
||||
if __name__ != "__main__":
|
||||
current_version = HFCVersionManager.get_version()
|
||||
logger.debug(f"HFC性能记录模块已加载，当前版本: {current_version}")
|
||||
@@ -18,7 +18,7 @@ from src.chat.planner_actions.action_manager import ActionManager
|
||||
from src.person_info.relationship_builder_manager import relationship_builder_manager
|
||||
from .priority_manager import PriorityManager
|
||||
import traceback
|
||||
from src.chat.planner_actions.planner_focus import ActionPlanner
|
||||
from src.chat.planner_actions.planner import ActionPlanner
|
||||
from src.chat.planner_actions.action_modifier import ActionModifier
|
||||
|
||||
from src.chat.utils.utils import get_chat_type_and_target_info
|
||||
@@ -773,14 +773,9 @@ class NormalChat:
|
||||
# 尝试优雅取消任务
|
||||
task_to_cancel.cancel()
|
||||
|
||||
# 不等待任务完成，让它自然结束
|
||||
# 这样可以避免等待过程中的潜在递归问题
|
||||
|
||||
# 异步清理思考消息，不阻塞当前流程
|
||||
asyncio.create_task(self._cleanup_thinking_messages_async())
|
||||
|
||||
logger.debug(f"[{self.stream_name}] 聊天任务停止完成")
|
||||
|
||||
async def _cleanup_thinking_messages_async(self):
|
||||
"""异步清理思考消息，避免阻塞主流程"""
|
||||
try:
|
||||
@@ -799,26 +794,6 @@ class NormalChat:
|
||||
logger.error(f"[{self.stream_name}] 异步清理思考消息时出错: {e}")
|
||||
# 不打印完整栈跟踪，避免日志污染
|
||||
|
||||
# 获取最近回复记录的方法
|
||||
def get_recent_replies(self, limit: int = 10) -> List[dict]:
|
||||
"""获取最近的回复记录
|
||||
|
||||
Args:
|
||||
limit: 最大返回数量，默认10条
|
||||
|
||||
Returns:
|
||||
List[dict]: 最近的回复记录列表，每项包含：
|
||||
time: 回复时间戳
|
||||
user_message: 用户消息内容
|
||||
user_info: 用户信息(user_id, user_nickname)
|
||||
response: 回复内容
|
||||
is_mentioned: 是否被提及(@)
|
||||
is_reference_reply: 是否为引用回复
|
||||
timing: 各阶段耗时
|
||||
"""
|
||||
# 返回最近的limit条记录，按时间倒序排列
|
||||
return sorted(self.recent_replies[-limit:], key=lambda x: x["time"], reverse=True)
|
||||
|
||||
def adjust_reply_frequency(self):
|
||||
"""
|
||||
根据预设规则动态调整回复意愿（willing_amplifier）。
|
||||
|
||||
Reference in New Issue
Block a user