Merge branch 'dev' into FPC-test

This commit is contained in:
SmartMita
2025-04-28 01:35:18 +09:00
committed by GitHub
43 changed files with 403 additions and 233 deletions

View File

@@ -1,6 +1,6 @@
import time
from typing import Tuple, Optional # 增加了 Optional
from src.common.logger import get_module_logger, LogConfig, PFC_ACTION_PLANNER_STYLE_CONFIG
from src.common.logger_manager import get_logger
from ..models.utils_model import LLMRequest
from ...config.config import global_config
from .chat_observer import ChatObserver
@@ -10,12 +10,8 @@ from .observation_info import ObservationInfo
from .conversation_info import ConversationInfo
from src.plugins.utils.chat_message_builder import build_readable_messages
pfc_action_log_config = LogConfig(
console_format=PFC_ACTION_PLANNER_STYLE_CONFIG["console_format"],
file_format=PFC_ACTION_PLANNER_STYLE_CONFIG["file_format"],
)
logger = get_module_logger("action_planner", config=pfc_action_log_config)
logger = get_logger("pfc_action_planner")
# --- 定义 Prompt 模板 ---

View File

@@ -10,7 +10,7 @@ from typing import Dict, Any, Optional
from ..chat.message import Message
from .pfc_types import ConversationState
from .pfc import ChatObserver, GoalAnalyzer, DirectMessageSender
from src.common.logger import get_module_logger
from src.common.logger_manager import get_logger
from .action_planner import ActionPlanner
from .observation_info import ObservationInfo
from .conversation_info import ConversationInfo # 确保导入 ConversationInfo
@@ -23,7 +23,7 @@ from .waiter import Waiter
import traceback
logger = get_module_logger("pfc_conversation")
logger = get_logger("pfc")
class Conversation: