nonebot-plugin-parser 2.0.5__tar.gz → 2.0.6__tar.gz

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.0.5
+Version: 2.0.6
 Summary: NoneBot2 链接分享解析器自动解析, BV号/链接/小程序/卡片 | B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun
 Keywords: nonebot,nonebot2,video,bilibili,youtube,tiktok,twitter,kuaishou,acfun,weibo,xiaohongshu,nga,douyin
 Author: fllesser
@@ -151,10 +151,9 @@ Windows 参考(原项目推荐): https://www.jianshu.com/p/5015a477de3c
 |  parser_duration_maximum  |  否   |           480            |                                                                                                                          视频最大解析时长，单位：_秒_                                                                                                                           |
 |      parser_max_size      |  否   |            90            |                                                                                                              音视频下载最大文件大小，单位 MB，超过该配置将阻断下载                                                                                                              |
 | parser_disabled_platforms |  否   |            []            |                               全局禁止的解析，示例 parser_disabled_platforms=["bilibili", "douyin"] 表示禁止了哔哩哔哩和抖, 请根据自己需求填写["bilibili", "douyin", "kuaishou", "twitter", "youtube", "acfun", "tiktok", "weibo", "xiaohongshu"]                               |
-|    parser_render_type     |  否   |         "common"         |                                                                                             渲染器类型，可选 "default"(无图片渲染), "common"(PIL 通用图片渲染), "htmlkit"(htmlkit)                                                                                              |
+|    parser_render_type     |  否   |         "common"         |                                                                                             渲染器类型，可选 "default"(无图片渲染), "common"(PIL 通用图片渲染), "htmlkit"(htmlkit, 暂不可用)                                                                                              |
 |     parser_append_url     |  否   |          False           |                                                                                                                           是否在解析结果中附加原始URL                                                                                                                           |
-|    parser_custom_font     |  否   |           None           |                                                                            自定义字体，如未指定则使用内置字体，需将字体文件放置于localstore 生成的插件 data 目录下，parser_custom_font 为字体文件名                                                                             |
-
+|    parser_custom_font     |  否   |           None           |                                                                           自定义渲染字体，配置字体文件名，并将字体文件放置于 localstore 生成的插件 data 目录下（如 ./data/nonebot_plugin_parser/）                                                                           |
 ## 🎉 使用
 ### 指令表
 |   指令   |         权限          | 需要@ | 范围  |   说明   |

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/README.md

@@ -121,10 +121,9 @@ Windows 参考(原项目推荐): https://www.jianshu.com/p/5015a477de3c
 |  parser_duration_maximum  |  否   |           480            |                                                                                                                          视频最大解析时长，单位：_秒_                                                                                                                           |
 |      parser_max_size      |  否   |            90            |                                                                                                              音视频下载最大文件大小，单位 MB，超过该配置将阻断下载                                                                                                              |
 | parser_disabled_platforms |  否   |            []            |                               全局禁止的解析，示例 parser_disabled_platforms=["bilibili", "douyin"] 表示禁止了哔哩哔哩和抖, 请根据自己需求填写["bilibili", "douyin", "kuaishou", "twitter", "youtube", "acfun", "tiktok", "weibo", "xiaohongshu"]                               |
-|    parser_render_type     |  否   |         "common"         |                                                                                             渲染器类型，可选 "default"(无图片渲染), "common"(PIL 通用图片渲染), "htmlkit"(htmlkit)                                                                                              |
+|    parser_render_type     |  否   |         "common"         |                                                                                             渲染器类型，可选 "default"(无图片渲染), "common"(PIL 通用图片渲染), "htmlkit"(htmlkit, 暂不可用)                                                                                              |
 |     parser_append_url     |  否   |          False           |                                                                                                                           是否在解析结果中附加原始URL                                                                                                                           |
-|    parser_custom_font     |  否   |           None           |                                                                            自定义字体，如未指定则使用内置字体，需将字体文件放置于localstore 生成的插件 data 目录下，parser_custom_font 为字体文件名                                                                             |
-
+|    parser_custom_font     |  否   |           None           |                                                                           自定义渲染字体，配置字体文件名，并将字体文件放置于 localstore 生成的插件 data 目录下（如 ./data/nonebot_plugin_parser/）                                                                           |
 ## 🎉 使用
 ### 指令表
 |   指令   |         权限          | 需要@ | 范围  |   说明   |

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.0.5"
+version = "2.0.6"
 description = "NoneBot2 链接分享解析器自动解析, BV号/链接/小程序/卡片 | B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun"
 authors = [{ "name" = "fllesser", "email" = "fllessive@gmail.com" }]
 readme = "README.md"
@@ -99,6 +99,7 @@ addopts = [
 [tool.poe.tasks]
 test_others = "pytest tests/others --cov=src --cov-report=xml:coverage1.xml --junitxml=junit1.xml -n auto"
 test_parsers = "pytest tests/parsers --cov=src --cov-report=xml:coverage2.xml --junitxml=junit2.xml -n auto"
+test_render = "pytest tests/render --cov=src --cov-report=xml:coverage3.xml --junitxml=junit3.xml -n auto"
 bump = "bump-my-version bump"
 show-bump = "bump-my-version show-bump"
 
@@ -180,12 +181,12 @@ reportShadowedImports = false
 disableBytesTypePromotions = true
 
 [build-system]
-requires = ["uv_build>=0.8.14,<0.9.0"]
+requires = ["uv_build>=0.9.0,<0.10.0"]
 build-backend = "uv_build"
 
 
 [tool.bumpversion]
-current_version = "2.0.5"
+current_version = "2.0.6"
 commit = true
 message = "🔖 release: bump vesion from {current_version} to {new_version}"
 tag = true

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/src/nonebot_plugin_parser/parsers/data.py

@@ -7,7 +7,7 @@ from typing import Any
 
 def repr_path_task(path_task: Path | Task[Path]) -> str:
     if isinstance(path_task, Path):
-        return f"path={path_task}"
+        return f"path={path_task.name}"
     else:
         return f"task={path_task.get_name()}, done={path_task.done()}"
 
@@ -57,6 +57,12 @@ class VideoContent(MediaContent):
         seconds = int(self.duration) % 60
         return f"时长: {minutes}:{seconds:02d}"
 
+    def __repr__(self) -> str:
+        repr = f"VideoContent(path={repr_path_task(self.path_task)}"
+        if self.cover is not None:
+            repr += f", cover={repr_path_task(self.cover)}"
+        return repr + ")"
+
 
 @dataclass(repr=False)
 class ImageContent(MediaContent):
@@ -139,6 +145,8 @@ class ParseResult:
     """额外信息"""
     repost: "ParseResult | None" = None
     """转发的内容"""
+    render_image: Path | None = None
+    """渲染图片"""
 
     @property
     def header(self) -> str:
@@ -197,15 +205,16 @@ class ParseResult:
 
     def __repr__(self) -> str:
         return (
-            f"\nplatform: {self.platform}\n"
-            f"title: {self.title}\n"
-            f"timestamp: {self.timestamp}\n"
-            f"author: {self.author}\n"
-            f"text: {self.text}\n"
-            f"contents: {self.contents}\n"
-            f"url: {self.url}\n"
-            f"extra: {self.extra}\n"
-            f"repost: {self.repost}\n"
+            f"platform: {self.platform.display_name}, "
+            f"timestamp: {self.timestamp}, "
+            f"title: {self.title}, "
+            f"text: {self.text}, "
+            f"url: {self.url}, "
+            f"author: {self.author}, "
+            f"contents: {self.contents}, "
+            f"extra: {self.extra}, "
+            f"repost: <<<<<<<{self.repost}>>>>>>, "
+            f"render_image: {self.render_image.name if self.render_image else 'None'}"
         )
 
 

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/src/nonebot_plugin_parser/parsers/twitter.py

@@ -71,7 +71,7 @@ class TwitterParser(BaseParser):
         soup = BeautifulSoup(html_content, "html.parser")
 
         # 初始化数据
-        title = ""
+        title = None
         cover_url = None
         video_url = None
         images_urls = []

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/src/nonebot_plugin_parser/parsers/weibo.py

@@ -257,7 +257,7 @@ class PagePic(Struct):
 
 
 class PageInfo(Struct):
-    title: str = ""
+    title: str | None = None
     urls: Urls | None = None
     page_pic: PagePic | None = None
 
@@ -286,8 +286,8 @@ class WeiboData(Struct):
     retweeted_status: "WeiboData | None" = None  # 转发微博
 
     @property
-    def title(self) -> str:
-        return self.page_info.title if self.page_info else ""
+    def title(self) -> str | None:
+        return self.page_info.title if self.page_info else None
 
     @property
     def display_name(self) -> str:

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/src/nonebot_plugin_parser/renders/base.py

@@ -3,6 +3,8 @@ from collections.abc import AsyncGenerator
 from itertools import chain
 from pathlib import Path
 from typing import Any, ClassVar
+from typing_extensions import override
+import uuid
 
 from ..config import pconfig
 from ..exception import DownloadException, DownloadLimitException, ZeroSizeException
@@ -79,3 +81,74 @@ class BaseRenderer(ABC):
     @property
     def append_url(self) -> bool:
         return pconfig.append_url
+
+
+class ImageRenderer(BaseRenderer):
+    """图片渲染器"""
+
+    @abstractmethod
+    async def render_image(self, result: ParseResult) -> bytes:
+        """渲染图片
+
+        Args:
+            result (ParseResult): 解析结果
+
+        Returns:
+            bytes: 图片字节 png 格式
+        """
+        raise NotImplementedError
+
+    @override
+    async def render_messages(self, result: ParseResult):
+        """渲染消息
+
+        Args:
+            result (ParseResult): 解析结果
+        """
+        image_seg = await self.cache_or_render_image(result)
+
+        msg = UniMessage(image_seg)
+        if self.append_url:
+            urls = (result.display_url, result.repost_display_url)
+            msg += "\n".join(url for url in urls if url)
+        yield msg
+
+        # 媒体内容
+        async for message in self.render_contents(result):
+            yield message
+
+    async def cache_or_render_image(self, result: ParseResult):
+        """获取缓存图片
+
+        Args:
+            result (ParseResult): 解析结果
+
+        Returns:
+            Image: 图片 Segment
+        """
+        if result.render_image is None:
+            image_raw = await self.render_image(result)
+            image_path = await self.save_img(image_raw)
+            result.render_image = image_path
+            if pconfig.use_base64:
+                return UniHelper.img_seg(raw=image_raw)
+
+        return UniHelper.img_seg(result.render_image)
+
+    @classmethod
+    async def save_img(cls, raw: bytes) -> Path:
+        """保存图片
+
+        Args:
+            raw (bytes): 图片字节
+
+        Returns:
+            Path: 图片路径
+        """
+        import aiofiles
+
+        file_name = f"{uuid.uuid4().hex}.png"
+        image_path = pconfig.cache_dir / file_name
+        async with aiofiles.open(image_path, "wb+") as f:
+            await f.write(raw)
+        return image_path

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/src/nonebot_plugin_parser/renders/common.py

@@ -6,10 +6,10 @@ from typing_extensions import override
 from nonebot import logger
 from PIL import Image, ImageDraw, ImageFont
 
-from .base import BaseRenderer, ParseResult, UniHelper, UniMessage
+from .base import ImageRenderer, ParseResult
 
 
-class CommonRenderer(BaseRenderer):
+class CommonRenderer(ImageRenderer):
     """统一的渲染器，将解析结果转换为消息"""
 
     __slots__ = ("font_path", "fonts")
@@ -86,20 +86,7 @@ class CommonRenderer(BaseRenderer):
         logger.success(f"加载字体「{self.font_path.name}」成功")
 
     @override
-    async def render_messages(self, result: ParseResult):
-        # 生成图片卡片
-        if image_raw := await self.draw_common_image(result):
-            msg = UniMessage(UniHelper.img_seg(raw=image_raw))
-            if self.append_url:
-                urls = (result.display_url, result.repost_display_url)
-                msg += "\n".join(url for url in urls if url)
-            yield msg
-
-        # 媒体内容
-        async for message in self.render_contents(result):
-            yield message
-
-    async def draw_common_image(self, result: ParseResult) -> bytes | None:
+    async def render_image(self, result: ParseResult) -> bytes:
         """使用 PIL 绘制通用社交媒体帖子卡片
 
         Args:
@@ -110,8 +97,6 @@ class CommonRenderer(BaseRenderer):
         """
         # 调用内部方法生成图片
         image = await self._create_card_image(result)
-        if not image:
-            return None
 
         # 将图片转换为字节
         output = BytesIO()
@@ -120,7 +105,7 @@ class CommonRenderer(BaseRenderer):
 
     async def _create_card_image(
         self, result: ParseResult, bg_color: tuple[int, int, int] | None = None, apply_min_cover_size: bool = True
-    ) -> Image.Image | None:
+    ) -> Image.Image:
         """创建卡片图片（内部方法，用于递归调用）
 
         Args:
@@ -129,9 +114,8 @@ class CommonRenderer(BaseRenderer):
             apply_min_cover_size: 是否对封面应用最小尺寸限制，转发内容不需要
 
         Returns:
-            PIL Image 对象，如果没有足够的内容则返回 None
+            PIL Image 对象
         """
-        # 使用预加载的字体
 
         # 先确定固定的卡片宽度和内容区域宽度
         card_width = max(self.DEFAULT_CARD_WIDTH, self.MIN_CARD_WIDTH)

{nonebot_plugin_parser-2.0.5 → nonebot_plugin_parser-2.0.6}/src/nonebot_plugin_parser/renders/default.py

@@ -2,6 +2,7 @@
 
 from typing_extensions import override
 
+from ..helper import Segment, Text
 from .base import BaseRenderer, ParseResult, UniHelper, UniMessage
 
 
@@ -19,20 +20,20 @@ class DefaultRenderer(BaseRenderer):
             Generator[UniMessage[Any], None, None]: 消息生成器
         """
 
-        texts: list[str] = [
+        texts = (
             result.header,
             result.text,
             result.extra_info,
             result.display_url,
             result.repost_display_url,
-        ]
+        )
         texts = [text for text in texts if text]
-        texts[:-1] = [seg + "\n" for seg in texts[:-1]]
+        texts[:-1] = [text + "\n" for text in texts[:-1]]
 
-        if cover_path := await result.cover_path:
-            segs = [texts[0], UniHelper.img_seg(cover_path), *texts[1:]]
-        else:
-            segs = texts
+        segs: list[Segment] = [Text(text) for text in texts]
+        cover_path = await result.cover_path
+        if cover_path is not None:
+            segs.insert(1, UniHelper.img_seg(cover_path))
         yield UniMessage(segs)
 
         async for message in self.render_contents(result):

nonebot_plugin_parser-2.0.6/src/nonebot_plugin_parser/renders/weibo.py

@@ -0,0 +1,18 @@
+from typing_extensions import override
+
+from nonebot import require
+
+require("nonebot_plugin_htmlkit")
+from nonebot_plugin_htmlkit import template_to_pic
+
+from .base import ImageRenderer, ParseResult
+
+
+class Renderer(ImageRenderer):
+    @override
+    async def render_image(self, result: ParseResult) -> bytes:
+        return await template_to_pic(
+            self.templates_dir.as_posix(),
+            "weibo.html.jinja",
+            templates={"result": result},
+        )

nonebot_plugin_parser-2.0.5/src/nonebot_plugin_parser/renders/weibo.py

@@ -1,28 +0,0 @@
-from typing_extensions import override
-
-from nonebot import require
-
-require("nonebot_plugin_htmlkit")
-from nonebot_plugin_htmlkit import template_to_pic
-
-from .base import BaseRenderer, ParseResult, UniHelper, UniMessage
-
-
-class Renderer(BaseRenderer):
-    @override
-    async def render_messages(self, result: ParseResult):
-        # 生成图片消息
-        image_raw = await template_to_pic(
-            self.templates_dir.as_posix(),
-            "weibo.html.jinja",
-            templates={"result": result},
-        )
-        # 组合文本消息
-        texts = [result.header, result.display_url, result.repost_display_url]
-        texts = [text for text in texts if text]
-        texts[:-1] = [seg + "\n" for seg in texts[:-1]]
-
-        yield UniMessage([texts[0], UniHelper.img_seg(raw=image_raw), *texts[1:]])
-
-        async for message in self.render_contents(result):
-            yield message