mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-18 10:40:03 +08:00
♻️ refactor(core): 重构 AI 能力与定时任务调度系统 (#2148)
* ♻️ refactor(core): 重构 AI 能力与定时任务调度系统 - 【AI 能力与工具】重构 Capability 注册与管理机制,引入 CapabilityManager 统一管理 - 移除全局能力注册表,改用声明式装饰器 `@capability` 进行解耦注册 - 重构工具解析器链,使用统一的 BaseToolResolver 代替原有的多个特定解析器 - 增强工具查询过滤,支持通配符匹配、工具箱过滤和排除标签 - 【定时任务调度】重构定时任务管理器,引入 SchedulerRegistry 统一管理任务元数据 - 引入 JobConfig 聚合定时任务配置,支持用户维度的定时任务调度 - 重构执行分发器,支持并发限制、串行间隔和随机延迟打散 - 【运行上下文】引入 ScheduledDeps 以支持后台和定时任务环境下的依赖注入 - 优化 RunContext,支持从定时任务上下文快速构造,并提供 emit 辅助方法 - 【日志与监控】引入 AILoggerProxy,实现 AI 各模块的专属日志输出 - 将各模块的全局 logger 替换为对应的模块专属日志代理 - 【其他优化】修复 Pydantic V1 兼容层中 model_validator 的装饰器兼容性问题 - 在非交互式环境(如定时任务)中自动隐藏 HITL 交互工具以节省 Token * ♻️ refactor(core): 优化内部导入路径并提升 Pydantic 兼容性 - 【重构】将 `services/ai` 模块内的绝对导入重构为相对导入,优化包结构 - 【重构】移除不必要的 `if TYPE_CHECKING` 保护,通过 `from __future__ import annotations` 直接导入类型 - 【清理】清理 `core/messages/types.py` 中未使用的 `AssistantContentUnion` 等联合类型定义 - 【优化】在 `utils/pydantic_compat.py` 中新增 `model_rebuild` 兼容函数,统一 Pydantic V1/V2 的模型重建逻辑 - 【优化】将部分函数内部的延迟导入提升至模块顶部,规范代码结构 * ♻️ refactor(imports): 优化导入路径为相对导入并清理冗余导入 - 【重构】将 AI 服务相关模块中的绝对导入路径修改为相对导入,提升模块内聚性与可移植性 - 【清理】移除多处函数内部或类方法中未使用的冗余导入,避免循环引用和资源浪费 - 【格式化】微调部分工具装饰器和返回语句的格式与尾随逗号 * 🚨 auto fix by pre-commit hooks --------- Co-authored-by: webjoin111 <455457521@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
webjoin111
pre-commit-ci[bot]
parent
0b32d69c9c
commit
922d092650
@@ -51,7 +51,7 @@ from zhenxun.services.ai.llm.system.network import (
|
||||
HealthManager,
|
||||
LLMHttpClient,
|
||||
)
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_llm as logger
|
||||
from zhenxun.utils.http_utils import AsyncHttpx
|
||||
from zhenxun.utils.log_sanitizer import sanitize_for_logging
|
||||
from zhenxun.utils.pydantic_compat import (
|
||||
@@ -136,7 +136,7 @@ class LLMCacheMiddleware:
|
||||
|
||||
if cached_data is not None:
|
||||
logger.debug(
|
||||
f"⚡ [LLMCache] 命中本地极速缓存 - "
|
||||
f"命中本地极速缓存 - "
|
||||
f"model: {self.model_name}, type: {type(context.request).__name__}"
|
||||
)
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ from zhenxun.services.ai.llm.manager import (
|
||||
)
|
||||
from zhenxun.services.ai.llm.system.capabilities import get_model_capabilities
|
||||
from zhenxun.services.ai.llm.system.network import health_manager
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_llm as logger
|
||||
|
||||
|
||||
class BaseModelRouter(ABC):
|
||||
@@ -57,7 +57,7 @@ class FallbackRouter(BaseModelRouter):
|
||||
m_name = model_names[idx]
|
||||
|
||||
if not health_manager.is_route_healthy(m_name, strict_mode=is_routed_call):
|
||||
logger.debug(f"👉 [Orchestrator] 节点 '{m_name}' 熔断中,已跳过")
|
||||
logger.debug(f"👉 节点 '{m_name}' 熔断中,已跳过")
|
||||
errors.append(f"{m_name}(熔断中)")
|
||||
continue
|
||||
|
||||
@@ -70,7 +70,7 @@ class FallbackRouter(BaseModelRouter):
|
||||
try:
|
||||
if len(model_names) > 1:
|
||||
if idx != start_idx:
|
||||
logger.debug(f"🔄 [Orchestrator] 切换至备用节点: '{m_name}'...")
|
||||
logger.debug(f"🔄 切换至备用节点: '{m_name}'...")
|
||||
|
||||
async with await get_model_instance(
|
||||
m_name, override_config, task=task
|
||||
@@ -83,26 +83,23 @@ class FallbackRouter(BaseModelRouter):
|
||||
except LLMException as e:
|
||||
if not e.should_failover:
|
||||
logger.warning(
|
||||
f"🚫 [Orchestrator] 节点 '{m_name}' "
|
||||
f"🚫 节点 '{m_name}' "
|
||||
f"返回不可恢复错误 ({e.__class__.__name__}),停止故障转移。"
|
||||
)
|
||||
raise e
|
||||
logger.warning(
|
||||
f"⚠️ [Orchestrator] 节点 '{m_name}' "
|
||||
f"⚠️ 节点 '{m_name}' "
|
||||
f"错误 ({e.__class__.__name__}),触发故障转移..."
|
||||
)
|
||||
errors.append(f"{m_name}({e.__class__.__name__})")
|
||||
except Exception as e:
|
||||
logger.warning(
|
||||
f"⚠️ [Orchestrator] 节点 '{m_name}' 发生未知异常,触发故障转移: {e}"
|
||||
)
|
||||
logger.warning(f"⚠️ 节点 '{m_name}' 发生未知异常,触发故障转移: {e}")
|
||||
errors.append(f"{m_name}(Error)")
|
||||
|
||||
if all_nodes_bypassed and len(model_names) > 1:
|
||||
fallback_model = health_manager.get_best_fallback_route(model_names)
|
||||
logger.warning(
|
||||
f"⚠️ [Orchestrator] 路由组所有节点均已宕机!"
|
||||
f"强制放行 '{fallback_model}' 探活..."
|
||||
f"⚠️ 路由组所有节点均已宕机!" f"强制放行 '{fallback_model}' 探活..."
|
||||
)
|
||||
try:
|
||||
async with await get_model_instance(
|
||||
|
||||
@@ -43,9 +43,22 @@ from zhenxun.services.ai.core.protocols.llm import (
|
||||
SupportsTextEmbedding,
|
||||
)
|
||||
from zhenxun.services.ai.core.protocols.middleware import LLMMiddleware
|
||||
from zhenxun.services.ai.llm.adapters.factory import get_adapter_for_api_type
|
||||
from zhenxun.services.ai.llm.system.models import RetryConfig
|
||||
from zhenxun.services.ai.llm.system.network import HealthManager, LLMHttpClient
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.ai.utils.logger import log_llm as logger
|
||||
|
||||
from .middlewares import (
|
||||
ConfigMergeMiddleware,
|
||||
FailoverAndRetryMiddleware,
|
||||
HttpExecutionMiddleware,
|
||||
LLMCacheMiddleware,
|
||||
LoggingMiddleware,
|
||||
MiddlewarePipeline,
|
||||
ModalityFilterMiddleware,
|
||||
OutputValidationMiddleware,
|
||||
ResponseRescueMiddleware,
|
||||
)
|
||||
|
||||
T = TypeVar("T", bound=BaseModel)
|
||||
|
||||
@@ -86,7 +99,7 @@ class LLMModel(
|
||||
)
|
||||
self.model_name = model_detail.model_name
|
||||
self.temperature = model_detail.temperature
|
||||
self.generation_max_tokens = model_detail.generation_max_tokens
|
||||
self.max_output_tokens = model_detail.max_output_tokens
|
||||
|
||||
self._is_closed = False
|
||||
self._ref_count = 0
|
||||
@@ -100,8 +113,6 @@ class LLMModel(
|
||||
generation_config=self._generation_config,
|
||||
)
|
||||
|
||||
from zhenxun.services.ai.llm.engine.middlewares import MiddlewarePipeline
|
||||
|
||||
self.pipeline = MiddlewarePipeline()
|
||||
self._setup_default_pipeline()
|
||||
|
||||
@@ -110,17 +121,6 @@ class LLMModel(
|
||||
self.pipeline.add_middleware(middleware)
|
||||
|
||||
def _setup_default_pipeline(self) -> None:
|
||||
from zhenxun.services.ai.llm.adapters.factory import get_adapter_for_api_type
|
||||
from zhenxun.services.ai.llm.engine.middlewares import (
|
||||
ConfigMergeMiddleware,
|
||||
FailoverAndRetryMiddleware,
|
||||
LLMCacheMiddleware,
|
||||
LoggingMiddleware,
|
||||
ModalityFilterMiddleware,
|
||||
OutputValidationMiddleware,
|
||||
ResponseRescueMiddleware,
|
||||
)
|
||||
|
||||
client_settings = get_llm_config().client_settings
|
||||
retry_config = RetryConfig(
|
||||
max_retries=client_settings.max_retries,
|
||||
@@ -216,10 +216,6 @@ class LLMModel(
|
||||
request=request,
|
||||
cancellation_token=cancellation_token,
|
||||
)
|
||||
|
||||
from zhenxun.services.ai.llm.adapters.factory import get_adapter_for_api_type
|
||||
from zhenxun.services.ai.llm.engine.middlewares import HttpExecutionMiddleware
|
||||
|
||||
adapter = get_adapter_for_api_type(self.api_type)
|
||||
execution_middleware = HttpExecutionMiddleware(
|
||||
http_client=self.http_client,
|
||||
|
||||
Reference in New Issue
Block a user