nonebot-plugin-parser 2.0.12__tar.gz → 2.0.13__tar.gz

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.0.12
+Version: 2.0.13
 Summary: NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga
 Keywords: nonebot,nonebot2,video,bilibili,youtube,tiktok,twitter,kuaishou,acfun,weibo,xiaohongshu,nga,douyin
 Author: fllesser
@@ -20,7 +20,6 @@ Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.59.4
 Requires-Dist: nonebot-plugin-uninfo>=0.9.0
 Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc3 ; extra == 'htmlkit'
-Requires-Dist: jinja2>=3.1.6 ; extra == 'htmlkit'
 Requires-Python: >=3.10
 Project-URL: IssueTracker, https://github.com/fllesser/nonebot-plugin-parser/issues
 Project-URL: Release, https://github.com/fllesser/nonebot-plugin-parser/releases

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.0.12"
+version = "2.0.13"
 description = "NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga"
 authors = [{ "name" = "fllesser", "email" = "fllessive@gmail.com" }]
 readme = "README.md"
@@ -41,7 +41,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc3", "jinja2>=3.1.6"]
+htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc3"]
 
 [project.urls]
 Repository = "https://github.com/fllesser/nonebot-plugin-parser"
@@ -52,10 +52,8 @@ Release = "https://github.com/fllesser/nonebot-plugin-parser/releases"
 dev = [
   "nb-cli>=1.4.2",
   "nonebot2[fastapi]>=2.4.3,<3.0.0",
-  "nonebot-adapter-telegram>=0.1.0b20",
   "pre-commit>=4.3.0",
   "ruff>=0.14.0,<1.0.0",
-  "bump-my-version>=1.2.4",
 ]
 
 test = [
@@ -69,16 +67,27 @@ test = [
   "respx>=0.22.0",
 ]
 
-all_extras = ["nonebot-plugin-htmlkit>=0.1.0rc1", "jinja2>=3.1.6"]
+telegram = ["nonebot-adapter-telegram>=0.1.0b20"]
+pydantic_v1 = ["pydantic<2.0.0"]
+pydantic_v2 = ["pydantic>=2.0.0"]
+
+all_extras = ["nonebot-plugin-htmlkit>=0.1.0rc3"]
 
 [tool.uv]
 required-version = ">=0.9.2"
 default-groups = ["test", "dev", "all_extras"]
+conflicts = [
+  [
+    { group = "pydantic_v1" },
+    { group = "pydantic_v2" },
+    { group = "telegram" },
+  ],
+]
 
 [tool.nonebot]
 adapters = [
   { "name" = "Onebot V11", module_name = "nonebot.adapters.onebot.v11" },
-  { name = "Telegram", module_name = "nonebot.adapters.telegram" },
+  # { name = "Telegram", module_name = "nonebot.adapters.telegram" },
 ]
 plugins = ["nonebot_plugin_parser"]
 
@@ -186,7 +195,7 @@ build-backend = "uv_build"
 
 
 [tool.bumpversion]
-current_version = "2.0.12"
+current_version = "2.0.13"
 commit = true
 message = "🔖 release: bump vesion from {current_version} to {new_version}"
 tag = true

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/src/nonebot_plugin_parser/__init__.py

@@ -12,7 +12,7 @@ from .utils import safe_unlink
 
 __plugin_meta__ = PluginMetadata(
     name="链接分享解析 Alconna 版",
-    description="全新通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga",
+    description="全新通用媒体卡片渲染(PIL 实现)\n支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga",
     usage="发送支持平台的(BV号/链接/小程序/卡片)即可",
     type="application",
     homepage="https://github.com/fllesser/nonebot-plugin-parser",

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/src/nonebot_plugin_parser/config.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from functools import cached_property
 from pathlib import Path
 from typing import Literal
 
@@ -57,22 +56,22 @@ class Config(BaseModel):
     parser_need_forward_contents: bool = True
     """是否需要转发媒体内容"""
 
-    @cached_property
+    @property
     def nickname(self) -> str:
         """全局名称"""
         return _nickname
 
-    @cached_property
+    @property
     def cache_dir(self) -> Path:
         """插件缓存目录"""
         return _cache_dir
 
-    @cached_property
+    @property
     def config_dir(self) -> Path:
         """插件配置目录"""
         return _config_dir
 
-    @cached_property
+    @property
     def data_dir(self) -> Path:
         """插件数据目录"""
         return _data_dir
@@ -132,7 +131,7 @@ class Config(BaseModel):
         """是否在解析结果中附加原始URL"""
         return self.parser_append_url
 
-    @cached_property
+    @property
     def custom_font(self) -> Path | None:
         """自定义字体"""
         return (self.data_dir / self.parser_custom_font) if self.parser_custom_font else None

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/src/nonebot_plugin_parser/parsers/douyin/__init__.py

@@ -1,6 +1,6 @@
 import re
 from typing import ClassVar
-from typing_extensions import override
+from typing_extensions import deprecated, override
 
 import httpx
 import msgspec
@@ -18,10 +18,7 @@ class DouyinParser(BaseParser):
     # URL 正则表达式模式（keyword, pattern）
     patterns: ClassVar[list[tuple[str, str]]] = [
         ("v.douyin", r"https://v\.douyin\.com/[a-zA-Z0-9_\-]+"),
-        (
-            "douyin",
-            r"https://www\.(?:douyin|iesdouyin)\.com/(?:video|note|share/(?:video|note|slides))/[0-9]+",
-        ),
+        ("douyin", r"https://www\.(?:douyin|iesdouyin)\.com/[a-zA-Z0-9_\-/]+"),
     ]
 
     def _build_iesdouyin_url(self, _type: str, video_id: str) -> str:
@@ -30,6 +27,7 @@ class DouyinParser(BaseParser):
     def _build_m_douyin_url(self, _type: str, video_id: str) -> str:
         return f"https://m.douyin.com/share/{_type}/{video_id}"
 
+    @deprecated("use parse instead after 2.0.12, will be removed in the future")
     async def parse_share_url(self, share_url: str):
         if matched := re.match(r"(video|note)/([0-9]+)", share_url):
             # https://www.douyin.com/video/xxxxxx
@@ -45,6 +43,7 @@ class DouyinParser(BaseParser):
             _type, video_id = matched.group(1), matched.group(2)
             if _type == "slides":
                 return await self.parse_slides(video_id)
+
         for url in [
             self._build_m_douyin_url(_type, video_id),
             share_url,
@@ -81,7 +80,6 @@ class DouyinParser(BaseParser):
         from .video import RouterData
 
         video_data = msgspec.json.decode(matched.group(1).strip(), type=RouterData).video_data
-
         # 使用新的简洁构建方式
         contents = []
 
@@ -152,5 +150,26 @@ class DouyinParser(BaseParser):
             ParseException: 解析失败时抛出
         """
         # 从匹配对象中获取原始URL
-        url = matched.group(0)
-        return await self.parse_share_url(url)
+        share_url = matched.group(0)
+        # return await self.parse_share_url(url)
+        if "v.douyin" in share_url:
+            share_url = await self.get_redirect_url(share_url)
+
+        searched = re.search(r"(slides|video|note)/(\d+)", share_url)
+        if not searched:
+            raise ParseException(f"无法从 {share_url} 中解析出 ID")
+        _type, video_id = searched.group(1), searched.group(2)
+        if _type == "slides":
+            return await self.parse_slides(video_id)
+
+        for url in (
+            self._build_m_douyin_url(_type, video_id),
+            self._build_iesdouyin_url(_type, video_id),
+            share_url,
+        ):
+            try:
+                return await self.parse_video(url)
+            except ParseException as e:
+                logger.warning(f"failed to parse {url[:60]}, error: {e}")
+                continue
+        raise ParseException("分享已删除或资源直链获取失败, 请稍后再试")

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/src/nonebot_plugin_parser/parsers/douyin/slides.py

@@ -1,3 +1,5 @@
+from random import choice
+
 from msgspec import Struct, field
 
 
@@ -26,7 +28,8 @@ class Avatar(Struct):
 
 class Author(Struct):
     nickname: str
-    avatar_larger: Avatar
+    # avatar_larger: Avatar
+    avatar_thumb: Avatar
 
 
 class SlidesData(Struct):
@@ -41,17 +44,15 @@ class SlidesData(Struct):
 
     @property
     def avatar_url(self) -> str:
-        from random import choice
-
-        return choice(self.author.avatar_larger.url_list)
+        return choice(self.author.avatar_thumb.url_list)
 
     @property
     def image_urls(self) -> list[str]:
-        return [image.url_list[0] for image in self.images]
+        return [choice(image.url_list) for image in self.images]
 
     @property
     def dynamic_urls(self) -> list[str]:
-        return [image.video.play_addr.url_list[0] for image in self.images if image.video]
+        return [choice(image.video.play_addr.url_list) for image in self.images if image.video]
 
 
 class SlidesInfo(Struct):

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/src/nonebot_plugin_parser/parsers/douyin/video.py

@@ -1,3 +1,4 @@
+from random import choice
 from typing import Any
 
 from msgspec import Struct, field
@@ -43,22 +44,22 @@ class VideoData(Struct):
 
     @property
     def image_urls(self) -> list[str]:
-        return [image.url_list[0] for image in self.images] if self.images else []
+        return [choice(image.url_list) for image in self.images] if self.images else []
 
     @property
     def video_url(self) -> str | None:
-        return self.video.play_addr.url_list[0].replace("playwm", "play") if self.video else None
+        return choice(self.video.play_addr.url_list).replace("playwm", "play") if self.video else None
 
     @property
     def cover_url(self) -> str | None:
-        return self.video.cover.url_list[0] if self.video else None
+        return choice(self.video.cover.url_list) if self.video else None
 
     @property
     def avatar_url(self) -> str | None:
         if avatar := self.author.avatar_thumb:
-            return avatar.url_list[0]
+            return choice(avatar.url_list)
         elif avatar := self.author.avatar_medium:
-            return avatar.url_list[0]
+            return choice(avatar.url_list)
         return None
 
 
@@ -69,11 +70,11 @@ class VideoInfoRes(Struct):
     def video_data(self) -> VideoData:
         if len(self.item_list) == 0:
             raise ParseException("can't find data in videoInfoRes")
-        return self.item_list[0]
+        return choice(self.item_list)
 
 
 class VideoOrNotePage(Struct):
-    videoInfoRes: VideoInfoRes
+    video_info_res: VideoInfoRes = field(name="videoInfoRes", default_factory=VideoInfoRes)
 
 
 class LoaderData(Struct):
@@ -82,13 +83,13 @@ class LoaderData(Struct):
 
 
 class RouterData(Struct):
-    loaderData: LoaderData
+    loader_data: LoaderData = field(name="loaderData", default_factory=LoaderData)
     errors: dict[str, Any] | None = None
 
     @property
     def video_data(self) -> VideoData:
-        if page := self.loaderData.video_page:
-            return page.videoInfoRes.video_data
-        elif page := self.loaderData.note_page:
-            return page.videoInfoRes.video_data
+        if page := self.loader_data.video_page:
+            return page.video_info_res.video_data
+        elif page := self.loader_data.note_page:
+            return page.video_info_res.video_data
         raise ParseException("can't find video_(id)/page or note_(id)/page in router data")

{nonebot_plugin_parser-2.0.12 → nonebot_plugin_parser-2.0.13}/src/nonebot_plugin_parser/parsers/kuaishou.py

@@ -1,4 +1,4 @@
-import random
+from random import choice
 import re
 from typing import ClassVar
 
@@ -106,7 +106,7 @@ class Atlas(Struct):
     def img_urls(self):
         if len(self.cdn_list) == 0 or len(self.img_route_list) == 0:
             return []
-        cdn = random.choice(self.cdn_list).cdn
+        cdn = choice(self.cdn_list).cdn
         return [f"https://{cdn}/{url}" for url in self.img_route_list]
 
 
@@ -131,11 +131,11 @@ class Photo(Struct):
 
     @property
     def cover_url(self):
-        return random.choice(self.cover_urls).url if len(self.cover_urls) != 0 else None
+        return choice(self.cover_urls).url if len(self.cover_urls) != 0 else None
 
     @property
     def video_url(self):
-        return random.choice(self.main_mv_urls).url if len(self.main_mv_urls) != 0 else None
+        return choice(self.main_mv_urls).url if len(self.main_mv_urls) != 0 else None
 
     @property
     def img_urls(self):