From c6806ee648a1b61c956cca901466544a7ef58d97 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Mon, 17 Nov 2025 12:34:20 +0800 Subject: [PATCH] fix agent tools --- app/agent/tools/base.py | 6 ++---- app/agent/tools/impl/add_download.py | 5 +++-- app/agent/tools/impl/add_subscribe.py | 2 +- app/agent/tools/impl/get_recommendations.py | 12 ++++++------ app/agent/tools/impl/query_downloads.py | 2 +- app/agent/tools/impl/query_media_library.py | 4 ++-- app/agent/tools/impl/query_sites.py | 4 ++-- app/agent/tools/impl/query_subscribes.py | 2 +- app/agent/tools/impl/search_media.py | 2 +- app/agent/tools/impl/search_torrents.py | 2 +- 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/agent/tools/base.py b/app/agent/tools/base.py index 0016b072..3d8103d9 100644 --- a/app/agent/tools/base.py +++ b/app/agent/tools/base.py @@ -37,13 +37,11 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta): # 发送运行工具前的消息 agent_message = await self._callback_handler.get_message() if agent_message: - await self.send_tool_message(agent_message) + await self.send_tool_message(agent_message, title="MoviePilot助手") # 发送执行工具说明 explanation = kwargs.get("explanation") if explanation: - if not explanation.startswith("正在"): - explanation = "正在" + explanation - await self.send_tool_message(f"{explanation} ...") + await self.send_tool_message(f"⏯️[{explanation}]") return await self.run(**kwargs) @abstractmethod diff --git a/app/agent/tools/impl/add_download.py b/app/agent/tools/impl/add_download.py index 2310a9ce..528d462f 100644 --- a/app/agent/tools/impl/add_download.py +++ b/app/agent/tools/impl/add_download.py @@ -58,7 +58,8 @@ class AddDownloadTool(MoviePilotTool): # 创建下载上下文 torrent_info = TorrentInfo( title=torrent_title, - download_url=torrent_url, + description=torrent_description, + enclosure=torrent_url, site_name=site_name, site_ua=siteinfo.ua, site_cookie=siteinfo.cookie, @@ -67,7 +68,7 @@ class AddDownloadTool(MoviePilotTool): site_downloader=siteinfo.downloader ) meta_info = MetaInfo(title=torrent_title, subtitle=torrent_description) - media_info = ToolChain().recognize_media(meta=meta_info) + media_info = await ToolChain().async_recognize_media(meta=meta_info) if not media_info: return "错误：无法识别媒体信息，无法添加下载任务" context = Context( diff --git a/app/agent/tools/impl/add_subscribe.py b/app/agent/tools/impl/add_subscribe.py index 3224b18a..3b1ad114 100644 --- a/app/agent/tools/impl/add_subscribe.py +++ b/app/agent/tools/impl/add_subscribe.py @@ -43,7 +43,7 @@ class AddSubscribeTool(MoviePilotTool): except (ValueError, TypeError): logger.warning(f"无效的 tmdb_id: {tmdb_id}，将忽略") - sid, message = subscribe_chain.add( + sid, message = await subscribe_chain.async_add( mtype=MediaType(media_type), title=title, year=year, diff --git a/app/agent/tools/impl/get_recommendations.py b/app/agent/tools/impl/get_recommendations.py index cbbe439a..9a69c1d9 100644 --- a/app/agent/tools/impl/get_recommendations.py +++ b/app/agent/tools/impl/get_recommendations.py @@ -38,17 +38,17 @@ class GetRecommendationsTool(MoviePilotTool): recommend_chain = RecommendChain() results = [] if source == "tmdb_trending": - results = recommend_chain.tmdb_trending(limit=limit) + results = await recommend_chain.async_tmdb_trending(limit=limit) elif source == "douban_hot": if media_type == "movie": - results = recommend_chain.douban_movie_hot(limit=limit) + results = await recommend_chain.async_douban_movie_hot(limit=limit) elif media_type == "tv": - results = recommend_chain.douban_tv_hot(limit=limit) + results = await recommend_chain.async_douban_tv_hot(limit=limit) else: # all - results.extend(recommend_chain.douban_movie_hot(limit=limit)) - results.extend(recommend_chain.douban_tv_hot(limit=limit)) + results.extend(await recommend_chain.async_douban_movie_hot(limit=limit)) + results.extend(await recommend_chain.async_douban_tv_hot(limit=limit)) elif source == "bangumi_calendar": - results = recommend_chain.bangumi_calendar(limit=limit) + results = await recommend_chain.async_bangumi_calendar(limit=limit) if results: # 限制最多20条结果 diff --git a/app/agent/tools/impl/query_downloads.py b/app/agent/tools/impl/query_downloads.py index aca3020b..36668801 100644 --- a/app/agent/tools/impl/query_downloads.py +++ b/app/agent/tools/impl/query_downloads.py @@ -74,7 +74,7 @@ class QueryDownloadsTool(MoviePilotTool): if total_count > 20: return f"注意：查询结果共找到 {total_count} 条，为节省上下文空间，仅显示前 20 条结果。\n\n{result_json}" return result_json - return "未找到相关下载任务。" + return "未找到相关下载任务" except Exception as e: logger.error(f"查询下载失败: {e}", exc_info=True) return f"查询下载时发生错误: {str(e)}" diff --git a/app/agent/tools/impl/query_media_library.py b/app/agent/tools/impl/query_media_library.py index 78f85d30..e612d21d 100644 --- a/app/agent/tools/impl/query_media_library.py +++ b/app/agent/tools/impl/query_media_library.py @@ -32,10 +32,10 @@ class QueryMediaLibraryTool(MoviePilotTool): logger.info(f"执行工具: {self.name}, 参数: media_type={media_type}, title={title}") try: media_server_oper = MediaServerOper() - filtered_medias: List[MediaServerItem] = media_server_oper.exists(title=title, year=year, mtype=media_type) + filtered_medias: List[MediaServerItem] = await media_server_oper.async_exists(title=title, year=year, mtype=media_type) if filtered_medias: return json.dumps([m.to_dict() for m in filtered_medias]) - return "媒体库中未找到相关媒体。" + return "媒体库中未找到相关媒体" except Exception as e: logger.error(f"查询媒体库失败: {e}", exc_info=True) return f"查询媒体库时发生错误: {str(e)}" diff --git a/app/agent/tools/impl/query_sites.py b/app/agent/tools/impl/query_sites.py index b5eb27f4..627f122c 100644 --- a/app/agent/tools/impl/query_sites.py +++ b/app/agent/tools/impl/query_sites.py @@ -29,7 +29,7 @@ class QuerySitesTool(MoviePilotTool): try: site_oper = SiteOper() # 获取所有站点（按优先级排序） - sites = site_oper.list_order_by_pri() + sites = await site_oper.async_list() filtered_sites = [] for site in sites: # 按状态过滤 @@ -59,7 +59,7 @@ class QuerySitesTool(MoviePilotTool): simplified_sites.append(simplified) result_json = json.dumps(simplified_sites, ensure_ascii=False, indent=2) return result_json - return "未找到相关站点。" + return "未找到相关站点" except Exception as e: logger.error(f"查询站点失败: {e}", exc_info=True) return f"查询站点时发生错误: {str(e)}" diff --git a/app/agent/tools/impl/query_subscribes.py b/app/agent/tools/impl/query_subscribes.py index 81215183..257adafb 100644 --- a/app/agent/tools/impl/query_subscribes.py +++ b/app/agent/tools/impl/query_subscribes.py @@ -28,7 +28,7 @@ class QuerySubscribesTool(MoviePilotTool): logger.info(f"执行工具: {self.name}, 参数: status={status}, media_type={media_type}") try: subscribe_oper = SubscribeOper() - subscribes = subscribe_oper.list() + subscribes = await subscribe_oper.async_list() filtered_subscribes = [] for sub in subscribes: if status != "all" and sub.state != status: diff --git a/app/agent/tools/impl/search_media.py b/app/agent/tools/impl/search_media.py index a9f606cc..8dc8fc47 100644 --- a/app/agent/tools/impl/search_media.py +++ b/app/agent/tools/impl/search_media.py @@ -44,7 +44,7 @@ class SearchMediaTool(MoviePilotTool): search_title = f"{search_title} S{season:02d}" # 使用 MediaChain.search 方法 - meta, results = media_chain.search(title=search_title) + meta, results = await media_chain.async_search(title=search_title) # 过滤结果 if results: diff --git a/app/agent/tools/impl/search_torrents.py b/app/agent/tools/impl/search_torrents.py index dfb55104..abd07a48 100644 --- a/app/agent/tools/impl/search_torrents.py +++ b/app/agent/tools/impl/search_torrents.py @@ -41,7 +41,7 @@ class SearchTorrentsTool(MoviePilotTool): try: search_chain = SearchChain() - torrents = search_chain.search_by_title(title=title, sites=sites) + torrents = await search_chain.async_search_by_title(title=title, sites=sites) filtered_torrents = [] # 编译正则表达式（如果提供） regex_pattern = None