Merge pull request #6410 from InfinityPacer/codex/replay/g3a

app/agent/tools/impl/_plugin_tool_utils.py

@@ -2,6 +2,7 @@
 
 import json
 import shutil
+from pathlib import Path
 from typing import Any, Optional
 
 from app.runtime.settings import RuntimeSettingsCompat
@@ -25,6 +26,17 @@ DEFAULT_PLUGIN_CANDIDATE_LIMIT = 50
 MAX_PLUGIN_CANDIDATE_LIMIT = 200
 
 
+def _remove_plugin_directory(path: Path) -> bool:
+    """删除插件目录并返回是否完成，供受控线程执行。"""
+    if not path.exists():
+        return False
+    try:
+        shutil.rmtree(path)
+    except Exception:
+        return False
+    return True
+
+
 def get_plugin_snapshot(plugin_id: str) -> Optional[dict[str, Any]]:
     """
     获取已安装插件的基础信息快照。
@@ -394,6 +406,7 @@ async def uninstall_plugin_runtime(plugin_id: str) -> dict[str, Any]:
     from app.application.plugin.folders import remove_plugin_from_folders
     from app.application.plugin.routes import remove_plugin_api
     from app.application.scheduling import remove_plugin_job
+    from app.agent.tools.base import run_agent_blocking
 
     plugin_manager = get_plugin_manager()
     virtual_instance = plugin_manager.get_plugin_instance(plugin_id)
@@ -423,13 +436,16 @@ async def uninstall_plugin_runtime(plugin_id: str) -> dict[str, Any]:
         plugin_manager.delete_plugin_config(plugin_id)
         plugin_manager.delete_plugin_data(plugin_id)
         plugin_base_dir = settings.ROOT_PATH / "app" / "plugins" / plugin_id.lower()
-        if plugin_base_dir.exists():
-            try:
-                shutil.rmtree(plugin_base_dir)
+        try:
+            clone_files_removed = await run_agent_blocking(
+                "plugin",
+                _remove_plugin_directory,
+                plugin_base_dir,
+            )
+            if clone_files_removed:
                 plugin_manager.plugins.pop(plugin_id, None)
-                clone_files_removed = True
-            except Exception:
-                clone_files_removed = False
+        except Exception:
+            clone_files_removed = False
 
     remove_plugin_from_folders(plugin_id)
     plugin_manager.remove_plugin(plugin_id)

app/agent/tools/impl/scrape_metadata.py

@@ -26,6 +26,12 @@ from app.domain.media import normalize_music_type
 from ._music_utils import simplify_music_info
 
 
+def _inspect_local_path(path: Path) -> tuple[bool, bool]:
+    """返回本地路径是否存在及是否为目录。"""
+    exists = path.exists()
+    return exists and path.is_dir(), exists
+
+
 class ScrapeMetadataInput(BaseModel):
     """刮削媒体元数据工具的输入参数模型"""
 
@@ -151,7 +157,14 @@ class ScrapeMetadataTool(MoviePilotTool):
             media_id = normalized_media_id or None
 
             local_path = Path(path)
-            is_local_directory = (storage or "local") == "local" and local_path.is_dir()
+            is_local_directory = False
+            path_exists = True
+            if (storage or "local") == "local":
+                is_local_directory, path_exists = await self.run_blocking(
+                    "storage",
+                    _inspect_local_path,
+                    local_path,
+                )
             file_type = "dir" if is_local_directory or not local_path.suffix else "file"
             fileitem = FileItem(
                 storage=storage or "local",
@@ -161,7 +174,7 @@ class ScrapeMetadataTool(MoviePilotTool):
 
             # 检查本地存储路径是否存在
             if storage == "local":
-                if not Path(path).exists():
+                if not path_exists:
                     return json.dumps(
                         {"success": False, "message": f"刮削路径不存在: {path}"},
                         ensure_ascii=False,

app/chain/media.py

@@ -43,6 +43,16 @@ from app.domain import title as title_rules
 recognize_lock = Lock()
 
 
+def _is_regular_file(path: Path) -> bool:
+    """判断路径是否仍指向可读取的普通文件。"""
+    return path.exists() and path.is_file()
+
+
+def _is_directory(path: Path) -> bool:
+    """判断路径是否仍指向目录。"""
+    return path.is_dir()
+
+
 class MediaChain(ChainBase, metaclass=Singleton):
     """
     媒体信息处理链，单例运行
@@ -1068,7 +1078,7 @@ class MediaChain(ChainBase, metaclass=Singleton):
     ) -> Optional[MusicInfo]:
         """异步查找所在目录专辑匹配中属于当前文件的结果。"""
         file_path = Path(path)
-        if not file_path.exists() or not file_path.is_file():
+        if not await run_in_threadpool(_is_regular_file, file_path):
             return None
         try:
             matched = await self.async_recognize_music_album_directory(
@@ -1212,7 +1222,7 @@ class MediaChain(ChainBase, metaclass=Singleton):
     ) -> dict[str, MusicInfo]:
         """异步按目录级线索批量识别整张专辑。"""
         directory = Path(path)
-        if not directory.is_dir():
+        if not await run_in_threadpool(_is_directory, directory):
             return {}
         files = await run_in_threadpool(self._directory_audio_files, directory)
         if len(files) < self._album_match_min_files:

app/modules/acoustid/__init__.py

@@ -9,6 +9,8 @@ from pathlib import Path
 from typing import Any, Optional, Tuple, Union
 from uuid import UUID
 
+from fastapi.concurrency import run_in_threadpool
+
 from app.runtime.settings import RuntimeSettingsCompat
 
 settings = RuntimeSettingsCompat()
@@ -137,7 +139,10 @@ class AcoustIdModule(_ModuleBase):
     ) -> Optional[str]:
         """异步读取音频指纹并返回高置信匹配的 MusicBrainz Recording ID。"""
         file_path = Path(path)
-        if not self._fpcalc_path or not file_path.is_file():
+        if not self._fpcalc_path or not await run_in_threadpool(
+                Path.is_file,
+                file_path,
+        ):
             return None
         cache_key = self._file_cache_key(file_path)
         if cache_key:

app/modules/discord/discord.py

@@ -8,6 +8,7 @@ from urllib.parse import quote
 import discord
 from discord import app_commands
 import httpx
+from fastapi.concurrency import run_in_threadpool
 
 from app.runtime.settings import RuntimeSettingsCompat
 
@@ -28,6 +29,11 @@ PARSE_FIELD_TYPES = {
 }
 
 
+def _is_regular_file(path: Path) -> bool:
+    """判断路径是否仍指向可发送的普通文件。"""
+    return path.exists() and path.is_file()
+
+
 class Discord:
     """
     Discord Bot 通知与交互实现（基于 discord.py 2.6.4）
@@ -780,7 +786,10 @@ class Discord:
             return False, None
 
         local_file = Path(file_path)
-        if not local_file.exists() or not local_file.is_file():
+        if not await run_in_threadpool(
+                _is_regular_file,
+                local_file,
+        ):
             logger.error(f"Discord发送文件失败，文件不存在: {local_file}")
             return False, None