Merge d32a6fbdd4 into f9a38a26b2

* ✨ 修复一些bug

- 移除不必要的定时器类，简化代码结构
- 优化好友请求处理逻辑，确保在自动同意和手动处理之间的清晰区分
- 更新缓存机制，避免重复处理相同的好友请求
- 新增判断文件是否为二进制文件的功能，提升文件处理的准确性
- 优化缓存字典的过期检查逻辑，提高性能和可读性

* ✨ 更新 get_async_client 函数，支持字符串类型的代理参数

- 修改 proxies 参数类型，允许传入字符串形式的代理地址
- 增强代理处理逻辑，将字符串代理转换为字典格式，提升灵活性和可用性

pyproject.toml

@@ -14,21 +14,21 @@ priority = "primary"
 [tool.poetry.dependencies]
 python = "^3.10"
 playwright = "^1.41.1"
-nonebot-adapter-onebot = "^2.3.1"
+nonebot-adapter-onebot = ">=2.3.1"
 nonebot-plugin-apscheduler = "^0.5"
 tortoise-orm = "^0.20.0"
 cattrs = "^23.2.3"
 ruamel-yaml = "^0.18.5"
 strenum = "^0.4.15"
-nonebot-plugin-session = "^0.2.3"
-ujson = "^5.9.0"
-nb-cli = "^1.3.0"
-nonebot2 = { extras = ["fastapi"], version = "^2.3.3" }
-pillow = "^10.0.0"
+nonebot-plugin-session = "^0.3.2"
+ujson = ">=5.9.0"
+nb-cli = ">=1.3.0"
+nonebot2 = { extras = ["fastapi"], version = ">=2.3.3" }
+pillow = ">=10.0.0"
 retrying = "^1.3.4"
 aiofiles = "^23.2.1"
 nonebot-plugin-htmlrender = ">=0.6.0,<1.0.0"
-pypinyin = "^0.51.0"
+pypinyin = ">=0.51.0"
 beautifulsoup4 = "^4.12.3"
 lxml = "^5.1.0"
 psutil = "^5.9.8"
@@ -36,14 +36,14 @@ feedparser = "^6.0.11"
 imagehash = "^4.3.1"
 cn2an = "^0.5.22"
 dateparser = "^1.2.0"
-bilireq = "0.2.3post0"
+bilireq = ">=0.2.10"
 python-jose = { extras = ["cryptography"], version = "^3.3.0" }
 python-multipart = "^0.0.9"
 aiocache = {extras = ["redis"], version = "^0.12.3"}
 py-cpuinfo = "^9.0.0"
-nonebot-plugin-alconna = "^0.54.0"
+nonebot-plugin-alconna = ">=0.56.0"
 tenacity = "^9.0.0"
-nonebot-plugin-uninfo = ">0.4.1"
+nonebot-plugin-uninfo = ">=0.7.3"
 nonebot-plugin-waiter = "^0.8.1"
 multidict = ">=6.0.0,!=6.3.2"
 

zhenxun/builtin_plugins/record_request.py

@@ -1,7 +1,6 @@
 import asyncio
 from datetime import datetime
 import random
-import time
 
 from nonebot import on_message, on_request
 from nonebot.adapters.onebot.v11 import (
@@ -12,7 +11,6 @@ from nonebot.adapters.onebot.v11 import (
 from nonebot.adapters.onebot.v11 import Bot as v11Bot
 from nonebot.adapters.onebot.v12 import Bot as v12Bot
 from nonebot.plugin import PluginMetadata
-from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import BotConfig, Config
@@ -66,19 +64,6 @@ __plugin_meta__ = PluginMetadata(
 )
 
 
-class Timer:
-    data: dict[str, float] = {}  # noqa: RUF012
-
-    @classmethod
-    def check(cls, uid: int | str):
-        return True if uid not in cls.data else time.time() - cls.data[uid] > 5 * 60
-
-    @classmethod
-    def clear(cls):
-        now = time.time()
-        cls.data = {k: v for k, v in cls.data.items() if v - now < 5 * 60}
-
-
 # TODO: 其他平台请求
 
 friend_req = on_request(priority=5, block=True)
@@ -86,14 +71,11 @@ group_req = on_request(priority=5, block=True)
 _t = on_message(priority=999, block=False, rule=lambda: False)
 
 
-cache = CacheRoot.cache_dict(
-    "REQUEST_CACHE", (base_config.get("TIP_MESSAGE_LIMIT") or 360) * 60, str
-)
+cache = CacheRoot.cache_dict("REQUEST_CACHE", 60, str)
 
 
 @friend_req.handle()
 async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSession):
-    if event.user_id and Timer.check(event.user_id):
     logger.debug("收录好友请求...", "好友请求", target=event.user_id)
     user = await bot.get_stranger_info(user_id=event.user_id)
     nickname = user["nickname"]
@@ -147,7 +129,12 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
                 f.message_ids = ",".join(message_ids)
                 await f.save(update_fields=["message_ids"])
         else:
-        logger.debug("好友请求五分钟内重复, 已忽略", "好友请求", target=event.user_id)
+            tip_limit = base_config.get("TIP_MESSAGE_LIMIT") or 360
+            logger.debug(
+                f"好友请求{tip_limit}分钟内重复, 已忽略",
+                "好友请求",
+                target=cache_key,
+            )
 
 
 @group_req.handle()
@@ -227,7 +214,7 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
                 "\n在群组中 群组管理员与群主 允许使用管理员帮助"
                 "（包括ban与功能开关等）\n请在群组中发送 '管理员帮助'",
             )
-    elif cache.get(f"{event.group_id}"):
+    elif not cache.get(f"{event.group_id}"):
         cache.set(f"{event.group_id}", "1")
         logger.debug(
             f"收录 用户[{event.user_id}] 群聊[{event.group_id}] 群聊请求",
@@ -284,15 +271,3 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
             "群聊请求",
             target=f"{event.user_id}:{event.group_id}",
         )
-
-
-@scheduler.scheduled_job(
-    "interval",
-    minutes=5,
-)
-async def _():
-    Timer.clear()
-
-
-async def _():
-    Timer.clear()

zhenxun/services/cache/cache_containers.py

@@ -82,12 +82,7 @@ class CacheDict(Generic[T]):
             return False
 
         # 检查是否过期
-        data = self._data[key]
-        if data.expire_time > 0 and data.expire_time < time.time():
-            del self._data[key]
-            return False
-
-        return True
+        return bool(self.expire_time(key))
 
     def get(self, key: str, default: Any = None) -> T | None:
         """获取字典项，如果不存在返回默认值

zhenxun/utils/_build_image.py

@@ -42,8 +42,8 @@ class BuildImage:
 
     def __init__(
         self,
-        width: int = 0,
-        height: int = 0,
+        width: float = 0,
+        height: float = 0,
         color: ColorAlias = (255, 255, 255),
         mode: ModeType = "RGBA",
         font: str | Path | FreeTypeFont = "HYWenHei-85W.ttf",
@@ -63,12 +63,14 @@ class BuildImage:
             else:
                 self.markImg = Image.open(background)
             if width and height:
-                self.markImg = self.markImg.resize((width, height), Resampling.LANCZOS)
+                self.markImg = self.markImg.resize(
+                    (int(width), int(height)), Resampling.LANCZOS
+                )
             else:
                 self.width = self.markImg.width
                 self.height = self.markImg.height
         elif width and height:
-            self.markImg = Image.new(mode, (width, height), color)  # type: ignore
+            self.markImg = Image.new(mode, (int(width), int(height)), color)
         else:
             raise ValueError("长度和宽度不能为空...")
         self.draw = ImageDraw.Draw(self.markImg)
@@ -222,7 +224,7 @@ class BuildImage:
         text: str,
         font: str | FreeTypeFont | None = "HYWenHei-85W.ttf",
         font_size: int = 10,
-    ) -> tuple[int, int]:  # sourcery skip: remove-unnecessary-cast
+    ) -> tuple[float, float]:
         """获取该字体下文本需要的长宽
 
         参数:
@@ -231,20 +233,20 @@ class BuildImage:
             font_size: 字体大小
 
         返回:
-            tuple[int, int]: 长宽
+            tuple[float, float]: 长宽
         """
         _font = font
         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)
-        text_box = draw.textbbox((0, 0), str(text), font=_font)  # type: ignore
+        text_box = draw.textbbox((0, 0), text, font=_font)  # pyright: ignore[reportArgumentType]
         text_width = text_box[2] - text_box[0]
         text_height = text_box[3] - text_box[1]
         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[float, float]:
         # sourcery skip: remove-unnecessary-cast
         """
         获取文字在该图片 font_size 下所需要的空间
@@ -253,7 +255,7 @@ class BuildImage:
             msg: 文本
 
         返回:
-            tuple[int, int]: 长宽
+            tuple[float, float]: 长宽
         """
         temp_image = Image.new("RGB", (1, 1), (255, 255, 255))
         draw = ImageDraw.Draw(temp_image)
@@ -265,9 +267,9 @@ class BuildImage:
 
     def __center_xy(
         self,
-        pos: tuple[int, int],
-        width: int,
-        height: int,
+        pos: tuple[float, float],
+        width: float,
+        height: float,
         center_type: CenterType | None,
     ) -> tuple[int, int]:
         """
@@ -284,21 +286,21 @@ class BuildImage:
         # _width, _height = pos
         if self.width and self.height:
             if center_type == "center":
-                width = int((self.width - width) / 2)
-                height = int((self.height - height) / 2)
+                width = (self.width - width) / 2
+                height = (self.height - height) / 2
             elif center_type == "width":
-                width = int((self.width - width) / 2)
+                width = (self.width - width) / 2
                 height = pos[1]
             elif center_type == "height":
                 width = pos[0]
-                height = int((self.height - height) / 2)
-        return width, height
+                height = (self.height - height) / 2
+        return int(width), int(height)
 
     @run_sync
     def paste(
         self,
         image: Self | tImage,
-        pos: tuple[int, int] = (0, 0),
+        pos: tuple[float, float] = (0, 0),
         center_type: CenterType | None = None,
     ) -> Self:
         """贴图
@@ -370,7 +372,7 @@ class BuildImage:
     @run_sync
     def text(
         self,
-        pos: tuple[int, int],
+        pos: tuple[float, float],
         text: str,
         fill: str | tuple[int, int, int] = (0, 0, 0),
         center_type: CenterType | None = None,
@@ -430,7 +432,7 @@ class BuildImage:
         self.markImg.show()
 
     @run_sync
-    def resize(self, ratio: float = 0, width: int = 0, height: int = 0) -> Self:
+    def resize(self, ratio: float = 0, width: float = 0, height: float = 0) -> Self:
         """
         压缩图片
 
@@ -451,13 +453,13 @@ class BuildImage:
             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
+            self.markImg = self.markImg.resize((int(width), int(height)), Image.LANCZOS)  # type: ignore
             self.width, self.height = self.markImg.size
             self.draw = ImageDraw.Draw(self.markImg)
         return self
 
     @run_sync
-    def crop(self, box: tuple[int, int, int, int]) -> Self:
+    def crop(self, box: tuple[float, float, float, float]) -> Self:
         """
         裁剪图片
 
@@ -580,7 +582,7 @@ class BuildImage:
     @run_sync
     def line(
         self,
-        xy: tuple[int, int, int, int],
+        xy: tuple[float, float, float, float],
         fill: tuple[int, int, int] | str = "#D8DEE4",
         width: int = 1,
     ) -> Self:

zhenxun/utils/_build_mat.py

@@ -321,8 +321,7 @@ class BuildMat:
         if not self.build_data.y_index:
             """没有指定y_index时，使用data自动生成"""
             max_num = max(self.build_data.data)
-            if max_num < 5:
-                max_num = 5
+            max_num = max(max_num, 5)
             s = int(max_num / 5)
             _y_index = [max_num]
             for _n in range(4):
@@ -334,23 +333,20 @@ class BuildMat:
             #         _tmp = ["_" for _ in range(len(_y_index) - 1)]
             #         _tmp.append(str(_y_index[0]))
             #         _y_index = _tmp
-            self.build_data.y_index = _y_index  # type: ignore
+            self.build_data.y_index = _y_index
         for item in self.build_data.y_index:
             text_size = BuildImage.get_text_size(str(item), font)
             if text_size[0] > padding_width:
                 padding_width = text_size[0]
             y_height_list.append(text_size)
         if self.build_data.mat_type == MatType.BARH:
-            _tmp = x_width_list
-            x_width_list = y_height_list
-            y_height_list = _tmp
+            x_width_list, y_height_list = y_height_list, x_width_list
         old_space = self.build_data.space
         width = padding_width * 2 + self.build_data.space[0] * 2 + 20
         height = (
-            sum([h[1] + self.build_data.space[1] for h in y_height_list])
+            sum(h[1] + self.build_data.space[1] for h in y_height_list)
             + self.build_data.space[1] * 2
-            + 30
-        )
+        ) + 30
         _x_index = self.build_data.x_index
         _y_index = self.build_data.y_index
         _barh_max_text_width = 0
@@ -376,7 +372,7 @@ class BuildMat:
             width += self.build_data.space[0] * (len(_x_index) - 1)
         else:
             """非横向柱状图时加字体宽度"""
-            width += sum([w[0] + self.build_data.space[0] for w in x_width_list])
+            width += sum(w[0] + self.build_data.space[0] for w in x_width_list)
 
         A = BuildImage(
             width + 5,

zhenxun/utils/_image_template.py

@@ -229,8 +229,8 @@ class ImageTemplate:
     async def __build_text_image(
         cls,
         text: str,
-        width: int,
-        height: int,
+        width: float,
+        height: float,
         font: FreeTypeFont,
         font_color: str | tuple[int, int, int] = (0, 0, 0),
         color: str | tuple[int, int, int] = (255, 255, 255),

zhenxun/utils/http_utils.py

@@ -98,7 +98,7 @@ def get_client() -> AsyncClient:
 
 
 def get_async_client(
-    proxies: dict[str, str] | None = None,
+    proxies: dict[str, str] | str | None = None,
     proxy: str | None = None,
     verify: bool = False,
     **kwargs,
@@ -109,6 +109,8 @@ def get_async_client(
     """
     transport = kwargs.pop("transport", None) or AsyncHTTPTransport(verify=verify)
     if proxies:
+        if isinstance(proxies, str):
+            proxies = {"http://": proxies, "https://": proxies}
         http_proxy = proxies.get("http://")
         https_proxy = proxies.get("https://")
         return httpx.AsyncClient(

zhenxun/utils/image_utils.py

@@ -65,13 +65,13 @@ async def text2image(
             top_padding = padding[0]
             left_padding = padding[1]
     _font = BuildImage.load_font(font, font_size)
+    image_list = []
     if auto_parse and re.search(r"<f(.*)>(.*)</f>", text):
         _data = []
         new_text = ""
         placeholder_index = 0
         for s in text.split("</f>"):
-            r = re.search(r"<f(.*)>(.*)", s)
-            if r:
+            if r := re.search(r"<f(.*)>(.*)", s):
                 start, end = r.span()
                 if start != 0 and (t := s[:start]):
                     new_text += t
@@ -79,14 +79,13 @@ async def text2image(
                     [
                         (start, end),
                         f"[placeholder_{placeholder_index}]",
-                        r.group(1).strip(),
-                        r.group(2),
+                        r[1].strip(),
+                        r[2],
                     ]
                 )
                 new_text += f"[placeholder_{placeholder_index}]"
                 placeholder_index += 1
         new_text += text.split("</f>")[-1]
-        image_list = []
         current_placeholder_index = 0
         # 切分换行，每行为单张图片
         for s in new_text.split("\n"):
@@ -97,12 +96,9 @@ async def text2image(
             for _ in range(s.count("[placeholder_")):
                 placeholder = _data[_tmp_index]
                 if "font_size" in placeholder[2]:
-                    r = re.search(r"font_size=['\"]?(\d+)", placeholder[2])
-                    if r:
-                        w, h = BuildImage.get_text_size(
-                            placeholder[3], font, int(r.group(1))
-                        )
-                        img_height = img_height if img_height > h else h
+                    if r := re.search(r"font_size=['\"]?(\d+)", placeholder[2]):
+                        w, h = BuildImage.get_text_size(placeholder[3], font, int(r[1]))
+                        img_height = max(img_height, h)
                         img_width += w
                 else:
                     img_width += BuildImage.get_text_size(placeholder[3], _font)[0]
@@ -135,10 +131,8 @@ async def text2image(
                         _font = e.split("=")[-1]
                     if e.startswith("font_size=") or e.startswith("fs="):
                         _font_size = int(e.split("=")[-1])
-                        if _font_size > 1000:
-                            _font_size = 1000
-                        if _font_size < 1:
-                            _font_size = 1
+                        _font_size = min(_font_size, 1000)
+                        _font_size = max(_font_size, 1)
                     if e.startswith("font_color") or e.startswith("fc="):
                         _font_color = e.split("=")[-1]
                 text_img = await BuildImage.build_text_image(
@@ -167,7 +161,7 @@ async def text2image(
         width = 0
         for img in image_list:
             height += img.h
-            width = width if width > img.w else img.w
+            width = max(width, img.w)
         width += pw
         height += ph
         A = BuildImage(width + left_padding, height + top_padding, color=color)
@@ -179,12 +173,11 @@ async def text2image(
         width = 0
         height = 0
         _, h = BuildImage.get_text_size("正", _font)
-        line_height = int(font_size / 3)
-        image_list = []
+        line_height = font_size // 3
         for s in text.split("\n"):
             w, _ = BuildImage.get_text_size(s.strip() or "正", _font)
             height += h + line_height
-            width = width if width > w else w
+            width = max(width, w)
             image_list.append(
                 await BuildImage.build_text_image(
                     s.strip(), font, font_size, font_color
@@ -205,7 +198,7 @@ async def text2image(
     return A
 
 
-def group_image(image_list: list[BuildImage]) -> tuple[list[list[BuildImage]], int]:
+def group_image(image_list: list[BuildImage]) -> tuple[list[list[BuildImage]], float]:
     """
     说明:
         根据图片大小进行分组
@@ -240,7 +233,7 @@ def group_image(image_list: list[BuildImage]) -> tuple[list[list[BuildImage]], i
                         break
                 else:
                     break
-            total_w += max([x.width for x in group]) + 15
+            total_w += max(x.width for x in group) + 15
             image_group.append(group)
     while surplus_list:
         surplus_list = [x for x in surplus_list if x.uid not in is_use]
@@ -252,7 +245,7 @@ def group_image(image_list: list[BuildImage]) -> tuple[list[list[BuildImage]], i
                 _w = 0
                 index = -1
                 for i, ig in enumerate(image_group):
-                    if s := sum([x.height for x in ig]) > _w:
+                    if s := sum(x.height for x in ig) > _w:
                         _w = s
                         index = i
                 if index != -1:
@@ -262,29 +255,29 @@ def group_image(image_list: list[BuildImage]) -> tuple[list[list[BuildImage]], i
     max_h = 0
     max_w = 0
     for ig in image_group:
-        if (_h := sum([x.height + 15 for x in ig])) > max_h:
+        if (_h := sum(x.height + 15 for x in ig)) > max_h:
             max_h = _h
-        max_w += max([x.width for x in ig]) + 30
+        max_w += max(x.width for x in ig) + 30
     is_use.clear()
     while abs(max_h - max_w) > 200 and len(image_group) - 1 >= len(image_group[-1]):
         for img in image_group[-1]:
             _min_h = 999999
             _min_index = -1
             for i, ig in enumerate(image_group):
-                if (_h := sum([x.height for x in ig]) + img.height) < _min_h:
+                if (_h := sum(x.height for x in ig) + img.height) < _min_h:
                     _min_h = _h
                     _min_index = i
             is_use.append(_min_index)
             image_group[_min_index].append(img)
-        max_w -= max([x.width for x in image_group[-1]]) - 30
+        max_w -= max(x.width for x in image_group[-1]) - 30
         image_group.pop(-1)
-        max_h = max([sum([x.height + 15 for x in ig]) for ig in image_group])
+        max_h = max(sum(x.height + 15 for x in ig) for ig in image_group)
     return image_group, max(max_h + 250, max_w + 70)
 
 
 async def build_sort_image(
     image_group: list[list[BuildImage]],
-    h: int | None = None,
+    h: float | None = None,
     padding_top: int = 200,
     color: ColorAlias = (
         255,
@@ -307,16 +300,15 @@ async def build_sort_image(
     """
     bk_file = None
     if background_path:
-        random_bk = os.listdir(background_path)
-        if random_bk:
+        if random_bk := os.listdir(background_path):
             bk_file = random.choice(random_bk)
     image_w = 0
     image_h = 0
     if not h:
         for ig in image_group:
-            _w = max([x.width + 30 for x in ig])
+            _w = max(x.width + 30 for x in ig)
             image_w += _w + 30
-            _h = sum([x.height + 10 for x in ig])
+            _h = sum(x.height + 10 for x in ig)
             if _h > image_h:
                 image_h = _h
         image_h += padding_top
@@ -342,7 +334,7 @@ async def build_sort_image(
         for img in ig:
             await A.paste(img, (curr_w, curr_h))
             curr_h += img.height + 10
-        curr_w += max([x.width for x in ig]) + 30
+        curr_w += max(x.width for x in ig) + 30
     return A
 
 

zhenxun/utils/utils.py

@@ -64,6 +64,25 @@ class ResourceDirManager:
             cls.__tree_append(path, deep)
 
 
+def is_binary_file(file_path: str) -> bool:
+    """判断是否为二进制文件"""
+    binary_extensions = {
+        ".jpg",
+        ".jpeg",
+        ".png",
+        ".gif",
+        ".bmp",
+        ".ico",
+        ".pdf",
+        ".zip",
+        ".rar",
+        ".7z",
+        ".exe",
+        ".dll",
+    }
+    return any(file_path.lower().endswith(ext) for ext in binary_extensions)
+
+
 def cn2py(word: str) -> str:
     """将字符串转化为拼音