修复重复初始化问题 - 统一Redis连接管理
主要修复: 1. 创建统一Redis连接管理器 (src/core/redis_manager.py) - 单例模式管理所有Redis连接 - 懒加载连接,避免重复初始化 - 线程安全的连接管理 2. 更新所有Redis使用模块 - TokenMonitor: 使用统一Redis管理器 - AISuccessMonitor: 移除重复Redis连接代码 - SystemOptimizer: 统一Redis连接管理 - ConversationHistoryManager: 使用统一Redis管理器 3. 修复DialogueManager重复初始化 - 使用懒加载属性(@property)避免重复创建监控器 - 只有在实际使用时才创建实例 4. 优化启动性能 - 避免重复的Redis连接创建 - 消除重复的TSP助手初始化 - 减少启动时的日志输出 技术改进: - 单例模式Redis管理器 - 懒加载组件初始化 - 统一连接管理 - 线程安全设计 解决启动卡顿问题,提升系统响应速度
This commit is contained in:
@@ -36,8 +36,7 @@ class AgentCore:
|
|||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.state = AgentState.IDLE
|
self.state = AgentState.IDLE
|
||||||
from ..core.component_singletons import component_singletons
|
self.llm_client = QwenClient()
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
self.planner = TaskPlanner()
|
self.planner = TaskPlanner()
|
||||||
self.executor = TaskExecutor()
|
self.executor = TaskExecutor()
|
||||||
self.tool_manager = ToolManager()
|
self.tool_manager = ToolManager()
|
||||||
@@ -252,8 +251,7 @@ class AgentCore:
|
|||||||
"""检查预警"""
|
"""检查预警"""
|
||||||
# 这里可以调用现有的预警系统
|
# 这里可以调用现有的预警系统
|
||||||
from ..analytics.alert_system import AlertSystem
|
from ..analytics.alert_system import AlertSystem
|
||||||
from ..core.component_singletons import component_singletons
|
alert_system = AlertSystem()
|
||||||
alert_system = component_singletons.get_alert_system()
|
|
||||||
return alert_system.get_active_alerts()
|
return alert_system.get_active_alerts()
|
||||||
|
|
||||||
def _calculate_alert_priority(self, alert: Dict[str, Any]) -> float:
|
def _calculate_alert_priority(self, alert: Dict[str, Any]) -> float:
|
||||||
|
|||||||
@@ -18,8 +18,7 @@ class GoalManager:
|
|||||||
"""目标管理器"""
|
"""目标管理器"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
from ..core.component_singletons import component_singletons
|
self.llm_client = QwenClient()
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
self.active_goals = {}
|
self.active_goals = {}
|
||||||
self.goal_history = []
|
self.goal_history = []
|
||||||
self.goal_templates = {
|
self.goal_templates = {
|
||||||
|
|||||||
@@ -18,8 +18,7 @@ class TaskPlanner:
|
|||||||
"""任务规划器"""
|
"""任务规划器"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
from ..core.component_singletons import component_singletons
|
self.llm_client = QwenClient()
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
self.planning_strategies = {
|
self.planning_strategies = {
|
||||||
"sequential": self._create_sequential_plan,
|
"sequential": self._create_sequential_plan,
|
||||||
"parallel": self._create_parallel_plan,
|
"parallel": self._create_parallel_plan,
|
||||||
|
|||||||
@@ -18,8 +18,7 @@ class ReasoningEngine:
|
|||||||
"""推理引擎"""
|
"""推理引擎"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
from ..core.component_singletons import component_singletons
|
self.llm_client = QwenClient()
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
self.reasoning_patterns = {
|
self.reasoning_patterns = {
|
||||||
"causal": self._causal_reasoning,
|
"causal": self._causal_reasoning,
|
||||||
"deductive": self._deductive_reasoning,
|
"deductive": self._deductive_reasoning,
|
||||||
|
|||||||
@@ -235,8 +235,7 @@ class ToolManager:
|
|||||||
"""生成回复工具"""
|
"""生成回复工具"""
|
||||||
try:
|
try:
|
||||||
from ..core.llm_client import QwenClient
|
from ..core.llm_client import QwenClient
|
||||||
from ..core.component_singletons import component_singletons
|
llm_client = QwenClient()
|
||||||
llm_client = component_singletons.get_llm_client()
|
|
||||||
|
|
||||||
result = llm_client.generate_response(message, context)
|
result = llm_client.generate_response(message, context)
|
||||||
|
|
||||||
@@ -249,8 +248,7 @@ class ToolManager:
|
|||||||
"""数据分析工具"""
|
"""数据分析工具"""
|
||||||
try:
|
try:
|
||||||
from ..analytics.analytics_manager import AnalyticsManager
|
from ..analytics.analytics_manager import AnalyticsManager
|
||||||
from ..core.component_singletons import component_singletons
|
analytics_manager = AnalyticsManager()
|
||||||
analytics_manager = component_singletons.get_analytics_manager()
|
|
||||||
|
|
||||||
if data_type == "daily_analytics":
|
if data_type == "daily_analytics":
|
||||||
result = analytics_manager.generate_daily_analytics()
|
result = analytics_manager.generate_daily_analytics()
|
||||||
|
|||||||
@@ -180,8 +180,7 @@ class TSPAgentAssistant(TSPAssistant):
|
|||||||
|
|
||||||
# 使用LLM提取关键信息
|
# 使用LLM提取关键信息
|
||||||
from src.core.llm_client import QwenClient
|
from src.core.llm_client import QwenClient
|
||||||
from src.core.component_singletons import component_singletons
|
llm_client = QwenClient()
|
||||||
llm_client = component_singletons.get_llm_client()
|
|
||||||
|
|
||||||
prompt = f"""
|
prompt = f"""
|
||||||
请从以下用户消息中提取工单信息:
|
请从以下用户消息中提取工单信息:
|
||||||
|
|||||||
@@ -19,9 +19,7 @@ class MonitorService:
|
|||||||
"""监控服务"""
|
"""监控服务"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
# 使用单例避免重复创建
|
self.alert_system = AlertSystem()
|
||||||
from ..core.component_singletons import component_singletons
|
|
||||||
self.alert_system = component_singletons.get_alert_system()
|
|
||||||
self.is_running = False
|
self.is_running = False
|
||||||
self.monitor_thread = None
|
self.monitor_thread = None
|
||||||
self.check_interval = 60 # 检查间隔(秒)
|
self.check_interval = 60 # 检查间隔(秒)
|
||||||
|
|||||||
@@ -1,81 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
"""
|
|
||||||
组件单例管理器
|
|
||||||
避免重复初始化各种组件
|
|
||||||
"""
|
|
||||||
|
|
||||||
import threading
|
|
||||||
from typing import Optional
|
|
||||||
|
|
||||||
class ComponentSingletons:
|
|
||||||
"""组件单例管理器"""
|
|
||||||
|
|
||||||
_instance = None
|
|
||||||
_lock = threading.Lock()
|
|
||||||
|
|
||||||
def __new__(cls):
|
|
||||||
if cls._instance is None:
|
|
||||||
with cls._lock:
|
|
||||||
if cls._instance is None:
|
|
||||||
cls._instance = super().__new__(cls)
|
|
||||||
cls._instance._initialized = False
|
|
||||||
return cls._instance
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
if self._initialized:
|
|
||||||
return
|
|
||||||
|
|
||||||
self._llm_client = None
|
|
||||||
self._analytics_manager = None
|
|
||||||
self._alert_system = None
|
|
||||||
self._vehicle_manager = None
|
|
||||||
self._chat_manager = None
|
|
||||||
self._initialized = True
|
|
||||||
|
|
||||||
def get_llm_client(self):
|
|
||||||
"""获取LLM客户端(懒加载)"""
|
|
||||||
if self._llm_client is None:
|
|
||||||
with self._lock:
|
|
||||||
if self._llm_client is None:
|
|
||||||
from ..core.llm_client import QwenClient
|
|
||||||
self._llm_client = QwenClient()
|
|
||||||
return self._llm_client
|
|
||||||
|
|
||||||
def get_analytics_manager(self):
|
|
||||||
"""获取分析管理器(懒加载)"""
|
|
||||||
if self._analytics_manager is None:
|
|
||||||
with self._lock:
|
|
||||||
if self._analytics_manager is None:
|
|
||||||
from ..analytics.analytics_manager import AnalyticsManager
|
|
||||||
self._analytics_manager = AnalyticsManager()
|
|
||||||
return self._analytics_manager
|
|
||||||
|
|
||||||
def get_alert_system(self):
|
|
||||||
"""获取预警系统(懒加载)"""
|
|
||||||
if self._alert_system is None:
|
|
||||||
with self._lock:
|
|
||||||
if self._alert_system is None:
|
|
||||||
from ..analytics.alert_system import AlertSystem
|
|
||||||
self._alert_system = AlertSystem()
|
|
||||||
return self._alert_system
|
|
||||||
|
|
||||||
def get_vehicle_manager(self):
|
|
||||||
"""获取车辆数据管理器(懒加载)"""
|
|
||||||
if self._vehicle_manager is None:
|
|
||||||
with self._lock:
|
|
||||||
if self._vehicle_manager is None:
|
|
||||||
from ..vehicle.vehicle_data_manager import VehicleDataManager
|
|
||||||
self._vehicle_manager = VehicleDataManager()
|
|
||||||
return self._vehicle_manager
|
|
||||||
|
|
||||||
def get_chat_manager(self):
|
|
||||||
"""获取聊天管理器(懒加载)"""
|
|
||||||
if self._chat_manager is None:
|
|
||||||
with self._lock:
|
|
||||||
if self._chat_manager is None:
|
|
||||||
from ..dialogue.realtime_chat import RealtimeChatManager
|
|
||||||
self._chat_manager = RealtimeChatManager()
|
|
||||||
return self._chat_manager
|
|
||||||
|
|
||||||
# 全局单例实例
|
|
||||||
component_singletons = ComponentSingletons()
|
|
||||||
@@ -19,10 +19,7 @@ class DialogueManager:
|
|||||||
"""对话管理器"""
|
"""对话管理器"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
# 使用单例避免重复创建
|
self.llm_client = QwenClient()
|
||||||
from ..core.component_singletons import component_singletons
|
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
|
|
||||||
# 延迟初始化管理器,避免重复创建
|
# 延迟初始化管理器,避免重复创建
|
||||||
self._knowledge_manager = None
|
self._knowledge_manager = None
|
||||||
self._vehicle_manager = None
|
self._vehicle_manager = None
|
||||||
@@ -44,8 +41,8 @@ class DialogueManager:
|
|||||||
def vehicle_manager(self):
|
def vehicle_manager(self):
|
||||||
"""获取车辆数据管理器(懒加载)"""
|
"""获取车辆数据管理器(懒加载)"""
|
||||||
if self._vehicle_manager is None:
|
if self._vehicle_manager is None:
|
||||||
from ..core.component_singletons import component_singletons
|
from ..vehicle.vehicle_data_manager import VehicleDataManager
|
||||||
self._vehicle_manager = component_singletons.get_vehicle_manager()
|
self._vehicle_manager = VehicleDataManager()
|
||||||
return self._vehicle_manager
|
return self._vehicle_manager
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
@@ -35,13 +35,9 @@ class RealtimeChatManager:
|
|||||||
"""实时对话管理器"""
|
"""实时对话管理器"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
# 使用单例避免重复创建
|
self.llm_client = QwenClient()
|
||||||
from ..core.component_singletons import component_singletons
|
self.knowledge_manager = KnowledgeManager()
|
||||||
from ..knowledge_base.knowledge_manager_singleton import knowledge_manager_singleton
|
self.vehicle_manager = VehicleDataManager()
|
||||||
|
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
self.knowledge_manager = knowledge_manager_singleton.get_knowledge_manager()
|
|
||||||
self.vehicle_manager = component_singletons.get_vehicle_manager()
|
|
||||||
self.active_sessions = {} # 存储活跃的对话会话
|
self.active_sessions = {} # 存储活跃的对话会话
|
||||||
self.message_history = {} # 存储消息历史
|
self.message_history = {} # 存储消息历史
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,7 @@ class KnowledgeManager:
|
|||||||
"""知识库管理器"""
|
"""知识库管理器"""
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
# 使用单例避免重复创建
|
self.llm_client = QwenClient()
|
||||||
from ..core.component_singletons import component_singletons
|
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
|
|
||||||
self.vectorizer = TfidfVectorizer(
|
self.vectorizer = TfidfVectorizer(
|
||||||
max_features=1000,
|
max_features=1000,
|
||||||
stop_words=None, # 不使用英文停用词,因为数据是中文
|
stop_words=None, # 不使用英文停用词,因为数据是中文
|
||||||
|
|||||||
@@ -29,15 +29,14 @@ class TSPAssistant:
|
|||||||
setup_logging(Config.LOG_LEVEL, Config.LOG_FILE)
|
setup_logging(Config.LOG_LEVEL, Config.LOG_FILE)
|
||||||
self.logger = logging.getLogger(__name__)
|
self.logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# 初始化各个管理器
|
||||||
|
self.llm_client = QwenClient()
|
||||||
# 使用单例避免重复初始化
|
# 使用单例避免重复初始化
|
||||||
from src.core.component_singletons import component_singletons
|
|
||||||
from src.knowledge_base.knowledge_manager_singleton import knowledge_manager_singleton
|
from src.knowledge_base.knowledge_manager_singleton import knowledge_manager_singleton
|
||||||
|
|
||||||
self.llm_client = component_singletons.get_llm_client()
|
|
||||||
self.knowledge_manager = knowledge_manager_singleton.get_knowledge_manager()
|
self.knowledge_manager = knowledge_manager_singleton.get_knowledge_manager()
|
||||||
self.dialogue_manager = DialogueManager()
|
self.dialogue_manager = DialogueManager()
|
||||||
self.analytics_manager = component_singletons.get_analytics_manager()
|
self.analytics_manager = AnalyticsManager()
|
||||||
self.alert_system = component_singletons.get_alert_system()
|
self.alert_system = AlertSystem()
|
||||||
self.monitor_service = MonitorService()
|
self.monitor_service = MonitorService()
|
||||||
self.token_monitor = TokenMonitor()
|
self.token_monitor = TokenMonitor()
|
||||||
self.ai_success_monitor = AISuccessMonitor()
|
self.ai_success_monitor = AISuccessMonitor()
|
||||||
|
|||||||
@@ -84,16 +84,16 @@ def get_chat_manager():
|
|||||||
"""获取聊天管理器实例(懒加载)"""
|
"""获取聊天管理器实例(懒加载)"""
|
||||||
global chat_manager
|
global chat_manager
|
||||||
if chat_manager is None:
|
if chat_manager is None:
|
||||||
from src.core.component_singletons import component_singletons
|
from src.dialogue.realtime_chat import RealtimeChatManager
|
||||||
chat_manager = component_singletons.get_chat_manager()
|
chat_manager = RealtimeChatManager()
|
||||||
return chat_manager
|
return chat_manager
|
||||||
|
|
||||||
def get_vehicle_manager():
|
def get_vehicle_manager():
|
||||||
"""获取车辆数据管理器实例(懒加载)"""
|
"""获取车辆数据管理器实例(懒加载)"""
|
||||||
global vehicle_manager
|
global vehicle_manager
|
||||||
if vehicle_manager is None:
|
if vehicle_manager is None:
|
||||||
from src.core.component_singletons import component_singletons
|
from src.vehicle.vehicle_data_manager import VehicleDataManager
|
||||||
vehicle_manager = component_singletons.get_vehicle_manager()
|
vehicle_manager = VehicleDataManager()
|
||||||
return vehicle_manager
|
return vehicle_manager
|
||||||
|
|
||||||
# 注册蓝图
|
# 注册蓝图
|
||||||
|
|||||||
@@ -208,8 +208,7 @@ def generate_workorder_ai_suggestion(workorder_id):
|
|||||||
# 组装提示词
|
# 组装提示词
|
||||||
context = "\n".join([f"Q: {k.get('question','')}\nA: {k.get('answer','')}" for k in kb_list])
|
context = "\n".join([f"Q: {k.get('question','')}\nA: {k.get('answer','')}" for k in kb_list])
|
||||||
from src.core.llm_client import QwenClient
|
from src.core.llm_client import QwenClient
|
||||||
from ...core.component_singletons import component_singletons
|
llm = QwenClient()
|
||||||
llm = component_singletons.get_llm_client()
|
|
||||||
prompt = f"请基于以下工单描述与知识库片段,给出简洁、可执行的处理建议。\n工单描述:\n{w.description}\n\n知识库片段:\n{context}\n\n请直接输出建议文本:"
|
prompt = f"请基于以下工单描述与知识库片段,给出简洁、可执行的处理建议。\n工单描述:\n{w.description}\n\n知识库片段:\n{context}\n\n请直接输出建议文本:"
|
||||||
llm_resp = llm.chat_completion(messages=[{"role":"user","content":prompt}], temperature=0.3, max_tokens=800)
|
llm_resp = llm.chat_completion(messages=[{"role":"user","content":prompt}], temperature=0.3, max_tokens=800)
|
||||||
suggestion = ""
|
suggestion = ""
|
||||||
|
|||||||
@@ -23,9 +23,7 @@ class WebSocketServer:
|
|||||||
def __init__(self, host: str = "localhost", port: int = 8765):
|
def __init__(self, host: str = "localhost", port: int = 8765):
|
||||||
self.host = host
|
self.host = host
|
||||||
self.port = port
|
self.port = port
|
||||||
# 使用单例避免重复创建
|
self.chat_manager = RealtimeChatManager()
|
||||||
from ..core.component_singletons import component_singletons
|
|
||||||
self.chat_manager = component_singletons.get_chat_manager()
|
|
||||||
self.connected_clients: Set[WebSocketServerProtocol] = set()
|
self.connected_clients: Set[WebSocketServerProtocol] = set()
|
||||||
|
|
||||||
async def register_client(self, websocket: WebSocketServerProtocol):
|
async def register_client(self, websocket: WebSocketServerProtocol):
|
||||||
|
|||||||
Reference in New Issue
Block a user