nonebot-plugin-parser 2.5.0__tar.gz → 2.5.2__tar.gz

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.5.0
+Version: 2.5.2
 Summary: NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA
 Keywords: acfun,bilibili,douyin,kuaishou,nga,nonebot,nonebot2,tiktok,twitter,video,weibo,xiaohongshu,youtube
 Author: fllesser
@@ -35,7 +35,7 @@ Requires-Dist: nonebot-plugin-localstore>=0.7.4,<1.0.0
 Requires-Dist: nonebot-plugin-uninfo>=0.10.1,<1.0.0
 Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'all'
 Requires-Dist: nonebot-plugin-htmlrender>=0.6.7 ; extra == 'all'
-Requires-Dist: yt-dlp[default]>=2026.2.21 ; extra == 'all'
+Requires-Dist: yt-dlp[default]>=2026.3.13 ; extra == 'all'
 Requires-Dist: emosvg>=0.1.7 ; extra == 'all'
 Requires-Dist: emosvg>=0.1.7 ; extra == 'emosvg'
 Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'htmlkit'
@@ -199,7 +199,7 @@ Description-Content-Type: text/markdown
 
     uv add "nonebot-plugin-parser[htmlkit]"
 
-`htmlrender`, 使用 `playwright` 渲染 `html`, 插件现有模版有点问题，并且极其丑陋，不建议使用
+`htmlrender`, 使用 `playwright` 渲染 `html`, 插件自 `v2.5.0` 起已正式支持
 
     uv add "nonebot-plugin-parser[htmlrender]"
 

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/README.md

@@ -145,7 +145,7 @@
 
     uv add "nonebot-plugin-parser[htmlkit]"
 
-`htmlrender`, 使用 `playwright` 渲染 `html`, 插件现有模版有点问题，并且极其丑陋，不建议使用
+`htmlrender`, 使用 `playwright` 渲染 `html`, 插件自 `v2.5.0` 起已正式支持
 
     uv add "nonebot-plugin-parser[htmlrender]"
 

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.5.0"
+version = "2.5.2"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -68,7 +68,7 @@ emosvg = ["emosvg>=0.1.7"]
 all = [
   "nonebot-plugin-htmlkit>=0.1.0rc4",
   "nonebot-plugin-htmlrender>=0.6.7",
-  "yt-dlp[default]>=2026.2.21",
+  "yt-dlp[default]>=2026.3.13",
   "emosvg>=0.1.7",
 ]
 
@@ -76,7 +76,7 @@ all = [
 dev = [
   "nonebot2[fastapi]>=2.4.3,<3.0.0",
   "nonebot-adapter-onebot>=2.4.6",
-  "ruff>=0.15.0,<1.0.0",
+  "ruff>=0.15.6,<1.0.0",
   { include-group = "extras" },
   { include-group = "test" },
 ]
@@ -84,8 +84,8 @@ extras = [
   "emosvg>=0.1.7",
   "nonebot-plugin-htmlkit>=0.1.0rc4",
   "nonebot-plugin-htmlrender>=0.6.7",
-  "yt-dlp[default]>=2026.2.21",
-  "types-yt-dlp>=2026.2.21.20260223",
+  "yt-dlp[default]>=2026.3.13",
+  "types-yt-dlp>=2026.3.13.20260314",
 ]
 test = [
   "nonebug>=0.4.3,<1.0.0",
@@ -118,7 +118,7 @@ nonebug = { git = "https://github.com/nonebot/nonebug", rev = "master" }
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.5.0"
+current_version = "2.5.2"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/src/nonebot_plugin_parser/download/__init__.py

@@ -98,7 +98,13 @@ class StreamDownloader:
         """download video file by url with stream"""
         if video_name is None:
             video_name = generate_file_name(url, ".mp4")
-        return await self.download_file(url, file_name=video_name, ext_headers=ext_headers, chunk_size=1024 * 1024)
+
+        return await self.download_file(
+            url,
+            file_name=video_name,
+            ext_headers=ext_headers,
+            chunk_size=1024 * 1024,
+        )
 
     @auto_task
     async def download_audio(
@@ -111,7 +117,12 @@ class StreamDownloader:
         """download audio file by url with stream"""
         if audio_name is None:
             audio_name = generate_file_name(url, ".mp3")
-        return await self.download_file(url, file_name=audio_name, ext_headers=ext_headers)
+
+        return await self.download_file(
+            url,
+            file_name=audio_name,
+            ext_headers=ext_headers,
+        )
 
     @auto_task
     async def download_img(
@@ -124,7 +135,12 @@ class StreamDownloader:
         """download image file by url with stream"""
         if img_name is None:
             img_name = generate_file_name(url, ".jpg")
-        return await self.download_file(url, file_name=img_name, ext_headers=ext_headers)
+
+        return await self.download_file(
+            url,
+            file_name=img_name,
+            ext_headers=ext_headers,
+        )
 
     @auto_task
     async def download_av_and_merge(

nonebot_plugin_parser-2.5.2/src/nonebot_plugin_parser/download/task.py

@@ -0,0 +1,92 @@
+from typing import Any, TypeVar, ParamSpec
+from asyncio import Task, create_task
+from pathlib import Path
+from functools import wraps
+from collections.abc import Callable, Coroutine
+
+
+class PathTask:
+    def __init__(self, task: Task[Path]):
+        self._task: Task[Path] = task
+        self._path: Path | None = None
+
+    async def get(self) -> Path:
+        if self._path is not None:
+            return self._path
+
+        self._path = await self._task
+        return self._path
+
+    def __await__(self):
+        return self.get().__await__()
+
+    async def safe_get(
+        self,
+        on_error: Callable[[Exception], None] | None = None,
+    ) -> Path | None:
+        """任务失败, 返回 None"""
+        try:
+            return await self.get()
+        except Exception as e:
+            if on_error is not None:
+                on_error(e)
+            return None
+
+    @property
+    def uri(self) -> str | None:
+        return self._path.as_uri() if self._path is not None else None
+
+    def __repr__(self) -> str:
+        if self._path is not None:
+            return f"PathTask(path={self._path.name})"
+        else:
+            return f"PathTask(task={self._task.get_name()}, done={self._task.done()})"
+
+
+class OptionalPathTask:
+    """封装可选的 PathTask, 提供便捷的 API 避免频繁判空"""
+
+    def __init__(self, path_task: PathTask | None = None):
+        self._path_task: PathTask | None = path_task
+
+    async def get(self) -> Path | None:
+        if self._path_task is None:
+            return None
+        return await self._path_task.get()
+
+    def __await__(self):
+        return self.get().__await__()
+
+    async def safe_get(
+        self,
+        on_error: Callable[[Exception], None] | None = None,
+    ) -> Path | None:
+        """任务失败, 返回 None"""
+        if self._path_task is None:
+            return None
+        return await self._path_task.safe_get(on_error)
+
+    @property
+    def uri(self) -> str | None:
+        if self._path_task is None:
+            return None
+        return self._path_task.uri
+
+    def __repr__(self) -> str:
+        return f"{self._path_task}"
+
+
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
+def auto_task(func: Callable[P, Coroutine[Any, Any, Path]]) -> Callable[P, PathTask]:
+    """装饰器：自动将异步函数调用转换为 Task, 完整保留类型提示"""
+
+    @wraps(func)
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> PathTask:
+        coro = func(*args, **kwargs)
+        name = " | ".join(str(arg) for arg in args if isinstance(arg, str))
+        return PathTask(create_task(coro, name=func.__name__ + " | " + name))
+
+    return wrapper

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/src/nonebot_plugin_parser/matchers/__init__.py

@@ -78,8 +78,8 @@ async def parser_handler(
         logger.debug(f"命中缓存: {cache_key}, 结果: {result}")
 
     # 3. 渲染内容消息并发送
-    renderer = get_renderer(result.platform.name)
-    async for message in renderer.render_messages(result):
+    renderer = get_renderer(result.platform.name)(result)
+    async for message in renderer.render_messages():
         await message.send()
 
     # 4. 缓存解析结果

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/src/nonebot_plugin_parser/parsers/acfun/__init__.py

@@ -40,14 +40,17 @@ class AcfunParser(BaseParser):
             video_name=f"acfun_{acid}.mp4",
         )
 
-        video_content = self.create_video_content(video_task, cover_url=video_info.coverUrl)
+        video_content = self.create_video_content(
+            video_task,
+            cover_url=video_info.coverUrl,
+        )
 
         return self.result(
             title=video_info.title,
             text=video_info.text,
             author=author,
             timestamp=video_info.timestamp,
-            contents=[video_content],
+            video=video_content,
         )
 
     async def parse_video_info(self, url: str):

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/src/nonebot_plugin_parser/parsers/base.py

@@ -15,6 +15,7 @@ from ..constants import PlatformEnum as PlatformEnum
 from ..exception import ParseException
 from ..exception import IgnoreException as IgnoreException
 from ..exception import DownloadException as DownloadException
+from ..download.task import PathTask, OptionalPathTask
 
 T = TypeVar("T", bound="BaseParser")
 HandlerFunc = Callable[[T, Match[str]], Coroutine[Any, Any, ParseResult]]
@@ -169,13 +170,13 @@ class BaseParser:
         avatar_task = None
         if avatar_url:
             avatar_task = DOWNLOADER.download_img(avatar_url, ext_headers=self.headers)
-        return Author(name=name, avatar=avatar_task, description=description)
+        return Author(name=name, avatar=OptionalPathTask(avatar_task), description=description)
 
     def create_video_content(
         self,
-        url_or_task: str | Task[Path],
+        url_or_task: str | Task[Path] | PathTask,
         cover_url: str | None = None,
-        duration: float = 0.0,
+        duration: float | None = None,
     ):
         """创建视频内容"""
         from .data import VideoContent
@@ -183,10 +184,15 @@ class BaseParser:
         cover_task = None
         if cover_url:
             cover_task = DOWNLOADER.download_img(cover_url, ext_headers=self.headers)
+
         if isinstance(url_or_task, str):
-            url_or_task = DOWNLOADER.download_video(url_or_task, ext_headers=self.headers)
+            path_task = DOWNLOADER.download_video(url_or_task, ext_headers=self.headers)
+        elif isinstance(url_or_task, Task):
+            path_task = PathTask(url_or_task)
+        elif isinstance(url_or_task, PathTask):
+            path_task = url_or_task
 
-        return VideoContent(url_or_task, cover_task, duration)
+        return VideoContent(path_task, OptionalPathTask(cover_task), duration)
 
     def create_image_contents(
         self,
@@ -201,14 +207,18 @@ class BaseParser:
 
     def create_image_content(
         self,
-        url_or_task: str | Task[Path],
+        url_or_task: str | Task[Path] | PathTask,
         alt: str | None = None,
     ):
         """创建图片内容"""
         if isinstance(url_or_task, str):
-            url_or_task = DOWNLOADER.download_img(url_or_task, ext_headers=self.headers)
+            path_task = DOWNLOADER.download_img(url_or_task, ext_headers=self.headers)
+        elif isinstance(url_or_task, Task):
+            path_task = PathTask(url_or_task)
+        elif isinstance(url_or_task, PathTask):
+            path_task = url_or_task
 
-        return ImageContent(url_or_task, alt=alt)
+        return ImageContent(path_task, alt=alt)
 
     def create_dynamic_contents(
         self,
@@ -223,22 +233,38 @@ class BaseParser:
             contents.append(DynamicContent(task))
         return contents
 
+    def create_dynamic_content(
+        self,
+        url_or_task: str | Task[Path] | PathTask,
+    ):
+        """创建动态图片内容"""
+        from .data import DynamicContent
+
+        if isinstance(url_or_task, str):
+            path_task = DOWNLOADER.download_video(url_or_task, ext_headers=self.headers)
+        elif isinstance(url_or_task, Task):
+            path_task = PathTask(url_or_task)
+        elif isinstance(url_or_task, PathTask):
+            path_task = url_or_task
+
+        return DynamicContent(path_task)
+
     def create_audio_content(
         self,
-        url_or_task: str | Task[Path],
+        url_or_task: str | Task[Path] | PathTask,
         duration: float = 0.0,
     ):
         """创建音频内容"""
         from .data import AudioContent
 
         if isinstance(url_or_task, str):
-            url_or_task = DOWNLOADER.download_audio(url_or_task, ext_headers=self.headers)
-
-        return AudioContent(url_or_task, duration)
+            path_task = DOWNLOADER.download_audio(url_or_task, ext_headers=self.headers)
+        elif isinstance(url_or_task, Task):
+            path_task = PathTask(url_or_task)
+        elif isinstance(url_or_task, PathTask):
+            path_task = url_or_task
 
-    def create_empty_graphics(self) -> list[str | ImageContent]:
-        """创建空的图片内容列表"""
-        return []
+        return AudioContent(path_task, duration)
 
     @property
     def downloader(self):

{nonebot_plugin_parser-2.5.0 → nonebot_plugin_parser-2.5.2}/src/nonebot_plugin_parser/parsers/bilibili/__init__.py

@@ -134,15 +134,22 @@ class BilibiliParser(BaseParser):
                 logger.warning(f"视频时长 {page_info.duration} 秒, 超过 {pconfig.duration_maximum} 秒, 取消下载")
                 raise IgnoreException
             if a_url is not None:
-                return await self.downloader.download_av_and_merge(
-                    v_url, a_url, output_path=output_path, ext_headers=self.headers
+                path = await self.downloader.download_av_and_merge(
+                    v_url,
+                    a_url,
+                    output_path=output_path,
+                    ext_headers=self.headers,
                 )
             else:
-                return await self.downloader.download_file(v_url, file_name=output_path.name, ext_headers=self.headers)
+                path = await self.downloader.download_file(
+                    v_url,
+                    file_name=output_path.name,
+                    ext_headers=self.headers,
+                )
+            return path
 
-        video_task = asyncio.create_task(download_video())
         video_content = self.create_video_content(
-            video_task,
+            asyncio.create_task(download_video()),
             page_info.cover,
             page_info.duration,
         )
@@ -153,7 +160,7 @@ class BilibiliParser(BaseParser):
             timestamp=page_info.timestamp,
             text=video_info.desc,
             author=author,
-            contents=[video_content],
+            video=video_content,
             extra={"info": ai_summary},
         )
 
@@ -210,25 +217,26 @@ class BilibiliParser(BaseParser):
         opus_info = await bili_opus.get_info()
         if not isinstance(opus_info, dict):
             raise ParseException("获取图文动态信息失败")
+
         # 转换为结构体
         opus_data = convert(opus_info, OpusItem)
         logger.debug(f"opus_data: {opus_data}")
         author = self.create_author(*opus_data.name_avatar)
 
         # 按顺序处理图文内容
-        graphics = self.create_empty_graphics()
+        result = self.result(
+            author=author,
+            title=opus_data.title,
+            timestamp=opus_data.timestamp,
+        )
+
         for node in opus_data.extract_nodes():
             if isinstance(node, str):
-                graphics.append(node)
+                result.graphics.append(node)
             else:
-                graphics.append(self.create_image_content(node.url, alt=node.alt))
+                result.graphics.append(self.create_image_content(node.url, alt=node.alt))
 
-        return self.result(
-            title=opus_data.title,
-            author=author,
-            timestamp=opus_data.timestamp,
-            graphics=graphics,
-        )
+        return result
 
     async def parse_live(self, room_id: int):
         """解析直播"""