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

🤖 自动格式化代码 [skip ci]

Browse Source
This commit is contained in:
github-actions[bot]
2025-06-15 05:46:13 +00:00
parent a9a0ce0447
commit c96963ce6a
2 changed files with 53 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/chat/focus_chat/heartFC_chat.py
View File

@@ -332,17 +332,17 @@ class HeartFChatting:
"loop_processor_info": {}, "loop_processor_info": {},
"loop_plan_info": { "loop_plan_info": {
"action_result": { "action_result": {
"action_type": "error", "action_type": "error",
"action_data": {}, "action_data": {},
"reasoning": f"上下文处理失败: {e}" "reasoning": f"上下文处理失败: {e}",
}, },
"observed_messages": "" "observed_messages": "",
}, },
"loop_action_info": {"action_taken": False, "reply_text": "", "command": ""}, "loop_action_info": {"action_taken": False, "reply_text": "", "command": ""},
} }
self._current_cycle_detail.set_loop_info(error_loop_info) self._current_cycle_detail.set_loop_info(error_loop_info)
self._current_cycle_detail.complete_cycle() self._current_cycle_detail.complete_cycle()
# 上下文处理失败，跳过当前循环 # 上下文处理失败，跳过当前循环
await asyncio.sleep(1) await asyncio.sleep(1)
continue continue
@@ -403,19 +403,19 @@ class HeartFChatting:
except Exception as e: except Exception as e:
logger.error(f"{self.log_prefix} 循环处理时出错: {e}") logger.error(f"{self.log_prefix} 循环处理时出错: {e}")
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
# 如果_current_cycle_detail存在但未完成，为其设置错误状态 # 如果_current_cycle_detail存在但未完成，为其设置错误状态
if self._current_cycle_detail and not hasattr(self._current_cycle_detail, 'end_time'): if self._current_cycle_detail and not hasattr(self._current_cycle_detail, "end_time"):
error_loop_info = { error_loop_info = {
"loop_observation_info": {}, "loop_observation_info": {},
"loop_processor_info": {}, "loop_processor_info": {},
"loop_plan_info": { "loop_plan_info": {
"action_result": { "action_result": {
"action_type": "error", "action_type": "error",
"action_data": {}, "action_data": {},
"reasoning": f"循环处理失败: {e}" "reasoning": f"循环处理失败: {e}",
}, },
"observed_messages": "" "observed_messages": "",
}, },
"loop_action_info": {"action_taken": False, "reply_text": "", "command": ""}, "loop_action_info": {"action_taken": False, "reply_text": "", "command": ""},
} }
@@ -424,7 +424,7 @@ class HeartFChatting:
self._current_cycle_detail.complete_cycle() self._current_cycle_detail.complete_cycle()
except Exception as inner_e: except Exception as inner_e:
logger.error(f"{self.log_prefix} 设置错误状态时出错: {inner_e}") logger.error(f"{self.log_prefix} 设置错误状态时出错: {inner_e}")
await asyncio.sleep(1) # 出错后等待一秒再继续 await asyncio.sleep(1) # 出错后等待一秒再继续
except asyncio.CancelledError: except asyncio.CancelledError:
@@ -620,12 +620,8 @@ class HeartFChatting:
"loop_observation_info": {}, "loop_observation_info": {},
"loop_processor_info": {}, "loop_processor_info": {},
"loop_plan_info": { "loop_plan_info": {
"action_result": { "action_result": {"action_type": "error", "action_data": {}, "reasoning": f"处理失败: {e}"},
"action_type": "error", "observed_messages": "",
"action_data": {},
"reasoning": f"处理失败: {e}"
},
"observed_messages": ""
}, },
"loop_action_info": {"action_taken": False, "reply_text": "", "command": ""}, "loop_action_info": {"action_taken": False, "reply_text": "", "command": ""},
} }

87
src/common/logger.py
View File

@@ -50,15 +50,15 @@ def get_console_handler():
_console_handler.setLevel(getattr(logging, console_level.upper(), logging.INFO)) _console_handler.setLevel(getattr(logging, console_level.upper(), logging.INFO))
return _console_handler return _console_handler
class CompressedRotatingFileHandler(logging.handlers.RotatingFileHandler): class CompressedRotatingFileHandler(logging.handlers.RotatingFileHandler):
"""支持压缩的轮转文件处理器""" """支持压缩的轮转文件处理器"""
def __init__(self, filename, maxBytes=0, backupCount=0, encoding=None, def __init__(self, filename, maxBytes=0, backupCount=0, encoding=None, compress=True, compress_level=6):
compress=True, compress_level=6): super().__init__(filename, "a", maxBytes, backupCount, encoding)
super().__init__(filename, 'a', maxBytes, backupCount, encoding)
self.compress = compress self.compress = compress
self.compress_level = compress_level self.compress_level = compress_level
def doRollover(self): def doRollover(self):
"""执行日志轮转，并压缩旧文件""" """执行日志轮转，并压缩旧文件"""
if self.stream: if self.stream:
@@ -70,57 +70,53 @@ class CompressedRotatingFileHandler(logging.handlers.RotatingFileHandler):
# 删除最旧的压缩文件 # 删除最旧的压缩文件
old_gz = f"{self.baseFilename}.{self.backupCount}.gz" old_gz = f"{self.baseFilename}.{self.backupCount}.gz"
old_file = f"{self.baseFilename}.{self.backupCount}" old_file = f"{self.baseFilename}.{self.backupCount}"
if Path(old_gz).exists(): if Path(old_gz).exists():
Path(old_gz).unlink() Path(old_gz).unlink()
if Path(old_file).exists(): if Path(old_file).exists():
Path(old_file).unlink() Path(old_file).unlink()
# 重命名现有的备份文件 # 重命名现有的备份文件
for i in range(self.backupCount - 1, 0, -1): for i in range(self.backupCount - 1, 0, -1):
source_gz = f"{self.baseFilename}.{i}.gz" source_gz = f"{self.baseFilename}.{i}.gz"
dest_gz = f"{self.baseFilename}.{i + 1}.gz" dest_gz = f"{self.baseFilename}.{i + 1}.gz"
source_file = f"{self.baseFilename}.{i}" source_file = f"{self.baseFilename}.{i}"
dest_file = f"{self.baseFilename}.{i + 1}" dest_file = f"{self.baseFilename}.{i + 1}"
if Path(source_gz).exists(): if Path(source_gz).exists():
Path(source_gz).rename(dest_gz) Path(source_gz).rename(dest_gz)
elif Path(source_file).exists(): elif Path(source_file).exists():
Path(source_file).rename(dest_file) Path(source_file).rename(dest_file)
# 处理当前日志文件 # 处理当前日志文件
dest_file = f"{self.baseFilename}.1" dest_file = f"{self.baseFilename}.1"
if Path(self.baseFilename).exists(): if Path(self.baseFilename).exists():
Path(self.baseFilename).rename(dest_file) Path(self.baseFilename).rename(dest_file)
# 在后台线程中压缩文件 # 在后台线程中压缩文件
if self.compress: if self.compress:
threading.Thread( threading.Thread(target=self._compress_file, args=(dest_file,), daemon=True).start()
target=self._compress_file,
args=(dest_file,),
daemon=True
).start()
# 重新创建日志文件 # 重新创建日志文件
if not self.delay: if not self.delay:
self.stream = self._open() self.stream = self._open()
def _compress_file(self, filepath): def _compress_file(self, filepath):
"""在后台压缩文件""" """在后台压缩文件"""
try: try:
source_path = Path(filepath) source_path = Path(filepath)
if not source_path.exists(): if not source_path.exists():
return return
compressed_path = Path(f"{filepath}.gz") compressed_path = Path(f"{filepath}.gz")
with open(source_path, 'rb') as f_in: with open(source_path, "rb") as f_in:
with gzip.open(compressed_path, 'wb', compresslevel=self.compress_level) as f_out: with gzip.open(compressed_path, "wb", compresslevel=self.compress_level) as f_out:
shutil.copyfileobj(f_in, f_out) shutil.copyfileobj(f_in, f_out)
# 删除原文件 # 删除原文件
source_path.unlink() source_path.unlink()
# 记录压缩完成，使用标准print避免循环日志 # 记录压缩完成，使用标准print避免循环日志
if source_path.exists(): if source_path.exists():
original_size = source_path.stat().st_size original_size = source_path.stat().st_size
@@ -129,7 +125,7 @@ class CompressedRotatingFileHandler(logging.handlers.RotatingFileHandler):
compressed_size = compressed_path.stat().st_size compressed_size = compressed_path.stat().st_size
ratio = (1 - compressed_size / original_size) * 100 if original_size > 0 else 0 ratio = (1 - compressed_size / original_size) * 100 if original_size > 0 else 0
print(f"[日志压缩] {source_path.name} -> {compressed_path.name} (压缩率: {ratio:.1f}%)") print(f"[日志压缩] {source_path.name} -> {compressed_path.name} (压缩率: {ratio:.1f}%)")
except Exception as e: except Exception as e:
print(f"[日志压缩] 压缩失败 {filepath}: {e}") print(f"[日志压缩] 压缩失败 {filepath}: {e}")
@@ -851,12 +847,12 @@ def initialize_logging():
logger = get_logger("logger") logger = get_logger("logger")
console_level = LOG_CONFIG.get("console_log_level", LOG_CONFIG.get("log_level", "INFO")) console_level = LOG_CONFIG.get("console_log_level", LOG_CONFIG.get("log_level", "INFO"))
file_level = LOG_CONFIG.get("file_log_level", LOG_CONFIG.get("log_level", "INFO")) file_level = LOG_CONFIG.get("file_log_level", LOG_CONFIG.get("log_level", "INFO"))
logger.info(f"日志系统已重新初始化:") logger.info("日志系统已重新初始化:")
logger.info(f" - 控制台级别: {console_level}") logger.info(f" - 控制台级别: {console_level}")
logger.info(f" - 文件级别: {file_level}") logger.info(f" - 文件级别: {file_level}")
logger.info(f" - 压缩功能: 启用") logger.info(" - 压缩功能: 启用")
logger.info(f" - 自动清理: 30天前的日志") logger.info(" - 自动清理: 30天前的日志")
def force_initialize_logging(): def force_initialize_logging():
@@ -920,7 +916,7 @@ def cleanup_old_logs():
cutoff_date = datetime.now() - timedelta(days=cleanup_days) cutoff_date = datetime.now() - timedelta(days=cleanup_days)
deleted_count = 0 deleted_count = 0
deleted_size = 0 deleted_size = 0
# 遍历日志目录 # 遍历日志目录
for log_file in LOG_DIR.glob("*.log*"): for log_file in LOG_DIR.glob("*.log*"):
try: try:
@@ -933,11 +929,11 @@ def cleanup_old_logs():
except Exception as e: except Exception as e:
logger = get_logger("logger") logger = get_logger("logger")
logger.warning(f"清理日志文件 {log_file} 时出错: {e}") logger.warning(f"清理日志文件 {log_file} 时出错: {e}")
if deleted_count > 0: if deleted_count > 0:
logger = get_logger("logger") logger = get_logger("logger")
logger.info(f"清理了 {deleted_count} 个过期日志文件，释放空间 {deleted_size / 1024 / 1024:.2f} MB") logger.info(f"清理了 {deleted_count} 个过期日志文件，释放空间 {deleted_size / 1024 / 1024:.2f} MB")
except Exception as e: except Exception as e:
logger = get_logger("logger") logger = get_logger("logger")
logger.error(f"清理旧日志文件时出错: {e}") logger.error(f"清理旧日志文件时出错: {e}")
@@ -945,56 +941,51 @@ def cleanup_old_logs():
def start_log_cleanup_task(): def start_log_cleanup_task():
"""启动日志清理任务""" """启动日志清理任务"""
def cleanup_task(): def cleanup_task():
while True: while True:
time.sleep(24 * 60 * 60) # 每24小时执行一次 time.sleep(24 * 60 * 60) # 每24小时执行一次
cleanup_old_logs() cleanup_old_logs()
cleanup_thread = threading.Thread(target=cleanup_task, daemon=True) cleanup_thread = threading.Thread(target=cleanup_task, daemon=True)
cleanup_thread.start() cleanup_thread.start()
logger = get_logger("logger") logger = get_logger("logger")
logger.info("已启动日志清理任务，将自动清理30天前的日志文件") logger.info("已启动日志清理任务，将自动清理30天前的日志文件")
def get_log_stats(): def get_log_stats():
"""获取日志文件统计信息""" """获取日志文件统计信息"""
stats = { stats = {"total_files": 0, "total_size": 0, "compressed_files": 0, "uncompressed_files": 0, "files": []}
"total_files": 0,
"total_size": 0,
"compressed_files": 0,
"uncompressed_files": 0,
"files": []
}
try: try:
if not LOG_DIR.exists(): if not LOG_DIR.exists():
return stats return stats
for log_file in LOG_DIR.glob("*.log*"): for log_file in LOG_DIR.glob("*.log*"):
file_info = { file_info = {
"name": log_file.name, "name": log_file.name,
"size": log_file.stat().st_size, "size": log_file.stat().st_size,
"modified": datetime.fromtimestamp(log_file.stat().st_mtime).strftime("%Y-%m-%d %H:%M:%S"), "modified": datetime.fromtimestamp(log_file.stat().st_mtime).strftime("%Y-%m-%d %H:%M:%S"),
"compressed": log_file.suffix == ".gz" "compressed": log_file.suffix == ".gz",
} }
stats["files"].append(file_info) stats["files"].append(file_info)
stats["total_files"] += 1 stats["total_files"] += 1
stats["total_size"] += file_info["size"] stats["total_size"] += file_info["size"]
if file_info["compressed"]: if file_info["compressed"]:
stats["compressed_files"] += 1 stats["compressed_files"] += 1
else: else:
stats["uncompressed_files"] += 1 stats["uncompressed_files"] += 1
# 按修改时间排序 # 按修改时间排序
stats["files"].sort(key=lambda x: x["modified"], reverse=True) stats["files"].sort(key=lambda x: x["modified"], reverse=True)
except Exception as e: except Exception as e:
logger = get_logger("logger") logger = get_logger("logger")
logger.error(f"获取日志统计信息时出错: {e}") logger.error(f"获取日志统计信息时出错: {e}")
return stats return stats