refactor(db): 修复异步连接池无界增长，并完成 SQLAlchemy 2.0 迁移与分层归位 (#6320)

2026-09-05 15:38:19 +08:00 · 2026-08-15 06:58:38 +08:00
parent e28de9cfe1
commit 8a11214a43
252 changed files with 11405 additions and 2889 deletions
@@ -5,8 +5,8 @@ import re
 from typing import Any, Dict, Iterable, Optional

 from app.runtime.events import eventmanager
-from app.db.subscribe_oper import SubscribeOper
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.subscribe import SubscribeOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.application.filter import RuleHelper
 from app.modules.filter.RuleParser import RuleParser
 from app.modules.filter.builtin_rules import BUILTIN_RULE_SET
@@ -6,7 +6,7 @@ from typing import Any, Optional

 from app.runtime.config import settings
 from app.runtime.extensions.plugin_manager import PluginManager
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.adapters.external.server import MoviePilotServerHelper
 from app.adapters.external.market import PluginHelper
 from app.schemas.types import SystemConfigKey
@@ -15,7 +15,7 @@ from app.chain.search import SearchChain
 from app.runtime.config import settings
 from app.domain.context import Context
 from app.domain.metainfo import MetaInfo
-from app.db.site_oper import SiteOper
+from app.db.oper.site import SiteOper
 from app.application.directory import DirectoryHelper, validate_download_save_path
 from app.runtime.log import logger
 from app.schemas import FileURI
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.subscribe import SubscribeChain
-from app.db.user_oper import UserOper
+from app.db.oper.user import UserOper
 from app.runtime.log import logger
 from app.schemas.types import MUSIC_ENTITY_ALBUM, MediaSource, MediaType, MessageChannel
 from ._music_utils import normalize_music_type
@@ -8,8 +8,8 @@ from pydantic import BaseModel, Field, model_validator
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.runtime.config import settings
-from app.db.agentchat_oper import AgentChatOper
-from app.db.agenttask_oper import AgentTaskOper
+from app.db.oper.agentchat import AgentChatOper
+from app.db.oper.agenttask import AgentTaskOper
 from app.runtime.scheduling import TimerUtils


@@ -4,7 +4,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.agenttask_oper import AgentTaskOper
+from app.db.oper.agenttask import AgentTaskOper


 class DeleteAgentTaskInput(BaseModel):
@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.downloadhistory_oper import DownloadHistoryOper
+from app.db.oper.downloadhistory import DownloadHistoryOper
 from app.runtime.log import logger


@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.runtime.events import eventmanager
-from app.db.subscribe_oper import SubscribeOper
+from app.db.oper.subscribe import SubscribeOper
 from app.adapters.external.server import MoviePilotServerHelper
 from app.runtime.log import logger
 from app.schemas.types import EventType
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.storage import StorageChain
-from app.db.transferhistory_oper import TransferHistoryOper
+from app.db.oper.transferhistory import TransferHistoryOper
 from app.runtime.log import logger
 from app.schemas import FileItem

@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.runtime.config import settings
-from app.db.agenttask_oper import AgentTaskOper
+from app.db.oper.agenttask import AgentTaskOper


 class QueryAgentTasksInput(BaseModel):
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.runtime.log import logger
 from app.schemas.types import SystemConfigKey

@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.download import DownloadChain
-from app.db.downloadhistory_oper import DownloadHistoryOper
+from app.db.oper.downloadhistory import DownloadHistoryOper
 from app.runtime.log import logger
 from app.schemas import DownloaderTorrent
 from app.schemas.types import MUSIC_ENTITY_RECORDING, TorrentQueryStatus, media_type_to_agent
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.runtime.log import logger
 from app.schemas.types import SystemConfigKey

@@ -12,7 +12,7 @@ from app.agent.tools.impl._plugin_tool_utils import (
    build_preview_payload,
    get_plugin_snapshot,
 )
-from app.db.plugindata_oper import PluginDataOper
+from app.db.oper.plugindata import PluginDataOper
 from app.runtime.log import logger


@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.site_oper import SiteOper
+from app.db.oper.site import SiteOper
 from app.runtime.log import logger

 SITE_USERDATA_DETAIL_PREVIEW_LIMIT = 10
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.site_oper import SiteOper
+from app.db.oper.site import SiteOper
 from app.runtime.log import logger


@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.subscribehistory_oper import SubscribeHistoryOper
+from app.db.oper.subscribehistory import SubscribeHistoryOper
 from app.runtime.log import logger
 from app.schemas.types import MUSIC_ENTITY_RECORDING, MediaType, media_type_to_agent
 from ._music_utils import normalize_music_type
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.subscribe_oper import SubscribeOper
+from app.db.oper.subscribe import SubscribeOper
 from app.runtime.log import logger
 from app.schemas.subscribe import Subscribe as SubscribeSchema
 from app.schemas.types import (
@@ -16,7 +16,7 @@ from app.agent.tools.impl._system_setting_utils import (
    should_redact_setting,
 )
 from app.runtime.config import settings
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.runtime.log import logger


@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.transferhistory_oper import TransferHistoryOper
+from app.db.oper.transferhistory import TransferHistoryOper
 from app.runtime.log import logger
 from app.schemas.types import media_type_to_agent
 from app.foundation.text import cut as jieba_cut
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.workflow_oper import WorkflowOper
+from app.db.oper.workflow import WorkflowOper
 from app.runtime.log import logger


@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field

 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.db.agenttask_oper import AgentTaskOper
+from app.db.oper.agenttask import AgentTaskOper


 class RunAgentTaskInput(BaseModel):
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.workflow import WorkflowChain
-from app.db.workflow_oper import WorkflowOper
+from app.db.oper.workflow import WorkflowOper
 from app.runtime.log import logger


@@ -19,7 +19,7 @@ from app.schemas.types import (
    MediaType,
    media_type_to_agent,
 )
-from app.domain.media import normalize_media_source
+from app.schemas.media import normalize_media_source
 from ._music_utils import normalize_music_type, simplify_music_info


@@ -10,7 +10,7 @@ from app.agent.tools.tags import ToolTag
 from app.chain.media import MediaChain
 from app.runtime.log import logger
 from app.schemas.types import MediaType, media_type_to_agent
-from app.domain.media import resolve_media_identity
+from app.schemas.media import resolve_media_identity
 from ._music_utils import normalize_music_type, simplify_music_info


@@ -11,7 +11,7 @@ from app.chain.douban import DoubanChain
 from app.chain.tmdb import TmdbChain
 from app.chain.bangumi import BangumiChain
 from app.runtime.log import logger
-from app.domain.media import resolve_media_identity
+from app.schemas.media import resolve_media_identity


 class SearchPersonCreditsInput(BaseModel):
@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.subscribe import SubscribeChain
-from app.db.subscribe_oper import SubscribeOper
+from app.db.oper.subscribe import SubscribeOper
 from app.runtime.log import logger
 from app.schemas.types import media_type_to_agent

@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.search import SearchChain
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.application.site.sites import SitesHelper  # pylint: disable=no-name-in-module
 from app.runtime.log import logger
 from app.schemas.types import MediaSource, MediaType, SystemConfigKey
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.site import SiteChain
-from app.db.site_oper import SiteOper
+from app.db.oper.site import SiteOper
 from app.runtime.log import logger


@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field, model_validator
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.runtime.config import settings
-from app.db.agenttask_oper import AgentTaskOper
+from app.db.oper.agenttask import AgentTaskOper
 from app.runtime.scheduling import TimerUtils


@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.domain.metainfo import clear_rust_parse_options_cache
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.runtime.log import logger
 from app.schemas.types import SystemConfigKey

@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.runtime.events import eventmanager
-from app.db.site_oper import SiteOper
+from app.db.oper.site import SiteOper
 from app.runtime.log import logger
 from app.schemas.types import EventType
 from app.domain.string import StringUtils
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.chain.site import SiteChain
-from app.db.site_oper import SiteOper
+from app.db.oper.site import SiteOper
 from app.runtime.log import logger


@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
 from app.runtime.events import eventmanager
-from app.db.subscribe_oper import SubscribeOper
+from app.db.oper.subscribe import SubscribeOper
 from app.runtime.log import logger
 from app.schemas.event import SubscribeModifiedEventData
 from app.schemas.types import EventType, media_type_to_agent
@@ -18,7 +18,7 @@ from app.agent.tools.impl._system_setting_utils import (
 )
 from app.runtime.config import settings
 from app.runtime.events import eventmanager
-from app.db.systemconfig_oper import SystemConfigOper
+from app.db.oper.systemconfig import SystemConfigOper
 from app.runtime.log import logger
 from app.schemas.event import ConfigChangeEventData
 from app.schemas.types import EventType