use structlog instead of loguru

This commit is contained in:
春河晴
2025-06-11 15:17:08 +09:00
parent 0cb595218e
commit 7b4e7b94f8
132 changed files with 283 additions and 1804 deletions

View File

@@ -1,6 +1,6 @@
import time
from typing import Tuple, Optional # 增加了 Optional
from src.common.logger_manager import get_logger
from src.common.logger import get_logger
from src.llm_models.utils_model import LLMRequest
from src.config.config import global_config
from src.experimental.PFC.chat_observer import ChatObserver

View File

@@ -2,7 +2,7 @@ import time
import asyncio
import traceback
from typing import Optional, Dict, Any, List
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from maim_message import UserInfo
from src.config.config import global_config
from src.experimental.PFC.chat_states import (
@@ -15,7 +15,7 @@ from rich.traceback import install
install(extra_lines=3)
logger = get_module_logger("chat_observer")
logger = get_logger("chat_observer")
class ChatObserver:

View File

@@ -11,7 +11,7 @@ from src.chat.message_receive.message import Message
from .pfc_types import ConversationState
from .pfc import ChatObserver, GoalAnalyzer
from .message_sender import DirectMessageSender
from src.common.logger_manager import get_logger
from src.common.logger import get_logger
from .action_planner import ActionPlanner
from .observation_info import ObservationInfo
from .conversation_info import ConversationInfo # 确保导入 ConversationInfo

View File

@@ -1,6 +1,6 @@
import time
from typing import Optional
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from src.chat.message_receive.chat_stream import ChatStream
from src.chat.message_receive.message import Message
from maim_message import UserInfo, Seg
@@ -13,7 +13,7 @@ from rich.traceback import install
install(extra_lines=3)
logger = get_module_logger("message_sender")
logger = get_logger("message_sender")
class DirectMessageSender:

View File

@@ -1,13 +1,13 @@
from typing import List, Optional, Dict, Any, Set
from maim_message import UserInfo
import time
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from src.experimental.PFC.chat_observer import ChatObserver
from src.experimental.PFC.chat_states import NotificationHandler, NotificationType, Notification
from src.chat.utils.chat_message_builder import build_readable_messages
import traceback # 导入 traceback 用于调试
logger = get_module_logger("observation_info")
logger = get_logger("observation_info")
class ObservationInfoHandler(NotificationHandler):

View File

@@ -1,5 +1,5 @@
from typing import List, Tuple, TYPE_CHECKING
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from src.llm_models.utils_model import LLMRequest
from src.config.config import global_config
from src.experimental.PFC.chat_observer import ChatObserver
@@ -15,7 +15,7 @@ install(extra_lines=3)
if TYPE_CHECKING:
pass
logger = get_module_logger("pfc")
logger = get_logger("pfc")
def _calculate_similarity(goal1: str, goal2: str) -> float:
@@ -289,13 +289,13 @@ class GoalAnalyzer:
# """直接发送消息到平台的发送器"""
# def __init__(self, private_name: str):
# self.logger = get_module_logger("direct_sender")
# self.logger = get_logger("direct_sender")
# self.storage = MessageStorage()
# self.private_name = private_name
# async def send_via_ws(self, message: MessageSending) -> None:
# try:
# await global_api.send_message(message)
# await get_global_api().send_message(message)
# except Exception as e:
# raise ValueError(f"未找到平台:{message.message_info.platform} 的url配置请检查配置文件") from e
@@ -341,6 +341,6 @@ class GoalAnalyzer:
# try:
# await self.send_via_ws(message)
# await self.storage.store_message(message, chat_stream)
# logger.success(f"[私聊][{self.private_name}]PFC消息已发送: {content}")
# logger.info(f"[私聊][{self.private_name}]PFC消息已发送: {content}")
# except Exception as e:
# logger.error(f"[私聊][{self.private_name}]PFC消息发送失败: {str(e)}")

View File

@@ -1,5 +1,5 @@
from typing import List, Tuple
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from src.chat.memory_system.Hippocampus import hippocampus_manager
from src.llm_models.utils_model import LLMRequest
from src.config.config import global_config
@@ -7,7 +7,7 @@ from src.chat.message_receive.message import Message
from src.chat.knowledge.knowledge_lib import qa_manager
from src.chat.utils.chat_message_builder import build_readable_messages
logger = get_module_logger("knowledge_fetcher")
logger = get_logger("knowledge_fetcher")
class KnowledgeFetcher:

View File

@@ -1,10 +1,10 @@
import time
from typing import Dict, Optional
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from .conversation import Conversation
import traceback
logger = get_module_logger("pfc_manager")
logger = get_logger("pfc_manager")
class PFCManager:

View File

@@ -1,9 +1,9 @@
import json
import re
from typing import Dict, Any, Optional, Tuple, List, Union
from src.common.logger import get_module_logger
from src.common.logger import get_logger
logger = get_module_logger("pfc_utils")
logger = get_logger("pfc_utils")
def get_items_from_json(

View File

@@ -1,12 +1,12 @@
import json
from typing import Tuple, List, Dict, Any
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from src.llm_models.utils_model import LLMRequest
from src.config.config import global_config
from src.experimental.PFC.chat_observer import ChatObserver
from maim_message import UserInfo
logger = get_module_logger("reply_checker")
logger = get_logger("reply_checker")
class ReplyChecker:

View File

@@ -1,5 +1,5 @@
from typing import Tuple, List, Dict, Any
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from src.llm_models.utils_model import LLMRequest
from src.config.config import global_config
from src.experimental.PFC.chat_observer import ChatObserver
@@ -9,7 +9,7 @@ from .observation_info import ObservationInfo
from .conversation_info import ConversationInfo
from src.chat.utils.chat_message_builder import build_readable_messages
logger = get_module_logger("reply_generator")
logger = get_logger("reply_generator")
# --- 定义 Prompt 模板 ---

View File

@@ -1,4 +1,4 @@
from src.common.logger import get_module_logger
from src.common.logger import get_logger
from .chat_observer import ChatObserver
from .conversation_info import ConversationInfo
@@ -7,7 +7,7 @@ from src.config.config import global_config
import time
import asyncio
logger = get_module_logger("waiter")
logger = get_logger("waiter")
# --- 在这里设定你想要的超时时间(秒) ---
# 例如: 120 秒 = 2 分钟

View File

@@ -1,4 +1,4 @@
from src.common.logger_manager import get_logger
from src.common.logger import get_logger
from src.chat.message_receive.message import MessageRecv
from src.chat.message_receive.storage import MessageStorage
from src.config.config import global_config