版本更新 (#1666)

* ✨ 父级插件加载

* ✅ 添加测试：更新与添加插件 (#1594)

* ✅ 测试更新与添加插件

* ✅ Sourcery建议

* 👷 添加pytest

* 🎨 优化代码

* 🐛 bug修复

* 🐛修复添加插件返回403的问题 (#1595)

* 完善测试方法
* vscode测试配置
* 重构插件安装过程

* 🎨 修改readme

* Update README.md

* 🐛 修改bug与版本锁定

* 🐛 修复超级用户对群组功能开关

* 🐛 修复插件商店检查插件更新问题 (#1597)

* 🐛 修复插件商店检查插件更新问题

* 🐛 恶意命令检测问题

* 🐛 增加插件状态检查 (#1598)

* ✅ 优化测试用例

* 🐛 更改插件更新与安装逻辑

* 🐛 修复更新群组成员信息

* 🎨 代码优化

* 🚀 更新Dockerfile (#1599)

* 🎨 更新requirements

* ➕ 添加依赖aiocache

* ⚡ 添加github镜像

* ✨ 添加仓库目录多获取渠道

* 🐛 修复测试用例

* ✨ 添加API缓存

* 🎨 采取Sourcery建议

* 🐛 文件下载逻辑修改

* 🎨 优化代码

* 🐛 修复插件开关有时出现错误

* ✨ 重构自检ui

* 🐛 自检html修正

* 修复签到逻辑bug，并使代码更灵活以适应签到好感度等级配置 (#1606)

* 修复签到功能已知问题

* 修复签到功能已知问题

* 修改参数名称

* 修改uid判断

---------

Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com>

* 🎨 代码结构优化

* 🐛 私聊时修改插件时删除私聊帮助

* 🐛 过滤父插件

* 🐛 修复自检在ARM上的问题 (#1607)

* 🐛 修复自检在ARM上的问题

* ✅ 优化测试

* ✨ 支持mysql，psql，sqlite随机函数

* 🔧 VSCode配置修改

* 🔧 VSCode配置修改

* ✨ 添加金币排行

Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com>

* 📝 修改README

Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com>

* 🔨 提取GitHub相关操作 (#1609)

* 🔨 提取GitHub相关操作

* 🔨 重构API策略

* ✨ 签到/金币排行限制最大数量 (#1616)

* ✨ 签到/金币排行限制最大数量

* 🐛 修复超级用户id获取问题

* 🐛 修复路径解压与挂载 (#1619)

* 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620)

* 🐛 签到文本适应 (#1622)

* 🐛 好感度排行提供默认值 (#1624)

* 🎈 优先使用github api (#1625)

* ✨ 重构帮助，限制普通用户查询管理插件 (#1626)

* 🐛 修复群权限与插件等级匹配 (#1627)

* ✨ 当管理员尝试ban真寻时将被反杀 (#1628)

* ✨ 群组发言时间检测提供开关配置 (#1630)

* 🐳 chore: 支持自动修改版本号 (#1629)

* 🎈 perf(github_utils): 支持github url下载遍历 (#1632)

* 🎈 perf(github_utils): 支持github url下载遍历

* 🐞 fix(http_utils): 修复一些下载问题

* 🦄 refactor(http_utils): 部分重构

* chore(version): Update version to v0.2.2-e6f17c4

---------

Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com>

* 🧪 test(auto_update): 修复测试用例 (#1633)

* 🐛 修复商店商品为空时报错 (#1634)

* 🐛 修复群权限与插件等级匹配 (#1635)

* ✨ message_build支持AtAll (#1639)

* 🎈 perf: 使用commit号下载插件 (#1641)

* 🎈 perf: 使用commit号下载插件

* chore(version): Update version to v0.2.2-f9c7360

---------

Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com>

* 🐳 chore: 修改运行检查触发路径 (#1642)

* 🐳 chore: 修改运行检查触发路径

* 🐳 chore: 添加tests目录

* ✨ 重构qq群事件处理 (#1643)

* 🐛 签到名称自适应 (#1644)

* 🎨  更新README (#1645)

* 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647)

* 🐛 修复群组中帮助功能状态显示问题 (#1650)

* 🐛 修复群欢迎消息设置 (#1651)

* 🐛 修复webui下载后首次启动错误 (#1652)

* 🐛 修复webui下载后首次启动错误

* chore(version): Update version to v0.2.2-4a8ef85

---------

Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>

* ✨ 移除默认图片文件夹：爬 (#1653)

* ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654)

* ✨ 新增超级用户与管理员帮助模板 (#1655)

* ✨ 新增个人信息命令 (#1657)

* ✨ 修改个人信息菜单名称 (#1658)

* ✨ 新增插件商店api (#1659)

* ✨ 新增插件商店api

* chore(version): Update version to v0.2.2-7e15f20

---------

Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>

* ✨ 将cd，block，count限制复原配置文件 (#1662)

* 🎨 修改README (#1663)

* 🎨 修改版本号 (#1664)

* 🎨 修改requirements (#1665)

---------

Co-authored-by: AkashiCoin <l1040186796@gmail.com>
Co-authored-by: fanyinrumeng <42991257+fanyinrumeng@users.noreply.github.com>
Co-authored-by: AkashiCoin <i@loli.vet>
Co-authored-by: Elaga <1728903318@qq.com>
Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com>
Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>

zhenxun/utils/_build_image.py

@@ -1,15 +1,17 @@
-import base64
 import math
 import uuid
+import base64
+import itertools
+import contextlib
 from io import BytesIO
 from pathlib import Path
-from typing import Literal, Tuple, TypeAlias, overload
+from typing_extensions import Self
+from typing import Literal, TypeAlias, overload
 
 from nonebot.utils import run_sync
-from PIL import Image, ImageDraw, ImageFilter, ImageFont
 from PIL.Image import Image as tImage
 from PIL.ImageFont import FreeTypeFont
-from typing_extensions import Self
+from PIL import Image, ImageDraw, ImageFont, ImageFilter
 
 from zhenxun.configs.path_config import FONT_PATH
 
@@ -18,7 +20,7 @@ ModeType = Literal[
 ]
 """图片类型"""
 
-ColorAlias: TypeAlias = str | Tuple[int, int, int] | Tuple[int, int, int, int] | None
+ColorAlias: TypeAlias = str | tuple[int, int, int] | tuple[int, int, int, int] | None
 
 CenterType = Literal["center", "height", "width"]
 """
@@ -52,9 +54,7 @@ class BuildImage:
         self.height = height
         self.color = color
         self.font = (
-            self.load_font(font, font_size)
-            if not isinstance(font, FreeTypeFont)
-            else font
+            font if isinstance(font, FreeTypeFont) else self.load_font(font, font_size)
         )
         if background:
             if isinstance(background, bytes):
@@ -66,14 +66,14 @@ class BuildImage:
             else:
                 self.width = self.markImg.width
                 self.height = self.markImg.height
-        else:
-            if not width or not height:
-                raise ValueError("长度和宽度不能为空...")
+        elif width and height:
             self.markImg = Image.new(mode, (width, height), color)  # type: ignore
+        else:
+            raise ValueError("长度和宽度不能为空...")
         self.draw = ImageDraw.Draw(self.markImg)
 
     @property
-    def size(self) -> Tuple[int, int]:
+    def size(self) -> tuple[int, int]:
         return self.markImg.size
 
     @classmethod
@@ -94,9 +94,9 @@ class BuildImage:
         text: str,
         font: str | FreeTypeFont | Path = "HYWenHei-85W.ttf",
         size: int = 10,
-        font_color: str | Tuple[int, int, int] = (0, 0, 0),
+        font_color: str | tuple[int, int, int] = (0, 0, 0),
         color: ColorAlias = None,
-        padding: int | Tuple[int, int, int, int] | None = None,
+        padding: int | tuple[int, int, int, int] | None = None,
     ) -> Self:
         """构建文本图片
 
@@ -116,7 +116,7 @@ class BuildImage:
         _font = None
         if isinstance(font, FreeTypeFont):
             _font = font
-        elif isinstance(font, (str, Path)):
+        elif isinstance(font, str | Path):
             _font = cls.load_font(font, size)
         width, height = cls.get_text_size(text, _font)
         if isinstance(padding, int):
@@ -161,7 +161,7 @@ class BuildImage:
         row_count = math.ceil(len(img_list) / row)
         if row_count == 1:
             background_width = (
-                sum([img.width for img in img_list]) + space * (row - 1) + padding * 2
+                sum(img.width for img in img_list) + space * (row - 1) + padding * 2
             )
         background_height = height * row_count + space * (row_count - 1) + padding * 2
         background_image = cls(
@@ -189,20 +189,20 @@ class BuildImage:
         返回:
             FreeTypeFont: 字体
         """
-        path = FONT_PATH / font if type(font) == str else font
+        path = FONT_PATH / font if type(font) is str else font
         return ImageFont.truetype(str(path), font_size)
 
     @overload
     @classmethod
     def get_text_size(
         cls, text: str, font: FreeTypeFont | None = None
-    ) -> Tuple[int, int]: ...
+    ) -> tuple[int, int]: ...
 
     @overload
     @classmethod
     def get_text_size(
         cls, text: str, font: str | None = None, font_size: int = 10
-    ) -> Tuple[int, int]: ...
+    ) -> tuple[int, int]: ...
 
     @classmethod
     def get_text_size(
@@ -210,7 +210,7 @@ class BuildImage:
         text: str,
         font: str | FreeTypeFont | None = "HYWenHei-85W.ttf",
         font_size: int = 10,
-    ) -> Tuple[int, int]:
+    ) -> tuple[int, int]:  # sourcery skip: remove-unnecessary-cast
         """获取该字体下文本需要的长宽
 
         参数:
@@ -219,10 +219,10 @@ class BuildImage:
             font_size: 字体大小
 
         返回:
-            Tuple[int, int]: 长宽
+            tuple[int, int]: 长宽
         """
         _font = font
-        if font and type(font) == str:
+        if font and type(font) is str:
             _font = cls.load_font(font, font_size)
         temp_image = Image.new("RGB", (1, 1), (255, 255, 255))
         draw = ImageDraw.Draw(temp_image)
@@ -232,7 +232,8 @@ class BuildImage:
         return text_width, text_height + 10
         # return _font.getsize(str(text))  # type: ignore
 
-    def getsize(self, msg: str) -> Tuple[int, int]:
+    def getsize(self, msg: str) -> tuple[int, int]:
+        # sourcery skip: remove-unnecessary-cast
         """
         获取文字在该图片 font_size 下所需要的空间
 
@@ -240,7 +241,7 @@ class BuildImage:
             msg: 文本
 
         返回:
-            Tuple[int, int]: 长宽
+            tuple[int, int]: 长宽
         """
         temp_image = Image.new("RGB", (1, 1), (255, 255, 255))
         draw = ImageDraw.Draw(temp_image)
@@ -252,11 +253,11 @@ class BuildImage:
 
     def __center_xy(
         self,
-        pos: Tuple[int, int],
+        pos: tuple[int, int],
         width: int,
         height: int,
         center_type: CenterType | None,
-    ) -> Tuple[int, int]:
+    ) -> tuple[int, int]:
         """
         根据居中类型定位xy
 
@@ -266,7 +267,7 @@ class BuildImage:
             center_type: 居中类型
 
         返回:
-            Tuple[int, int]: 定位
+            tuple[int, int]: 定位
         """
         # _width, _height = pos
         if self.width and self.height:
@@ -285,7 +286,7 @@ class BuildImage:
     def paste(
         self,
         image: Self | tImage,
-        pos: Tuple[int, int] = (0, 0),
+        pos: tuple[int, int] = (0, 0),
         center_type: CenterType | None = None,
     ) -> Self:
         """贴图
@@ -303,7 +304,6 @@ class BuildImage:
         """
         if center_type and center_type not in ["center", "height", "width"]:
             raise ValueError("center_type must be 'center', 'width' or 'height'")
-        width, height = 0, 0
         _image = image
         if isinstance(image, BuildImage):
             _image = image.markImg
@@ -317,7 +317,7 @@ class BuildImage:
 
     @run_sync
     def point(
-        self, pos: Tuple[int, int], fill: Tuple[int, int, int] | None = None
+        self, pos: tuple[int, int], fill: tuple[int, int, int] | None = None
     ) -> Self:
         """
         绘制多个或单独的像素
@@ -335,9 +335,9 @@ class BuildImage:
     @run_sync
     def ellipse(
         self,
-        pos: Tuple[int, int, int, int],
-        fill: Tuple[int, int, int] | None = None,
-        outline: Tuple[int, int, int] | None = None,
+        pos: tuple[int, int, int, int],
+        fill: tuple[int, int, int] | None = None,
+        outline: tuple[int, int, int] | None = None,
         width: int = 1,
     ) -> Self:
         """
@@ -358,13 +358,13 @@ class BuildImage:
     @run_sync
     def text(
         self,
-        pos: Tuple[int, int],
+        pos: tuple[int, int],
         text: str,
-        fill: str | Tuple[int, int, int] = (0, 0, 0),
+        fill: str | tuple[int, int, int] = (0, 0, 0),
         center_type: CenterType | None = None,
         font: FreeTypeFont | str | Path | None = None,
         font_size: int = 10,
-    ) -> Self:
+    ) -> Self:  # sourcery skip: remove-unnecessary-cast
         """
         在图片上添加文字
 
@@ -382,11 +382,10 @@ class BuildImage:
         异常:
             ValueError: 居中类型错误
         """
-        text = str(text)
         if center_type and center_type not in ["center", "height", "width"]:
             raise ValueError("center_type must be 'center', 'width' or 'height'")
         max_length_text = ""
-        sentence = text.split("\n")
+        sentence = str(text).split("\n")
         for x in sentence:
             max_length_text = x if len(x) > len(max_length_text) else max_length_text
         if font:
@@ -398,7 +397,7 @@ class BuildImage:
             ttf_w, ttf_h = self.getsize(max_length_text)  # type: ignore
             # ttf_h = ttf_h * len(sentence)
             pos = self.__center_xy(pos, ttf_w, ttf_h, center_type)
-        self.draw.text(pos, text, fill=fill, font=font)
+        self.draw.text(pos, str(text), fill=fill, font=font)
         return self
 
     @run_sync
@@ -437,7 +436,7 @@ class BuildImage:
         if not width and not height and not ratio:
             raise ValueError("缺少参数...")
         if self.width and self.height:
-            if not width and not height and ratio:
+            if not width and not height:
                 width = int(self.width * ratio)
                 height = int(self.height * ratio)
             self.markImg = self.markImg.resize((width, height), Image.LANCZOS)  # type: ignore
@@ -446,7 +445,7 @@ class BuildImage:
         return self
 
     @run_sync
-    def crop(self, box: Tuple[int, int, int, int]) -> Self:
+    def crop(self, box: tuple[int, int, int, int]) -> Self:
         """
         裁剪图片
 
@@ -475,11 +474,10 @@ class BuildImage:
         """
         self.markImg = self.markImg.convert("RGBA")
         x, y = self.markImg.size
-        for i in range(n, x - n):
-            for k in range(n, y - n):
-                color = self.markImg.getpixel((i, k))
-                color = color[:-1] + (int(100 * alpha_ratio),)
-                self.markImg.putpixel((i, k), color)
+        for i, k in itertools.product(range(n, x - n), range(n, y - n)):
+            color = self.markImg.getpixel((i, k))
+            color = color[:-1] + (int(100 * alpha_ratio),)
+            self.markImg.putpixel((i, k), color)
         self.draw = ImageDraw.Draw(self.markImg)
         return self
 
@@ -492,7 +490,7 @@ class BuildImage:
         buf = BytesIO()
         self.markImg.save(buf, format="PNG")
         base64_str = base64.b64encode(buf.getvalue()).decode()
-        return "base64://" + base64_str
+        return f"base64://{base64_str}"
 
     def pic2bytes(self) -> bytes:
         """获取bytes
@@ -520,8 +518,8 @@ class BuildImage:
     @run_sync
     def rectangle(
         self,
-        xy: Tuple[int, int, int, int],
-        fill: Tuple[int, int, int] | None = None,
+        xy: tuple[int, int, int, int],
+        fill: tuple[int, int, int] | None = None,
         outline: str | None = None,
         width: int = 1,
     ) -> Self:
@@ -543,8 +541,8 @@ class BuildImage:
     @run_sync
     def polygon(
         self,
-        xy: list[Tuple[int, int]],
-        fill: Tuple[int, int, int] = (0, 0, 0),
+        xy: list[tuple[int, int]],
+        fill: tuple[int, int, int] = (0, 0, 0),
         outline: int = 1,
     ) -> Self:
         """
@@ -564,8 +562,8 @@ class BuildImage:
     @run_sync
     def line(
         self,
-        xy: Tuple[int, int, int, int],
-        fill: Tuple[int, int, int] | str = "#D8DEE4",
+        xy: tuple[int, int, int, int],
+        fill: tuple[int, int, int] | str = "#D8DEE4",
         width: int = 1,
     ) -> Self:
         """
@@ -605,21 +603,19 @@ class BuildImage:
         )
         draw = ImageDraw.Draw(mask)
         for offset, fill in (width / -2.0, "black"), (width / 2.0, "white"):
-            left, top = [(value + offset) * antialias for value in ellipse_box[:2]]
-            right, bottom = [(value - offset) * antialias for value in ellipse_box[2:]]
+            left, top = ((value + offset) * antialias for value in ellipse_box[:2])
+            right, bottom = ((value - offset) * antialias for value in ellipse_box[2:])
             draw.ellipse([left, top, right, bottom], fill=fill)
         mask = mask.resize(self.markImg.size, Image.LANCZOS)
-        try:
+        with contextlib.suppress(ValueError):
             self.markImg.putalpha(mask)
-        except ValueError:
-            pass
         return self
 
     @run_sync
     def circle_corner(
         self,
         radii: int = 30,
-        point_list: list[Literal["lt", "rt", "lb", "rb"]] = ["lt", "rt", "lb", "rb"],
+        point_list: list[Literal["lt", "rt", "lb", "rb"]] | None = None,
     ) -> Self:
         """
         矩形四角变圆
@@ -631,6 +627,8 @@ class BuildImage:
         返回:
             BuildImage: Self
         """
+        if point_list is None:
+            point_list = ["lt", "rt", "lb", "rb"]
         # 画圆（用于分离4个角）
         img = self.markImg.convert("RGBA")
         alpha = img.split()[-1]