nonebot-plugin-parser 2.4.3__tar.gz → 2.5.1__tar.gz

{nonebot_plugin_parser-2.4.3 → nonebot_plugin_parser-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.4.3
+Version: 2.5.1
 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,9 +35,9 @@ 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: emosvg>=0.1.6 ; extra == 'all'
-Requires-Dist: emosvg>=0.1.6 ; extra == 'emosvg'
+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'
 Requires-Dist: nonebot-plugin-htmlrender>=0.6.7 ; extra == 'htmlrender'
 Requires-Dist: yt-dlp[default]>=2025.2.21 ; extra == 'ytdlp'
@@ -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]"
 
@@ -300,8 +300,8 @@ parser_render_type="common"
 parser_append_url=False
 
 # [可选] 自定义渲染字体
-# 配置字体文件名，并将字体文件放置于 localstore 生成的插件 data 目录下
-# 例如: ./data/nonebot_plugin_parser/
+# 配置字体文件名，并将字体文件放置于 localstore 生成的插件 config 目录下
+# 例如: ./config/nonebot_plugin_parser/
 parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
@@ -452,16 +452,6 @@ images = self.create_image_contents([
 ])
 ```
 
-> 构建图文内容(适用于类似 Bilibili 动态图文混排)
-
-```python
-graphics = self.create_graphics_content(
-    image_url="https://example.com/image.jpg",
-    text="图片前的文字说明",  # 可选
-    alt="图片描述"            # 可选，居中显示
-)
-```
-
 > 创建动图内容（GIF)，平台一般只提供视频（后续插件会做自动转为 gif 的处理)
 
 ```python

{nonebot_plugin_parser-2.4.3 → nonebot_plugin_parser-2.5.1}/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]"
 
@@ -246,8 +246,8 @@ parser_render_type="common"
 parser_append_url=False
 
 # [可选] 自定义渲染字体
-# 配置字体文件名，并将字体文件放置于 localstore 生成的插件 data 目录下
-# 例如: ./data/nonebot_plugin_parser/
+# 配置字体文件名，并将字体文件放置于 localstore 生成的插件 config 目录下
+# 例如: ./config/nonebot_plugin_parser/
 parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
@@ -398,16 +398,6 @@ images = self.create_image_contents([
 ])
 ```
 
-> 构建图文内容(适用于类似 Bilibili 动态图文混排)
-
-```python
-graphics = self.create_graphics_content(
-    image_url="https://example.com/image.jpg",
-    text="图片前的文字说明",  # 可选
-    alt="图片描述"            # 可选，居中显示
-)
-```
-
 > 创建动图内容（GIF)，平台一般只提供视频（后续插件会做自动转为 gif 的处理)
 
 ```python

{nonebot_plugin_parser-2.4.3 → nonebot_plugin_parser-2.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.4.3"
+version = "2.5.1"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -53,7 +53,6 @@ dependencies = [
   "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
   "nonebot-plugin-localstore>=0.7.4,<1.0.0",
   "nonebot-plugin-uninfo>=0.10.1,<1.0.0",
-
 ]
 
 [project.urls]
@@ -65,32 +64,32 @@ Repository = "https://github.com/fllesser/nonebot-plugin-parser"
 htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc4"]
 htmlrender = ["nonebot-plugin-htmlrender>=0.6.7"]
 ytdlp = ["yt-dlp[default]>=2025.2.21"]
-emosvg = ["emosvg>=0.1.6"]
+emosvg = ["emosvg>=0.1.7"]
 all = [
   "nonebot-plugin-htmlkit>=0.1.0rc4",
   "nonebot-plugin-htmlrender>=0.6.7",
-  "yt-dlp[default]>=2026.2.21",
-  "emosvg>=0.1.6",
+  "yt-dlp[default]>=2026.3.13",
+  "emosvg>=0.1.7",
 ]
 
 [dependency-groups]
 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" },
 ]
 extras = [
-  "emosvg>=0.1.6",
+  "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",
-  "poethepoet>=0.42.0",
+  "poethepoet>=0.42.1",
   "pytest-asyncio>=1.3.0,<1.4.0",
   "pytest-cov>=7.0.0",
   "pytest-xdist>=3.8.0,<4.0.0",
@@ -114,12 +113,12 @@ conflicts = [
 ]
 
 [tool.uv.sources]
-nonebug = { git = "https://github.com/nonebot/nonebug" }
+nonebug = { git = "https://github.com/nonebot/nonebug", rev = "master" }
 
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.4.3"
+current_version = "2.5.1"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.4.3 → nonebot_plugin_parser-2.5.1}/src/nonebot_plugin_parser/config.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from nonebot import require, get_driver, get_plugin_config
+from nonebot import logger, require, get_driver, get_plugin_config
 from apilmoji import ELK_SH_CDN, EmojiStyle
 from pydantic import BaseModel
 from bilibili_api.video import VideoCodecs, VideoQuality
@@ -143,7 +143,22 @@ class Config(BaseModel):
     @property
     def custom_font(self) -> Path | None:
         """自定义字体"""
-        return (self.data_dir / self.parser_custom_font) if self.parser_custom_font else None
+        if self.parser_custom_font:
+            font_path = self.config_dir / self.parser_custom_font
+            if font_path.exists():
+                return font_path
+
+            # 尝试从旧路径迁移字体文件
+            old_path = self.data_dir / self.parser_custom_font
+            if old_path.exists():
+                try:
+                    old_path.rename(font_path)
+                    logger.info(f"字体文件 {old_path} 成功迁移到 {font_path}")
+                except OSError:
+                    logger.error(f"字体文件迁移失败, 请手动将其移动到 {font_path}")
+                    return old_path
+
+                return font_path
 
     @property
     def need_forward_contents(self) -> bool:

{nonebot_plugin_parser-2.4.3 → nonebot_plugin_parser-2.5.1}/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.1/src/nonebot_plugin_parser/download/task.py

@@ -0,0 +1,84 @@
+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) -> Path | None:
+        """任务失败, 返回 None"""
+        try:
+            return await self.get()
+        except Exception:
+            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) -> Path | None:
+        """任务失败, 返回 None"""
+        if self._path_task is None:
+            return None
+        return await self._path_task.safe_get()
+
+    @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.4.3 → nonebot_plugin_parser-2.5.1}/src/nonebot_plugin_parser/helper.py

@@ -101,8 +101,7 @@ class UniHelper:
         """文件 Seg"""
         if not display_name:
             display_name = file.name
-        if not display_name:
-            raise ValueError("文件名不能为空")
+
         if pconfig.use_base64:
             return File(raw=file.read_bytes(), name=display_name)
         else:

{nonebot_plugin_parser-2.4.3 → nonebot_plugin_parser-2.5.1}/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.4.3 → nonebot_plugin_parser-2.5.1}/src/nonebot_plugin_parser/parsers/__init__.py

@@ -23,7 +23,6 @@ from .data import (
     ImageContent,
     VideoContent,
     DynamicContent,
-    GraphicsContent,
 )
 
 __all__ = [
@@ -31,7 +30,6 @@ __all__ = [
     "Author",
     "BaseParser",
     "DynamicContent",
-    "GraphicsContent",
     "ImageContent",
     "ParseResult",
     "Platform",

{nonebot_plugin_parser-2.4.3 → nonebot_plugin_parser-2.5.1}/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.4.3 → nonebot_plugin_parser-2.5.1}/src/nonebot_plugin_parser/parsers/base.py

@@ -4,9 +4,9 @@ from typing import TYPE_CHECKING, Any, TypeVar, ClassVar, cast
 from asyncio import Task
 from pathlib import Path
 from collections.abc import Callable, Coroutine
-from typing_extensions import Unpack
+from typing_extensions import Unpack, final
 
-from .data import Platform, ParseResult, ParseResultKwargs
+from .data import Platform, ParseResult, ImageContent, ParseResultKwargs
 from ..config import pconfig as pconfig
 from ..download import DOWNLOADER
 from ..constants import IOS_HEADER, COMMON_HEADER, ANDROID_HEADER, COMMON_TIMEOUT
@@ -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]]
@@ -83,9 +84,11 @@ class BaseParser:
         """获取所有已注册的 Parser 类"""
         return cls._registry
 
+    @final
     async def parse(self, keyword: str, searched: Match[str]) -> ParseResult:
         return await self._handlers[keyword](self, searched)
 
+    @final
     async def parse_with_redirect(
         self,
         url: str,
@@ -167,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
@@ -181,18 +184,21 @@ 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,
         image_urls: list[str],
     ):
         """创建图片内容列表"""
-        from .data import ImageContent
-
         contents: list[ImageContent] = []
         for url in image_urls:
             task = DOWNLOADER.download_img(url, ext_headers=self.headers)
@@ -201,15 +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,
     ):
         """创建图片内容"""
-        from .data import ImageContent
-
         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)
+        return ImageContent(path_task, alt=alt)
 
     def create_dynamic_contents(
         self,
@@ -224,30 +233,38 @@ class BaseParser:
             contents.append(DynamicContent(task))
         return contents
 
-    def create_audio_content(
+    def create_dynamic_content(
         self,
-        url_or_task: str | Task[Path],
-        duration: float = 0.0,
+        url_or_task: str | Task[Path] | PathTask,
     ):
-        """创建音频内容"""
-        from .data import AudioContent
+        """创建动态图片内容"""
+        from .data import DynamicContent
 
         if isinstance(url_or_task, str):
-            url_or_task = DOWNLOADER.download_audio(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 AudioContent(url_or_task, duration)
+        return DynamicContent(path_task)
 
-    def create_graphics_content(
+    def create_audio_content(
         self,
-        image_url: str,
-        text: str | None = None,
-        alt: str | None = None,
+        url_or_task: str | Task[Path] | PathTask,
+        duration: float = 0.0,
     ):
-        """创建图文内容 图片不能为空 文字可空 渲染时文字在前 图片在后"""
-        from .data import GraphicsContent
+        """创建音频内容"""
+        from .data import AudioContent
+
+        if isinstance(url_or_task, str):
+            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
 
-        image_task = DOWNLOADER.download_img(image_url, ext_headers=self.headers)
-        return GraphicsContent(image_task, text, alt)
+        return AudioContent(path_task, duration)
 
     @property
     def downloader(self):