diff --git a/.gitignore b/.gitignore index cd52268..f01164f 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ run.sh .env .vscode aerich_config.py +.DS_Store \ No newline at end of file diff --git a/U1/message.py b/U1/message.py deleted file mode 100644 index b081602..0000000 --- a/U1/message.py +++ /dev/null @@ -1,38 +0,0 @@ -from io import BytesIO -from pathlib import Path - -from nonebot.adapters.onebot.v11.message import Message, MessageSegment - - -class MessageBuilder(Message): - def at(self, user_id: int | str) -> "MessageBuilder": - self.append(MessageSegment.at(user_id)) - return self - - def face(self, id_: int) -> "MessageBuilder": - self.append(MessageSegment.face(id_)) - return self - - def image( - self, - file: str | bytes | BytesIO | Path, - type_: str | None = None, - cache: bool = True, - proxy: bool = True, - timeout: int | None = None, - ) -> "MessageBuilder": - self.append(MessageSegment.image(file, type_, cache, proxy, timeout)) - return self - - def reply(self, id_: int) -> "MessageBuilder": - self.append(MessageSegment.reply(id_)) - return self - - def text(self, text: str) -> "MessageBuilder": - if self[-1].type == "text": - text = "\n" + text - self.append(MessageSegment.text(text)) - return self - - def done(self) -> str: - return "".join(map(str, self)) diff --git a/U1/model.py b/U1/model.py index 72fe29d..618c0c6 100644 --- a/U1/model.py +++ b/U1/model.py @@ -16,5 +16,5 @@ class Channel(Model): permissions = fields.TextField(null=True, default=None) createdAt = fields.DatetimeField(null=True, default=None) - class Meta: + class Meta: # type: ignore unique_together = ("platform", "flag") diff --git a/U1/utils/permission.py b/U1/utils/permission.py new file mode 100644 index 0000000..6f75fd4 --- /dev/null +++ b/U1/utils/permission.py @@ -0,0 +1,35 @@ +from nonebot.adapters.milky.event import GroupMessageEvent +from nonebot.adapters.milky.model.common import Member +from nonebot.permission import Permission + + +async def _group_admin(event: GroupMessageEvent) -> bool: + if isinstance(event.data.sender, Member): + return event.data.sender.role == "admin" + raise TypeError( + f"Expected Member, got {type(event.data.sender)}: {event.data.sender}" + ) + + +async def _group_owner(event: GroupMessageEvent) -> bool: + if isinstance(event.data.sender, Member): + return event.data.sender.role == "owner" + raise TypeError( + f"Expected Member, got {type(event.data.sender)}: {event.data.sender}" + ) + + +async def _group_member(event: GroupMessageEvent) -> bool: + if isinstance(event.data.sender, Member): + return event.data.sender.role == "member" + raise TypeError( + f"Expected Member, got {type(event.data.sender)}: {event.data.sender}" + ) + + +GROUP_MEMBER: Permission = Permission(_group_member) +"""匹配任意群员群聊消息类型事件""" +GROUP_ADMIN: Permission = Permission(_group_admin) +"""匹配任意群管理员群聊消息类型事件""" +GROUP_OWNER: Permission = Permission(_group_owner) +"""匹配任意群主群聊消息类型事件""" diff --git a/U1/utils/token_bucket.py b/U1/utils/token_bucket.py new file mode 100644 index 0000000..2541799 --- /dev/null +++ b/U1/utils/token_bucket.py @@ -0,0 +1,86 @@ +from asyncio import get_running_loop +from collections import defaultdict +from enum import IntEnum, auto + +from nonebot.adapters.milky.event import MessageEvent +from nonebot.matcher import Matcher +from nonebot.params import Depends + + +class CooldownIsolateLevel(IntEnum): + """命令冷却的隔离级别""" + + GLOBAL = auto() + """全局使用同一个冷却计时""" + GROUP = auto() + """群组内使用同一个冷却计时""" + USER = auto() + """按用户使用同一个冷却计时""" + GROUP_USER = auto() + """群组内每个用户使用同一个冷却计时""" + + +def Cooldown( + cooldown: float = 5, + *, + prompt: str | None = None, + isolate_level: CooldownIsolateLevel = CooldownIsolateLevel.USER, + parallel: int = 1, +) -> None: + """依赖注入形式的事件冷却 + + 用法: + ```python + @matcher.handle(parameterless=[Cooldown(cooldown=11.4514, ...)]) + async def handle_command(matcher: Matcher, message: Message): + ... + ``` + + 参数: + cooldown: 冷却间隔 + prompt: 当触发冷却时发送给用户的提示消息 + isolate_level: 事件冷却的隔离级别, 参考 `CooldownIsolateLevel` + parallel: 并行执行的命令数量 + """ + if not isinstance(isolate_level, CooldownIsolateLevel): + raise ValueError( + f"invalid isolate level: {isolate_level!r}, " + "isolate level must use provided enumerate value." + ) + running: defaultdict[str, int] = defaultdict(lambda: parallel) + + def increase(key: str, value: int = 1): + running[key] += value + if running[key] >= parallel: + del running[key] + return + + async def dependency(matcher: Matcher, event: MessageEvent): + loop = get_running_loop() + + + if isolate_level is CooldownIsolateLevel.GROUP: + if event.data.message_scene == "group": + key = str(event.data.peer_id) + else: + raise ValueError( + "isolate_level is set to GROUP, but event is not a group message." + ) + elif isolate_level is CooldownIsolateLevel.USER: + key = event.get_user_id() + elif isolate_level is CooldownIsolateLevel.GROUP_USER: + key = event.get_session_id() + else: + key = CooldownIsolateLevel.GLOBAL.name + + if not key: + return + + if running[key] <= 0: + await matcher.finish(prompt) + else: + running[key] -= 1 + loop.call_later(cooldown, lambda: increase(key)) + return + + return Depends(dependency) diff --git a/U1/utils/utils.py b/U1/utils/utils.py new file mode 100644 index 0000000..0874625 --- /dev/null +++ b/U1/utils/utils.py @@ -0,0 +1,16 @@ +from nonebot.adapters.milky import Message + +def extract_image_urls(message: Message) -> list[str]: + """提取消息中的图片链接 + + 参数: + message: 消息对象 + + 返回: + 图片链接列表 + """ + return [ + segment.data["url"] + for segment in message + if (segment.type == "image") and ("url" in segment.data) + ] diff --git a/bot.py b/bot.py index f8dddea..8d14132 100644 --- a/bot.py +++ b/bot.py @@ -45,14 +45,14 @@ def default_filter(record: "Record"): ) -from nonebot.adapters.onebot.v11 import Adapter as ONEBOT_V11Adapter -from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent +from nonebot.adapters.milky import Adapter as MilkyAdapter +from nonebot.adapters.milky import Bot +from nonebot.adapters.milky.event import GroupMessageEvent from nonebot.exception import IgnoredException nonebot.init() -app = nonebot.get_asgi() driver = nonebot.get_driver() -driver.register_adapter(ONEBOT_V11Adapter) +driver.register_adapter(MilkyAdapter) @driver.on_startup @@ -86,10 +86,10 @@ async def _(bot: Bot, event: GroupMessageEvent): if event.to_me: return - channel = await get_channel(str(event.group_id)) + channel = await get_channel(str(event.data.peer_id)) if channel is None: for _ in range(3): - channel = await get_channel(str(event.group_id)) + channel = await get_channel(str(event.data.peer_id)) if channel is not None: break # 重试直到找到频道 await asyncio.sleep(0.5) diff --git a/migrations/versions/adc8daa3ce44_migrate_cq_codes_to_img_base64.py b/migrations/versions/adc8daa3ce44_migrate_cq_codes_to_img_base64.py new file mode 100644 index 0000000..2bd76ab --- /dev/null +++ b/migrations/versions/adc8daa3ce44_migrate_cq_codes_to_img_base64.py @@ -0,0 +1,100 @@ +"""migrate_cq_codes_to_img_base64 + +迁移 ID: adc8daa3ce44 +父迁移: 782cb0785d08 +创建时间: 2025-07-11 01:05:56.515358 + +""" + +from __future__ import annotations + +import json +import re +from collections.abc import Sequence + +import sqlalchemy as sa +from alembic import op + +revision: str = "adc8daa3ce44" +down_revision: str | Sequence[str] | None = "782cb0785d08" +branch_labels: str | Sequence[str] | None = None +depends_on: str | Sequence[str] | None = None + + +def extract_base64_from_cq_codes(text: str) -> list[str]: + """ + 从文本中提取所有 [CQ:image,file=base64://...] 中的 base64 数据。 + """ + base64_images = [] + # 匹配 [CQ:image,file=base64://xxxxx] 格式 + cq_pattern = r"\[CQ:image,file=base64://([^]]+)\]" + matches = re.findall(cq_pattern, text) + base64_images.extend(matches) + return base64_images + + +def remove_cq_codes(text: str) -> str: + """ + 移除文本中的所有 CQ 码。 + """ + # 移除所有 [CQ:...] 格式的代码 + return re.sub(r"\[CQ:[^\]]+\]", "", text).strip() + + +def upgrade(name: str = "") -> None: + if name: + return + + # 检查 img_base64 列是否存在 + connection = op.get_bind() + inspector = sa.inspect(connection) + columns = [col["name"] for col in inspector.get_columns("cave_models")] + + # 如果字段不存在，则添加它 + if "img_base64" not in columns: + with op.batch_alter_table("cave_models", schema=None) as batch_op: + batch_op.add_column(sa.Column("img_base64", sa.JSON(), nullable=False)) + + # 数据迁移：处理现有的 CQ 码数据 + # 查询所有包含 CQ 码的记录 + result = connection.execute( + sa.text("SELECT id, details FROM cave_models WHERE details LIKE '%[CQ:image%'") + ) + + for row in result: + record_id, details = row + + # 提取 base64 数据 + base64_images = extract_base64_from_cq_codes(details) + + # 移除 CQ 码 + clean_details = remove_cq_codes(details) + + # 更新记录 + connection.execute( + sa.text( + "UPDATE cave_models SET details = :details, img_base64 = :img_base64 WHERE id = :id" + ), + { + "details": clean_details, + "img_base64": json.dumps(base64_images), + "id": record_id, + }, + ) + + # 为没有图片的记录设置空数组 + connection.execute( + sa.text("UPDATE cave_models SET img_base64 = '[]' WHERE img_base64 IS NULL OR img_base64 = ''") + ) + + connection.commit() + + +def downgrade(name: str = "") -> None: + if name: + return + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table("cave_models", schema=None) as batch_op: + batch_op.drop_column("img_base64") + + # ### end Alembic commands ### diff --git a/pyproject.toml b/pyproject.toml index aecdc21..a0795e2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,10 +8,6 @@ plugins = [ "nonebot_plugin_orm", ] plugin_dirs = ["src/plugins"] -builtin_plugins = [] -[[tool.nonebot.adapters]] -name = "OneBot V11" -module_name = "nonebot.adapters.onebot.v11" [tool.ruff] line-length = 88 @@ -22,16 +18,14 @@ select = ["F", "W", "E", "UP", "ASYNC", "C4", "T10", "PYI", "PT", "Q", "RUF"] ignore = ["E402", "E501", "UP037", "RUF001", "RUF002", "RUF003"] [tool.pyright] -typeCheckingMode = "basic" +typeCheckingMode = "standard" [project] requires-python = "<4.0,>=3.10" dependencies = [ - "nonebot2[fastapi,aiohttp,websockets]>=2.4.1", "nonebot-plugin-orm[mysql]>=0.8.1", "nonebot-plugin-apscheduler>=0.5.0", "nonebot-plugin-htmlrender==0.4.0", - "nonebot-adapter-onebot>=2.4.6", "nonebot-plugin-userinfo>=0.2.6", "aiohttp>=3.10.0", "ujson>=5.10.0", @@ -50,6 +44,10 @@ dependencies = [ "openai>=1.76.0", "tomlkit>=0.13.2", "nb-cli>=1.4.2", + "nonebot-adapter-milky>=0.4.1", + "pysilk>=0.0.1", + "qrcode>=8.2", + "nonebot2[httpx,websockets]>=2.4.2", ] name = "u1bot" version = "0.1.0" diff --git a/src/plugins/Menu/__init__.py b/src/plugins/Menu/__init__.py index d8103f5..ec8361b 100644 --- a/src/plugins/Menu/__init__.py +++ b/src/plugins/Menu/__init__.py @@ -5,9 +5,9 @@ import ujson as json from nonebot import on_command -from nonebot.adapters.onebot.v11 import Bot as V11Bot -from nonebot.adapters.onebot.v11 import Message as V11Msg -from nonebot.adapters.onebot.v11 import MessageSegment as V11MsgSeg +from nonebot.adapters.milky import Bot +from nonebot.adapters.milky import Message +from nonebot.adapters.milky import MessageSegment from nonebot.log import logger from nonebot.matcher import Matcher from nonebot.params import CommandArg @@ -39,11 +39,11 @@ async def get_reply(name: str): @menu.handle() -async def _(bot: V11Bot, matcher: Matcher, arg: V11Msg = CommandArg()): +async def _(bot: Bot, matcher: Matcher, arg: Message = CommandArg()): msg = arg.extract_plain_text().strip() if not msg: # 参数为空，主菜单 - await matcher.finish(V11MsgSeg.image(base64_str)) + await matcher.finish(MessageSegment.image(base64_str)) match_result = re.match(r"^(?P.*?)$", msg) if not match_result: @@ -76,7 +76,7 @@ async def _(bot: V11Bot, matcher: Matcher, arg: V11Msg = CommandArg()): if isinstance(result, str) and not result.startswith("base64://"): await matcher.finish(result) - if isinstance(bot, V11Bot): - await matcher.finish(V11MsgSeg.image(result)) + if isinstance(bot, Bot): + await matcher.finish(MessageSegment.image(result)) else: raise NotImplementedError diff --git a/src/plugins/addfirend/__init__.py b/src/plugins/addfirend/__init__.py index 176345f..c2880fb 100644 --- a/src/plugins/addfirend/__init__.py +++ b/src/plugins/addfirend/__init__.py @@ -2,8 +2,10 @@ import time from nonebot import get_bots, get_driver, logger, on_request -from nonebot.adapters.onebot.v11 import ( +from nonebot.adapters.milky import ( Bot, +) +from nonebot.adapters.milky.event import ( FriendRequestEvent, GroupRequestEvent, RequestEvent, @@ -28,7 +30,7 @@ async def check_bot_priority_in_group( 返回: (是否应该进群, 原因) """ # 跳过免疫群组 - if group_id == 966016220 or group_id == 713478803: + if group_id in {966016220, 713478803}: return True, "免疫群组，直接进入" bots = get_bots() @@ -93,26 +95,23 @@ def format_time(_time: int) -> str: @addfriend.handle() async def _(bot: Bot, event: RequestEvent): if isinstance(event, GroupRequestEvent): - if event.sub_type != "invite": + if event.data.request_type != "invite": return # 获取好友列表对比 friend_list = await bot.get_friend_list() - if event.user_id not in [friend["user_id"] for friend in friend_list]: + if event.data.initiator_id not in [friend.user_id for friend in friend_list]: try: - await bot.send_private_msg( - user_id=event.user_id, + await bot.send_private_message( + user_id=event.data.initiator_id, message="我们还是先成为好友再带我去别的地方吧~", ) except Exception as e: - logger.warning(f"发送私信失败 (用户: {event.user_id}): {e}") + logger.warning(f"发送私信失败 (用户: {event.data.initiator_id}): {e}") return - nickname = (await bot.get_stranger_info(user_id=event.user_id, no_cache=True))[ - "nickname" - ] try: group_info = await bot.get_group_info( - group_id=event.group_id, no_cache=True + group_id=event.data.group_id, no_cache=True ) except Exception: logger.exception("获取群信息失败") @@ -121,14 +120,14 @@ async def _(bot: Bot, event: RequestEvent): # 检查机器人优先级 current_bot_id = int(bot.self_id) can_join, priority_reason = await check_bot_priority_in_group( - event.group_id, current_bot_id + event.data.group_id, current_bot_id ) # 基本条件检查：人数 > 15 或者是免疫群组 basic_approve = ( - group_info["member_count"] > 15 - or event.group_id == 966016220 - or event.group_id == 713478803 + group_info.member_count > 15 + or event.data.group_id == 966016220 + or event.data.group_id == 713478803 ) # 最终决定：基本条件 AND 优先级检查 @@ -137,13 +136,11 @@ async def _(bot: Bot, event: RequestEvent): # 构建消息 msg = ( "⚠收到一条拉群邀请:\n" - f"flag: {event.flag}\n" - f"user: {event.user_id}\n" - f"name: {nickname}\n" - f"group: {event.group_id}\n" - f"name: {group_info['group_name']}\n" + f"user: {event.data.initiator_id}\n" + f"group: {event.data.group_id}\n" + f"name: {group_info.name}\n" f"time: {format_time(event.time)}\n" - f"人数: {group_info['member_count']}\n" + f"人数: {group_info.member_count}\n" f"机器人优先级检查: {priority_reason}\n" f"自动同意/拒绝: {approve}\n" ) @@ -157,45 +154,43 @@ async def _(bot: Bot, event: RequestEvent): reasons.append(f"优先级冲突 ({priority_reason})") msg += f"拒绝原因: {', '.join(reasons)}\n" - msg += f"验证信息:\n{event.comment}" + msg += f"验证信息:\n{event.data.comment}" # 设置群邀请结果 - await bot.set_group_add_request( - flag=event.flag, sub_type="invite", approve=approve - ) + await bot.accept_request(request_id=event.data.request_id) # 如果拒绝进群，发送说明消息 if not approve: try: if not can_join: - await bot.send_private_msg( - user_id=event.user_id, + await bot.send_private_message( + user_id=event.data.initiator_id, message=f"抱歉，由于群内已有其他机器人且优先级更高，无法进入该群。原因: {priority_reason}", ) else: - await bot.send_private_msg( - user_id=event.user_id, + await bot.send_private_message( + user_id=event.data.initiator_id, message="由于机器人的群数量过多，对新的群要求人数超过15人以上，请见谅！", ) except Exception as e: - logger.warning(f"发送拒绝私信失败 (用户: {event.user_id}): {e}") + logger.warning( + f"发送拒绝私信失败 (用户: {event.data.initiator_id}): {e}" + ) elif isinstance(event, FriendRequestEvent): - nickname = (await bot.get_stranger_info(user_id=event.user_id, no_cache=True))[ - "nickname" - ] approve = True msg = ( "⚠收到一条好友请求:\n" - f"flag: {event.flag}\n" - f"user: {event.user_id}\n" - f"name: {nickname}\n" + f"user: {event.data.initiator_id}\n" f"time: {format_time(event.time)}\n" f"自动同意/拒绝: {approve}\n" f"验证信息:\n" - f"{event.comment}" + f"{event.data.comment}" ) - await bot.set_friend_add_request(flag=event.flag, approve=approve) + if approve: + await bot.accept_request(request_id=event.data.request_id) + else: + await bot.reject_request(request_id=event.data.request_id) else: return for super_id in SUPERUSER_list: - await bot.send_private_msg(user_id=int(super_id), message=msg) + await bot.send_private_message(user_id=int(super_id), message=msg) diff --git a/src/plugins/cave/__init__.py b/src/plugins/cave/__init__.py index c3f2a9e..fd4de07 100644 --- a/src/plugins/cave/__init__.py +++ b/src/plugins/cave/__init__.py @@ -1,23 +1,25 @@ import random from nonebot import get_driver, logger, on_command -from nonebot.adapters.onebot.v11 import ( +from nonebot.adapters.milky import ( Bot, - GroupMessageEvent, Message, MessageEvent, - PrivateMessageEvent, + MessageSegment, ) -from nonebot.adapters.onebot.v11.helpers import extract_image_urls +from nonebot.adapters.milky.event import FriendMessageEvent +from nonebot.adapters.milky.message import OutgoingForwardedMessage from nonebot.params import CommandArg from nonebot.permission import SUPERUSER from nonebot.plugin import PluginMetadata from nonebot_plugin_orm import get_session from sqlalchemy import delete, select +from U1.utils.utils import extract_image_urls + from ..coin.api import subtract_coin from .models import cave_models -from .tool import is_image_message +from .tool import process_image_message nickname_list = list(get_driver().config.nickname) Bot_NICKNAME = nickname_list[0] if nickname_list else "bot" @@ -123,7 +125,7 @@ async def condition(event: MessageEvent, key: str) -> tuple[bool, str | None]: urllist = extract_image_urls(event.get_message()) if len(urllist) > 1: return False, "呃，投稿只能包含一张图片诶~\n再斟酌一下你的投稿内容吧~" - if not isinstance(event, PrivateMessageEvent): + if not isinstance(event, FriendMessageEvent): return False, "还是请来私聊我投稿罢~" if not key: return ( @@ -137,76 +139,105 @@ async def condition(event: MessageEvent, key: str) -> tuple[bool, str | None]: @cave_add.handle() async def _(bot: Bot, event: MessageEvent): - is_image = await is_image_message(event) - details = is_image[1] if is_image[0] else str(event.get_message()) + has_image, clean_text, base64_images = await process_image_message(event) + details = clean_text if has_image else str(event.get_message()) details = details.replace("投稿", "", 1).strip() result = await condition(event, details) if result[0] is False: # 审核 await cave_add.finish(result[1]) # 扣除次元币 - user_id = str(event.user_id) - success, remaining_coin = await subtract_coin(user_id, 200) + user_id = event.data.sender_id + success, remaining_coin = await subtract_coin(str(user_id), 200) if not success: await cave_add.finish( f"投稿需要消耗 200 次元币，您当前只有 {remaining_coin:.1f} 次元币，余额不足！" ) async with get_session() as session: - caves = cave_models(details=details, user_id=event.user_id) + caves = cave_models(details=details, user_id=user_id, img_base64=base64_images) session.add(caves) await session.commit() await session.refresh(caves) - result = f"[投稿成功 #{caves.id}]\n" - result += f"{caves.details}\n" - result += "————————————\n" - result += f"投稿时间: {caves.time.strftime('%Y-%m-%d %H:%M:%S')}\n" - result += f"消耗次元币: 200 | 余额: {remaining_coin:.1f}" + # 构建包含图片的消息序列 + img_seq: list[MessageSegment] = [] + + # 投稿内容部分 + content_part = f"[投稿成功 #{caves.id}]\n{caves.details}" + img_seq.append(MessageSegment.text(content=content_part)) + + # 图片部分 + if caves.img_base64: + img_seq.extend( + [ + MessageSegment.image(base64=img_base64) + for img_base64 in caves.img_base64 + ] + ) + + # 分割线和信息部分 + info_part = f"\n————————————\n投稿时间: {caves.time.strftime('%Y-%m-%d %H:%M:%S')}\n消耗次元币: 200 | 余额: {remaining_coin:.1f}" + img_seq.append(MessageSegment.text(content=info_part)) + for i in SUPERUSER_list: - await bot.send_private_msg( + await bot.send_private_message( user_id=int(i), message=Message(f"来自用户{event.get_user_id()}\n{result}"), ) - await cave_add.finish(Message(f"{result}")) + await cave_add.finish(message=Message(img_seq)) @cave_am_add.handle() async def _(bot: Bot, event: MessageEvent): "匿名发布回声洞" - is_image = await is_image_message(event) - details = is_image[1] if is_image[0] else str(event.get_message()) + has_image, clean_text, base64_images = await process_image_message(event) + details = clean_text if has_image else str(event.get_message()) details = details.replace("匿名投稿", "", 1).strip() result = await condition(event, details) if result[0] is False: # 审核 await cave_am_add.finish(result[1]) # 扣除次元币 - user_id = str(event.user_id) - success, remaining_coin = await subtract_coin(user_id, 400) + user_id = event.data.sender_id + success, remaining_coin = await subtract_coin(str(user_id), 400) if not success: await cave_am_add.finish( f"匿名投稿需要消耗 400 次元币，您当前只有 {remaining_coin:.1f} 次元币，余额不足！" ) async with get_session() as session: - caves = cave_models(details=details, user_id=event.user_id, anonymous=True) + caves = cave_models( + details=details, user_id=user_id, anonymous=True, img_base64=base64_images + ) session.add(caves) await session.commit() - await session.refresh(caves) + await session.refresh(caves) # 构建包含图片的消息序列 + img_seq: list[MessageSegment] = [] + + # 投稿内容部分 + content_part = f"[匿名投稿成功 #{caves.id}]\n{caves.details}" + img_seq.append(MessageSegment.text(content=content_part)) + + # 图片部分 + if caves.img_base64: + img_seq.extend( + [ + MessageSegment.image(base64=img_base64) + for img_base64 in caves.img_base64 + ] + ) + + # 分割线和信息部分 + info_part = f"\n————————————\n投稿时间: {caves.time.strftime('%Y-%m-%d %H:%M:%S')}\n匿名投稿会保存用户信息但其他用户无法看到作者\n消耗次元币: 400 | 余额: {remaining_coin:.1f}" + img_seq.append(MessageSegment.text(content=info_part)) - result = f"[匿名投稿成功 #{caves.id}]\n" - result += f"{caves.details}\n" - result += "————————————\n" - result += f"投稿时间: {caves.time.strftime('%Y-%m-%d %H:%M:%S')}\n" - result += "匿名投稿会保存用户信息但其他用户无法看到作者\n" - result += f"消耗次元币: 400 | 余额: {remaining_coin:.1f}" for i in SUPERUSER_list: - await bot.send_private_msg( + await bot.send_private_message( user_id=int(i), message=Message(f"来自用户{event.get_user_id()}\n{result}"), ) - await cave_am_add.finish(Message(f"{result}")) + await cave_am_add.finish(message=Message(img_seq)) @cave_del.handle() @@ -230,9 +261,9 @@ async def _(bot: Bot, event: MessageEvent): await cave_del.finish("没有这个序号的投稿") # 判断是否是超级用户或者是投稿人 - if str(event.user_id) in SUPERUSER_list: + if str(event.data.sender_id) in SUPERUSER_list: try: - await bot.send_private_msg( + await bot.send_private_message( user_id=data.user_id, message=Message( f"您的投稿 #{key} 已被管理员删除\n内容: {data.details}\n删除原因: {reason}" @@ -243,24 +274,51 @@ async def _(bot: Bot, event: MessageEvent): f"回声洞删除投稿私聊通知失败，投稿人 id：{data.user_id}" ) await cave_del.send("删除失败，私聊通知失败") - elif event.user_id == data.user_id: - result_content = data.details + elif event.data.sender_id == data.user_id: await session.delete(data) await session.commit() - await cave_del.finish( - Message(f"[删除成功] 编号 {key} 的投稿已删除\n内容: {result_content}") - ) + img_seq: list[MessageSegment] = [] + + # 投稿内容部分 + content_part = f"[删除成功] 编号 {key} 的投稿已删除\n内容: {data.details}" + img_seq.append(MessageSegment.text(content=content_part)) + + # 图片部分 + if data.img_base64: + img_seq.extend( + [ + MessageSegment.image(base64=img_base64) + for img_base64 in data.img_base64 + ] + ) + + await cave_del.finish(message=Message(img_seq)) else: await cave_del.finish("您没有权限删除此投稿") - result_content = data.details await session.delete(data) await session.commit() - await cave_del.finish( - Message( - f"[删除成功] 编号 {key} 的投稿已删除\n内容: {result_content}\n删除原因: {reason}" + + img_seq: list[MessageSegment] = [] + + # 投稿内容部分 + content_part = f"[删除成功] 编号 {key} 的投稿已删除\n内容: {data.details}" + img_seq.append(MessageSegment.text(content=content_part)) + + # 图片部分 + if data.img_base64: + img_seq.extend( + [ + MessageSegment.image(base64=img_base64) + for img_base64 in data.img_base64 + ] ) - ) + + # 分割线和删除原因部分 + reason_part = f"\n————————————\n删除原因: {reason}" + img_seq.append(MessageSegment.text(content=reason_part)) + + await cave_main.finish(message=Message(img_seq)) @cave_main.handle() @@ -280,13 +338,27 @@ async def _(args: Message = CommandArg()): displayname = ( "匿名用户" if random_cave.anonymous else f"用户{random_cave.user_id}" ) - result = f"[回声洞 #{random_cave.id}]\n" - result += f"{random_cave.details}\n" - result += "————————————\n" - result += f"投稿人：{displayname}\n" - result += f"时间：{random_cave.time.strftime('%Y-%m-%d %H:%M:%S')}\n" - result += "\n私聊机器人可以投稿：\n投稿 [内容] | 匿名投稿 [内容]" - await cave_main.finish(Message(result)) + + img_seq: list[MessageSegment] = [] + + # 投稿内容部分 + content_part = f"[回声洞 #{random_cave.id}]\n{random_cave.details}" + img_seq.append(MessageSegment.text(content=content_part)) + + # 图片部分 + if random_cave.img_base64: + img_seq.extend( + [ + MessageSegment.image(base64=img_base64) + for img_base64 in random_cave.img_base64 + ] + ) + + # 分割线和信息部分 + info_part = f"\n————————————\n投稿人：{displayname}\n时间：{random_cave.time.strftime('%Y-%m-%d %H:%M:%S')}\n\n私聊机器人可以投稿：\n投稿 [内容] | 匿名投稿 [内容]" + img_seq.append(MessageSegment.text(content=info_part)) + + await cave_main.finish(message=Message(img_seq)) else: # 验证输入是否为有效的数字 try: @@ -303,68 +375,80 @@ async def _(args: Message = CommandArg()): # 判断是否是匿名 displayname = "匿名用户" if cave.anonymous else f"用户{cave.user_id}" - result = f"[回声洞 #{cave.id}]\n" - result += f"{cave.details}\n" - result += "————————————\n" - result += f"投稿人: {displayname}\n" - result += f"时间: {cave.time.strftime('%Y-%m-%d %H:%M:%S')}\n" - result += "\n私聊机器人可以投稿:\n投稿 [内容] | 匿名投稿 [内容]" - await cave_main.finish(Message(result)) + + img_seq: list[MessageSegment] = [] + + # 投稿内容部分 + content_part = f"[回声洞 #{cave.id}]\n{cave.details}" + img_seq.append(MessageSegment.text(content=content_part)) + + # 图片部分 + if cave.img_base64: + img_seq.extend( + [ + MessageSegment.image(base64=img_base64) + for img_base64 in cave.img_base64 + ] + ) + + # 分割线和信息部分 + info_part = f"\n————————————\n投稿人: {displayname}\n时间: {cave.time.strftime('%Y-%m-%d %H:%M:%S')}\n\n私聊机器人可以投稿:\n投稿 [内容] | 匿名投稿 [内容]" + img_seq.append(MessageSegment.text(content=info_part)) + + await cave_main.finish(message=Message(img_seq)) @cave_history.handle() async def _(bot: Bot, event: MessageEvent): # 查询 userid 写所有数据 async with get_session() as session: - stmt = select(cave_models).where(cave_models.user_id == event.user_id) + stmt = select(cave_models).where(cave_models.user_id == event.data.sender_id) result = await session.execute(stmt) all_caves = result.scalars().all() - msg_list = [ - "您的回声洞投稿记录:", - *[ - Message( - f"[编号 #{i.id}]\n" - f"{i.details}\n" - f"————————————\n" - f"投稿时间: {i.time.strftime('%Y-%m-%d %H:%M:%S')}" + if not all_caves: + await cave_history.finish("您还没有任何投稿记录") + + # 构造转发消息 + messages: list[list[MessageSegment]] = [] + messages.append([MessageSegment.text("您的回声洞投稿记录:")]) + + # 添加每个投稿记录 + for i in all_caves: + # 为每个投稿构建消息段列表 + msg_segments: list[MessageSegment] = [] + + # 投稿内容部分 + content_part = f"[编号 #{i.id}]\n{i.details}" + msg_segments.append(MessageSegment.text(content=content_part)) + + # 图片部分 + if i.img_base64: + msg_segments.extend( + [ + MessageSegment.image(base64=img_base64) + for img_base64 in i.img_base64 + ] ) - for i in all_caves - ], - ] - await send_forward_msg(bot, event, Bot_NICKNAME, bot.self_id, msg_list) - - -async def send_forward_msg( - bot: Bot, - event: MessageEvent, - name: str, - uin: str, - msgs: list, -) -> dict: - """ - 发送转发消息的异步函数。 - 参数： - bot (Bot): 机器人实例 - event (MessageEvent): 消息事件 - name (str): 转发消息的名称 - uin (str): 转发消息的 UIN - msgs (list): 转发的消息列表 + # 分割线和信息部分 + info_part = ( + f"\n————————————\n投稿时间: {i.time.strftime('%Y-%m-%d %H:%M:%S')}" + ) + msg_segments.append(MessageSegment.text(content=info_part)) - 返回： - dict: API 调用结果 - """ + messages.append(msg_segments) - def to_json(msg: Message): - return {"type": "node", "data": {"name": name, "uin": uin, "content": msg}} + forward_msgs = [ + OutgoingForwardedMessage( + name=Bot_NICKNAME, + user_id=int(bot.self_id), + segments=msg_segments, + ) + for msg_segments in messages + ] - messages = [to_json(msg) for msg in msgs] - if isinstance(event, GroupMessageEvent): - return await bot.send_group_forward_msg( - group_id=event.group_id, messages=messages - ) - return await bot.send_private_forward_msg(user_id=event.user_id, messages=messages) + await cave_history.finish(MessageSegment.forward(forward_msgs)) def extract_deletion_reason(text): diff --git a/src/plugins/cave/models.py b/src/plugins/cave/models.py index 8989203..41dfa86 100644 --- a/src/plugins/cave/models.py +++ b/src/plugins/cave/models.py @@ -6,26 +6,18 @@ require("nonebot_plugin_orm") from nonebot_plugin_orm import Model -from sqlalchemy import BigInteger, Boolean, DateTime, Integer +from sqlalchemy import JSON, BigInteger, Boolean, DateTime, Integer from sqlalchemy.dialects.mysql import LONGTEXT -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import mapped_column +from sqlalchemy.orm.properties import MappedColumn class cave_models(Model): - """ - Model representing the cave_models table in the database. - - Attributes: - id (int): The primary key of the cave model. - details (str): The details of the cave model. - user_id (int): The user ID associated with the cave model. - time (datetime): The timestamp when the cave model was created. - """ - __tablename__ = "cave_models" - id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True) - details: Mapped[str] = mapped_column(LONGTEXT) - user_id: Mapped[int] = mapped_column(BigInteger) - time: Mapped[datetime] = mapped_column(DateTime, default=datetime.now) - anonymous: Mapped[bool] = mapped_column(Boolean, default=False) + id: MappedColumn[int] = mapped_column(Integer, primary_key=True, autoincrement=True) + details: MappedColumn[str] = mapped_column(LONGTEXT) + img_base64: MappedColumn[list[str]] = mapped_column(JSON, default=[]) + user_id: MappedColumn[int] = mapped_column(BigInteger) + time: MappedColumn[datetime] = mapped_column(DateTime, default=datetime.now) + anonymous: MappedColumn[bool] = mapped_column(Boolean, default=False) diff --git a/src/plugins/cave/tool.py b/src/plugins/cave/tool.py index 09f147d..9e3d473 100644 --- a/src/plugins/cave/tool.py +++ b/src/plugins/cave/tool.py @@ -3,8 +3,8 @@ import ssl import aiohttp -from nonebot.adapters.onebot.v11 import MessageEvent -from nonebot.adapters.onebot.v11.utils import unescape +from nonebot.adapters.milky import MessageEvent +from nonebot.adapters.milky.message import Image, IncomingImageData async def url_to_base64(image_url) -> str: @@ -24,9 +24,7 @@ def extract_image_url(message: str) -> str: - message (str): 消息文本。 Returns: - - tuple: 包含两个元素： - - is_image (bool): 是否找到图片 URL。 - - image_url (str): 图片 URL。 + - str: 图片 URL。 """ url_pattern = r"url=(https?[^,]+)" if image_match := re.search(url_pattern, message): @@ -39,71 +37,59 @@ def extract_image_url(message: str) -> str: return "" -def replace_cq_with_caption(text: str, base64_image: str) -> str: +def extract_base64_from_cq_codes(text: str) -> list[str]: """ - 将文本中的 [CQ:...] 标签替换为指定的描述。 + 从文本中提取所有 [CQ:image,file=base64://...] 中的 base64 数据。 参数: - - text: 包含 [CQ:...] 标签的原始文本 - - caption: 用于替换 [CQ:...] 的描述文本 + - text: 包含 CQ 码的文本 返回值: - - 替换后的文本 + - list[str]: 所有提取到的 base64 数据列表 """ - # 反转义 - text = unescape(text) - potential_matches = re.finditer(r"\[CQ:image", text) - result = [] - last_pos = 0 - replacement_template = f"[CQ:image,file=base64://{base64_image}]" - - for match in potential_matches: - start = match.start() - result.append(text[last_pos:start]) # 添加上次匹配结束到这次匹配开始的部分 - # 从匹配位置开始逐字符解析，寻找完整的 [CQ:image,...] - i = start - depth = 0 - while i < len(text): - if text[i] == "[": - depth += 1 - elif text[i] == "]": - depth -= 1 - if depth == 0: - # 匹配到完整的 [CQ:image,...] - result.append(replacement_template) - last_pos = i + 1 # 更新最后的结束位置 - break - i += 1 - else: - # 如果没能闭合，直接保留原始文本 - last_pos = start - - # 添加剩余未处理的部分 - result.append(text[last_pos:]) - return "".join(result) - - -async def is_image_message( - data: MessageEvent, is_cq_code: bool = False -) -> tuple[bool, str]: - if is_cq_code: - image_url = extract_image_url(str(data.message)) - return ( - ( - True, - replace_cq_with_caption( - str(data.message), await url_to_base64(image_url) - ), - ) - if image_url - else (False, "") - ) + base64_images = [] + # 匹配 [CQ:image,file=base64://xxxxx] 格式 + cq_pattern = r"\[CQ:image,file=base64://([^]]+)\]" + matches = re.findall(cq_pattern, text) + base64_images.extend(matches) + + return base64_images + + +def remove_cq_codes(text: str) -> str: + """ + 移除文本中的所有 CQ 码。 + + 参数: + - text: 包含 CQ 码的文本 + + 返回值: + - str: 移除 CQ 码后的纯文本 + """ + # 移除所有 [CQ:...] 格式的代码 + return re.sub(r"\[CQ:[^\]]+\]", "", text).strip() + + +async def process_image_message(data: MessageEvent) -> tuple[bool, str, list[str]]: + """ + 处理图片消息，返回是否包含图片、处理后的文本和图片base64数据。 + + 参数: + - data: 消息事件数据 + + 返回值: + - tuple: (是否包含图片, 处理后的文本, 图片base64数据列表) + """ + has_image = False + base64_images = [] for msg in data.message: - print(msg) - if msg.type == "image" and (image_url := msg.data.get("url", "")): - return True, replace_cq_with_caption( - str(data.message), await url_to_base64(image_url) - ) + if isinstance(msg, Image) and msg.data is IncomingImageData: + has_image = True + base64_data = await url_to_base64(msg.data["temp_url"]) + base64_images.append(base64_data) + + # 移除消息中的所有 CQ 码 + clean_text = remove_cq_codes(str(data.message)) - return False, "" + return has_image, clean_text, base64_images diff --git a/src/plugins/coin/__init__.py b/src/plugins/coin/__init__.py index 9fca8d4..3fd5b11 100644 --- a/src/plugins/coin/__init__.py +++ b/src/plugins/coin/__init__.py @@ -1,5 +1,5 @@ from nonebot import on_command -from nonebot.adapters.onebot.v11 import MessageEvent +from nonebot.adapters import Event from nonebot.params import CommandArg from nonebot_plugin_orm import get_session from sqlalchemy import select @@ -10,14 +10,13 @@ @coin.handle() -async def handle_coin(event: MessageEvent, args=CommandArg()): - user_id = str(event.user_id) +async def handle_coin(event: Event, args=CommandArg()): + user_id = event.get_user_id() async with get_session() as session: result = await session.execute( select(CoinRecord).where(CoinRecord.user_id == user_id) ) - record = result.scalar_one_or_none() - if record: + if record := result.scalar_one_or_none(): await coin.finish( f"你当前拥有金币：{record.coin}\n历史总金币：{record.count_coin}" ) diff --git a/src/plugins/coin/models.py b/src/plugins/coin/models.py index 9e1050f..111cb2b 100644 --- a/src/plugins/coin/models.py +++ b/src/plugins/coin/models.py @@ -1,12 +1,13 @@ from nonebot_plugin_orm import Model from sqlalchemy import Float, Integer, String -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import mapped_column +from sqlalchemy.orm.properties import MappedColumn class CoinRecord(Model): __tablename__ = "coin_coinrecord" - id: Mapped[int] = mapped_column(Integer, primary_key=True) - user_id: Mapped[str] = mapped_column(String(32)) - coin: Mapped[float] = mapped_column(Float, default=0) - count_coin: Mapped[float] = mapped_column(Float, default=0) + id: MappedColumn[int] = mapped_column(Integer, primary_key=True) + user_id: MappedColumn[str] = mapped_column(String(32)) + coin: MappedColumn[float] = mapped_column(Float, default=0) + count_coin: MappedColumn[float] = mapped_column(Float, default=0) diff --git a/src/plugins/fishing/__init__.py b/src/plugins/fishing/__init__.py index f311dbd..fb87fbb 100644 --- a/src/plugins/fishing/__init__.py +++ b/src/plugins/fishing/__init__.py @@ -2,22 +2,25 @@ import random from nonebot import get_driver, on_command, on_fullmatch -from nonebot.adapters import Event, Message -from nonebot.adapters.onebot.v11 import ( +from nonebot.adapters import Event +from nonebot.adapters.milky import ( Bot, - GroupMessageEvent, + Message, MessageEvent, - PrivateMessageEvent, + MessageSegment, ) -from nonebot.adapters.onebot.v11.helpers import ( - Cooldown, - CooldownIsolateLevel, -) -from nonebot.adapters.onebot.v11.permission import GROUP_ADMIN, GROUP_OWNER +from nonebot.adapters.milky.event import FriendMessageEvent, GroupMessageEvent +from nonebot.adapters.milky.message import OutgoingForwardedMessage from nonebot.params import CommandArg from nonebot.permission import SUPERUSER from nonebot.plugin import PluginMetadata +from U1.utils.permission import GROUP_ADMIN, GROUP_OWNER +from U1.utils.token_bucket import ( + Cooldown, + CooldownIsolateLevel, +) + from .config import Config, config from .data_source import ( choice, @@ -75,16 +78,21 @@ async def _update(event: Event): ) ] ) -async def _fishing(event: GroupMessageEvent | PrivateMessageEvent, bot: Bot): +async def _fishing(event: GroupMessageEvent | FriendMessageEvent, bot: Bot): """钓鱼""" if isinstance(event, GroupMessageEvent) and not await get_switch_fish(event): await fishing.finish("钓鱼在本群处于关闭状态，请看菜单重新打开") user_id = event.get_user_id() fish = await choice(user_id=user_id) - await bot.set_msg_emoji_like( - message_id=event.message_id, - emoji_id="127881", + + await fishing.send( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(f"* {Bot_NICKNAME} 正在钓鱼..."), + ], + ), ) fish_name = fish[0] @@ -101,14 +109,29 @@ async def _fishing(event: GroupMessageEvent | PrivateMessageEvent, bot: Bot): result = f"* 你钓到了一条 {get_quality(fish_name)} {fish_name}，长度为 {fish_long}cm！" await save_fish(user_id, fish_name, fish_long) await asyncio.sleep(sleep_time) - await fishing.finish(result, reply_message=True) + await fishing.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(result), + ], + ), + ) @stats.handle() -async def _stats(event: Event): +async def _stats(event: MessageEvent): """统计信息""" user_id = event.get_user_id() - await stats.finish(await get_stats(user_id), reply_message=True) + + await stats.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(await get_stats(user_id)), + ], + ) + ) @backpack.handle() @@ -116,70 +139,79 @@ async def _backpack(bot: Bot, event: MessageEvent): """背包""" user_id = event.get_user_id() fmt = await get_backpack(user_id) - return ( - await backpack.send(fmt) - if isinstance(fmt, str) - else await send_forward_msg(bot, event, Bot_NICKNAME, bot.self_id, fmt) - ) + + if isinstance(fmt, str): + await backpack.finish(fmt) + else: + messages: list[MessageSegment] = [] + # 将每个品质的信息转换为消息段 + messages.extend(MessageSegment.text(quality_info) for quality_info in fmt) + # 创建转发消息 + forward_msg = [ + OutgoingForwardedMessage( + name=Bot_NICKNAME, + user_id=int(bot.self_id), + segments=[messages_seq], + ) + for messages_seq in messages + ] + + await backpack.finish(MessageSegment.forward(forward_msg)) @sell.handle() -async def _sell(event: Event, arg: Message = CommandArg()): +async def _sell(event: MessageEvent, arg: Message = CommandArg()): """卖鱼""" msg = arg.extract_plain_text() user_id = event.get_user_id() if msg == "": await sell.finish("请输入要卖出的鱼的名字，如：卖鱼 小鱼") if msg == "全部": - await sell.finish(await sell_all_fish(user_id), reply_message=True) + await sell.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(await sell_all_fish(user_id)), + ], + ) + ) if msg in fish_quality.keys(): # 判断是否是为品质 - await sell.finish(await sell_quality_fish(user_id, msg), reply_message=True) - await sell.finish(await sell_fish(user_id, msg), reply_message=True) + await sell.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(await sell_quality_fish(user_id, msg)), + ], + ) + ) + await sell.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(await sell_fish(user_id, msg)), + ], + ) + ) @balance.handle() -async def _balance(event: Event): +async def _balance(event: MessageEvent): """余额""" user_id = event.get_user_id() - await balance.finish(await get_balance(user_id), reply_message=True) + await balance.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(await get_balance(user_id)), + ], + ) + ) @switch.handle() -async def _switch(event: GroupMessageEvent | PrivateMessageEvent): +async def _switch(event: GroupMessageEvent | FriendMessageEvent): """钓鱼开关""" if await switch_fish(event): await switch.finish("钓鱼 已打开") else: await switch.finish("钓鱼 已关闭") - - -async def send_forward_msg( - bot: Bot, - event: MessageEvent, - name: str, - uin: str, - msgs: list, -) -> dict: - """ - 发送转发消息的异步函数。 - - 参数: - bot (Bot): 机器人实例 - event (MessageEvent): 消息事件 - name (str): 转发消息的名称 - uin (str): 转发消息的 UIN - msgs (list): 转发的消息列表 - - 返回: - dict: API 调用结果 - """ - - def to_json(msg: Message): - return {"type": "node", "data": {"name": name, "uin": uin, "content": msg}} - - messages = [to_json(msg) for msg in msgs] - if isinstance(event, GroupMessageEvent): - return await bot.send_group_forward_msg( - group_id=event.group_id, messages=messages - ) - return await bot.send_private_forward_msg(user_id=event.user_id, messages=messages) diff --git a/src/plugins/fishing/data_source.py b/src/plugins/fishing/data_source.py index d4705a6..3f601e1 100644 --- a/src/plugins/fishing/data_source.py +++ b/src/plugins/fishing/data_source.py @@ -2,7 +2,7 @@ import time import ujson as json -from nonebot.adapters.onebot.v11 import GroupMessageEvent, PrivateMessageEvent +from nonebot.adapters.milky.event import FriendMessageEvent, GroupMessageEvent from nonebot_plugin_orm import get_session from sqlalchemy import select, update @@ -174,9 +174,7 @@ async def save_fish(user_id: str, fish_name: str, fish_long: int) -> None: async with get_session() as session: stmt = select(FishingRecord).where(FishingRecord.user_id == user_id) result = await session.execute(stmt) - record = result.scalar_one_or_none() - - if record: + if record := result.scalar_one_or_none(): loads_fishes: dict[str, list[int]] = json.loads(record.fishes) try: loads_fishes[fish_name].append(fish_long) @@ -186,7 +184,6 @@ async def save_fish(user_id: str, fish_name: str, fish_long: int) -> None: record.time = time_now + fishing_limit record.frequency += 1 record.fishes = dump_fishes - await session.commit() else: data = {fish_name: [fish_long]} dump_fishes = json.dumps(data) @@ -197,7 +194,7 @@ async def save_fish(user_id: str, fish_name: str, fish_long: int) -> None: fishes=dump_fishes, ) session.add(new_record) - await session.commit() + await session.commit() async def get_stats(user_id: str) -> str: @@ -205,9 +202,7 @@ async def get_stats(user_id: str) -> str: async with get_session() as session: stmt = select(FishingRecord).where(FishingRecord.user_id == user_id) result = await session.execute(stmt) - fishing_record = result.scalar_one_or_none() - - if fishing_record: + if fishing_record := result.scalar_one_or_none(): total_length = sum( sum(fish_long) for fish_long in json.loads(fishing_record.fishes).values() @@ -226,9 +221,7 @@ async def get_backpack(user_id: str) -> str | list: async with get_session() as session: stmt = select(FishingRecord).where(FishingRecord.user_id == user_id) result = await session.execute(stmt) - fishes_record = result.scalar_one_or_none() - - if fishes_record: + if fishes_record := result.scalar_one_or_none(): load_fishes = json.loads(fishes_record.fishes) if not load_fishes: return "你的背包里空无一物" @@ -266,9 +259,7 @@ async def sell_quality_fish(user_id: str, quality: str) -> str: async with get_session() as session: stmt = select(FishingRecord).where(FishingRecord.user_id == user_id) result = await session.execute(stmt) - fishes_record = result.scalar_one_or_none() - - if fishes_record: + if fishes_record := result.scalar_one_or_none(): load_fishes = json.loads(fishes_record.fishes) if not load_fishes: return "你的背包里空无一物" @@ -303,9 +294,7 @@ async def sell_all_fish(user_id: str) -> str: async with get_session() as session: stmt = select(FishingRecord).where(FishingRecord.user_id == user_id) result = await session.execute(stmt) - fishes_record = result.scalar_one_or_none() - - if fishes_record: + if fishes_record := result.scalar_one_or_none(): load_fishes = json.loads(fishes_record.fishes) if not load_fishes: return "你的背包里空无一物" @@ -340,9 +329,7 @@ async def sell_fish(user_id: str, fish_name: str) -> str: async with get_session() as session: stmt = select(FishingRecord).where(FishingRecord.user_id == user_id) result = await session.execute(stmt) - fishes_record = result.scalar_one_or_none() - - if fishes_record: + if fishes_record := result.scalar_one_or_none(): load_fishes = json.loads(fishes_record.fishes) if fish_name not in load_fishes: return "你的背包里没有这种鱼" @@ -370,34 +357,32 @@ async def get_balance(user_id: str) -> str: return f"你有 {coin} {fishing_coin_name}" if coin else "你什么也没有 :)" -async def switch_fish(event: GroupMessageEvent | PrivateMessageEvent) -> bool: +async def switch_fish(event: GroupMessageEvent | FriendMessageEvent) -> bool: """钓鱼开关切换，没有就创建""" - if isinstance(event, PrivateMessageEvent): + if isinstance(event, FriendMessageEvent): return True async with get_session() as session: - stmt = select(FishingSwitch).where(FishingSwitch.group_id == event.group_id) + stmt = select(FishingSwitch).where(FishingSwitch.group_id == event.data.peer_id) result = await session.execute(stmt) - switch = result.scalar_one_or_none() - - if switch: + if switch := result.scalar_one_or_none(): switch.switch = not switch.switch await session.commit() return switch.switch else: - new_switch = FishingSwitch(group_id=event.group_id, switch=False) + new_switch = FishingSwitch(group_id=event.data.peer_id, switch=False) session.add(new_switch) await session.commit() return False -async def get_switch_fish(event: GroupMessageEvent | PrivateMessageEvent) -> bool: +async def get_switch_fish(event: GroupMessageEvent | FriendMessageEvent) -> bool: """获取钓鱼开关""" - if isinstance(event, PrivateMessageEvent): + if isinstance(event, FriendMessageEvent): return True async with get_session() as session: - stmt = select(FishingSwitch).where(FishingSwitch.group_id == event.group_id) + stmt = select(FishingSwitch).where(FishingSwitch.group_id == event.data.peer_id) result = await session.execute(stmt) switch = result.scalar_one_or_none() diff --git a/src/plugins/fishing/models.py b/src/plugins/fishing/models.py index 6f6843d..8dffb4c 100644 --- a/src/plugins/fishing/models.py +++ b/src/plugins/fishing/models.py @@ -4,21 +4,22 @@ from nonebot_plugin_orm import Model from sqlalchemy import Boolean, Integer, String, Text -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import mapped_column +from sqlalchemy.orm.properties import MappedColumn class FishingRecord(Model): __tablename__ = "fishing_fishingrecord" - id: Mapped[int] = mapped_column(Integer, primary_key=True) - user_id: Mapped[str] = mapped_column(String(32)) - time: Mapped[int] = mapped_column(Integer) - frequency: Mapped[int] = mapped_column(Integer) - fishes: Mapped[str] = mapped_column(Text) + id: MappedColumn[int] = mapped_column(Integer, primary_key=True) + user_id: MappedColumn[str] = mapped_column(String(32)) + time: MappedColumn[int] = mapped_column(Integer) + frequency: MappedColumn[int] = mapped_column(Integer) + fishes: MappedColumn[str] = mapped_column(Text) class FishingSwitch(Model): __tablename__ = "fishing_fishingswitch" - group_id: Mapped[int] = mapped_column(Integer, primary_key=True) - switch: Mapped[bool] = mapped_column(Boolean, default=True) + group_id: MappedColumn[int] = mapped_column(Integer, primary_key=True) + switch: MappedColumn[bool] = mapped_column(Boolean, default=True) diff --git a/src/plugins/nonebot_plugin_heweather/render_pic.py b/src/plugins/nonebot_plugin_heweather/render_pic.py index aa93cdd..deb6757 100644 --- a/src/plugins/nonebot_plugin_heweather/render_pic.py +++ b/src/plugins/nonebot_plugin_heweather/render_pic.py @@ -1,7 +1,6 @@ import platform from datetime import datetime from pathlib import Path -from typing import List from nonebot_plugin_htmlrender import template_to_pic @@ -14,9 +13,8 @@ async def render(weather: Weather) -> bytes: template_path = str(Path(__file__).parent / "templates") air = None - if weather.air: - if weather.air.now: - air = add_tag_color(weather.air.now) + if weather.air and weather.air.now: + air = add_tag_color(weather.air.now) return await template_to_pic( template_path=template_path, @@ -36,9 +34,9 @@ async def render(weather: Weather) -> bytes: ) -def add_hour_data(hourly: List[Hourly]): - min_temp = min([int(hour.temp) for hour in hourly]) - high = max([int(hour.temp) for hour in hourly]) +def add_hour_data(hourly: list[Hourly]): + min_temp = min(int(hour.temp) for hour in hourly) + high = max(int(hour.temp) for hour in hourly) low = int(min_temp - (high - min_temp)) for hour in hourly: date_time = datetime.fromisoformat(hour.fxTime) @@ -57,7 +55,7 @@ def add_hour_data(hourly: List[Hourly]): return hourly -def add_date(daily: List[Daily]): +def add_date(daily: list[Daily]): week_map = [ "周日", "周一", @@ -90,4 +88,4 @@ def add_tag_color(air: Air): "严重污染": "#D94371", } air.tag_color = color[air.category] - return air \ No newline at end of file + return air diff --git a/src/plugins/nonebot_plugin_heweather/weather_data.py b/src/plugins/nonebot_plugin_heweather/weather_data.py index 549cdcd..12d494b 100644 --- a/src/plugins/nonebot_plugin_heweather/weather_data.py +++ b/src/plugins/nonebot_plugin_heweather/weather_data.py @@ -19,7 +19,7 @@ class CityNotFoundError(Exception): ... class Weather: def __url__(self): self.url_geoapi = "https://geoapi.qweather.com/v2/city/" - if self.api_type == 2 or self.api_type == 1: + if self.api_type in [2, 1]: self.url_weather_api = "https://api.qweather.com/v7/weather/" self.url_weather_warning = "https://api.qweather.com/v7/warning/now" self.url_air = "https://api.qweather.com/v7/air/now" @@ -43,9 +43,8 @@ def __url__(self): def _forecast_days(self): self.forecast_days = QWEATHER_FORECASE_DAYS - if self.forecast_days: - if self.api_type == 0 and not (3 <= self.forecast_days <= 7): - raise ConfigError("api_type = 0 免费订阅 预报天数必须 3<= x <=7") + if self.forecast_days and (self.api_type == 0 and not (3 <= self.forecast_days <= 7)): + raise ConfigError("api_type = 0 免费订阅 预报天数必须 3<= x <=7") def __init__(self, city_name: str, api_key: str, api_type: int = 0): self.city_name = city_name @@ -90,35 +89,30 @@ async def _get_city_id(self, api_type: str = "lookup"): if res["code"] == "404": raise CityNotFoundError() elif res["code"] != "200": - raise APIError("错误! 错误代码: {}".format(res["code"]) + self.__reference) + raise APIError(f'错误! 错误代码: {res["code"]}{self.__reference}') else: self.city_name = res["location"][0]["name"] return res["location"][0]["id"] def _data_validate(self): - if self.now.code == "200" and self.daily.code == "200": - pass - else: + if self.now.code != "200" or self.daily.code != "200": raise APIError( - "错误! 请检查配置! " - f"错误代码: now: {self.now.code} " - f"daily: {self.daily.code} " - + "air: {} ".format(self.air.code if self.air else "None") - + "warning: {}".format(self.warning.code if self.warning else "None") + f"错误! 请检查配置! 错误代码: now: {self.now.code} daily: {self.daily.code} " + + f'air: {self.air.code if self.air else "None"} ' + + f'warning: {self.warning.code if self.warning else "None"}' + self.__reference ) def _check_response(self, response: Response) -> bool: - if response.status_code == 200: - logger.debug(f"{response.json()}") - return True - else: + if response.status_code != 200: raise APIError(f"Response code:{response.status_code}") + logger.debug(f"{response.json()}") + return True @property async def _now(self) -> NowApi: res = await self._get_data( - url=self.url_weather_api + "now", + url=f"{self.url_weather_api}now", params={"location": self.city_id, "key": self.apikey}, ) self._check_response(res) diff --git a/src/plugins/nonebot_plugin_multincm/__init__.py b/src/plugins/nonebot_plugin_multincm/__init__.py index 556b1db..398348d 100644 --- a/src/plugins/nonebot_plugin_multincm/__init__.py +++ b/src/plugins/nonebot_plugin_multincm/__init__.py @@ -1,10 +1,13 @@ # ruff: noqa: E402 +import asyncio + from nonebot import get_driver from nonebot.plugin import PluginMetadata, inherit_supported_adapters, require require("nonebot_plugin_alconna") require("nonebot_plugin_waiter") +require("nonebot_plugin_localstore") require("nonebot_plugin_htmlrender") from . import interaction as interaction @@ -13,7 +16,12 @@ from .interaction import load_commands driver = get_driver() -driver.on_startup(login) + + +@driver.on_startup +async def _(): + asyncio.create_task(login()) + load_commands() @@ -29,7 +37,7 @@ "▶ Bot 会自动解析你发送的网易云链接\n" if config.ncm_auto_resolve else "" ) -__version__ = "1.1.5" +__version__ = "1.2.6" __plugin_meta__ = PluginMetadata( name="MultiNCM", description="网易云多选点歌", diff --git a/src/plugins/nonebot_plugin_multincm/config.py b/src/plugins/nonebot_plugin_multincm/config.py index 11399ac..33dea88 100644 --- a/src/plugins/nonebot_plugin_multincm/config.py +++ b/src/plugins/nonebot_plugin_multincm/config.py @@ -17,6 +17,7 @@ class ConfigModel(BaseConfigModel): ncm_email: Optional[str] = None ncm_password: Optional[str] = None ncm_password_hash: Optional[str] = None + ncm_anonymous: bool = False # ui ncm_list_limit: int = 20 @@ -41,7 +42,6 @@ class ConfigModel(BaseConfigModel): ncm_resolve_cool_down_cache_size: int = 1024 ncm_card_sign_url: Optional[Annotated[str, AnyHttpUrl]] = None ncm_card_sign_timeout: int = 5 - ncm_ob_v11_local_mode: bool = False ncm_ffmpeg_executable: str = "ffmpeg" diff --git a/src/plugins/nonebot_plugin_multincm/const.py b/src/plugins/nonebot_plugin_multincm/const.py index 4301e65..25b5566 100644 --- a/src/plugins/nonebot_plugin_multincm/const.py +++ b/src/plugins/nonebot_plugin_multincm/const.py @@ -1,13 +1,37 @@ from pathlib import Path -DATA_DIR = Path.cwd() / "data" / "multincm" -SONG_CACHE_DIR = DATA_DIR / "song_cache" -for _p in (DATA_DIR, SONG_CACHE_DIR): - _p.mkdir(parents=True, exist_ok=True) +from cookit.nonebot.localstore import ensure_localstore_path_config +from nonebot_plugin_localstore import get_plugin_data_dir + +ensure_localstore_path_config() -DEBUG_ROOT_DIR = Path.cwd() / "debug" -DEBUG_DIR = DEBUG_ROOT_DIR / "multincm" +DATA_DIR = get_plugin_data_dir() +SONG_CACHE_DIR = DATA_DIR / "song_cache" URL_REGEX = r"music\.163\.com/(.*?)(?P[a-zA-Z]+)(/?\?id=|/)(?P[0-9]+)&?" SHORT_URL_BASE = "https://163cn.tv" SHORT_URL_REGEX = r"163cn\.tv/(?P[a-zA-Z0-9]+)" + +SESSION_FILE_NAME = "session.cache" +SESSION_FILE_PATH = DATA_DIR / SESSION_FILE_NAME + + +def migrate_old_data(): + old_data_dir = Path.cwd() / "data" / "multincm" + if not old_data_dir.exists(): + return + + import shutil + + from nonebot import logger + + old_session_file_path = old_data_dir / SESSION_FILE_NAME + if old_session_file_path.exists(): + shutil.move(old_session_file_path, SESSION_FILE_PATH) + logger.info("已迁移旧登录态文件") + + shutil.rmtree(old_data_dir) + logger.info("已删除旧缓存目录") + + +migrate_old_data() diff --git a/src/plugins/nonebot_plugin_multincm/data_source/base.py b/src/plugins/nonebot_plugin_multincm/data_source/base.py index 91c624c..72c4228 100644 --- a/src/plugins/nonebot_plugin_multincm/data_source/base.py +++ b/src/plugins/nonebot_plugin_multincm/data_source/base.py @@ -6,8 +6,11 @@ from typing import Any, ClassVar, Generic, Optional, TypeVar, Union from typing_extensions import Self, TypeAlias, TypeGuard, override +from yarl import URL + from ..config import config from ..utils import ( + NCMLrcGroupLine, build_item_link, calc_max_page, calc_min_index, @@ -120,9 +123,7 @@ def display_duration(self) -> str: @property def file_suffix(self) -> Optional[str]: - with suppress(Exception): - return self.playable_url.rsplit("/", 1)[-1].rsplit(".", 1)[-1] - return None + return URL(self.playable_url).suffix.removeprefix(".") or None @property def display_filename(self) -> str: @@ -179,7 +180,7 @@ async def get_cover_url(self) -> str: ... async def get_playable_url(self) -> str: ... @abstractmethod - async def get_lyrics(self) -> Optional[list[list[str]]]: ... + async def get_lyrics(self) -> Optional[list[NCMLrcGroupLine]]: ... async def get_info(self) -> SongInfo: ( diff --git a/src/plugins/nonebot_plugin_multincm/data_source/raw/login.py b/src/plugins/nonebot_plugin_multincm/data_source/raw/login.py index f2fa2ac..51b0ee9 100644 --- a/src/plugins/nonebot_plugin_multincm/data_source/raw/login.py +++ b/src/plugins/nonebot_plugin_multincm/data_source/raw/login.py @@ -1,6 +1,11 @@ -from typing import cast +import asyncio +import time +from pathlib import Path +from typing import Any, Optional import anyio +import qrcode +from cookit.loguru import warning_suppress from nonebot import logger from nonebot.utils import run_sync from pyncm import ( @@ -11,75 +16,215 @@ ) from pyncm.apis.login import ( GetCurrentLoginStatus, + LoginFailedException, + LoginQrcodeCheck, + LoginQrcodeUnikey, LoginViaAnonymousAccount, LoginViaCellphone, LoginViaEmail, + SetSendRegisterVerifcationCodeViaCellphone, + WriteLoginInfo, ) from ...config import config -from ...const import DATA_DIR +from ...const import SESSION_FILE_PATH +from .request import NCMResponseError, ncm_request -SESSION_FILE = DATA_DIR / "session.cache" +async def sms_login(phone: str, country_code: int = 86): + timeout = 60 -async def do_login(retry: bool = True): - if SESSION_FILE.exists(): - logger.info(f"使用缓存登录态 ({SESSION_FILE})") + while True: + await ncm_request( + SetSendRegisterVerifcationCodeViaCellphone, + phone, + country_code, + ) + last_send_time = time.time() + logger.success( + f"已发送验证码到 +{country_code} {'*' * (len(phone) - 3)}{phone[-3:]}", + ) + + while True: + captcha = input("> 请输入验证码，留空直接回车代表重发: ").strip() + if not captcha: + if (time_passed := (time.time() - last_send_time)) >= timeout: + break + logger.warning(f"请等待 {timeout - time_passed:.0f} 秒后再重发") + continue + + try: + await ncm_request( + LoginViaCellphone, + phone=phone, + ctcode=country_code, + captcha=captcha, + ) + except LoginFailedException as e: + data: dict[str, Any] = e.args[0] + if data.get("code") != 503: + raise + logger.error("验证码错误，请重新输入") + else: + return + + +async def phone_login( + phone: str, + password: str = "", + password_hash: str = "", + country_code: int = 86, +): + await run_sync(LoginViaCellphone)( + ctcode=country_code, + phone=phone, + password=password, + passwordHash=password_hash, + ) + + +async def email_login( + email: str, + password: str = "", + password_hash: str = "", +): + await run_sync(LoginViaEmail)( + email=email, + password=password, + passwordHash=password_hash, + ) + + +async def qrcode_login(): + async def wait_scan(uni_key: str) -> bool: + last_status: Optional[int] = None + while True: + await asyncio.sleep(2) + try: + await ncm_request(LoginQrcodeCheck, uni_key) + except NCMResponseError as e: + code = e.code + if code != last_status: + last_status = code + extra_tip = ( + f" (用户：{e.data.get('nickname')})" if code == 802 else "" + ) + logger.info(f"当前二维码状态：[{code}] {e.message}{extra_tip}") + if code == 800: + return False # 二维码过期 + if code == 803: + return True # 授权成功 + if code and (code >= 1000): + raise + + while True: + uni_key: str = (await ncm_request(LoginQrcodeUnikey))["unikey"] + + url = f"https://music.163.com/login?codekey={uni_key}" + qr = qrcode.QRCode() + qr.add_data(url) + + logger.info("请使用网易云音乐 APP 扫描下方二维码完成登录") + qr.print_ascii() + + qr_img_filename = "multincm-qrcode.png" + qr_img_path = Path.cwd() / qr_img_filename + with warning_suppress("Failed to save qrcode image"): + qr.make_image().save( + str(qr_img_path), # type: ignore + ) + logger.info( + f"二维码图片已保存至 Bot 根目录的 {qr_img_filename} 文件" + f"，如终端中二维码无法扫描可使用", + ) + + logger.info("或使用下方 URL 生成二维码扫描登录：") + logger.info(url) + + try: + scan_res = await wait_scan(uni_key) + finally: + with warning_suppress("Failed to delete qrcode image"): + qr_img_path.unlink(missing_ok=True) + if scan_res: + return + + +async def anonymous_login(): + await ncm_request(LoginViaAnonymousAccount) + + +async def validate_login(): + with warning_suppress("Failed to get login status"): + ret = await ncm_request(GetCurrentLoginStatus) + ok = bool(ret.get("account")) + if ok: + WriteLoginInfo(ret, GetCurrentSession()) + return ok + return False + + +async def do_login(anonymous: bool = False): + using_cached_session = False + + if anonymous: + logger.info("使用游客身份登录") + await anonymous_login() + + elif using_cached_session := SESSION_FILE_PATH.exists(): + logger.info(f"使用缓存登录态 ({SESSION_FILE_PATH})") SetCurrentSession( LoadSessionFromString( - (await anyio.Path(SESSION_FILE).read_text(encoding="u8")), + (await anyio.Path(SESSION_FILE_PATH).read_text(encoding="u8")), ), ) - elif (config.ncm_phone or config.ncm_email) and ( - config.ncm_password or config.ncm_password_hash - ): - retry = False - - if config.ncm_phone: - logger.info("使用手机号登录") - await run_sync(LoginViaCellphone)( - ctcode=config.ncm_ctcode, - phone=config.ncm_phone, - password=config.ncm_password or "", - passwordHash=config.ncm_password_hash or "", + elif config.ncm_phone: + if config.ncm_password or config.ncm_password_hash: + logger.info("使用手机号与密码登录") + await phone_login( + config.ncm_phone, + config.ncm_password or "", + config.ncm_password_hash or "", ) - else: - logger.info("使用邮箱登录") - await run_sync(LoginViaEmail)( - email=config.ncm_email or "", - password=config.ncm_password or "", - passwordHash=config.ncm_password_hash or "", - ) + logger.info("使用短信验证登录") + await sms_login(config.ncm_phone) - await anyio.Path(SESSION_FILE).write_text( - DumpSessionAsString(GetCurrentSession()), - encoding="u8", + elif (has_password := bool(config.ncm_password or config.ncm_password_hash)) and ( + config.ncm_email + ): + logger.info("使用邮箱与密码登录") + await email_login( + config.ncm_email, + config.ncm_password or "", + config.ncm_password_hash or "", ) else: - retry = False - logger.warning("账号或密码未填写，使用游客账号登录") - await run_sync(LoginViaAnonymousAccount)() - - try: - ret = cast(dict, await run_sync(GetCurrentLoginStatus)()) - assert ret["code"] == 200 - assert ret["account"] - except Exception as e: - if await (pth := anyio.Path(SESSION_FILE)).exists(): - await pth.unlink() - - if retry: - logger.warning("恢复缓存会话失败，尝试使用正常流程登录") - await do_login(retry=False) - return - - raise RuntimeError("登录态异常，请重新登录") from e + if config.ncm_email and (not has_password): + logger.warning("配置文件中提供了邮箱，但是通过邮箱登录需要提供密码") + logger.info("使用二维码登录") + await qrcode_login() + + if not (await validate_login()) and using_cached_session: + SESSION_FILE_PATH.unlink() + logger.warning("恢复缓存会话失败，尝试使用正常流程登录") + await do_login() + return - session = GetCurrentSession() - logger.info(f"登录成功，欢迎您，{session.nickname} [{session.uid}]") + session_exists = GetCurrentSession() + if anonymous: + logger.success("游客登录成功") + else: + if not using_cached_session: + SESSION_FILE_PATH.write_text( + DumpSessionAsString(session_exists), + "u8", + ) + logger.success( + f"登录成功，欢迎您，{session_exists.nickname} [{session_exists.uid}]", + ) async def login(): @@ -92,4 +237,10 @@ async def login(): logger.info("检测到当前全局 Session 已登录，插件将跳过登录步骤") return - await do_login() + if not config.ncm_anonymous: + with warning_suppress("登录失败，回落到游客登录"): + await do_login() + return + + with warning_suppress("登录失败"): + await do_login(anonymous=True) diff --git a/src/plugins/nonebot_plugin_multincm/data_source/raw/request.py b/src/plugins/nonebot_plugin_multincm/data_source/raw/request.py index b3d4202..509a91a 100644 --- a/src/plugins/nonebot_plugin_multincm/data_source/raw/request.py +++ b/src/plugins/nonebot_plugin_multincm/data_source/raw/request.py @@ -1,5 +1,6 @@ from functools import partial from typing import Any, Callable, Literal, Optional, TypeVar, Union, cast, overload +from typing_extensions import ParamSpec from nonebot.utils import run_sync from pydantic import BaseModel @@ -10,7 +11,7 @@ from pyncm.apis.track import GetTrackAudio, GetTrackDetail, GetTrackLyrics from ...config import config -from ...utils import calc_min_index, is_debug_mode, write_debug_file +from ...utils import calc_min_index, debug from .models import ( AlbumInfo, AlbumSearchResult, @@ -29,14 +30,36 @@ ) TModel = TypeVar("TModel", bound=BaseModel) +P = ParamSpec("P") -async def ncm_request(api: Callable, *args, **kwargs) -> dict[str, Any]: +class NCMResponseError(Exception): + def __init__(self, name: str, data: dict[str, Any]): + self.name = name + self.data = data + + @property + def code(self) -> Optional[int]: + return self.data.get("code") + + @property + def message(self) -> Optional[str]: + return self.data.get("message") + + def __str__(self): + return f"{self.name} failed: [{self.code}] {self.message}" + + +async def ncm_request( + api: Callable[P, Any], + *args: P.args, + **kwargs: P.kwargs, +) -> dict[str, Any]: ret = await run_sync(api)(*args, **kwargs) - if is_debug_mode(): - write_debug_file(f"{api.__name__}_{{time}}.json", ret) + if debug.enabled: + debug.write(ret, f"{api.__name__}_{{time}}.json") if ret.get("code", 200) != 200: - raise RuntimeError(f"请求 {api.__name__} 失败\n{ret}") + raise NCMResponseError(api.__name__, ret) return ret @@ -143,7 +166,7 @@ async def get_track_audio( **kwargs, ) -> list[TrackAudio]: res = await ncm_request(GetTrackAudio, song_ids, bitrate=bit_rate, **kwargs) - return [TrackAudio(**x) for x in cast(list[dict], res["data"])] + return [TrackAudio(**x) for x in cast("list[dict]", res["data"])] async def get_track_info(ids: list[int], **kwargs) -> list[Song]: @@ -163,7 +186,7 @@ async def get_track_info(ids: list[int], **kwargs) -> list[Song]: async def get_track_lrc(song_id: int): - res = await ncm_request(GetTrackLyrics, song_id) + res = await ncm_request(GetTrackLyrics, str(song_id)) return LyricData(**res) @@ -204,5 +227,5 @@ async def get_playlist_info(playlist_id: int): async def get_album_info(album_id: int): - res = await ncm_request(GetAlbumInfo, album_id) + res = await ncm_request(GetAlbumInfo, str(album_id)) return AlbumInfo(**res) diff --git a/src/plugins/nonebot_plugin_multincm/interaction/message/common.py b/src/plugins/nonebot_plugin_multincm/interaction/message/common.py index 404cc69..263f9da 100644 --- a/src/plugins/nonebot_plugin_multincm/interaction/message/common.py +++ b/src/plugins/nonebot_plugin_multincm/interaction/message/common.py @@ -1,3 +1,5 @@ +from typing import Union + from cookit.loguru import warning_suppress from nonebot_plugin_alconna.uniseg import UniMessage @@ -13,7 +15,7 @@ async def construct_info_msg( - it: BaseSong | BasePlaylist, + it: Union[BaseSong, BasePlaylist], tip_command: bool = True, ) -> UniMessage: tip = ( @@ -41,15 +43,8 @@ async def send(): if config.ncm_send_media: with warning_suppress(f"Send {song} file failed"): receipt = await send_song_media(song) - reply = None - if receipt and (receipt is not ...): - r = receipt.get_reply() - if isinstance(r, list): - reply = r[0] if r else None - else: - reply = r await (await construct_info_msg(song, tip_command=(receipt is ...))).send( - reply_to=reply, + reply_to=receipt.get_reply() if receipt and (receipt is not ...) else None, ) await send() diff --git a/src/plugins/nonebot_plugin_multincm/interaction/message/song_file.py b/src/plugins/nonebot_plugin_multincm/interaction/message/song_file.py index f26478d..91f6cde 100644 --- a/src/plugins/nonebot_plugin_multincm/interaction/message/song_file.py +++ b/src/plugins/nonebot_plugin_multincm/interaction/message/song_file.py @@ -21,13 +21,15 @@ async def download_song(info: "SongInfo"): filename = info.download_filename file_path = SONG_CACHE_DIR / filename - if not file_path.exists(): - async with AsyncClient(follow_redirects=True) as cli: - async with cli.stream("GET", info.playable_url) as resp: - resp.raise_for_status() - with file_path.open("wb") as f: - async for chunk in resp.aiter_bytes(): - f.write(chunk) + if file_path.exists(): + return file_path + + async with AsyncClient(follow_redirects=True) as cli, cli.stream("GET", info.playable_url) as resp: # fmt: skip + resp.raise_for_status() + SONG_CACHE_DIR.mkdir(parents=True, exist_ok=True) + with file_path.open("wb") as f: + async for chunk in resp.aiter_bytes(): + f.write(chunk) return file_path @@ -55,7 +57,6 @@ async def get_current_ev_receipt(msg_ids: Any): context=ev, exporter=exporter, msg_ids=msg_ids if isinstance(msg_ids, list) else [msg_ids], - uni_factory=UniMessage, ) @@ -63,7 +64,7 @@ async def send_song_media_telegram(info: "SongInfo", as_file: bool = False): return await send_song_media_uni_msg(await download_song(info), info, as_file=False) -async def send_song_media_onebot_v11(info: "SongInfo", as_file: bool = False): +async def send_song_media_milky(info: "SongInfo", as_file: bool = False): async def send_voice(): if not await ffmpeg_exists(): logger.warning( @@ -76,27 +77,23 @@ async def send_voice(): ).send() async def send_file(): - from nonebot.adapters.onebot.v11 import ( - Bot as OB11Bot, + from nonebot.adapters.milky import ( + Bot as MilkyBot, ) - from nonebot.adapters.onebot.v11 import ( + from nonebot.adapters.milky import ( + FriendMessageEvent, GroupMessageEvent, - PrivateMessageEvent, ) - bot = cast(OB11Bot, current_bot.get()) + bot = cast(MilkyBot, current_bot.get()) event = current_event.get() - if not isinstance(event, GroupMessageEvent | PrivateMessageEvent): + if not isinstance(event, (GroupMessageEvent, FriendMessageEvent)): raise TypeError("Event not supported") - file = ( - (await download_song(info)) - if config.ncm_ob_v11_local_mode - else cast(str, (await bot.download_file(url=info.playable_url))["file"]) - ) + file = await download_song(info) - if isinstance(event, PrivateMessageEvent): + if isinstance(event, FriendMessageEvent): await bot.upload_private_file( user_id=event.user_id, file=file, @@ -120,7 +117,7 @@ async def send_song_media_platform_specific( adapter_name = bot.adapter.get_name() processors = { "Telegram": send_song_media_telegram, - "OneBot V11": send_song_media_onebot_v11, + "Milky": send_song_media_milky, } if adapter_name not in processors: raise TypeError("This adapter is not supported") diff --git a/src/plugins/nonebot_plugin_multincm/interaction/resolver.py b/src/plugins/nonebot_plugin_multincm/interaction/resolver.py index b0afc7f..f727573 100644 --- a/src/plugins/nonebot_plugin_multincm/interaction/resolver.py +++ b/src/plugins/nonebot_plugin_multincm/interaction/resolver.py @@ -1,13 +1,13 @@ import re from dataclasses import dataclass -from typing import Annotated, TypeAlias +from typing import Annotated, Optional, Union +from typing_extensions import TypeAlias from cachetools import TTLCache from cookit import flatten, queued from cookit.loguru import warning_suppress from httpx import AsyncClient -from nonebot.adapters import Bot as BaseBot -from nonebot.adapters import Message as BaseMessage +from nonebot.adapters import Bot as BaseBot, Message as BaseMessage from nonebot.consts import REGEX_MATCHED from nonebot.matcher import Matcher from nonebot.params import Depends @@ -28,9 +28,10 @@ from ..utils import is_song_card_supported from .cache import get_cache -ExpectedTypeType: TypeAlias = ( - type[GeneralSongOrPlaylist] | tuple[type[GeneralSongOrPlaylist], ...] -) +ExpectedTypeType: TypeAlias = Union[ + type[GeneralSongOrPlaylist], + tuple[type[GeneralSongOrPlaylist], ...], +] resolved_cache: TTLCache[int, "ResolveCache"] = TTLCache( @@ -61,7 +62,7 @@ async def resolve_from_link_params_cool_down(link_type: str, link_id: int): def check_is_expected_type( item_type: str, - expected_type: ExpectedTypeType | None = None, + expected_type: Optional[ExpectedTypeType] = None, ) -> bool: if not expected_type: return True @@ -76,8 +77,8 @@ def check_is_expected_type( def extract_song_card_hyper( msg: UniMessage, - bot: BaseBot | None = None, -) -> Hyper | None: + bot: Optional[BaseBot] = None, +) -> Optional[Hyper]: if (Hyper in msg) and is_song_card_supported(bot): return msg[Hyper, 0] return None @@ -85,7 +86,7 @@ def extract_song_card_hyper( async def resolve_short_url( suffix: str, - expected_type: ExpectedTypeType | None = None, + expected_type: Optional[ExpectedTypeType] = None, use_cool_down: bool = False, ) -> GeneralSongOrPlaylist: async with AsyncClient(base_url=SHORT_URL_BASE) as client: @@ -93,7 +94,8 @@ async def resolve_short_url( if resp.status_code // 100 != 3: raise ValueError( - f"Short url {suffix} returned invalid status code {resp.status_code}", + f"Short url {suffix} " + f"returned invalid status code {resp.status_code}", ) location = resp.headers.get("Location") @@ -113,9 +115,9 @@ async def resolve_short_url( async def resolve_from_matched( matched: re.Match[str], - expected_type: ExpectedTypeType | None = None, + expected_type: Optional[ExpectedTypeType] = None, use_cool_down: bool = False, -) -> GeneralSongOrPlaylist | None: +) -> Optional[GeneralSongOrPlaylist]: groups = matched.groupdict() if "suffix" in groups: @@ -143,9 +145,9 @@ async def resolve_from_matched( async def resolve_from_plaintext( text: str, - expected_type: ExpectedTypeType | None = None, + expected_type: Optional[ExpectedTypeType] = None, use_cool_down: bool = False, -) -> GeneralSongOrPlaylist | None: +) -> Optional[GeneralSongOrPlaylist]: for regex in (SHORT_URL_REGEX, URL_REGEX): if m := re.search(regex, text, re.IGNORECASE): return await resolve_from_matched(m, expected_type, use_cool_down) @@ -155,9 +157,9 @@ async def resolve_from_plaintext( async def resolve_from_card( card: Hyper, resolve_playable: bool = True, - expected_type: ExpectedTypeType | None = None, + expected_type: Optional[ExpectedTypeType] = None, use_cool_down: bool = False, -) -> GeneralSongOrPlaylist | None: +) -> Optional[GeneralSongOrPlaylist]: if not (raw := card.raw): return None @@ -171,10 +173,10 @@ async def resolve_from_card( async def resolve_from_msg( msg: UniMessage, resolve_playable_card: bool = True, - expected_type: ExpectedTypeType | None = None, + expected_type: Optional[ExpectedTypeType] = None, use_cool_down: bool = False, - bot: BaseBot | None = None, -) -> GeneralSongOrPlaylist | None: + bot: Optional[BaseBot] = None, +) -> Optional[GeneralSongOrPlaylist]: if (h := extract_song_card_hyper(msg, bot)) and ( it := await resolve_from_card( h, @@ -195,9 +197,9 @@ async def resolve_from_ev_msg( state: T_State, bot: BaseBot, matcher: Matcher, - expected_type: ExpectedTypeType | None = None, + expected_type: Optional[ExpectedTypeType] = None, ) -> GeneralSongOrPlaylist: - regex_matched: re.Match[str] | None = state.get(REGEX_MATCHED) + regex_matched: Optional[re.Match[str]] = state.get(REGEX_MATCHED) if regex_matched: # auto resolve if h := extract_song_card_hyper(msg, bot): if it := await resolve_from_card( @@ -227,7 +229,7 @@ async def resolve_from_ev_msg( ): return it - await matcher.finish() + await matcher.finish() # noqa: RET503: NoReturn async def dependency_resolve_from_ev( @@ -270,7 +272,7 @@ async def dependency_resolve_playlist_from_ev( async def dependency_is_auto_resolve(state: T_State) -> bool: - return not not state.get(REGEX_MATCHED) + return bool(state.get(REGEX_MATCHED)) ResolvedItem = Annotated[ diff --git a/src/plugins/nonebot_plugin_multincm/render/__init__.py b/src/plugins/nonebot_plugin_multincm/render/__init__.py index 146dc35..1cde1c5 100644 --- a/src/plugins/nonebot_plugin_multincm/render/__init__.py +++ b/src/plugins/nonebot_plugin_multincm/render/__init__.py @@ -6,6 +6,5 @@ render_track_card_html as render_track_card_html, ) from .lyrics import ( - LyricsRenderParams as LyricsRenderParams, render_lyrics as render_lyrics, ) diff --git a/src/plugins/nonebot_plugin_multincm/render/lyrics.py b/src/plugins/nonebot_plugin_multincm/render/lyrics.py index 7ffa78d..f200d4a 100644 --- a/src/plugins/nonebot_plugin_multincm/render/lyrics.py +++ b/src/plugins/nonebot_plugin_multincm/render/lyrics.py @@ -1,12 +1,19 @@ -from typing import TypedDict -from typing_extensions import Unpack +from typing import TYPE_CHECKING from .utils import render_html, render_template +if TYPE_CHECKING: + from ..utils import NCMLrcGroupLine -class LyricsRenderParams(TypedDict): - groups: list[list[str]] - -async def render_lyrics(**kwargs: Unpack[LyricsRenderParams]) -> bytes: - return await render_html(await render_template("lyrics.html.jinja", **kwargs)) +async def render_lyrics(groups: list["NCMLrcGroupLine"]) -> bytes: + group_tuples = [[(n, r) for n, r in x.lrc.items()] for x in groups] + sort_order = ("roma", "main", "trans") + for group in group_tuples: + group.sort(key=lambda x: sort_order.index(x[0]) if x[0] in sort_order else 999) + return await render_html( + await render_template( + "lyrics.html.jinja", + groups=group_tuples, + ), + ) diff --git a/src/plugins/nonebot_plugin_multincm/render/templates/lyrics.html.jinja b/src/plugins/nonebot_plugin_multincm/render/templates/lyrics.html.jinja index f46163a..c7e63ab 100644 --- a/src/plugins/nonebot_plugin_multincm/render/templates/lyrics.html.jinja +++ b/src/plugins/nonebot_plugin_multincm/render/templates/lyrics.html.jinja @@ -19,15 +19,18 @@ font-size: 20px; font-weight: bold; } + + .lyric-group .roma { + font-size: 14px; + } {%- endblock %} {% block main -%} {% for group in groups -%}
- {% for it in group -%} - {% if it %}
{{ it }}
{% endif %} - {%- endfor %} + {% for n, r in group %}
{{ r }}
+ {% endfor -%}
{%- endfor %}
diff --git a/src/plugins/nonebot_plugin_multincm/render/utils.py b/src/plugins/nonebot_plugin_multincm/render/utils.py index d8e53f3..d3e70de 100644 --- a/src/plugins/nonebot_plugin_multincm/render/utils.py +++ b/src/plugins/nonebot_plugin_multincm/render/utils.py @@ -7,7 +7,7 @@ from nonebot_plugin_htmlrender import get_new_page from ..config import config -from ..utils import is_debug_mode, write_debug_file +from ..utils import debug jinja_env = jinja2.Environment( loader=jinja2.FileSystemLoader(Path(__file__).parent / "templates"), @@ -51,8 +51,8 @@ async def render_html( selector: str = "main", image_type: Literal["jpeg", "png"] = "jpeg", ) -> bytes: - if is_debug_mode(): - write_debug_file("{time}.html", html) + if debug.enabled: + debug.write(html, "{time}.html") async with get_new_page() as page: await page.set_content(html) elem = await page.query_selector(selector) diff --git a/src/plugins/nonebot_plugin_multincm/utils/__init__.py b/src/plugins/nonebot_plugin_multincm/utils/__init__.py index 03670d3..3caf113 100644 --- a/src/plugins/nonebot_plugin_multincm/utils/__init__.py +++ b/src/plugins/nonebot_plugin_multincm/utils/__init__.py @@ -5,19 +5,22 @@ calc_min_max_index as calc_min_max_index, calc_page_number as calc_page_number, cut_string as cut_string, + debug as debug, encode_silk as encode_silk, ffmpeg_exists as ffmpeg_exists, format_alias as format_alias, format_artists as format_artists, format_time as format_time, get_thumb_url as get_thumb_url, - is_debug_mode as is_debug_mode, is_song_card_supported as is_song_card_supported, merge_alias as merge_alias, - write_debug_file as write_debug_file, ) from .lrc_parser import ( + NCM_MAIN_LRC_GROUP as NCM_MAIN_LRC_GROUP, + LrcGroupLine as LrcGroupLine, LrcLine as LrcLine, + NCMLrcGroupLine as NCMLrcGroupLine, + NCMLrcGroupNameType as NCMLrcGroupNameType, merge_lrc as merge_lrc, normalize_lrc as normalize_lrc, parse_lrc as parse_lrc, diff --git a/src/plugins/nonebot_plugin_multincm/utils/base.py b/src/plugins/nonebot_plugin_multincm/utils/base.py index 73fec6a..5122b34 100644 --- a/src/plugins/nonebot_plugin_multincm/utils/base.py +++ b/src/plugins/nonebot_plugin_multincm/utils/base.py @@ -1,29 +1,26 @@ import asyncio -import json import math -import time -from typing import TYPE_CHECKING, Any, TypeVar +from pathlib import Path +from typing import TYPE_CHECKING, Optional, TypeVar +from typing_extensions import ParamSpec -from cookit import flatten -from nonebot.adapters import Bot as BaseBot -from nonebot.adapters import Event as BaseEvent +from cookit import DebugFileWriter, flatten +from nonebot.adapters import Bot as BaseBot, Event as BaseEvent from nonebot.matcher import current_bot from nonebot.utils import run_sync from nonebot_plugin_alconna.uniseg import SupportScope, UniMessage -from typing_extensions import ParamSpec from yarl import URL from ..config import config -from ..const import DEBUG_DIR, DEBUG_ROOT_DIR if TYPE_CHECKING: - from pathlib import Path - from ..data_source import md P = ParamSpec("P") TR = TypeVar("TR") +debug = DebugFileWriter(Path.cwd() / "debug", "multincm") + def format_time(time: int) -> str: ss, _ = divmod(time, 1000) @@ -31,7 +28,7 @@ def format_time(time: int) -> str: return f"{mm:0>2d}:{ss:0>2d}" -def format_alias(name: str, alias: list[str] | None = None) -> str: +def format_alias(name: str, alias: Optional[list[str]] = None) -> str: return f"{name}（{'；'.join(alias)}）" if alias else name @@ -57,26 +54,6 @@ def calc_max_page(total: int) -> int: return math.ceil(total / config.ncm_list_limit) -def is_debug_mode() -> bool: - return DEBUG_ROOT_DIR.exists() and DEBUG_ROOT_DIR.is_dir() - - -def write_debug_file(filename: str, content: Any): - filename = filename.format(time=round(time.time() * 1000)) - path = DEBUG_DIR / filename - if isinstance(content, bytes | bytearray): - path.write_bytes(content) - return - path.write_text( - ( - content - if isinstance(content, str) - else json.dumps(content, ensure_ascii=False) - ), - "u8", - ) - - def get_thumb_url(url: str, size: int = 64) -> str: return str(URL(url).update_query(param=f"{size}y{size}")) @@ -125,7 +102,7 @@ async def encode_silk(path: "Path", rate: int = 24000) -> "Path": ) try: - from pysilk import encode # type: ignore + from pysilk import encode await run_sync(encode)(pcm_path.open("rb"), silk_path.open("wb"), rate, rate) finally: @@ -143,10 +120,10 @@ def merge_alias(song: "md.Song") -> list[str]: def is_song_card_supported( - bot: BaseBot | None = None, - event: BaseEvent | None = None, + bot: Optional[BaseBot] = None, + event: Optional[BaseEvent] = None, ) -> bool: if bot is None: bot = current_bot.get() s = UniMessage.get_target(event, bot).scope - return not not s and s == SupportScope.qq_client.value + return bool(s and s == SupportScope.qq_client.value) diff --git a/src/plugins/nonebot_plugin_multincm/utils/lrc_parser.py b/src/plugins/nonebot_plugin_multincm/utils/lrc_parser.py index bcaff0a..f5988e7 100644 --- a/src/plugins/nonebot_plugin_multincm/utils/lrc_parser.py +++ b/src/plugins/nonebot_plugin_multincm/utils/lrc_parser.py @@ -1,12 +1,15 @@ import re from dataclasses import dataclass -from typing import TYPE_CHECKING, Optional, cast +from typing import TYPE_CHECKING, Generic, Literal, Optional, TypeVar +from typing_extensions import TypeAlias from ..config import config if TYPE_CHECKING: from ..data_source import md +SK = TypeVar("SK", bound=str) + @dataclass class LrcLine: @@ -17,6 +20,13 @@ class LrcLine: skip_merge: bool = False +@dataclass +class LrcGroupLine(Generic[SK]): + time: int + """Lyric Time (ms)""" + lrc: dict[SK, str] + + LRC_TIME_REGEX = r"(?P\d+):(?P\d+)([\.:](?P\d+))?(-(?P\d))?" LRC_LINE_REGEX = re.compile(rf"^((\[{LRC_TIME_REGEX}\])+)(?P.*)$", re.MULTILINE) @@ -36,10 +46,10 @@ def parse_lrc( LrcLine( time=( int(i["min"]) * 60 * 1000 - + int(float(f'{i["sec"]}.{i["mili"] or 0}') * 1000) + + int(float(f"{i['sec']}.{i['mili'] or 0}") * 1000) ), lrc=lrc, - skip_merge=not not i["meta"] + skip_merge=bool(i["meta"]) or lrc.startswith(("作词", "作曲", "编曲")), ) for i in times @@ -72,18 +82,25 @@ def strip_lrc_lines(lines: list[LrcLine]) -> list[LrcLine]: def merge_lrc( - *lyrics: list[LrcLine], + lyric_groups: dict[SK, list[LrcLine]], + main_group: Optional[SK] = None, threshold: int = 20, replace_empty_line: Optional[str] = None, -) -> list[list[LrcLine]]: - lyrics = tuple(x.copy() for x in lyrics) - - for lrc in lyrics: - while not lrc[-1].lrc: - lrc.pop() + skip_merge_group_name: Optional[SK] = None, +) -> list[LrcGroupLine[SK]]: + lyric_groups = {k: v.copy() for k, v in lyric_groups.items()} + for v in lyric_groups.values(): + while not v[-1].lrc: + v.pop() + + if main_group is None: + main_group, main_lyric = next(iter(lyric_groups.items())) + else: + main_lyric = lyric_groups[main_group] + main_lyric = strip_lrc_lines(main_lyric) - main_lyric = strip_lrc_lines(lyrics[0]) - sub_lyrics = [strip_lrc_lines(x) for x in lyrics[1:]] + lyric_groups.pop(main_group) + sub_lines = [(n, strip_lrc_lines(x)) for n, x in lyric_groups.items()] if replace_empty_line: for x in main_lyric: @@ -91,15 +108,23 @@ def merge_lrc( x.lrc = replace_empty_line x.skip_merge = True - merged: list[list[LrcLine]] = [[x] for x in main_lyric] - for merged_line in merged: - main_line = merged_line[0] + merged: list[LrcGroupLine] = [] + for main_line in main_lyric: if not main_line.lrc: continue main_time = main_line.time + line_main_group = ( + skip_merge_group_name + if main_line.skip_merge and skip_merge_group_name + else main_group + ) + line_group = LrcGroupLine( + time=main_time, + lrc={line_main_group: main_line.lrc}, + ) - for sub_lrc in sub_lyrics: + for group, sub_lrc in sub_lines: for i, line in enumerate(sub_lrc): if (not line.lrc) or main_line.skip_merge: continue @@ -108,16 +133,31 @@ def merge_lrc( for _ in range(i + 1): it = sub_lrc.pop(0) # noqa: B909 if it.lrc: - merged_line.append(it) + line_group.lrc[group] = it.lrc break - for sub_lrc in sub_lyrics: - merged[-1].extend(sub_lrc) + merged.append(line_group) + + rest_lrc_len = max(len(x[1]) for x in sub_lines) if sub_lines else 0 + if rest_lrc_len: + extra_lines = [ + LrcGroupLine(time=merged[-1].time + 1000, lrc={}) + for _ in range(rest_lrc_len) + ] + for group, line in sub_lines: + for target, extra in zip(extra_lines, line): + target.lrc[group] = extra.lrc return merged -def normalize_lrc(lrc: "md.LyricData") -> Optional[list[list[str]]]: +NCMLrcGroupNameType: TypeAlias = Literal["main", "roma", "trans", "meta"] +NCM_MAIN_LRC_GROUP: NCMLrcGroupNameType = "main" + +NCMLrcGroupLine: TypeAlias = LrcGroupLine[NCMLrcGroupNameType] + + +def normalize_lrc(lrc: "md.LyricData") -> Optional[list[NCMLrcGroupLine]]: def fmt_usr(usr: "md.User") -> str: return f"{usr.nickname} [{usr.user_id}]" @@ -125,29 +165,49 @@ def fmt_usr(usr: "md.User") -> str: if (not raw) or (not (raw_lrc := raw.lyric)): return None - lyrics = [ - parse_lrc(x.lyric) - for x in cast(list[Optional["md.Lyric"]], [raw, lrc.roma_lrc, lrc.trans_lrc]) - if x - ] - lyrics = [x for x in lyrics if x] + raw_lyric_groups: dict[NCMLrcGroupNameType, Optional[md.Lyric]] = { + "main": raw, + "roma": lrc.roma_lrc, + "trans": lrc.trans_lrc, + } + lyrics: dict[NCMLrcGroupNameType, list[LrcLine]] = { + k: x for k, v in raw_lyric_groups.items() if v and (x := parse_lrc(v.lyric)) + } empty_line = config.ncm_lrc_empty_line if not lyrics: - lines = [[x or empty_line or ""] for x in raw_lrc.split("\n")] + lines = [ + LrcGroupLine( + time=0, + lrc={NCM_MAIN_LRC_GROUP: (x or empty_line or "")}, + ) + for x in raw_lrc.splitlines() + ] else: - if lyrics[0][-1].time >= 5940000: + if lyrics[NCM_MAIN_LRC_GROUP][-1].time >= 5940000: return None # 纯音乐 - lines = [ - [y.lrc for y in x] - for x in merge_lrc(*lyrics, replace_empty_line=empty_line) - ] + lines: list[NCMLrcGroupLine] = merge_lrc( + lyrics, + main_group=NCM_MAIN_LRC_GROUP, + replace_empty_line=empty_line, + skip_merge_group_name="meta", + ) if lrc.lyric_user or lrc.trans_user: if usr := lrc.lyric_user: - lines.append(["", f"歌词贡献者：{fmt_usr(usr)}"]) + lines.append( + LrcGroupLine( + time=5940000, + lrc={"meta": f"歌词贡献者：{fmt_usr(usr)}"}, + ), + ) if usr := lrc.trans_user: - lines.append(["", f"翻译贡献者：{fmt_usr(usr)}"]) + lines.append( + LrcGroupLine( + time=5940000, + lrc={"meta": f"翻译贡献者：{fmt_usr(usr)}"}, + ), + ) return lines diff --git a/src/plugins/nonebot_plugin_picstatus/__init__.py b/src/plugins/nonebot_plugin_picstatus/__init__.py index ff22dfa..572baf0 100644 --- a/src/plugins/nonebot_plugin_picstatus/__init__.py +++ b/src/plugins/nonebot_plugin_picstatus/__init__.py @@ -1,9 +1,8 @@ -# ruff: noqa: E402 - from nonebot import get_driver from nonebot.plugin import PluginMetadata -from . import __main__ as __main__, misc_statistics as misc_statistics +from . import __main__ as __main__ +from . import misc_statistics as misc_statistics from .bg_provider import bg_preloader from .collectors import ( enable_collectors, diff --git a/src/plugins/nonebot_plugin_picstatus/__main__.py b/src/plugins/nonebot_plugin_picstatus/__main__.py index 49c9058..abaa006 100644 --- a/src/plugins/nonebot_plugin_picstatus/__main__.py +++ b/src/plugins/nonebot_plugin_picstatus/__main__.py @@ -1,6 +1,5 @@ import asyncio from contextlib import suppress -from typing import Optional from nonebot import logger, on_command from nonebot.adapters import Bot as BaseBot, Event as BaseEvent, Message as BaseMessage @@ -56,17 +55,15 @@ async def _msg_pic(msg: UniMsg) -> BgData | None: current_matcher.get().state, img, ) - if not data: - return None - return BgData(data=data, mime=img.mimetype or "image") + return BgData(data=data, mime=img.mimetype or "image") if data else None -def MsgPic(): # noqa: N802 +def MsgPic(): return Depends(_msg_pic) @stat_matcher.handle() -async def _(bot: BaseBot, event: BaseEvent, msg_pic: Optional[BgData] = MsgPic()): +async def _(bot: BaseBot, event: BaseEvent, msg_pic: BgData | None = MsgPic()): with suppress(Exception): await cache_bot_info(bot, event) diff --git a/src/plugins/nonebot_plugin_picstatus/bg_provider.py b/src/plugins/nonebot_plugin_picstatus/bg_provider.py index d211224..658e809 100644 --- a/src/plugins/nonebot_plugin_picstatus/bg_provider.py +++ b/src/plugins/nonebot_plugin_picstatus/bg_provider.py @@ -189,8 +189,8 @@ async def get(self) -> BgData: self.start_preload(create_when_full=True) if self.tasks: await self._wait_signal() - if not self.backgrounds: - raise RuntimeError("Failed to wait background") + if not self.backgrounds: + raise RuntimeError("Failed to wait background") bg = self.backgrounds.pop(0) self.start_preload() return bg diff --git a/src/plugins/nonebot_plugin_picstatus/collectors/__init__.py b/src/plugins/nonebot_plugin_picstatus/collectors/__init__.py index 3f4e3d3..119bdcc 100644 --- a/src/plugins/nonebot_plugin_picstatus/collectors/__init__.py +++ b/src/plugins/nonebot_plugin_picstatus/collectors/__init__.py @@ -3,23 +3,17 @@ import time from abc import abstractmethod from collections import deque +from collections.abc import Awaitable, Callable from pathlib import Path from typing import ( Any, - Awaitable, - Callable, - Deque, - Dict, Generic, - Optional, - Type, TypeVar, - Union, ) -from typing_extensions import override from nonebot import logger from nonebot_plugin_apscheduler import scheduler +from typing_extensions import override from ..config import config @@ -57,7 +51,7 @@ async def get(self) -> T: class BaseFirstTimeCollector(Collector[T, T], Generic[T]): def __init__(self) -> None: super().__init__() - self._cached: Union[T, Undefined] = Undefined() + self._cached: T | Undefined = Undefined() @override async def get(self) -> T: @@ -68,13 +62,13 @@ async def get(self) -> T: return data -class BasePeriodicCollector(Collector[T, Deque[T]], Generic[T]): +class BasePeriodicCollector(Collector[T, deque[T]], Generic[T]): def __init__(self, size: int = config.ps_default_collect_cache_size) -> None: super().__init__() self.data = deque(maxlen=size) @override - async def get(self) -> Deque[T]: + async def get(self) -> deque[T]: return self.data async def collect(self): @@ -88,12 +82,12 @@ async def collect(self): self.data.append(data) -registered_collectors: Dict[str, Type[Collector]] = {} -enabled_collectors: Dict[str, Collector] = {} +registered_collectors: dict[str, type[Collector]] = {} +enabled_collectors: dict[str, Collector] = {} def collector(name: str): - def deco(cls: Type[TC]) -> Type[TC]: + def deco(cls: type[TC]) -> type[TC]: if name in registered_collectors: raise ValueError(f"Collector {name} already exists") registered_collectors[name] = cls @@ -120,7 +114,7 @@ async def enable_collectors(*names: str): await init_first_time_collectors() -def functional_collector(cls: Type[Collector], name: Optional[str] = None): +def functional_collector(cls: type[Collector], name: str | None = None): def deco(func: TCF) -> TCF: collector_name = name or func.__name__ if not collector_name: @@ -136,22 +130,22 @@ async def _get(self) -> Any: return deco -def normal_collector(name: Optional[str] = None): +def normal_collector(name: str | None = None): return functional_collector(BaseNormalCollector, name) -def first_time_collector(name: Optional[str] = None): +def first_time_collector(name: str | None = None): return functional_collector(BaseFirstTimeCollector, name) -def periodic_collector(name: Optional[str] = None): +def periodic_collector(name: str | None = None): return functional_collector(BasePeriodicCollector, name) class TimeBasedCounterCollector(BasePeriodicCollector[R], Generic[T, R]): def __init__(self, size: int = config.ps_default_collect_cache_size) -> None: super().__init__(size) - self.last_obj: Union[Undefined, T] = Undefined() + self.last_obj: Undefined | T = Undefined() self.last_time: float = 0 @abstractmethod @@ -174,7 +168,7 @@ async def _get(self) -> R: return await self._calc(past, self.last_obj, time_passed) -async def collect_all() -> Dict[str, Any]: +async def collect_all() -> dict[str, Any]: async def get(name: str): return name, await enabled_collectors[name].get() diff --git a/src/plugins/nonebot_plugin_picstatus/collectors/bot.py b/src/plugins/nonebot_plugin_picstatus/collectors/bot.py index b8582f8..1eb202f 100644 --- a/src/plugins/nonebot_plugin_picstatus/collectors/bot.py +++ b/src/plugins/nonebot_plugin_picstatus/collectors/bot.py @@ -1,9 +1,8 @@ import asyncio from dataclasses import dataclass from datetime import datetime -from typing import List, Optional, Tuple -from nonebot import get_bots, logger +from nonebot import get_bots from nonebot.adapters import Bot as BaseBot from nonebot.matcher import current_bot @@ -18,9 +17,9 @@ from . import normal_collector try: - from nonebot.adapters.onebot.v11 import Bot as OBV11Bot + from nonebot.adapters.milky import Bot as MilkyBot except ImportError: - OBV11Bot = None + MilkyBot = None @dataclass @@ -33,27 +32,6 @@ class BotStatus: msg_sent: str -async def get_ob11_msg_num(bot: BaseBot) -> Tuple[Optional[int], Optional[int]]: - if not (config.ps_ob_v11_use_get_status and OBV11Bot and isinstance(bot, OBV11Bot)): - return None, None - - try: - bot_stat = (await bot.get_status()).get("stat") - except Exception as e: - logger.warning( - f"Error when getting bot status: {e.__class__.__name__}: {e}", - ) - return None, None - if not bot_stat: - return None, None - - msg_rec = bot_stat.get("message_received") or bot_stat.get( - "MessageReceived", - ) - msg_sent = bot_stat.get("message_sent") or bot_stat.get("MessageSent") - return msg_rec, msg_sent - - async def get_bot_status(bot: BaseBot, now_time: datetime) -> BotStatus: nick = ( ((info := bot_info_cache[bot.self_id]).user_displayname or info.user_name) @@ -66,11 +44,8 @@ async def get_bot_status(bot: BaseBot, now_time: datetime) -> BotStatus: else "未知" ) - msg_rec, msg_sent = await get_ob11_msg_num(bot) - if msg_rec is None: - msg_rec = recv_num.get(bot.self_id) - if msg_sent is None: - msg_sent = send_num.get(bot.self_id) + msg_rec = recv_num.get(bot.self_id) + msg_sent = send_num.get(bot.self_id) msg_rec = "未知" if (msg_rec is None) else str(msg_rec) msg_sent = "未知" if (msg_sent is None) else str(msg_sent) @@ -85,7 +60,7 @@ async def get_bot_status(bot: BaseBot, now_time: datetime) -> BotStatus: @normal_collector() -async def bots() -> List[BotStatus]: +async def bots() -> list[BotStatus]: now_time = datetime.now().astimezone() return ( [await get_bot_status(current_bot.get(), now_time)] diff --git a/src/plugins/nonebot_plugin_picstatus/collectors/disk.py b/src/plugins/nonebot_plugin_picstatus/collectors/disk.py index 15612d0..a6a49a9 100644 --- a/src/plugins/nonebot_plugin_picstatus/collectors/disk.py +++ b/src/plugins/nonebot_plugin_picstatus/collectors/disk.py @@ -1,5 +1,4 @@ from dataclasses import dataclass -from typing import Dict, List, Optional, Union import psutil from nonebot import logger @@ -24,7 +23,7 @@ class DiskUsageWithExc: exception: str -DiskUsageType = Union[DiskUsageNormal, DiskUsageWithExc] +DiskUsageType = DiskUsageNormal | DiskUsageWithExc @dataclass @@ -35,8 +34,8 @@ class DiskIO: @periodic_collector() -async def disk_usage() -> List[DiskUsageType]: - def get_one(disk: sdiskpart) -> Optional[DiskUsageType]: +async def disk_usage() -> list[DiskUsageType]: + def get_one(disk: sdiskpart) -> DiskUsageType | None: mountpoint = disk.mountpoint if match_list_regexp(config.ps_ignore_parts, mountpoint): @@ -71,14 +70,14 @@ def get_one(disk: sdiskpart) -> Optional[DiskUsageType]: @collector("disk_io") -class DiskIOCollector(TimeBasedCounterCollector[Dict[str, sdiskio], List[DiskIO]]): +class DiskIOCollector(TimeBasedCounterCollector[dict[str, sdiskio], list[DiskIO]]): async def _calc( self, - past: Dict[str, sdiskio], - now: Dict[str, sdiskio], + past: dict[str, sdiskio], + now: dict[str, sdiskio], time_passed: float, - ) -> List[DiskIO]: - def calc_one(name: str, past_it: sdiskio, now_it: sdiskio) -> Optional[DiskIO]: + ) -> list[DiskIO]: + def calc_one(name: str, past_it: sdiskio, now_it: sdiskio) -> DiskIO | None: if match_list_regexp(config.ps_ignore_disk_ios, name): # logger.info(f"IO统计 磁盘 {name} 匹配 {regex.re.pattern}，忽略") return None @@ -98,5 +97,5 @@ def calc_one(name: str, past_it: sdiskio, now_it: sdiskio) -> Optional[DiskIO]: res.sort(key=lambda x: x.read + x.write, reverse=True) return res - async def _get_obj(self) -> Dict[str, sdiskio]: + async def _get_obj(self) -> dict[str, sdiskio]: return psutil.disk_io_counters(perdisk=True) diff --git a/src/plugins/nonebot_plugin_picstatus/collectors/misc.py b/src/plugins/nonebot_plugin_picstatus/collectors/misc.py index 0ed954c..7bbbbab 100644 --- a/src/plugins/nonebot_plugin_picstatus/collectors/misc.py +++ b/src/plugins/nonebot_plugin_picstatus/collectors/misc.py @@ -3,7 +3,6 @@ import time from datetime import datetime from pathlib import Path -from typing import Dict, Optional, Tuple, Union import nonebot import psutil @@ -13,9 +12,9 @@ from . import first_time_collector, normal_collector, periodic_collector -def parse_env(env: str) -> Dict[str, Optional[str]]: +def parse_env(env: str) -> dict[str, str | None]: env_lines = env.strip().splitlines() - env_dict: Dict[str, Optional[str]] = {} + env_dict: dict[str, str | None] = {} for line in env_lines: if "=" not in line: @@ -28,7 +27,7 @@ def parse_env(env: str) -> Dict[str, Optional[str]]: return env_dict -def parse_env_file(env_file: Union[str, Path]) -> Optional[Dict[str, Optional[str]]]: +def parse_env_file(env_file: str | Path) -> dict[str, str | None] | None: if not isinstance(env_file, Path): env_file = Path(env_file) if not env_file.exists(): @@ -38,7 +37,7 @@ def parse_env_file(env_file: Union[str, Path]) -> Optional[Dict[str, Optional[st # Thanks to https://github.com/nonedesktop/nonebot-plugin-guestool/blob/main/nonebot_plugin_guestool/info.py -def get_linux_name_version() -> Optional[Tuple[str, str]]: +def get_linux_name_version() -> tuple[str, str] | None: env = parse_env_file("/etc/os-release") if env and (name := env.get("NAME")) and (version_id := env.get("VERSION_ID")): return name, version_id diff --git a/src/plugins/nonebot_plugin_picstatus/collectors/network.py b/src/plugins/nonebot_plugin_picstatus/collectors/network.py index 14f3ad0..636f428 100644 --- a/src/plugins/nonebot_plugin_picstatus/collectors/network.py +++ b/src/plugins/nonebot_plugin_picstatus/collectors/network.py @@ -1,7 +1,6 @@ import asyncio import time from dataclasses import dataclass -from typing import Dict, List, Optional, Union import psutil from httpx import AsyncClient, ReadTimeout @@ -33,18 +32,18 @@ class NetworkConnectionError: error: str -NetworkConnectionType = Union[NetworkConnectionOK, NetworkConnectionError] +NetworkConnectionType = NetworkConnectionOK | NetworkConnectionError @collector("network_io") -class NetworkIOCollector(TimeBasedCounterCollector[Dict[str, snetio], List[NetworkIO]]): +class NetworkIOCollector(TimeBasedCounterCollector[dict[str, snetio], list[NetworkIO]]): async def _calc( self, - past: Dict[str, snetio], - now: Dict[str, snetio], + past: dict[str, snetio], + now: dict[str, snetio], time_passed: float, - ) -> List[NetworkIO]: - def calc_one(name: str, past_it: snetio, now_it: snetio) -> Optional[NetworkIO]: + ) -> list[NetworkIO]: + def calc_one(name: str, past_it: snetio, now_it: snetio) -> NetworkIO | None: if match_list_regexp(config.ps_ignore_nets, name): # logger.info(f"网卡IO统计 {name} 匹配 {regex.re.pattern}，忽略") return None @@ -64,16 +63,14 @@ def calc_one(name: str, past_it: snetio, now_it: snetio) -> Optional[NetworkIO]: res.sort(key=lambda x: x.sent + x.recv, reverse=True) return res - async def _get_obj(self) -> Dict[str, snetio]: + async def _get_obj(self) -> dict[str, snetio]: return psutil.net_io_counters(pernic=True) @normal_collector() -async def network_connection() -> List[NetworkConnectionType]: +async def network_connection() -> list[NetworkConnectionType]: def format_conn_error(error: Exception) -> str: - if isinstance(error, ReadTimeout): - return "超时" - return error.__class__.__name__ + return "超时" if isinstance(error, ReadTimeout) else error.__class__.__name__ async def test_one(site: TestSiteCfg) -> NetworkConnectionType: try: diff --git a/src/plugins/nonebot_plugin_picstatus/collectors/process.py b/src/plugins/nonebot_plugin_picstatus/collectors/process.py index 66c2ee6..6fea4f8 100644 --- a/src/plugins/nonebot_plugin_picstatus/collectors/process.py +++ b/src/plugins/nonebot_plugin_picstatus/collectors/process.py @@ -40,10 +40,7 @@ async def parse_one(proc: psutil.Process) -> ProcessStatus | None: def sorter(x: ProcessStatus): sort_by = config.ps_proc_sort_by - if sort_by == "mem": - return x.mem - # if sort_by == "cpu": - return x.cpu + return x.mem if sort_by == "mem" else x.cpu proc_list = cast( list[ProcessStatus | None | Exception], diff --git a/src/plugins/nonebot_plugin_picstatus/config.py b/src/plugins/nonebot_plugin_picstatus/config.py index 5157e71..aa41422 100644 --- a/src/plugins/nonebot_plugin_picstatus/config.py +++ b/src/plugins/nonebot_plugin_picstatus/config.py @@ -1,5 +1,5 @@ from pathlib import Path -from typing import Dict, List, Literal, Optional, Set, Union +from typing import Literal from nonebot import get_plugin_config from nonebot.compat import type_validate_python @@ -22,21 +22,21 @@ class TestSiteCfg(BaseModel): class ConfigModel(BaseModel): # region builtin - superusers: Set[str] - nickname: Set[str] + superusers: set[str] + nickname: set[str] # endregion # region global - proxy: Optional[str] = None + proxy: str | None = None # endregion # region behavior ps_template: str = "default" - ps_command: List[str] = ["运行状态", "状态", "zt", "yxzt", "status"] + ps_command: list[str] = ["运行状态", "状态", "zt", "yxzt", "status"] ps_only_su: bool = False ps_need_at: bool = False ps_reply_target: bool = True - ps_req_timeout: Optional[int] = 10 + ps_req_timeout: int | None = 10 # endregion # region style @@ -51,36 +51,36 @@ class ConfigModel(BaseModel): # region base ps_collect_interval: int = 2 ps_default_collect_cache_size: int = 1 - ps_collect_cache_size: Dict[str, int] = Field(default_factory=dict) + ps_collect_cache_size: dict[str, int] = Field(default_factory=dict) # endregion # region header ps_use_env_nick: bool = False ps_show_current_bot_only: bool = False - ps_ob_v11_use_get_status: bool = True - ps_count_message_sent_event: Union[bool, Set[str]] = False + ps_ob_milky_use_get_status: bool = True + ps_count_message_sent_event: bool | set[str] = False ps_disconnect_reset_counter: bool = True # endregion # region disk # usage - ps_ignore_parts: List[str] = [] + ps_ignore_parts: list[str] = [] ps_ignore_bad_parts: bool = False ps_sort_parts: bool = True ps_sort_parts_reverse: bool = False # io - ps_ignore_disk_ios: List[str] = [] + ps_ignore_disk_ios: list[str] = [] ps_ignore_no_io_disk: bool = False ps_sort_disk_ios: bool = True # endregion # region network # io - ps_ignore_nets: List[str] = [r"^lo(op)?\d*$", "^Loopback"] + ps_ignore_nets: list[str] = [r"^lo(op)?\d*$", "^Loopback"] ps_ignore_0b_net: bool = False ps_sort_nets: bool = True # connection_test - ps_test_sites: List[TestSiteCfg] = [ + ps_test_sites: list[TestSiteCfg] = [ type_validate_python( TestSiteCfg, {"name": "百度", "url": "https://www.baidu.com/"}, @@ -96,7 +96,7 @@ class ConfigModel(BaseModel): # region process ps_proc_len: int = 5 - ps_ignore_procs: List[str] = ["^System Idle Process$"] + ps_ignore_procs: list[str] = ["^System Idle Process$"] ps_proc_sort_by: ProcSortByType = "cpu" ps_proc_cpu_max_100p: bool = False # endregion diff --git a/src/plugins/nonebot_plugin_picstatus/debug.py b/src/plugins/nonebot_plugin_picstatus/debug.py index f20c155..d0f1ef3 100644 --- a/src/plugins/nonebot_plugin_picstatus/debug.py +++ b/src/plugins/nonebot_plugin_picstatus/debug.py @@ -16,7 +16,7 @@ def write_debug_file(filename: str, content: Any): DEBUG_DIR.mkdir(parents=True) filename = filename.format(time=round(time.time() * 1000)) path = DEBUG_DIR / filename - if isinstance(content, (bytes, bytearray)): + if isinstance(content, bytes | bytearray): path.write_bytes(content) return path.write_text( diff --git a/src/plugins/nonebot_plugin_picstatus/misc_statistics.py b/src/plugins/nonebot_plugin_picstatus/misc_statistics.py index 96f4253..7044d80 100644 --- a/src/plugins/nonebot_plugin_picstatus/misc_statistics.py +++ b/src/plugins/nonebot_plugin_picstatus/misc_statistics.py @@ -44,6 +44,7 @@ "Satori": ["message_create"], "Telegram": lambda x: x.startswith("send_"), "大别野": ["send_message"], + "Milky": ["send_private_message", "send_group_message"], } diff --git a/src/plugins/nonebot_plugin_picstatus/templates/__init__.py b/src/plugins/nonebot_plugin_picstatus/templates/__init__.py index 952cb99..0c32265 100644 --- a/src/plugins/nonebot_plugin_picstatus/templates/__init__.py +++ b/src/plugins/nonebot_plugin_picstatus/templates/__init__.py @@ -1,17 +1,18 @@ import importlib +from collections.abc import Awaitable from dataclasses import dataclass from pathlib import Path -from typing import Any, Awaitable, Dict, Optional, Set, TypedDict -from typing_extensions import Protocol, Unpack +from typing import Any, TypedDict from nonebot import logger +from typing_extensions import Protocol, Unpack from ..bg_provider import BgData from ..config import config class TemplateRendererKwargs(TypedDict): - collected: Dict[str, Any] + collected: dict[str, Any] bg: BgData @@ -27,15 +28,15 @@ def __call__( @dataclass() class TemplateInfo: renderer: TemplateRenderer - collectors: Optional[Set[str]] = None + collectors: set[str] | None = None -loaded_templates: Dict[str, TemplateInfo] = {} +loaded_templates: dict[str, TemplateInfo] = {} def pic_template( - name: Optional[str] = None, - collecting: Optional[Set[str]] = None, + name: str | None = None, + collecting: set[str] | None = None, ): def deco(func: TemplateRenderer): template_name = name or func.__name__ diff --git a/src/plugins/nonebot_plugin_picstatus/templates/default/__init__.py b/src/plugins/nonebot_plugin_picstatus/templates/default/__init__.py index d595686..94f4594 100644 --- a/src/plugins/nonebot_plugin_picstatus/templates/default/__init__.py +++ b/src/plugins/nonebot_plugin_picstatus/templates/default/__init__.py @@ -1,6 +1,6 @@ from collections import deque from pathlib import Path -from typing import Any, Dict, List, Literal +from typing import Any, Literal import jinja2 from cookit import flatten @@ -23,7 +23,7 @@ require("nonebot_plugin_htmlrender") -from nonebot_plugin_htmlrender import get_new_page # noqa: E402 +from nonebot_plugin_htmlrender import get_new_page RES_PATH = Path(__file__).parent / "res" TEMPLATE_PATH = RES_PATH / "templates" @@ -65,7 +65,7 @@ class TemplateConfig(BaseModel): - ps_default_components: List[str] = [ + ps_default_components: list[str] = [ "header", "cpu_mem", "disk", @@ -73,16 +73,16 @@ class TemplateConfig(BaseModel): "process", "footer", ] - ps_default_additional_css: List[str] = [] - ps_default_additional_script: List[str] = [] + ps_default_additional_css: list[str] = [] + ps_default_additional_script: list[str] = [] ps_default_pic_format: Literal["jpeg", "png"] = "jpeg" @field_validator("ps_default_additional_css") - def resolve_css_url(cls, v: List[str]): # noqa: N805 + def resolve_css_url(cls, v: list[str]): return [resolve_file_url(x, {"default/res/css": CSS_PATH}) for x in v] @field_validator("ps_default_additional_script") - def resolve_script_url(cls, v: List[str]): # noqa: N805 + def resolve_script_url(cls, v: list[str]): return [resolve_file_url(x) for x in v] @@ -93,10 +93,8 @@ def resolve_script_url(cls, v: List[str]): # noqa: N805 @pic_template(collecting=collecting) -async def default(collected: Dict[str, Any], bg: BgData, **_) -> bytes: - collected = { - k: v[0] if isinstance(v, deque) else v for k, v in collected.items() - } +async def default(collected: dict[str, Any], bg: BgData, **_) -> bytes: + collected = {k: v[0] if isinstance(v, deque) else v for k, v in collected.items()} template = ENVIRONMENT.get_template("index.html.jinja") html = await template.render_async(d=collected, config=template_config) diff --git a/src/plugins/nonebot_plugin_picstatus/templates/pw_render.py b/src/plugins/nonebot_plugin_picstatus/templates/pw_render.py index c7e9b96..e3a43df 100644 --- a/src/plugins/nonebot_plugin_picstatus/templates/pw_render.py +++ b/src/plugins/nonebot_plugin_picstatus/templates/pw_render.py @@ -1,5 +1,6 @@ +from collections.abc import Callable from pathlib import Path -from typing import Any, Callable, Dict, Optional, TypeVar +from typing import Any, TypeVar from urllib.parse import urlencode import jinja2 @@ -32,7 +33,7 @@ def resolve_file_url( path: str, - additional_locations: Optional[Dict[str, Path]] = None, + additional_locations: dict[str, Path] | None = None, ) -> str: if path.startswith("res:"): path = path[4:].lstrip("/") @@ -46,8 +47,8 @@ def resolve_file_url( def make_file_router( - query_name: Optional[str] = None, - base_path: Optional[Path] = None, + query_name: str | None = None, + base_path: Path | None = None, prefix_omit: str = "", ) -> CKRouterFunc: @log_router_err() @@ -122,7 +123,7 @@ async def _(route: Route, **_): # region jinja -global_jinja_filters: Dict[str, Callable] = all_filters.copy() +global_jinja_filters: dict[str, Callable] = all_filters.copy() jinja_filter = make_append_func_to_dict_deco(global_jinja_filters) diff --git a/src/plugins/nonebot_plugin_picstatus/util.py b/src/plugins/nonebot_plugin_picstatus/util.py index a96699a..c836da6 100644 --- a/src/plugins/nonebot_plugin_picstatus/util.py +++ b/src/plugins/nonebot_plugin_picstatus/util.py @@ -1,6 +1,6 @@ import re from functools import partial -from typing import TYPE_CHECKING, List, Optional +from typing import TYPE_CHECKING from cookit import auto_convert_byte, format_timedelta @@ -10,7 +10,7 @@ format_time_delta_ps = partial(format_timedelta, day_divider=" ", day_suffix="天") -def match_list_regexp(reg_list: List[str], txt: str) -> Optional[re.Match]: +def match_list_regexp(reg_list: list[str], txt: str) -> re.Match | None: return next((match for r in reg_list if (match := re.search(r, txt))), None) diff --git a/src/plugins/removegroup/__init__.py b/src/plugins/removegroup/__init__.py index 8976e57..1d93f7b 100644 --- a/src/plugins/removegroup/__init__.py +++ b/src/plugins/removegroup/__init__.py @@ -3,7 +3,8 @@ import asyncio from nonebot import get_bots, logger, on_command -from nonebot.adapters.onebot.v11 import Bot +from nonebot.adapters.milky import Bot +from nonebot.adapters.milky.model.common import Friend, Group, Member from nonebot.exception import FinishedException from nonebot.permission import SUPERUSER @@ -18,38 +19,33 @@ rlist = on_command("removegrouplist", permission=SUPERUSER) -def condition(group_info): - member_count = group_info["member_count"] - group_name: str = group_info["group_name"] +def condition(group_info: Group) -> bool: + member_count = group_info.member_count + group_name: str = group_info.name return ( - ( - member_count < 10 - or ( - ("机器人" in group_name or "ai" in group_name or "test" in group_name) - and len(group_name) < 8 - ) - or group_name.count("、") >= 2 + member_count < 10 + or ( + ("机器人" in group_name or "ai" in group_name or "test" in group_name) + and len(group_name) < 8 ) - and group_info["group_id"] != 966016220 - and group_info["group_id"] != 713478803 - ) + or group_name.count("、") >= 2 + ) and group_info.group_id not in (966016220, 713478803) -async def get_group_member_list_safe(bot: Bot, group_id: int) -> list[int]: +async def get_group_member_list_safe(bot: Bot, group_id: int) -> list[Member]: """安全获取群成员列表""" try: - group_member_list = await bot.get_group_member_list(group_id=group_id) - return [member["user_id"] for member in group_member_list] + return await bot.get_group_member_list(group_id=group_id) except Exception as e: logger.warning(f"获取群 {group_id} 成员列表失败: {e}") return [] async def batch_get_group_members( - bot: Bot, group_list: list, batch_size: int = 10 -) -> dict[int, list[int]]: + bot: Bot, group_list: list[Group], batch_size: int = 10 +) -> dict[Group, list[Member]]: """并发批量获取群成员列表""" - group_member_lists = {} + group_members_mapping = {} total_groups = len(group_list) for i in range(0, total_groups, batch_size): @@ -57,19 +53,18 @@ async def batch_get_group_members( # 并发获取这一批群的成员列表 tasks = [ - get_group_member_list_safe(bot, group_info["group_id"]) - for group_info in batch + get_group_member_list_safe(bot, group_info.group_id) for group_info in batch ] results = await asyncio.gather(*tasks, return_exceptions=True) # 处理结果 - for j, (group_info, result) in enumerate(zip(batch, results)): + for group_info, result in zip(batch, results): if isinstance(result, Exception): - logger.error(f"获取群 {group_info['group_id']} 成员列表异常: {result}") - group_member_lists[group_info["group_id"]] = [] + logger.error(f"获取群 {group_info.group_id} 成员列表异常: {result}") + group_members_mapping[group_info] = [] else: - group_member_lists[group_info["group_id"]] = result + group_members_mapping[group_info] = result # 输出进度 completed = min(i + batch_size, total_groups) @@ -80,12 +75,12 @@ async def batch_get_group_members( if i + batch_size < total_groups: await asyncio.sleep(0.5) - return group_member_lists + return group_members_mapping async def analyze_groups( - bot: Bot, group_list: list, friend_list_qq: list[int] -) -> tuple[list[dict], list[dict]]: + bot: Bot, group_list: list[Group], friend_list: list[Friend] +) -> tuple[list[Group], list[Group]]: """并发分析群组，返回需要处理的群组""" # 检查人数条件的群组 member_count_groups = [] @@ -94,45 +89,34 @@ async def analyze_groups( no_friend_groups = [] # 并发获取所有群成员列表 - group_member_lists = await batch_get_group_members(bot, group_list) + group_members_mapping = await batch_get_group_members(bot, group_list) - friend_set = set(friend_list_qq) + # 创建好友QQ号集合以便比较 + friend_qq_set: set[int] = {friend.user_id for friend in friend_list} # 分析每个群组 for group_info in group_list: - group_id = group_info["group_id"] - member_count = group_info["member_count"] - group_name = group_info["group_name"] + group_id = group_info.group_id + member_count = group_info.member_count # 检查人数条件 if condition(group_info): - member_count_groups.append( - { - "group_id": group_id, - "group_name": group_name, - "member_count": member_count, - "reason": "人数或名称条件", - } - ) + member_count_groups.append(group_info) # 检查好友条件 - group_member_list_qq = group_member_lists.get(group_id, []) - group_member_set = set(group_member_list_qq) - intersection = friend_set & group_member_set + group_member_list = group_members_mapping.get(group_info, []) + # 将群成员转换为QQ号集合 + member_qq_set = {member.user_id for member in group_member_list} + intersection = friend_qq_set & member_qq_set if not intersection: - no_friend_groups.append( - { - "group_id": group_id, - "group_name": group_name, - "member_count": member_count, - "reason": "无共同好友", - } - ) + no_friend_groups.append(group_info) # 输出分析进度 progress = (group_list.index(group_info) + 1) / len(group_list) * 100 - intersection_ratio = len(intersection) / len(friend_set) if friend_set else 0 + intersection_ratio = ( + len(intersection) / len(friend_qq_set) if friend_qq_set else 0 + ) logger.info( f"分析进度: {progress:.1f}% 群:{group_id} 成员:{member_count} " f"好友交集:{len(intersection)} 占比:{intersection_ratio:.2f}" @@ -149,15 +133,14 @@ async def _(bot: Bot): # 获取群列表和好友列表 group_list = await bot.get_group_list() friend_list = await bot.get_friend_list() - friend_list_qq = [friend["user_id"] for friend in friend_list] await rlist.send( - f"📊 共有 {len(group_list)} 个群组，{len(friend_list_qq)} 个好友，开始并发分析..." + f"📊 共有 {len(group_list)} 个群组，{len(friend_list)} 个好友，开始并发分析..." ) # 并发分析群组 member_count_groups, no_friend_groups = await analyze_groups( - bot, group_list, friend_list_qq + bot, group_list, friend_list ) # 合并输出结果 @@ -167,11 +150,10 @@ async def _(bot: Bot): messages.append( f"📉 人数/名称条件不符合的群组 ({len(member_count_groups)} 个):" ) - for group in member_count_groups[:10]: # 最多显示10个 - messages.append( - f" 群号: {group['group_id']} | 群名: {group['group_name']} | " - f"成员: {group['member_count']} | 原因: {group['reason']}" - ) + messages.extend( + f" 群号: {group.group_id} | 群名: {group.name} | 成员: {group.member_count} | 原因: 人数或名称条件" + for group in member_count_groups[:10] + ) if len(member_count_groups) > 10: messages.append(f" ... 还有 {len(member_count_groups) - 10} 个群组") else: @@ -181,11 +163,10 @@ async def _(bot: Bot): if no_friend_groups: messages.append(f"👥 无共同好友的群组 ({len(no_friend_groups)} 个):") - for group in no_friend_groups[:10]: # 最多显示10个 - messages.append( - f" 群号: {group['group_id']} | 群名: {group['group_name']} | " - f"成员: {group['member_count']} | 原因: {group['reason']}" - ) + messages.extend( + f" 群号: {group.group_id} | 群名: {group.name} | 成员: {group.member_count} | 原因: 无共同好友" + for group in no_friend_groups[:10] + ) if len(no_friend_groups) > 10: messages.append(f" ... 还有 {len(no_friend_groups) - 10} 个群组") else: @@ -221,7 +202,7 @@ async def _(bot: Bot): async def leave_group_safe(bot: Bot, group_id: int) -> tuple[int, bool, str]: """安全退出群组""" try: - await bot.set_group_leave(group_id=group_id) + await bot.quit_group(group_id=group_id) return group_id, True, "成功退出" except Exception as e: logger.warning(f"退出群 {group_id} 失败: {e}") @@ -229,8 +210,8 @@ async def leave_group_safe(bot: Bot, group_id: int) -> tuple[int, bool, str]: async def batch_leave_groups( - bot: Bot, groups_to_remove: list[dict], batch_size: int = 5 -) -> tuple[list[dict], list[dict]]: + bot: Bot, groups_to_remove: list[Group], batch_size: int = 5 +) -> tuple[list[Group], list[tuple[Group, str]]]: """并发批量退出群组""" success_groups = [] failed_groups = [] @@ -240,22 +221,22 @@ async def batch_leave_groups( batch = groups_to_remove[i : i + batch_size] # 并发退出这一批群组 - tasks = [leave_group_safe(bot, group["group_id"]) for group in batch] + tasks = [leave_group_safe(bot, group.group_id) for group in batch] results = await asyncio.gather(*tasks, return_exceptions=True) # 处理结果 for group, result in zip(batch, results): if isinstance(result, Exception): - failed_groups.append({**group, "error": str(result)}) + failed_groups.append((group, str(result))) elif isinstance(result, tuple) and len(result) == 3: group_id, success, message = result if success: - success_groups.append({**group, "message": message}) + success_groups.append(group) else: - failed_groups.append({**group, "error": message}) + failed_groups.append((group, message)) else: - failed_groups.append({**group, "error": "未知结果格式"}) + failed_groups.append((group, "未知结果格式")) # 输出进度 completed = min(i + batch_size, total_groups) @@ -278,15 +259,14 @@ async def _(bot: Bot): try: # 获取群列表和好友列表 - group_list = await bot.get_group_list() - friend_list = await bot.get_friend_list() - friend_list_qq = [friend["user_id"] for friend in friend_list] + group_list: list[Group] = await bot.get_group_list() + friend_list: list[Friend] = await bot.get_friend_list() await rgroup.send(f"📊 共有 {len(group_list)} 个群组，开始分析...") # 并发分析群组 member_count_groups, no_friend_groups = await analyze_groups( - bot, group_list, friend_list_qq + bot, group_list, friend_list ) # 合并要移除的群组 @@ -307,21 +287,19 @@ async def _(bot: Bot): if success_groups: messages.append(f"✅ 成功退出的群组 ({len(success_groups)} 个):") - for group in success_groups[:15]: # 最多显示15个 - messages.append( - f" ✓ {group['group_id']} | {group['group_name']} | " - f"成员:{group['member_count']} | {group['reason']}" - ) + messages.extend( + f" ✓ {group.group_id} | {group.name} | 成员:{group.member_count} | 原因:符合移除条件" + for group in success_groups[:15] + ) if len(success_groups) > 15: messages.append(f" ... 还有 {len(success_groups) - 15} 个群组") if failed_groups: messages.append(f"\n❌ 退出失败的群组 ({len(failed_groups)} 个):") - for group in failed_groups[:10]: # 最多显示10个 - messages.append( - f" ✗ {group['group_id']} | {group['group_name']} | " - f"错误: {group['error'][:50]}..." - ) + messages.extend( + f" ✗ {group.group_id} | {group.name} | 错误: {error[:50]}..." + for group, error in failed_groups[:10] + ) if len(failed_groups) > 10: messages.append(f" ... 还有 {len(failed_groups) - 10} 个群组") @@ -352,7 +330,7 @@ async def _(bot: Bot): await rgroup.finish("🎯 群组移除操作完成!") -async def get_all_bots_groups() -> dict[int, list[dict]]: +async def get_all_bots_groups() -> dict[int, list[Group]]: """获取所有机器人的群组信息""" bots = get_bots() all_bot_groups = {} @@ -361,7 +339,7 @@ async def get_all_bots_groups() -> dict[int, list[dict]]: try: # 将bot_id转换为整数 bot_id_int = int(bot_id) - group_list = await bot.get_group_list() + group_list: list[Group] = await bot.get_group_list() all_bot_groups[bot_id_int] = group_list logger.info(f"机器人 {bot_id_int} 加入了 {len(group_list)} 个群组") except Exception as e: @@ -372,31 +350,27 @@ async def get_all_bots_groups() -> dict[int, list[dict]]: async def find_duplicate_groups( - all_bot_groups: dict[int, list[dict]], + all_bot_groups: dict[int, list[Group]], ) -> dict[int, list[int]]: """查找重复的群组""" - group_to_bots = {} # {group_id: [bot_id1, bot_id2, ...]} + group_to_bots: dict[int, list[int]] = {} # 收集所有群组和对应的机器人 for bot_id, groups in all_bot_groups.items(): for group in groups: - group_id = group["group_id"] - # 跳过免疫群组 - if group_id == 966016220 or group_id == 713478803: + group_id = group.group_id + if group_id in (966016220, 713478803): continue if group_id not in group_to_bots: group_to_bots[group_id] = [] group_to_bots[group_id].append(bot_id) - # 找出有多个机器人的群组 - duplicate_groups = { + return { group_id: bot_list for group_id, bot_list in group_to_bots.items() if len(bot_list) > 1 } - return duplicate_groups - async def determine_bots_to_remove( duplicate_groups: dict[int, list[int]], @@ -418,8 +392,9 @@ async def determine_bots_to_remove( f"群 {group_id}: 保留机器人 {highest_priority_bot}，移除 {bots_to_remove_from_group}" ) - for bot_id in bots_to_remove_from_group: - bots_to_remove.append((bot_id, group_id)) + bots_to_remove.extend( + (bot_id, group_id) for bot_id in bots_to_remove_from_group + ) return bots_to_remove @@ -441,12 +416,11 @@ async def batch_remove_bots_from_groups( for bot_id, group_id in batch: if str(bot_id) in bots: bot = bots[str(bot_id)] - # 检查是否是OneBot V11适配器 - if hasattr(bot, "set_group_leave"): + if isinstance(bot, Bot): tasks.append(remove_bot_from_group_safe(bot, group_id, bot_id)) else: - failed_removals.append( - (bot_id, group_id, f"机器人 {bot_id} 不支持OneBot V11协议") + raise TypeError( + f"Bot {bot_id} is not an instance of Bot, got {type(bot)}" ) else: failed_removals.append((bot_id, group_id, f"机器人 {bot_id} 不在线")) @@ -454,7 +428,7 @@ async def batch_remove_bots_from_groups( if tasks: results = await asyncio.gather(*tasks, return_exceptions=True) - for j, ((bot_id, group_id), result) in enumerate(zip(batch, results)): + for (bot_id, group_id), result in zip(batch, results): if isinstance(result, Exception): failed_removals.append((bot_id, group_id, str(result))) elif isinstance(result, tuple) and len(result) == 3: @@ -477,11 +451,11 @@ async def batch_remove_bots_from_groups( async def remove_bot_from_group_safe( - bot, group_id: int, bot_id: int + bot: Bot, group_id: int, bot_id: int ) -> tuple[int, bool, str]: """安全地从群组中移除机器人""" try: - await bot.set_group_leave(group_id=group_id) + await bot.quit_group(group_id=group_id) return bot_id, True, "成功退出群组" except Exception as e: logger.warning(f"机器人 {bot_id} 退出群 {group_id} 失败: {e}") @@ -510,9 +484,7 @@ async def _(bot: Bot): await rdup_check.finish("✅ 没有发现重复的群组") # 生成报告 - messages = [] - messages.append(f"📊 发现 {len(duplicate_groups)} 个重复群组:") - + messages = [f"📊 发现 {len(duplicate_groups)} 个重复群组:"] for group_id, bot_list in duplicate_groups.items(): # 获取群组信息 group_name = "未知" @@ -521,9 +493,9 @@ async def _(bot: Bot): for bot_id in bot_list: if bot_id in all_bot_groups: for group in all_bot_groups[bot_id]: - if group["group_id"] == group_id: - group_name = group["group_name"] - member_count = group["member_count"] + if group.group_id == group_id: + group_name = group.name + member_count = group.member_count break break @@ -535,10 +507,12 @@ async def _(bot: Bot): to_remove = sorted_bots[1:] messages.append(f" 群 {group_id} ({group_name}) - 成员: {member_count}") - messages.append( - f" 保留: {highest_priority} (优先级: {BOT_PRIORITY.get(highest_priority, 0)})" + messages.extend( + [ + f" 保留: {highest_priority} (优先级: {BOT_PRIORITY.get(highest_priority, 0)})", + f" 移除: {to_remove}", + ] ) - messages.append(f" 移除: {to_remove}") # 发送报告 current_message = "" @@ -604,17 +578,19 @@ async def _(bot: Bot): if success_removals: messages.append(f"✅ 成功移除 ({len(success_removals)} 个):") - for bot_id, group_id in success_removals[:10]: - messages.append(f" ✓ 机器人 {bot_id} 已退出群 {group_id}") + messages.extend( + f" ✓ 机器人 {bot_id} 已退出群 {group_id}" + for bot_id, group_id in success_removals[:10] + ) if len(success_removals) > 10: messages.append(f" ... 还有 {len(success_removals) - 10} 个成功移除") if failed_removals: messages.append(f"\n❌ 移除失败 ({len(failed_removals)} 个):") - for bot_id, group_id, error in failed_removals[:10]: - messages.append( - f" ✗ 机器人 {bot_id} 退出群 {group_id} 失败: {error[:30]}..." - ) + messages.extend( + f" ✗ 机器人 {bot_id} 退出群 {group_id} 失败: {error[:30]}..." + for bot_id, group_id, error in failed_removals[:10] + ) if len(failed_removals) > 10: messages.append(f" ... 还有 {len(failed_removals) - 10} 个失败") diff --git a/src/plugins/sleep/__init__.py b/src/plugins/sleep/__init__.py index 0e70879..a05fb21 100644 --- a/src/plugins/sleep/__init__.py +++ b/src/plugins/sleep/__init__.py @@ -3,7 +3,8 @@ from nonebot import on_fullmatch, on_startswith from nonebot.adapters import Bot -from nonebot.adapters.onebot.v11 import GroupMessageEvent +from nonebot.adapters.milky import Message, MessageSegment +from nonebot.adapters.milky.event import GroupMessageEvent from . import scheduler from .data_source import ( @@ -48,19 +49,33 @@ @morning.handle() @morning_2.handle() async def _(bot: Bot, event: GroupMessageEvent): - uid = event.user_id - gid = event.group_id - - await morning.finish(await get_morning_msg(uid, gid), reply_message=True) + uid = event.data.sender_id + gid = event.data.peer_id + + await morning.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + await get_morning_msg(uid, gid), + ], + ) + ) @night.handle() @night_2.handle() async def _(bot: Bot, event: GroupMessageEvent): - uid = event.user_id - gid = event.group_id - - await night.finish(await get_night_msg(uid, gid), reply_message=True) + uid = event.data.sender_id + gid = event.data.peer_id + + await night.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + await get_night_msg(uid, gid), + ], + ) + ) # 早晚安大统计 @@ -70,7 +85,8 @@ async def _(bot: Bot, event: GroupMessageEvent): @statistics.handle() async def _(bot: Bot, event: GroupMessageEvent): - gid = event.group_id + gid = event.data.peer_id + ( morning_count, night_count, @@ -101,7 +117,14 @@ async def _(bot: Bot, event: GroupMessageEvent): f"╚═══════════" ) - await statistics.finish(msg, reply_message=True) + await statistics.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(msg), + ], + ) + ) # 我的作息 @@ -111,20 +134,25 @@ async def _(bot: Bot, event: GroupMessageEvent): @my_sleep.handle() async def _(bot: Bot, event: GroupMessageEvent): - uid = event.user_id + uid = event.data.sender_id user_data = await get_weekly_sleep_data(uid) if user_data is None: - await my_sleep.finish("未找到你的作息数据呢......", reply_message=True) + await my_sleep.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text("未找到你的作息数据呢......"), + ], + ) + ) today = datetime.now(ZoneInfo("Asia/Shanghai")).strftime("%Y年%m月%d日") # 格式化时间显示 def format_time(dt: datetime | None) -> str: - if dt is None: - return "无" - return dt.strftime("%Y年%m月%d日 %H:%M:%S") + return "无" if dt is None else dt.strftime("%Y年%m月%d日 %H:%M:%S") # 格式化睡眠时长（从秒转换为小时分钟） def format_sleep_time(seconds: int) -> str: @@ -160,4 +188,11 @@ def format_sleep_time(seconds: int) -> str: f"╚═══════════" ) - await my_sleep.finish(msg, reply_message=True) + await my_sleep.finish( + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(msg), + ], + ) + ) diff --git a/src/plugins/sleep/data_source.py b/src/plugins/sleep/data_source.py index 6f0ebee..8e830c4 100644 --- a/src/plugins/sleep/data_source.py +++ b/src/plugins/sleep/data_source.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta from zoneinfo import ZoneInfo -from nonebot.adapters.onebot.v11 import MessageSegment +from nonebot.adapters.milky import MessageSegment from nonebot_plugin_orm import get_session from sqlalchemy import func, select @@ -195,11 +195,10 @@ async def get_morning_msg(uid: int, gid: int) -> MessageSegment: return MessageSegment.text(msg) # 检查超级早起限制 - if not settings.morning_super_get_up_enable: - if is_within_time_range( - last_sleep_time, now_time, settings.morning_super_get_up_interval - ): - return MessageSegment.text("睡这么点没关系吗？要不再睡一会吧... /_ \\") + if not settings.morning_super_get_up_enable and is_within_time_range( + last_sleep_time, now_time, settings.morning_super_get_up_interval + ): + return MessageSegment.text("睡这么点没关系吗？要不再睡一会吧... /_ \\") # 执行早安更新 num, server_rank, sleep_duration = await morning_and_update(uid, gid, now_time) @@ -272,9 +271,7 @@ async def get_night_msg(uid: int, gid: int) -> MessageSegment: async with get_session() as session: stmt = select(SleepUserModel).where(SleepUserModel.user_id == uid) result = await session.execute(stmt) - target_user = result.scalar_one_or_none() - - if target_user: + if target_user := result.scalar_one_or_none(): # 检查晚安间隔限制 if settings.night_good_sleep_enable and target_user.night_time: night_time = ensure_timezone_aware(target_user.night_time) @@ -368,20 +365,18 @@ async def get_weekly_sleep_data(uid: int) -> WeeklySleepData | None: async with get_session() as session: stmt = select(SleepUserModel).where(SleepUserModel.user_id == uid) result = await session.execute(stmt) - target_user = result.scalar_one_or_none() - - if not target_user: + if target_user := result.scalar_one_or_none(): + return WeeklySleepData( + weekly_sleep_time=target_user.weekly_sleep_time or 0, + weekly_morning_count=target_user.weekly_morning_cout or 0, + weekly_night_count=target_user.weekly_night_cout or 0, + weekly_earliest_morning=target_user.weekly_earliest_morning_time, + weekly_latest_night=target_user.weekly_latest_night_time, + lastweek_sleep_time=target_user.lastweek_sleep_time or 0, + lastweek_morning_count=target_user.lastweek_morning_cout or 0, + lastweek_night_count=target_user.lastweek_night_cout or 0, + lastweek_earliest_morning=target_user.lastweek_earliest_morning_time, + lastweek_latest_night=target_user.lastweek_latest_night_time, + ) + else: return None - - return WeeklySleepData( - weekly_sleep_time=target_user.weekly_sleep_time or 0, - weekly_morning_count=target_user.weekly_morning_cout or 0, - weekly_night_count=target_user.weekly_night_cout or 0, - weekly_earliest_morning=target_user.weekly_earliest_morning_time, - weekly_latest_night=target_user.weekly_latest_night_time, - lastweek_sleep_time=target_user.lastweek_sleep_time or 0, - lastweek_morning_count=target_user.lastweek_morning_cout or 0, - lastweek_night_count=target_user.lastweek_night_cout or 0, - lastweek_earliest_morning=target_user.lastweek_earliest_morning_time, - lastweek_latest_night=target_user.lastweek_latest_night_time, - ) diff --git a/src/plugins/sleep/models.py b/src/plugins/sleep/models.py index 0f902f5..9deb282 100644 --- a/src/plugins/sleep/models.py +++ b/src/plugins/sleep/models.py @@ -6,50 +6,54 @@ from nonebot_plugin_orm import Model from sqlalchemy import DateTime, Integer, String -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import mapped_column +from sqlalchemy.orm.properties import MappedColumn + class SleepGroupModel(Model): __tablename__ = "sleep_group" - group_id: Mapped[str] = mapped_column(String(32), primary_key=True) + group_id: MappedColumn[str] = mapped_column(String(32), primary_key=True) # 每日早晚安 - morning_count: Mapped[int] = mapped_column(Integer, default=0) - night_count: Mapped[int] = mapped_column(Integer, default=0) + morning_count: MappedColumn[int] = mapped_column(Integer, default=0) + night_count: MappedColumn[int] = mapped_column(Integer, default=0) class SleepUserModel(Model): __tablename__ = "sleep_user" - user_id: Mapped[str] = mapped_column(String(32), primary_key=True) + user_id: MappedColumn[str] = mapped_column(String(32), primary_key=True) # 每日早晚安 - night_time: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) - morning_time: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) + night_time: MappedColumn[datetime | None] = mapped_column(DateTime, nullable=True) + morning_time: MappedColumn[datetime | None] = mapped_column(DateTime, nullable=True) # 每周早晚安 - weekly_morning_cout: Mapped[int] = mapped_column(Integer, default=0) # 早安次数 - weekly_night_cout: Mapped[int] = mapped_column(Integer, default=0) # 晚安次数 - weekly_sleep_time: Mapped[int] = mapped_column(Integer, default=0) # 睡觉时间 - weekly_earliest_morning_time: Mapped[datetime | None] = mapped_column( + weekly_morning_cout: MappedColumn[int] = mapped_column( + Integer, default=0 + ) # 早安次数 + weekly_night_cout: MappedColumn[int] = mapped_column(Integer, default=0) # 晚安次数 + weekly_sleep_time: MappedColumn[int] = mapped_column(Integer, default=0) # 睡觉时间 + weekly_earliest_morning_time: MappedColumn[datetime | None] = mapped_column( DateTime, nullable=True ) # 最早起床时间 - weekly_latest_night_time: Mapped[datetime | None] = mapped_column( + weekly_latest_night_time: MappedColumn[datetime | None] = mapped_column( DateTime, nullable=True ) # 最晚睡觉时间 # 这周迁移到上周 - lastweek_morning_cout: Mapped[int] = mapped_column(Integer, default=0) - lastweek_night_cout: Mapped[int] = mapped_column(Integer, default=0) - lastweek_sleep_time: Mapped[int] = mapped_column(Integer, default=0) - lastweek_earliest_morning_time: Mapped[datetime | None] = mapped_column( + lastweek_morning_cout: MappedColumn[int] = mapped_column(Integer, default=0) + lastweek_night_cout: MappedColumn[int] = mapped_column(Integer, default=0) + lastweek_sleep_time: MappedColumn[int] = mapped_column(Integer, default=0) + lastweek_earliest_morning_time: MappedColumn[datetime | None] = mapped_column( DateTime, nullable=True ) - lastweek_latest_night_time: Mapped[datetime | None] = mapped_column( + lastweek_latest_night_time: MappedColumn[datetime | None] = mapped_column( DateTime, nullable=True ) # 总数 - morning_count: Mapped[int] = mapped_column(Integer, default=0) - night_count: Mapped[int] = mapped_column(Integer, default=0) - total_sleep_time: Mapped[int] = mapped_column(Integer, default=0) + morning_count: MappedColumn[int] = mapped_column(Integer, default=0) + night_count: MappedColumn[int] = mapped_column(Integer, default=0) + total_sleep_time: MappedColumn[int] = mapped_column(Integer, default=0) diff --git a/src/plugins/sleep/scheduler.py b/src/plugins/sleep/scheduler.py index 7de73bd..cdd07b0 100644 --- a/src/plugins/sleep/scheduler.py +++ b/src/plugins/sleep/scheduler.py @@ -9,7 +9,7 @@ async def group_daily_refresh() -> None: - """每日早晚安刷新 - 优化版本""" + """每日早晚安刷新""" from nonebot_plugin_orm import get_session from sqlalchemy import delete @@ -24,7 +24,7 @@ async def group_daily_refresh() -> None: async def user_weekly_refresh() -> None: - """每周早晚安刷新 - 优化版本""" + """每周早晚安刷新""" from nonebot_plugin_orm import get_session from sqlalchemy import update diff --git a/src/plugins/smart_bot_switch/__init__.py b/src/plugins/smart_bot_switch/__init__.py index 7042291..8f42bae 100644 --- a/src/plugins/smart_bot_switch/__init__.py +++ b/src/plugins/smart_bot_switch/__init__.py @@ -1,8 +1,9 @@ import time from nonebot import get_bots, logger, on_command -from nonebot.adapters.onebot.v11 import ActionFailed, Bot, GroupMessageEvent -from nonebot.internal.matcher.matcher import Matcher +from nonebot.adapters.milky import Bot +from nonebot.adapters.milky.exception import ActionFailed +from nonebot.matcher import Matcher from nonebot.message import event_preprocessor, run_postprocessor from nonebot.plugin import PluginMetadata @@ -19,7 +20,6 @@ """, type="application", homepage="https://github.com/nonebot/nonebot2", - supported_adapters={"~onebot.v11"}, ) # 简单的全局状态变量 @@ -98,7 +98,7 @@ async def handle_action_failed( # 事件处理器 - 追踪活动 @event_preprocessor -async def track_bot_activity(bot: Bot, event: GroupMessageEvent): +async def track_bot_activity(bot: Bot): update_bot_activity(bot.self_id) @@ -109,7 +109,7 @@ async def track_bot_activity(bot: Bot, event: GroupMessageEvent): @bot_health_cmd.handle() -async def handle_bot_health(bot: Bot, event: GroupMessageEvent): +async def handle_bot_health(bot: Bot): update_bot_activity(bot.self_id) available_bots = get_bots() @@ -139,9 +139,7 @@ async def handle_bot_health(bot: Bot, event: GroupMessageEvent): msg_parts.append(f"{status_emoji} {bot_id}: {status_text} ({activity_status})") - # 显示失败的操作类型 - failed_actions_list = status_info.get("failed_actions", []) - if failed_actions_list: + if failed_actions_list := status_info.get("failed_actions", []): failed_actions_str = ", ".join(failed_actions_list) msg_parts.append(f" └ 失败操作: {failed_actions_str}") diff --git a/src/plugins/tarot/__init__.py b/src/plugins/tarot/__init__.py index 1eecfbf..43894aa 100644 --- a/src/plugins/tarot/__init__.py +++ b/src/plugins/tarot/__init__.py @@ -1,6 +1,6 @@ -from nonebot import logger, on_command, on_regex -from nonebot.adapters.onebot.v11 import Bot -from nonebot.adapters.onebot.v11.event import GroupMessageEvent, MessageEvent +from nonebot import on_command, on_regex +from nonebot.adapters.milky import Bot +from nonebot.adapters.milky.event import GroupMessageEvent, MessageEvent from nonebot.matcher import Matcher from nonebot.permission import SUPERUSER from nonebot.plugin import PluginMetadata diff --git a/src/plugins/tarot/config.py b/src/plugins/tarot/config.py index 288f4fb..7bc713e 100644 --- a/src/plugins/tarot/config.py +++ b/src/plugins/tarot/config.py @@ -5,7 +5,7 @@ import nonebot from aiocache import cached from nonebot import logger -from pydantic import BaseModel, Extra +from pydantic import BaseModel try: import ujson as json @@ -13,7 +13,7 @@ import json -class PluginConfig(BaseModel, extra=Extra.ignore): +class PluginConfig(BaseModel, extra="allow"): """ Path of tarot images resource """ diff --git a/src/plugins/tarot/data_source.py b/src/plugins/tarot/data_source.py index 5e1676b..8c943b4 100644 --- a/src/plugins/tarot/data_source.py +++ b/src/plugins/tarot/data_source.py @@ -5,11 +5,12 @@ import aiofiles from nonebot.adapters import Event -from nonebot.adapters.onebot.v11 import Bot, Message, MessageSegment -from nonebot.adapters.onebot.v11.event import ( +from nonebot.adapters.milky import Bot, Message, MessageSegment +from nonebot.adapters.milky.event import ( + FriendMessageEvent, GroupMessageEvent, - PrivateMessageEvent, ) +from nonebot.adapters.milky.message import OutgoingForwardedMessage from nonebot.matcher import Matcher from PIL import Image @@ -111,7 +112,8 @@ async def divine(self, bot: Bot, matcher: Matcher, event: Event) -> None: ) # 4. Genrate message - chain = [] + chain: list[Message] = [] + fowardmsg = None for i, card_info in enumerate(cards_info_list): # Select the #i tarot msg_header = MessageSegment.text( @@ -123,10 +125,25 @@ async def divine(self, bot: Bot, matcher: Matcher, event: Event) -> None: await matcher.finish(msg_body) if ( - isinstance(event, GroupMessageEvent | PrivateMessageEvent) + isinstance(event, GroupMessageEvent | FriendMessageEvent) ) and self.is_chain_reply: - chain = chain_reply(bot, chain, msg_header + msg_body) - elif isinstance(event, PrivateMessageEvent): + combined_msg = msg_header + msg_body + chain.append(combined_msg) + segments: list[MessageSegment] = [] + for msg in chain: + if isinstance(msg, Message): + segments.extend(msg) + else: + segments.append(msg) + fowardmsg = [ + OutgoingForwardedMessage( + name=next(iter(tarot_config.nickname)), + user_id=int(bot.self_id), + segments=[msg_seq], + ) + for msg_seq in segments + ] + elif isinstance(event, FriendMessageEvent): await matcher.send(msg_header + msg_body) elif isinstance(event, GroupMessageEvent): await matcher.send(msg_header + msg_body) @@ -135,15 +152,8 @@ async def divine(self, bot: Bot, matcher: Matcher, event: Event) -> None: else: raise EventNotSupport - if self.is_chain_reply: - if isinstance(event, PrivateMessageEvent): - await bot.send_private_forward_msg( - user_id=int(event.get_user_id()), messages=chain - ) - elif isinstance(event, GroupMessageEvent): - await bot.send_group_forward_msg( - group_id=event.group_id, messages=chain - ) + if self.is_chain_reply and fowardmsg is not None: + await matcher.finish(MessageSegment.forward(messages=fowardmsg)) async def onetime_divine(self) -> MessageSegment | str | Message: """ @@ -251,8 +261,15 @@ async def _get_text_and_image( buf = BytesIO() img.save(buf, format="png") + buf.seek(0) + + # Convert BytesIO to base64 string for image + import base64 + + img_b64 = base64.b64encode(buf.getvalue()).decode() + img_url = f"data:image/png;base64,{img_b64}" - return True, msg + MessageSegment.image(buf) + return True, Message([msg, MessageSegment.image(img_url)]) tarot_manager = Tarot() diff --git a/src/plugins/today_in_history/__init__.py b/src/plugins/today_in_history/__init__.py index 4681bda..520f7c2 100644 --- a/src/plugins/today_in_history/__init__.py +++ b/src/plugins/today_in_history/__init__.py @@ -1,13 +1,13 @@ +import base64 from datetime import date import httpx import ujson as json -from nonebot import get_driver, on_fullmatch, require -from nonebot.adapters.onebot.v11 import MessageSegment +from nonebot import on_fullmatch, require +from nonebot.adapters.milky import MessageSegment from nonebot.plugin import PluginMetadata from nonebot_plugin_htmlrender import text_to_pic - require("nonebot_plugin_apscheduler") __plugin_meta__ = PluginMetadata( @@ -88,4 +88,6 @@ async def get_history_info() -> MessageSegment: if i == len_max - 1 else f"{s}{str_year} {str_title}\n" ) - return MessageSegment.image(await text_to_pic(s)) + img_bytes = await text_to_pic(s) + img_base64 = base64.b64encode(img_bytes).decode("utf-8") + return MessageSegment.image(f"base64://{img_base64}") diff --git a/src/plugins/today_yunshi/__init__.py b/src/plugins/today_yunshi/__init__.py index 2d0a0e7..c130b2c 100644 --- a/src/plugins/today_yunshi/__init__.py +++ b/src/plugins/today_yunshi/__init__.py @@ -1,7 +1,8 @@ """这是一个今日运势插件，可以查看今日运势。""" from nonebot import on_command -from nonebot.adapters.onebot.v11 import Bot, MessageEvent +from nonebot.adapters import Bot +from nonebot.adapters.milky import Message, MessageEvent, MessageSegment from nonebot.plugin import PluginMetadata from .data_source import luck_result @@ -17,5 +18,13 @@ @Luck.handle() async def luck(bot: Bot, event: MessageEvent): - result = await luck_result(str(event.user_id)) - await bot.send(event, result, reply_message=True) + result = await luck_result(str(event.data.sender_id)) + await bot.send( + event, + Message( + [ + MessageSegment.reply(event.data.message_seq), + MessageSegment.text(result), + ], + ), + ) diff --git a/src/plugins/today_yunshi/api.py b/src/plugins/today_yunshi/api.py index b95ab74..3b5df52 100644 --- a/src/plugins/today_yunshi/api.py +++ b/src/plugins/today_yunshi/api.py @@ -35,10 +35,11 @@ async def get_user_luck_star(user_id: str) -> int | None: ): async with aiofiles.open(luckpath, encoding="utf-8") as f: luckdata = json.loads(await f.read()) - luck_star_num = ( - luckdata.get(str(luck.luckid), {}).get("星级", "").count("★") + return ( + luckdata.get(str(luck.luckid), {}) + .get("星级", "") + .count("★") ) - return luck_star_num except (OSError, json.JSONDecodeError) as e: print(f"Error reading or parsing luck data: {e}") @@ -66,8 +67,7 @@ async def get_user_luck_info(user_id: str) -> dict | None: ): async with aiofiles.open(luckpath, encoding="utf-8") as f: luckdata = json.loads(await f.read()) - luck_info = luckdata.get(str(luck.luckid)) - if luck_info: + if luck_info := luckdata.get(str(luck.luckid)): return { "luckid": luck.luckid, "star_count": luck_info.get("星级", "").count("★"), diff --git a/src/plugins/today_yunshi/data_source.py b/src/plugins/today_yunshi/data_source.py index 63d66eb..41b4bc0 100644 --- a/src/plugins/today_yunshi/data_source.py +++ b/src/plugins/today_yunshi/data_source.py @@ -38,10 +38,11 @@ async def get_user_luck_star(user_id: str) -> int | None: ): async with aiofiles.open(luckpath, encoding="utf-8") as f: luckdata = json.loads(await f.read()) - luck_star_num = ( - luckdata.get(str(luck.luckid), {}).get("星级", "").count("★") + return ( + luckdata.get(str(luck.luckid), {}) + .get("星级", "") + .count("★") ) - return luck_star_num except (OSError, json.JSONDecodeError) as e: print(f"Error reading or parsing luck data: {e}") @@ -69,8 +70,7 @@ async def get_user_luck_info(user_id: str) -> dict | None: ): async with aiofiles.open(luckpath, encoding="utf-8") as f: luckdata = json.loads(await f.read()) - luck_info = luckdata.get(str(luck.luckid)) - if luck_info: + if luck_info := luckdata.get(str(luck.luckid)): return { "luckid": luck.luckid, "star_count": luck_info.get("星级", "").count("★"), @@ -123,11 +123,7 @@ async def luck_result(user_id: str, focus: bool = False) -> str: ): # 如果是今天的数据则返回今天的数据 r = str(member_model.luckid) - result_text = ( - f"----\n{luckdata[r]['运势']}\n{luckdata[r]['星级']}\n" - f"{luckdata[r]['签文']}\n{luckdata[r]['解签']}\n----" - ) - return result_text + return f"----\n{luckdata[r]['运势']}\n{luckdata[r]['星级']}\n{luckdata[r]['签文']}\n{luckdata[r]['解签']}\n----" else: # 如果不是今天的数据则随机运势 result_text, luckid = random_luck(luckdata) diff --git a/src/plugins/today_yunshi/models.py b/src/plugins/today_yunshi/models.py index a954a3f..34af38d 100644 --- a/src/plugins/today_yunshi/models.py +++ b/src/plugins/today_yunshi/models.py @@ -1,20 +1,20 @@ -# 导入插件方法 from datetime import datetime from nonebot import require +from sqlalchemy.orm.properties import MappedColumn require("nonebot_plugin_orm") from nonebot_plugin_orm import Model from sqlalchemy import BigInteger, DateTime, Integer -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import mapped_column class MemberData(Model): __tablename__ = "today_yunshi_memberdata" - user_id: Mapped[int] = mapped_column(BigInteger, primary_key=True) - luckid: Mapped[int] = mapped_column(Integer, default=0) - time: Mapped[datetime] = mapped_column( + user_id: MappedColumn[int] = mapped_column(BigInteger, primary_key=True) + luckid: MappedColumn[int] = mapped_column(Integer, default=0) + time: MappedColumn[datetime] = mapped_column( DateTime, default=datetime.now, onupdate=datetime.now ) diff --git a/src/plugins/waifu/__init__.py b/src/plugins/waifu/__init__.py index 80ecb79..3a6c444 100644 --- a/src/plugins/waifu/__init__.py +++ b/src/plugins/waifu/__init__.py @@ -3,7 +3,8 @@ from zoneinfo import ZoneInfo from nonebot import get_driver, logger, on_command, require -from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment +from nonebot.adapters.milky import Bot, Message, MessageSegment +from nonebot.adapters.milky.event import GroupMessageEvent from nonebot.permission import SUPERUSER from nonebot.plugin import PluginMetadata from nonebot_plugin_apscheduler import scheduler @@ -174,8 +175,8 @@ async def handle_waifu(bot: Bot, event: GroupMessageEvent): if not await validate_user(bot, event): return - group_id = event.group_id - user_id = event.user_id + group_id = event.data.peer_id + user_id = event.data.sender_id from nonebot_plugin_orm import get_session @@ -231,9 +232,9 @@ async def select_waifu( async def get_available_members(bot: Bot, group_id: int, protected: list) -> list[int]: return [ - member["user_id"] + member.user_id for member in await bot.get_group_member_list(group_id=group_id) - if member["user_id"] not in [*protected, bot.self_id, 2854196310] + if member.user_id not in [*protected, int(bot.self_id), 2854196310] ] @@ -242,29 +243,26 @@ async def validate_user(bot: Bot, event: GroupMessageEvent) -> bool: await bot.send(event, "不可以啦...", at_sender=True) return False - protected = await get_protected_users(event.group_id) - if event.user_id in protected: - return False - - return True + protected = await get_protected_users(event.data.peer_id) + return event.data.sender_id not in protected async def handle_existing_cp(bot: Bot, event: GroupMessageEvent, existing_cp: int): member = await bot.get_group_member_info( - group_id=event.group_id, user_id=existing_cp + group_id=event.data.peer_id, user_id=existing_cp ) msg = ( f"你已经有 CP 了，不许花心哦~{MessageSegment.image(await user_img(existing_cp))}" - f"你的 CP：{member['card'] or member['nickname']}" + f"你的 CP：{member.card or member.nickname}" ) await bot.send(event, Message(msg), at_sender=True) async def send_result(bot: Bot, event: GroupMessageEvent, selected: int): - member = await bot.get_group_member_info(group_id=event.group_id, user_id=selected) + member = await bot.get_group_member_info(group_id=event.data.peer_id, user_id=selected) msg = ( f"你的 CP 是！\n{MessageSegment.image(await user_img(selected))}" - f"『{member['card'] or member['nickname']}』!" + f"『{member.card or member.nickname}』!" f"\n{random.choice(happy_end)}" ) await waifu.finish(Message(msg), at_sender=True) @@ -286,7 +284,7 @@ async def handle_at_selection( :param taken_users: 已被娶的群友列表 :return: 选择的用户 ID 或 None """ - user_id = event.user_id + user_id = event.data.sender_id # 检查是否是自己 if at_user_id == user_id: @@ -303,10 +301,7 @@ async def handle_at_selection( # 随机选择逻辑 X = random.randint(1, 100) - if 0 < X <= HE: - return at_user_id - else: - return None + return at_user_id if 0 < X <= HE else None async def clean_cd_cache(): diff --git a/src/plugins/waifu/card_pool.py b/src/plugins/waifu/card_pool.py index 3c9cbb2..02ecd90 100644 --- a/src/plugins/waifu/card_pool.py +++ b/src/plugins/waifu/card_pool.py @@ -1,7 +1,9 @@ +import base64 from datetime import datetime from nonebot import on_command -from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageSegment +from nonebot.adapters.milky import Bot, MessageSegment +from nonebot.adapters.milky.event import GroupMessageEvent from .utils import bbcode_to_png @@ -10,24 +12,20 @@ @card_pool.handle() async def show_card_pool(bot: Bot, event: GroupMessageEvent): - group_id = event.group_id + group_id = event.data.peer_id members = await bot.get_group_member_list(group_id=group_id) # 按最后发言时间排序（假设活跃度） - sorted_members = sorted( - members, key=lambda m: m.get("last_sent_time", 0), reverse=True - ) + sorted_members = sorted(members, key=lambda m: m.last_sent_time, reverse=True) - # 生成BBCode内容 - content = "[size=24][b]群友卡池（按活跃度排序）[/b][/size]\n" - content += "────────────────\n" + content = "[size=24][b]群友卡池（按活跃度排序）[/b][/size]\n" + "────────────────\n" for idx, member in enumerate(sorted_members[:20], 1): - name = member["card"] or member["nickname"] - last_active = datetime.fromtimestamp(member.get("last_sent_time", 0)).strftime( - "%Y-%m-%d" - ) + name = member.card or member.nickname + last_active = datetime.fromtimestamp(member.last_sent_time).strftime("%Y-%m-%d") content += f"{idx}. {name} (最后活跃：{last_active})\n" - # 生成图片 img_bytes = bbcode_to_png(content) - await card_pool.finish(MessageSegment.image(img_bytes)) + img_bytes.seek(0) + b64 = base64.b64encode(img_bytes.read()).decode() + img_url = f"base64://{b64}" + await card_pool.finish(MessageSegment.image(img_url)) diff --git a/src/plugins/waifu/cp_list.py b/src/plugins/waifu/cp_list.py index bea72de..edecece 100644 --- a/src/plugins/waifu/cp_list.py +++ b/src/plugins/waifu/cp_list.py @@ -1,5 +1,8 @@ +import base64 + from nonebot import on_fullmatch, require -from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageSegment +from nonebot.adapters.milky import Bot, MessageSegment +from nonebot.adapters.milky.event import GroupMessageEvent require("nonebot_plugin_orm") from nonebot_plugin_orm import get_session @@ -13,7 +16,7 @@ @cp_list.handle() async def show_cp_list(bot: Bot, event: GroupMessageEvent): - group_id = event.group_id + group_id = event.data.peer_id async with get_session() as session: # 获取CP数据 @@ -23,10 +26,7 @@ async def show_cp_list(bot: Bot, event: GroupMessageEvent): cp_result = await session.execute(cp_stmt) relationships = cp_result.fetchall() - # 生成消息内容 - content = "[size=40][b]本群CP列表[/b][/size]\n" - content += "────────────────\n" - + content = "[size=40][b]本群CP列表[/b][/size]\n" + "────────────────\n" if not relationships: content += "暂无CP记录" else: @@ -42,11 +42,14 @@ async def show_cp_list(bot: Bot, event: GroupMessageEvent): partner = await bot.get_group_member_info( group_id=group_id, user_id=partner_id ) - content += f"❤ {user['card'] or user['nickname']} ↔ {partner['card'] or partner['nickname']}\n" + content += f"❤ {user.card or user.nickname} ↔ {partner.card or partner.nickname}\n" except Exception: # 如果用户不在群里了，跳过 continue # 生成图片 img_bytes = bbcode_to_png(content) - await cp_list.finish(MessageSegment.image(img_bytes)) + img_bytes.seek(0) + b64 = base64.b64encode(img_bytes.read()).decode() + img_str = f"base64://{b64}" + await cp_list.finish(MessageSegment.image(img_str)) diff --git a/src/plugins/waifu/divorce.py b/src/plugins/waifu/divorce.py index cc8332e..3774a83 100644 --- a/src/plugins/waifu/divorce.py +++ b/src/plugins/waifu/divorce.py @@ -4,7 +4,7 @@ from cachetools import TTLCache from nonebot import on_command, require -from nonebot.adapters.onebot.v11 import GroupMessageEvent +from nonebot.adapters.milky.event import GroupMessageEvent require("nonebot_plugin_orm") from nonebot_plugin_orm import get_session @@ -13,12 +13,9 @@ from ..coin.api import subtract_coin from .models import WaifuLock, WaifuRelationship -# 初始化全局缓存 last_reset_cache = TTLCache(maxsize=1000, ttl=86400) # 24小时过期 cd_cache = TTLCache(maxsize=1000, ttl=3600) # 1小时过期 -# 新增：离婚次数缓存，key为user_id，ttl为2天，防止跨天后还残留 divorce_count_cache = TTLCache(maxsize=2000, ttl=172800) -# 新增：记录上次清零日期 divorce_last_reset_date = datetime.now().strftime("%Y%m%d") bye = on_command("离婚", aliases={"分手"}, block=True) @@ -27,8 +24,8 @@ @bye.handle() async def handle_divorce(event: GroupMessageEvent): global divorce_last_reset_date - user_id = event.user_id - group_id = event.group_id + user_id = event.data.sender_id + group_id = event.data.peer_id # 检查是否需要清空离婚次数缓存（每天0点） today = datetime.now().strftime("%Y%m%d") @@ -113,9 +110,7 @@ async def process_divorce(group_id: int, user_id: int): .limit(1) ) relationship_result = await session.execute(relationship_stmt) - relationship = relationship_result.scalar_one_or_none() - - if relationship: + if relationship := relationship_result.scalar_one_or_none(): # 确定双方的ID if relationship.user_id == user_id: partner_id = relationship.partner_id diff --git a/src/plugins/waifu/models.py b/src/plugins/waifu/models.py index bc6d966..2914869 100644 --- a/src/plugins/waifu/models.py +++ b/src/plugins/waifu/models.py @@ -2,12 +2,13 @@ from zoneinfo import ZoneInfo from nonebot import require +from sqlalchemy.orm.properties import MappedColumn require("nonebot_plugin_orm") from nonebot_plugin_orm import Model from sqlalchemy import BigInteger, Boolean, DateTime, Index, String, UniqueConstraint -from sqlalchemy.orm import Mapped, mapped_column +from sqlalchemy.orm import mapped_column def get_current_time(): @@ -20,11 +21,11 @@ class WaifuRelationship(Model): __tablename__ = "waifu_relationships" - id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) - group_id: Mapped[int] = mapped_column(BigInteger, nullable=False, index=True) - user_id: Mapped[int] = mapped_column(BigInteger, nullable=False) - partner_id: Mapped[int] = mapped_column(BigInteger, nullable=False) - created_at: Mapped[datetime] = mapped_column( + id: MappedColumn[int]= mapped_column(BigInteger, primary_key=True, autoincrement=True) + group_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False, index=True) + user_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) + partner_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) + created_at: MappedColumn[datetime] = mapped_column( DateTime, default=get_current_time, nullable=False ) @@ -45,10 +46,10 @@ class WaifuProtectedUser(Model): __tablename__ = "waifu_protected_users" - id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) - group_id: Mapped[int] = mapped_column(BigInteger, nullable=False) - user_id: Mapped[int] = mapped_column(BigInteger, nullable=False) - created_at: Mapped[datetime] = mapped_column( + id: MappedColumn[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) + group_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) + user_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) + created_at: MappedColumn[datetime] = mapped_column( DateTime, default=get_current_time, nullable=False ) @@ -64,17 +65,17 @@ class WaifuLock(Model): __tablename__ = "waifu_locks" - id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) - group_id: Mapped[int] = mapped_column(BigInteger, nullable=False) - user_id: Mapped[int] = mapped_column(BigInteger, nullable=False) - lock_type: Mapped[str] = mapped_column( + id: MappedColumn[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) + group_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) + user_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) + lock_type: MappedColumn[str] = mapped_column( String(50), nullable=False, default="general" ) - expires_at: Mapped[datetime] = mapped_column( + expires_at: MappedColumn[datetime] = mapped_column( DateTime, nullable=True ) # 过期时间，None表示永久 - is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False) - created_at: Mapped[datetime] = mapped_column( + is_active: MappedColumn[bool] = mapped_column(Boolean, default=True, nullable=False) + created_at: MappedColumn[datetime] = mapped_column( DateTime, default=get_current_time, nullable=False ) @@ -93,14 +94,14 @@ class YinpaRecord(Model): __tablename__ = "yinpa_records" - id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) - group_id: Mapped[int] = mapped_column(BigInteger, nullable=False, index=True) - active_user_id: Mapped[int] = mapped_column(BigInteger, nullable=False) # 主动方 - passive_user_id: Mapped[int] = mapped_column(BigInteger, nullable=False) # 被动方 - success: Mapped[bool] = mapped_column( + id: MappedColumn[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) + group_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False, index=True) + active_user_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) # 主动方 + passive_user_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) # 被动方 + success: MappedColumn[bool] = mapped_column( Boolean, nullable=False, default=False ) # 是否成功 - created_at: Mapped[datetime] = mapped_column( + created_at: MappedColumn[datetime] = mapped_column( DateTime, default=get_current_time, nullable=False ) @@ -117,12 +118,12 @@ class WaifuDailyReset(Model): __tablename__ = "waifu_daily_resets" - id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) - group_id: Mapped[int] = mapped_column(BigInteger, nullable=False) - reset_date: Mapped[datetime] = mapped_column( + id: MappedColumn[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) + group_id: MappedColumn[int] = mapped_column(BigInteger, nullable=False) + reset_date: MappedColumn[datetime] = mapped_column( DateTime, nullable=False ) # 重置日期（只到日期，不包含时间） - created_at: Mapped[datetime] = mapped_column( + created_at: MappedColumn[datetime] = mapped_column( DateTime, default=get_current_time, nullable=False ) @@ -137,9 +138,9 @@ class YinpaActive(Model): __tablename__ = "yinpa_active" - user_id: Mapped[int] = mapped_column(BigInteger, primary_key=True) - active_count: Mapped[int] = mapped_column(default=0, nullable=False) - updated_at: Mapped[datetime] = mapped_column( + user_id: MappedColumn[int] = mapped_column(BigInteger, primary_key=True) + active_count: MappedColumn[int] = mapped_column(default=0, nullable=False) + updated_at: MappedColumn[datetime] = mapped_column( DateTime, default=get_current_time, onupdate=get_current_time, nullable=False ) @@ -149,8 +150,8 @@ class YinpaPassive(Model): __tablename__ = "yinpa_passive" - user_id: Mapped[int] = mapped_column(BigInteger, primary_key=True) - passive_count: Mapped[int] = mapped_column(default=0, nullable=False) - updated_at: Mapped[datetime] = mapped_column( + user_id: MappedColumn[int] = mapped_column(BigInteger, primary_key=True) + passive_count: MappedColumn[int] = mapped_column(default=0, nullable=False) + updated_at: MappedColumn[datetime] = mapped_column( DateTime, default=get_current_time, onupdate=get_current_time, nullable=False ) diff --git a/src/plugins/waifu/record.py b/src/plugins/waifu/record.py index 83f95b5..d166a88 100644 --- a/src/plugins/waifu/record.py +++ b/src/plugins/waifu/record.py @@ -1,8 +1,10 @@ +import base64 from datetime import datetime from zoneinfo import ZoneInfo from nonebot import on_command, require -from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment +from nonebot.adapters.milky import Bot, Message, MessageSegment +from nonebot.adapters.milky.event import GroupMessageEvent from nonebot.params import CommandArg require("nonebot_plugin_orm") @@ -20,11 +22,7 @@ async def show_yinpa_record( bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg() ): # 获取目标用户 - if targets := get_message_at(arg): - user_id = targets[0] - else: - user_id = event.user_id - + user_id = targets[0] if (targets := get_message_at(arg)) else event.data.sender_id async with get_session() as session: # 查询记录 active_stmt = select(YinpaActive).where(YinpaActive.user_id == user_id) @@ -42,6 +40,9 @@ async def show_yinpa_record( content += f"被透次数：{passive.passive_count if passive else 0}\n" content += f"最后更新时间：{datetime.now(ZoneInfo('Asia/Shanghai')).strftime('%Y-%m-%d %H:%M')}" - # 生成图片 + # 生成图片 img_bytes = bbcode_to_png(content) - await record.finish(MessageSegment.image(img_bytes)) + img_bytes.seek(0) + b64 = base64.b64encode(img_bytes.read()).decode("utf-8") + data_uri = f"base64://{b64}" + await record.finish(MessageSegment.image(data_uri)) diff --git a/src/plugins/waifu/utils.py b/src/plugins/waifu/utils.py index 9a79b61..33d445d 100644 --- a/src/plugins/waifu/utils.py +++ b/src/plugins/waifu/utils.py @@ -4,7 +4,7 @@ import httpx from nonebot import logger -from nonebot.adapters.onebot.v11 import Message +from nonebot.adapters import Message from pil_utils import Text2Image defualt_md5 = "acef72340ac0e914090bd35799f5594e" diff --git a/src/plugins/waifu/yinpa.py b/src/plugins/waifu/yinpa.py index b283653..1545c51 100644 --- a/src/plugins/waifu/yinpa.py +++ b/src/plugins/waifu/yinpa.py @@ -3,7 +3,8 @@ from cachetools import TTLCache from nonebot import on_command, require -from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment +from nonebot.adapters.milky import Bot, Message, MessageSegment +from nonebot.adapters.milky.event import GroupMessageEvent require("nonebot_plugin_orm") from nonebot_plugin_orm import get_session @@ -26,8 +27,8 @@ async def handle_yinpa(bot: Bot, event: GroupMessageEvent): # 检查目标用户 targets = get_message_at(event.message) - user_id = event.user_id - group_id = event.group_id + user_id = event.data.sender_id + group_id = event.data.peer_id if targets: target = targets[0] @@ -95,17 +96,17 @@ async def get_available_members( exclude = exclude or [] members = await bot.get_group_member_list(group_id=group_id) return [ - member["user_id"] + member.user_id for member in members - if member["user_id"] not in protected - and member["user_id"] not in exclude - and member["user_id"] != int(bot.self_id) # 排除机器人 + if member.user_id not in protected + and member.user_id not in exclude + and member.user_id != int(bot.self_id) ] def check_yinpa_cd(event: GroupMessageEvent) -> bool: """检查涩涩CD""" - key = f"yinpa_{event.group_id}_{event.user_id}" + key = f"yinpa_{event.data.peer_id}_{event.data.sender_id}" last_time = cd_cache.get(key, 0) if time.time() - last_time < 300: # 5分钟CD return False @@ -124,8 +125,10 @@ async def generate_yinpa_result( ) -> Message: """生成涩涩结果消息""" # 获取目标用户信息 - member = await bot.get_group_member_info(group_id=event.group_id, user_id=target) - target_name = member["card"] or member["nickname"] + member = await bot.get_group_member_info( + group_id=event.data.peer_id, user_id=target + ) + target_name = member.card or member.nickname if success: success_messages = [ diff --git a/uv.lock b/uv.lock index 2fc24f3..4ff97d8 100644 --- a/uv.lock +++ b/uv.lock @@ -22,18 +22,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/37/d7/15d67e05b235d1ed8c3ce61688fe4d84130e72af1657acadfaac3479f4cf/aiocache-0.12.3-py2.py3-none-any.whl", hash = "sha256:889086fc24710f431937b87ad3720a289f7fc31c4fd8b68e9f918b9bacd8270d" }, ] -[[package]] -name = "aiodns" -version = "3.5.0" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -dependencies = [ - { name = "pycares" }, -] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/17/0a/163e5260cecc12de6abc259d158d9da3b8ec062ab863107dcdb1166cdcef/aiodns-3.5.0.tar.gz", hash = "sha256:11264edbab51896ecf546c18eb0dd56dff0428c6aa6d2cd87e643e07300eb310" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/f6/2c/711076e5f5d0707b8ec55a233c8bfb193e0981a800cd1b3b123e8ff61ca1/aiodns-3.5.0-py3-none-any.whl", hash = "sha256:6d0404f7d5215849233f6ee44854f2bb2481adf71b336b2279016ea5990ca5c5" }, -] - [[package]] name = "aiofiles" version = "24.1.0" @@ -138,13 +126,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/9d/47/b11d0089875a23bff0abd3edb5516bcd454db3fefab8604f5e4b07bd6210/aiohttp-3.12.13-cp313-cp313-win_amd64.whl", hash = "sha256:5a178390ca90419bfd41419a809688c368e63c86bd725e1186dd97f6b89c2706" }, ] -[package.optional-dependencies] -speedups = [ - { name = "aiodns" }, - { name = "brotli", marker = "platform_python_implementation == 'CPython'" }, - { name = "brotlicffi", marker = "platform_python_implementation != 'CPython'" }, -] - [[package]] name = "aiomysql" version = "0.2.0" @@ -360,98 +341,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/24/7e/f7b6f453e6481d1e233540262ccbfcf89adcd43606f44a028d7f5fae5eb2/binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4" }, ] -[[package]] -name = "brotli" -version = "1.1.0" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/2f/c2/f9e977608bdf958650638c3f1e28f85a1b075f075ebbe77db8555463787b/Brotli-1.1.0.tar.gz", hash = "sha256:81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/6d/3a/dbf4fb970c1019a57b5e492e1e0eae745d32e59ba4d6161ab5422b08eefe/Brotli-1.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e1140c64812cb9b06c922e77f1c26a75ec5e3f0fb2bf92cc8c58720dec276752" }, - { url = "https://mirrors.aliyun.com/pypi/packages/dd/11/afc14026ea7f44bd6eb9316d800d439d092c8d508752055ce8d03086079a/Brotli-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c8fd5270e906eef71d4a8d19b7c6a43760c6abcfcc10c9101d14eb2357418de9" }, - { url = "https://mirrors.aliyun.com/pypi/packages/36/83/7545a6e7729db43cb36c4287ae388d6885c85a86dd251768a47015dfde32/Brotli-1.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ae56aca0402a0f9a3431cddda62ad71666ca9d4dc3a10a142b9dce2e3c0cda3" }, - { url = "https://mirrors.aliyun.com/pypi/packages/32/23/35331c4d9391fcc0f29fd9bec2c76e4b4eeab769afbc4b11dd2e1098fb13/Brotli-1.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:43ce1b9935bfa1ede40028054d7f48b5469cd02733a365eec8a329ffd342915d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3b/24/1671acb450c902edb64bd765d73603797c6c7280a9ada85a195f6b78c6e5/Brotli-1.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7c4855522edb2e6ae7fdb58e07c3ba9111e7621a8956f481c68d5d979c93032e" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d5/00/40f760cc27007912b327fe15bf6bfd8eaecbe451687f72a8abc587d503b3/Brotli-1.1.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:38025d9f30cf4634f8309c6874ef871b841eb3c347e90b0851f63d1ded5212da" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b8/cb/8aaa83f7a4caa131757668c0fb0c4b6384b09ffa77f2fba9570d87ab587d/Brotli-1.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e6a904cb26bfefc2f0a6f240bdf5233be78cd2488900a2f846f3c3ac8489ab80" }, - { url = "https://mirrors.aliyun.com/pypi/packages/bc/c4/65456561d89d3c49f46b7fbeb8fe6e449f13bdc8ea7791832c5d476b2faf/Brotli-1.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a37b8f0391212d29b3a91a799c8e4a2855e0576911cdfb2515487e30e322253d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/05/1b/cf49528437bae28abce5f6e059f0d0be6fecdcc1d3e33e7c54b3ca498425/Brotli-1.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e84799f09591700a4154154cab9787452925578841a94321d5ee8fb9a9a328f0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/81/ff/190d4af610680bf0c5a09eb5d1eac6e99c7c8e216440f9c7cfd42b7adab5/Brotli-1.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f66b5337fa213f1da0d9000bc8dc0cb5b896b726eefd9c6046f699b169c41b9e" }, - { url = "https://mirrors.aliyun.com/pypi/packages/80/7d/f1abbc0c98f6e09abd3cad63ec34af17abc4c44f308a7a539010f79aae7a/Brotli-1.1.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:5dab0844f2cf82be357a0eb11a9087f70c5430b2c241493fc122bb6f2bb0917c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/34/ce/5a5020ba48f2b5a4ad1c0522d095ad5847a0be508e7d7569c8630ce25062/Brotli-1.1.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e4fe605b917c70283db7dfe5ada75e04561479075761a0b3866c081d035b01c1" }, - { url = "https://mirrors.aliyun.com/pypi/packages/44/89/fa2c4355ab1eecf3994e5a0a7f5492c6ff81dfcb5f9ba7859bd534bb5c1a/Brotli-1.1.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:1e9a65b5736232e7a7f91ff3d02277f11d339bf34099a56cdab6a8b3410a02b2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/af/a4/79196b4a1674143d19dca400866b1a4d1a089040df7b93b88ebae81f3447/Brotli-1.1.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:58d4b711689366d4a03ac7957ab8c28890415e267f9b6589969e74b6e42225ec" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e9/54/1c0278556a097f9651e657b873ab08f01b9a9ae4cac128ceb66427d7cd20/Brotli-1.1.0-cp310-cp310-win32.whl", hash = "sha256:be36e3d172dc816333f33520154d708a2657ea63762ec16b62ece02ab5e4daf2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f7/65/b785722e941193fd8b571afd9edbec2a9b838ddec4375d8af33a50b8dab9/Brotli-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:0c6244521dda65ea562d5a69b9a26120769b7a9fb3db2fe9545935ed6735b128" }, - { url = "https://mirrors.aliyun.com/pypi/packages/96/12/ad41e7fadd5db55459c4c401842b47f7fee51068f86dd2894dd0dcfc2d2a/Brotli-1.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a3daabb76a78f829cafc365531c972016e4aa8d5b4bf60660ad8ecee19df7ccc" }, - { url = "https://mirrors.aliyun.com/pypi/packages/95/4e/5afab7b2b4b61a84e9c75b17814198ce515343a44e2ed4488fac314cd0a9/Brotli-1.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c8146669223164fc87a7e3de9f81e9423c67a79d6b3447994dfb9c95da16e2d6" }, - { url = "https://mirrors.aliyun.com/pypi/packages/9d/e6/f305eb61fb9a8580c525478a4a34c5ae1a9bcb12c3aee619114940bc513d/Brotli-1.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:30924eb4c57903d5a7526b08ef4a584acc22ab1ffa085faceb521521d2de32dd" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3e/4f/af6846cfbc1550a3024e5d3775ede1e00474c40882c7bf5b37a43ca35e91/Brotli-1.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ceb64bbc6eac5a140ca649003756940f8d6a7c444a68af170b3187623b43bebf" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b3/e7/ca2993c7682d8629b62630ebf0d1f3bb3d579e667ce8e7ca03a0a0576a2d/Brotli-1.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a469274ad18dc0e4d316eefa616d1d0c2ff9da369af19fa6f3daa4f09671fd61" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b3/96/da98e7bedc4c51104d29cc61e5f449a502dd3dbc211944546a4cc65500d3/Brotli-1.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:524f35912131cc2cabb00edfd8d573b07f2d9f21fa824bd3fb19725a9cf06327" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e8/ef/ccbc16947d6ce943a7f57e1a40596c75859eeb6d279c6994eddd69615265/Brotli-1.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:5b3cc074004d968722f51e550b41a27be656ec48f8afaeeb45ebf65b561481dd" }, - { url = "https://mirrors.aliyun.com/pypi/packages/80/d6/0bd38d758d1afa62a5524172f0b18626bb2392d717ff94806f741fcd5ee9/Brotli-1.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:19c116e796420b0cee3da1ccec3b764ed2952ccfcc298b55a10e5610ad7885f9" }, - { url = "https://mirrors.aliyun.com/pypi/packages/14/56/48859dd5d129d7519e001f06dcfbb6e2cf6db92b2702c0c2ce7d97e086c1/Brotli-1.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:510b5b1bfbe20e1a7b3baf5fed9e9451873559a976c1a78eebaa3b86c57b4265" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3d/77/a236d5f8cd9e9f4348da5acc75ab032ab1ab2c03cc8f430d24eea2672888/Brotli-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a1fd8a29719ccce974d523580987b7f8229aeace506952fa9ce1d53a033873c8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f1/87/3b283efc0f5cb35f7f84c0c240b1e1a1003a5e47141a4881bf87c86d0ce2/Brotli-1.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c247dd99d39e0338a604f8c2b3bc7061d5c2e9e2ac7ba9cc1be5a69cb6cd832f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f3/eb/2be4cc3e2141dc1a43ad4ca1875a72088229de38c68e842746b342667b2a/Brotli-1.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1b2c248cd517c222d89e74669a4adfa5577e06ab68771a529060cf5a156e9757" }, - { url = "https://mirrors.aliyun.com/pypi/packages/66/13/b58ddebfd35edde572ccefe6890cf7c493f0c319aad2a5badee134b4d8ec/Brotli-1.1.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:2a24c50840d89ded6c9a8fdc7b6ed3692ed4e86f1c4a4a938e1e92def92933e0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/84/9c/bc96b6c7db824998a49ed3b38e441a2cae9234da6fa11f6ed17e8cf4f147/Brotli-1.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f31859074d57b4639318523d6ffdca586ace54271a73ad23ad021acd807eb14b" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e7/71/8f161dee223c7ff7fea9d44893fba953ce97cf2c3c33f78ba260a91bcff5/Brotli-1.1.0-cp311-cp311-win32.whl", hash = "sha256:39da8adedf6942d76dc3e46653e52df937a3c4d6d18fdc94a7c29d263b1f5b50" }, - { url = "https://mirrors.aliyun.com/pypi/packages/02/8a/fece0ee1057643cb2a5bbf59682de13f1725f8482b2c057d4e799d7ade75/Brotli-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:aac0411d20e345dc0920bdec5548e438e999ff68d77564d5e9463a7ca9d3e7b1" }, - { url = "https://mirrors.aliyun.com/pypi/packages/5c/d0/5373ae13b93fe00095a58efcbce837fd470ca39f703a235d2a999baadfbc/Brotli-1.1.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:32d95b80260d79926f5fab3c41701dbb818fde1c9da590e77e571eefd14abe28" }, - { url = "https://mirrors.aliyun.com/pypi/packages/8e/48/f6e1cdf86751300c288c1459724bfa6917a80e30dbfc326f92cea5d3683a/Brotli-1.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b760c65308ff1e462f65d69c12e4ae085cff3b332d894637f6273a12a482d09f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/06/88/564958cedce636d0f1bed313381dfc4b4e3d3f6015a63dae6146e1b8c65c/Brotli-1.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:316cc9b17edf613ac76b1f1f305d2a748f1b976b033b049a6ecdfd5612c70409" }, - { url = "https://mirrors.aliyun.com/pypi/packages/58/79/b7026a8bb65da9a6bb7d14329fd2bd48d2b7f86d7329d5cc8ddc6a90526f/Brotli-1.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:caf9ee9a5775f3111642d33b86237b05808dafcd6268faa492250e9b78046eb2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e5/18/c18c32ecea41b6c0004e15606e274006366fe19436b6adccc1ae7b2e50c2/Brotli-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:70051525001750221daa10907c77830bc889cb6d865cc0b813d9db7fefc21451" }, - { url = "https://mirrors.aliyun.com/pypi/packages/08/c8/69ec0496b1ada7569b62d85893d928e865df29b90736558d6c98c2031208/Brotli-1.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f4bf76817c14aa98cc6697ac02f3972cb8c3da93e9ef16b9c66573a68014f91" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ab/fb/0517cea182219d6768113a38167ef6d4eb157a033178cc938033a552ed6d/Brotli-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0c5516f0aed654134a2fc936325cc2e642f8a0e096d075209672eb321cff408" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c7/53/73a3431662e33ae61a5c80b1b9d2d18f58dfa910ae8dd696e57d39f1a2f5/Brotli-1.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c3020404e0b5eefd7c9485ccf8393cfb75ec38ce75586e046573c9dc29967a0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/55/ac/bd280708d9c5ebdbf9de01459e625a3e3803cce0784f47d633562cf40e83/Brotli-1.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4ed11165dd45ce798d99a136808a794a748d5dc38511303239d4e2363c0695dc" }, - { url = "https://mirrors.aliyun.com/pypi/packages/76/58/5c391b41ecfc4527d2cc3350719b02e87cb424ef8ba2023fb662f9bf743c/Brotli-1.1.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:4093c631e96fdd49e0377a9c167bfd75b6d0bad2ace734c6eb20b348bc3ea180" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c7/4e/91b8256dfe99c407f174924b65a01f5305e303f486cc7a2e8a5d43c8bec3/Brotli-1.1.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e4c4629ddad63006efa0ef968c8e4751c5868ff0b1c5c40f76524e894c50248" }, - { url = "https://mirrors.aliyun.com/pypi/packages/5a/a6/e2a39a5d3b412938362bbbeba5af904092bf3f95b867b4a3eb856104074e/Brotli-1.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:861bf317735688269936f755fa136a99d1ed526883859f86e41a5d43c61d8966" }, - { url = "https://mirrors.aliyun.com/pypi/packages/13/f0/358354786280a509482e0e77c1a5459e439766597d280f28cb097642fc26/Brotli-1.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:87a3044c3a35055527ac75e419dfa9f4f3667a1e887ee80360589eb8c90aabb9" }, - { url = "https://mirrors.aliyun.com/pypi/packages/80/f7/daf538c1060d3a88266b80ecc1d1c98b79553b3f117a485653f17070ea2a/Brotli-1.1.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:c5529b34c1c9d937168297f2c1fde7ebe9ebdd5e121297ff9c043bdb2ae3d6fb" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ad/cf/0eaa0585c4077d3c2d1edf322d8e97aabf317941d3a72d7b3ad8bce004b0/Brotli-1.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ca63e1890ede90b2e4454f9a65135a4d387a4585ff8282bb72964fab893f2111" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d8/63/1c1585b2aa554fe6dbce30f0c18bdbc877fa9a1bf5ff17677d9cca0ac122/Brotli-1.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e79e6520141d792237c70bcd7a3b122d00f2613769ae0cb61c52e89fd3443839" }, - { url = "https://mirrors.aliyun.com/pypi/packages/5f/3b/4e3fd1893eb3bbfef8e5a80d4508bec17a57bb92d586c85c12d28666bb13/Brotli-1.1.0-cp312-cp312-win32.whl", hash = "sha256:5f4d5ea15c9382135076d2fb28dde923352fe02951e66935a9efaac8f10e81b0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3d/d5/942051b45a9e883b5b6e98c041698b1eb2012d25e5948c58d6bf85b1bb43/Brotli-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:906bc3a79de8c4ae5b86d3d75a8b77e44404b0f4261714306e3ad248d8ab0951" }, - { url = "https://mirrors.aliyun.com/pypi/packages/0a/9f/fb37bb8ffc52a8da37b1c03c459a8cd55df7a57bdccd8831d500e994a0ca/Brotli-1.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:8bf32b98b75c13ec7cf774164172683d6e7891088f6316e54425fde1efc276d5" }, - { url = "https://mirrors.aliyun.com/pypi/packages/06/b3/dbd332a988586fefb0aa49c779f59f47cae76855c2d00f450364bb574cac/Brotli-1.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7bc37c4d6b87fb1017ea28c9508b36bbcb0c3d18b4260fcdf08b200c74a6aee8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/bb/80/6aaddc2f63dbcf2d93c2d204e49c11a9ec93a8c7c63261e2b4bd35198283/Brotli-1.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c0ef38c7a7014ffac184db9e04debe495d317cc9c6fb10071f7fefd93100a4f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ea/1d/e6ca79c96ff5b641df6097d299347507d39a9604bde8915e76bf026d6c77/Brotli-1.1.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91d7cc2a76b5567591d12c01f019dd7afce6ba8cba6571187e21e2fc418ae648" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ac/a3/d98d2472e0130b7dd3acdbb7f390d478123dbf62b7d32bda5c830a96116d/Brotli-1.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a93dde851926f4f2678e704fadeb39e16c35d8baebd5252c9fd94ce8ce68c4a0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c4/a5/c69e6d272aee3e1423ed005d8915a7eaa0384c7de503da987f2d224d0721/Brotli-1.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f0db75f47be8b8abc8d9e31bc7aad0547ca26f24a54e6fd10231d623f183d089" }, - { url = "https://mirrors.aliyun.com/pypi/packages/58/9f/4149d38b52725afa39067350696c09526de0125ebfbaab5acc5af28b42ea/Brotli-1.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6967ced6730aed543b8673008b5a391c3b1076d834ca438bbd70635c73775368" }, - { url = "https://mirrors.aliyun.com/pypi/packages/5a/5a/145de884285611838a16bebfdb060c231c52b8f84dfbe52b852a15780386/Brotli-1.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:7eedaa5d036d9336c95915035fb57422054014ebdeb6f3b42eac809928e40d0c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/50/ae/408b6bfb8525dadebd3b3dd5b19d631da4f7d46420321db44cd99dcf2f2c/Brotli-1.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d487f5432bf35b60ed625d7e1b448e2dc855422e87469e3f450aa5552b0eb284" }, - { url = "https://mirrors.aliyun.com/pypi/packages/af/85/a94e5cfaa0ca449d8f91c3d6f78313ebf919a0dbd55a100c711c6e9655bc/Brotli-1.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:832436e59afb93e1836081a20f324cb185836c617659b07b129141a8426973c7" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c2/f0/a61d9262cd01351df22e57ad7c34f66794709acab13f34be2675f45bf89d/Brotli-1.1.0-cp313-cp313-win32.whl", hash = "sha256:43395e90523f9c23a3d5bdf004733246fba087f2948f87ab28015f12359ca6a0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/7e/c1/ec214e9c94000d1c1974ec67ced1c970c148aa6b8d8373066123fc3dbf06/Brotli-1.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:9011560a466d2eb3f5a6e4929cf4a09be405c64154e12df0dd72713f6500e32b" }, -] - -[[package]] -name = "brotlicffi" -version = "1.1.0.0" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -dependencies = [ - { name = "cffi" }, -] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/95/9d/70caa61192f570fcf0352766331b735afa931b4c6bc9a348a0925cc13288/brotlicffi-1.1.0.0.tar.gz", hash = "sha256:b77827a689905143f87915310b93b273ab17888fd43ef350d4832c4a71083c13" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/a2/11/7b96009d3dcc2c931e828ce1e157f03824a69fb728d06bfd7b2fc6f93718/brotlicffi-1.1.0.0-cp37-abi3-macosx_10_9_x86_64.whl", hash = "sha256:9b7ae6bd1a3f0df532b6d67ff674099a96d22bc0948955cb338488c31bfb8851" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d6/e6/a8f46f4a4ee7856fbd6ac0c6fb0dc65ed181ba46cd77875b8d9bbe494d9e/brotlicffi-1.1.0.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19ffc919fa4fc6ace69286e0a23b3789b4219058313cf9b45625016bf7ff996b" }, - { url = "https://mirrors.aliyun.com/pypi/packages/be/20/201559dff14e83ba345a5ec03335607e47467b6633c210607e693aefac40/brotlicffi-1.1.0.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9feb210d932ffe7798ee62e6145d3a757eb6233aa9a4e7db78dd3690d7755814" }, - { url = "https://mirrors.aliyun.com/pypi/packages/cd/15/695b1409264143be3c933f708a3f81d53c4a1e1ebbc06f46331decbf6563/brotlicffi-1.1.0.0-cp37-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84763dbdef5dd5c24b75597a77e1b30c66604725707565188ba54bab4f114820" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b4/40/b961a702463b6005baf952794c2e9e0099bde657d0d7e007f923883b907f/brotlicffi-1.1.0.0-cp37-abi3-win32.whl", hash = "sha256:1b12b50e07c3911e1efa3a8971543e7648100713d4e0971b13631cce22c587eb" }, - { url = "https://mirrors.aliyun.com/pypi/packages/1c/fa/5408a03c041114ceab628ce21766a4ea882aa6f6f0a800e04ee3a30ec6b9/brotlicffi-1.1.0.0-cp37-abi3-win_amd64.whl", hash = "sha256:994a4f0681bb6c6c3b0925530a1926b7a189d878e6e5e38fae8efa47c5d9c613" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e5/3b/bd4f3d2bcf2306ae66b0346f5b42af1962480b200096ffc7abc3bd130eca/brotlicffi-1.1.0.0-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2e4aeb0bd2540cb91b069dbdd54d458da8c4334ceaf2d25df2f4af576d6766ca" }, - { url = "https://mirrors.aliyun.com/pypi/packages/54/10/1fd57864449360852c535c2381ee7120ba8f390aa3869df967c44ca7eba1/brotlicffi-1.1.0.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4b7b0033b0d37bb33009fb2fef73310e432e76f688af76c156b3594389d81391" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e5/95/15aa422aa6450e6556e54a5fd1650ff59f470aed77ac739aa90ab63dc611/brotlicffi-1.1.0.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:54a07bb2374a1eba8ebb52b6fafffa2afd3c4df85ddd38fcc0511f2bb387c2a8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/6c/a7/f254e13b2cb43337d6d99a4ec10394c134e41bfda8a2eff15b75627f4a3d/brotlicffi-1.1.0.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7901a7dc4b88f1c1475de59ae9be59799db1007b7d059817948d8e4f12e24e35" }, - { url = "https://mirrors.aliyun.com/pypi/packages/72/a9/0971251c4427c14b2a827dba3d910d4d3330dabf23d4278bf6d06a978847/brotlicffi-1.1.0.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ce01c7316aebc7fce59da734286148b1d1b9455f89cf2c8a4dfce7d41db55c2d" }, -] - [[package]] name = "cachetools" version = "5.5.2" @@ -479,63 +368,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/84/ae/320161bd181fc06471eed047ecce67b693fd7515b16d495d8932db763426/certifi-2025.6.15-py3-none-any.whl", hash = "sha256:2e0c7ce7cb5d8f8634ca55d2ba7e6ec2689a2fd6537d8dec1296a477a4910057" }, ] -[[package]] -name = "cffi" -version = "1.17.1" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -dependencies = [ - { name = "pycparser" }, -] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz", hash = "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/90/07/f44ca684db4e4f08a3fdc6eeb9a0d15dc6883efc7b8c90357fdbf74e186c/cffi-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14" }, - { url = "https://mirrors.aliyun.com/pypi/packages/08/fd/cc2fedbd887223f9f5d170c96e57cbf655df9831a6546c1727ae13fa977a/cffi-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67" }, - { url = "https://mirrors.aliyun.com/pypi/packages/de/cc/4635c320081c78d6ffc2cab0a76025b691a91204f4aa317d568ff9280a2d/cffi-1.17.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b6/7b/3b2b250f3aab91abe5f8a51ada1b717935fdaec53f790ad4100fe2ec64d1/cffi-1.17.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d3/48/1b9283ebbf0ec065148d8de05d647a986c5f22586b18120020452fff8f5d/cffi-1.17.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3" }, - { url = "https://mirrors.aliyun.com/pypi/packages/40/87/3b8452525437b40f39ca7ff70276679772ee7e8b394934ff60e63b7b090c/cffi-1.17.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6" }, - { url = "https://mirrors.aliyun.com/pypi/packages/8d/fb/4da72871d177d63649ac449aec2e8a29efe0274035880c7af59101ca2232/cffi-1.17.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ab/a0/62f00bcb411332106c02b663b26f3545a9ef136f80d5df746c05878f8c4b/cffi-1.17.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/36/83/76127035ed2e7e27b0787604d99da630ac3123bfb02d8e80c633f218a11d/cffi-1.17.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e" }, - { url = "https://mirrors.aliyun.com/pypi/packages/21/81/a6cd025db2f08ac88b901b745c163d884641909641f9b826e8cb87645942/cffi-1.17.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f8/fe/4d41c2f200c4a457933dbd98d3cf4e911870877bd94d9656cc0fcb390681/cffi-1.17.1-cp310-cp310-win32.whl", hash = "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d1/b6/0b0f5ab93b0df4acc49cae758c81fe4e5ef26c3ae2e10cc69249dfd8b3ab/cffi-1.17.1-cp310-cp310-win_amd64.whl", hash = "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15" }, - { url = "https://mirrors.aliyun.com/pypi/packages/6b/f4/927e3a8899e52a27fa57a48607ff7dc91a9ebe97399b357b85a0c7892e00/cffi-1.17.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401" }, - { url = "https://mirrors.aliyun.com/pypi/packages/6c/f5/6c3a8efe5f503175aaddcbea6ad0d2c96dad6f5abb205750d1b3df44ef29/cffi-1.17.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf" }, - { url = "https://mirrors.aliyun.com/pypi/packages/94/dd/a3f0118e688d1b1a57553da23b16bdade96d2f9bcda4d32e7d2838047ff7/cffi-1.17.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/2e/ea/70ce63780f096e16ce8588efe039d3c4f91deb1dc01e9c73a287939c79a6/cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41" }, - { url = "https://mirrors.aliyun.com/pypi/packages/1c/a0/a4fa9f4f781bda074c3ddd57a572b060fa0df7655d2a4247bbe277200146/cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1" }, - { url = "https://mirrors.aliyun.com/pypi/packages/62/12/ce8710b5b8affbcdd5c6e367217c242524ad17a02fe5beec3ee339f69f85/cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ff/6b/d45873c5e0242196f042d555526f92aa9e0c32355a1be1ff8c27f077fd37/cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/1a/52/d9a0e523a572fbccf2955f5abe883cfa8bcc570d7faeee06336fbd50c9fc/cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6" }, - { url = "https://mirrors.aliyun.com/pypi/packages/44/74/f2a2460684a1a2d00ca799ad880d54652841a780c4c97b87754f660c7603/cffi-1.17.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f8/4a/34599cac7dfcd888ff54e801afe06a19c17787dfd94495ab0c8d35fe99fb/cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b" }, - { url = "https://mirrors.aliyun.com/pypi/packages/34/33/e1b8a1ba29025adbdcda5fb3a36f94c03d771c1b7b12f726ff7fef2ebe36/cffi-1.17.1-cp311-cp311-win32.whl", hash = "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3d/97/50228be003bb2802627d28ec0627837ac0bf35c90cf769812056f235b2d1/cffi-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/5a/84/e94227139ee5fb4d600a7a4927f322e1d4aea6fdc50bd3fca8493caba23f/cffi-1.17.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/da/ee/fb72c2b48656111c4ef27f0f91da355e130a923473bf5ee75c5643d00cca/cffi-1.17.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/cc/b6/db007700f67d151abadf508cbfd6a1884f57eab90b1bb985c4c8c02b0f28/cffi-1.17.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36" }, - { url = "https://mirrors.aliyun.com/pypi/packages/1a/df/f8d151540d8c200eb1c6fba8cd0dfd40904f1b0682ea705c36e6c2e97ab3/cffi-1.17.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5" }, - { url = "https://mirrors.aliyun.com/pypi/packages/28/c0/b31116332a547fd2677ae5b78a2ef662dfc8023d67f41b2a83f7c2aa78b1/cffi-1.17.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff" }, - { url = "https://mirrors.aliyun.com/pypi/packages/91/2b/9a1ddfa5c7f13cab007a2c9cc295b70fbbda7cb10a286aa6810338e60ea1/cffi-1.17.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b2/d5/da47df7004cb17e4955df6a43d14b3b4ae77737dff8bf7f8f333196717bf/cffi-1.17.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93" }, - { url = "https://mirrors.aliyun.com/pypi/packages/0b/ac/2a28bcf513e93a219c8a4e8e125534f4f6db03e3179ba1c45e949b76212c/cffi-1.17.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d4/38/ca8a4f639065f14ae0f1d9751e70447a261f1a30fa7547a828ae08142465/cffi-1.17.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/86/c5/28b2d6f799ec0bdecf44dced2ec5ed43e0eb63097b0f58c293583b406582/cffi-1.17.1-cp312-cp312-win32.whl", hash = "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65" }, - { url = "https://mirrors.aliyun.com/pypi/packages/50/b9/db34c4755a7bd1cb2d1603ac3863f22bcecbd1ba29e5ee841a4bc510b294/cffi-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903" }, - { url = "https://mirrors.aliyun.com/pypi/packages/8d/f8/dd6c246b148639254dad4d6803eb6a54e8c85c6e11ec9df2cffa87571dbe/cffi-1.17.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e" }, - { url = "https://mirrors.aliyun.com/pypi/packages/8b/f1/672d303ddf17c24fc83afd712316fda78dc6fce1cd53011b839483e1ecc8/cffi-1.17.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/0e/2d/eab2e858a91fdff70533cab61dcff4a1f55ec60425832ddfdc9cd36bc8af/cffi-1.17.1-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3" }, - { url = "https://mirrors.aliyun.com/pypi/packages/75/b2/fbaec7c4455c604e29388d55599b99ebcc250a60050610fadde58932b7ee/cffi-1.17.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683" }, - { url = "https://mirrors.aliyun.com/pypi/packages/4f/b7/6e4a2162178bf1935c336d4da8a9352cccab4d3a5d7914065490f08c0690/cffi-1.17.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c7/8a/1d0e4a9c26e54746dc08c2c6c037889124d4f59dffd853a659fa545f1b40/cffi-1.17.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/26/9f/1aab65a6c0db35f43c4d1b4f580e8df53914310afc10ae0397d29d697af4/cffi-1.17.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd" }, - { url = "https://mirrors.aliyun.com/pypi/packages/5f/e4/fb8b3dd8dc0e98edf1135ff067ae070bb32ef9d509d6cb0f538cd6f7483f/cffi-1.17.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f1/47/d7145bf2dc04684935d57d67dff9d6d795b2ba2796806bb109864be3a151/cffi-1.17.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9" }, - { url = "https://mirrors.aliyun.com/pypi/packages/bf/ee/f94057fa6426481d663b88637a9a10e859e492c73d0384514a17d78ee205/cffi-1.17.1-cp313-cp313-win32.whl", hash = "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/7c/fc/6a8cb64e5f0324877d503c854da15d76c1e50eb722e320b15345c4d0c6de/cffi-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a" }, -] - [[package]] name = "chardet" version = "5.2.0" @@ -728,20 +560,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/36/f4/c6e662dade71f56cd2f3735141b265c3c79293c109549c1e6933b0651ffc/exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10" }, ] -[[package]] -name = "fastapi" -version = "0.115.13" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -dependencies = [ - { name = "pydantic" }, - { name = "starlette" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/20/64/ec0788201b5554e2a87c49af26b77a4d132f807a0fa9675257ac92c6aa0e/fastapi-0.115.13.tar.gz", hash = "sha256:55d1d25c2e1e0a0a50aceb1c8705cd932def273c102bff0b1c1da88b3c6eb307" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/59/4a/e17764385382062b0edbb35a26b7cf76d71e27e456546277a42ba6545c6e/fastapi-0.115.13-py3-none-any.whl", hash = "sha256:0a0cab59afa7bab22f5eb347f8c9864b681558c278395e94035a741fc10cd865" }, -] - [[package]] name = "filelock" version = "3.18.0" @@ -905,6 +723,28 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86" }, ] +[[package]] +name = "h2" +version = "4.2.0" +source = { registry = "https://mirrors.aliyun.com/pypi/simple" } +dependencies = [ + { name = "hpack" }, + { name = "hyperframe" }, +] +sdist = { url = "https://mirrors.aliyun.com/pypi/packages/1b/38/d7f80fd13e6582fb8e0df8c9a653dcc02b03ca34f4d72f34869298c5baf8/h2-4.2.0.tar.gz", hash = "sha256:c8a52129695e88b1a0578d8d2cc6842bbd79128ac685463b887ee278126ad01f" } +wheels = [ + { url = "https://mirrors.aliyun.com/pypi/packages/d0/9e/984486f2d0a0bd2b024bf4bc1c62688fcafa9e61991f041fb0e2def4a982/h2-4.2.0-py3-none-any.whl", hash = "sha256:479a53ad425bb29af087f3458a61d30780bc818e4ebcf01f0b536ba916462ed0" }, +] + +[[package]] +name = "hpack" +version = "4.1.0" +source = { registry = "https://mirrors.aliyun.com/pypi/simple" } +sdist = { url = "https://mirrors.aliyun.com/pypi/packages/2c/48/71de9ed269fdae9c8057e5a4c0aa7402e8bb16f2c6e90b3aa53327b113f8/hpack-4.1.0.tar.gz", hash = "sha256:ec5eca154f7056aa06f196a557655c5b009b382873ac8d1e66e79e87535f1dca" } +wheels = [ + { url = "https://mirrors.aliyun.com/pypi/packages/07/c6/80c95b1b2b94682a72cbdbfb85b81ae2daffa4291fbfa1b1464502ede10d/hpack-4.1.0-py3-none-any.whl", hash = "sha256:157ac792668d995c657d93111f46b4535ed114f0c9c8d672271bbec7eae1b496" }, +] + [[package]] name = "httpcore" version = "1.0.9" @@ -918,42 +758,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55" }, ] -[[package]] -name = "httptools" -version = "0.6.4" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/a7/9a/ce5e1f7e131522e6d3426e8e7a490b3a01f39a6696602e1c4f33f9e94277/httptools-0.6.4.tar.gz", hash = "sha256:4e93eee4add6493b59a5c514da98c939b244fce4a0d8879cd3f466562f4b7d5c" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/3b/6f/972f8eb0ea7d98a1c6be436e2142d51ad2a64ee18e02b0e7ff1f62171ab1/httptools-0.6.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3c73ce323711a6ffb0d247dcd5a550b8babf0f757e86a52558fe5b86d6fefcc0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/6a/b0/17c672b4bc5c7ba7f201eada4e96c71d0a59fbc185e60e42580093a86f21/httptools-0.6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:345c288418f0944a6fe67be8e6afa9262b18c7626c3ef3c28adc5eabc06a68da" }, - { url = "https://mirrors.aliyun.com/pypi/packages/92/5e/b4a826fe91971a0b68e8c2bd4e7db3e7519882f5a8ccdb1194be2b3ab98f/httptools-0.6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:deee0e3343f98ee8047e9f4c5bc7cedbf69f5734454a94c38ee829fb2d5fa3c1" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b0/51/ce61e531e40289a681a463e1258fa1e05e0be54540e40d91d065a264cd8f/httptools-0.6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca80b7485c76f768a3bc83ea58373f8db7b015551117375e4918e2aa77ea9b50" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ea/9e/270b7d767849b0c96f275c695d27ca76c30671f8eb8cc1bab6ced5c5e1d0/httptools-0.6.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:90d96a385fa941283ebd231464045187a31ad932ebfa541be8edf5b3c2328959" }, - { url = "https://mirrors.aliyun.com/pypi/packages/81/86/ced96e3179c48c6f656354e106934e65c8963d48b69be78f355797f0e1b3/httptools-0.6.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:59e724f8b332319e2875efd360e61ac07f33b492889284a3e05e6d13746876f4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/75/73/187a3f620ed3175364ddb56847d7a608a6fc42d551e133197098c0143eca/httptools-0.6.4-cp310-cp310-win_amd64.whl", hash = "sha256:c26f313951f6e26147833fc923f78f95604bbec812a43e5ee37f26dc9e5a686c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/7b/26/bb526d4d14c2774fe07113ca1db7255737ffbb119315839af2065abfdac3/httptools-0.6.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f47f8ed67cc0ff862b84a1189831d1d33c963fb3ce1ee0c65d3b0cbe7b711069" }, - { url = "https://mirrors.aliyun.com/pypi/packages/a6/17/3e0d3e9b901c732987a45f4f94d4e2c62b89a041d93db89eafb262afd8d5/httptools-0.6.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0614154d5454c21b6410fdf5262b4a3ddb0f53f1e1721cfd59d55f32138c578a" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b7/24/0fe235d7b69c42423c7698d086d4db96475f9b50b6ad26a718ef27a0bce6/httptools-0.6.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8787367fbdfccae38e35abf7641dafc5310310a5987b689f4c32cc8cc3ee975" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b1/2f/205d1f2a190b72da6ffb5f41a3736c26d6fa7871101212b15e9b5cd8f61d/httptools-0.6.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40b0f7fe4fd38e6a507bdb751db0379df1e99120c65fbdc8ee6c1d044897a636" }, - { url = "https://mirrors.aliyun.com/pypi/packages/6e/4c/d09ce0eff09057a206a74575ae8f1e1e2f0364d20e2442224f9e6612c8b9/httptools-0.6.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:40a5ec98d3f49904b9fe36827dcf1aadfef3b89e2bd05b0e35e94f97c2b14721" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3e/d2/84c9e23edbccc4a4c6f96a1b8d99dfd2350289e94f00e9ccc7aadde26fb5/httptools-0.6.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:dacdd3d10ea1b4ca9df97a0a303cbacafc04b5cd375fa98732678151643d4988" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d0/46/4d8e7ba9581416de1c425b8264e2cadd201eb709ec1584c381f3e98f51c1/httptools-0.6.4-cp311-cp311-win_amd64.whl", hash = "sha256:288cd628406cc53f9a541cfaf06041b4c71d751856bab45e3702191f931ccd17" }, - { url = "https://mirrors.aliyun.com/pypi/packages/bb/0e/d0b71465c66b9185f90a091ab36389a7352985fe857e352801c39d6127c8/httptools-0.6.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:df017d6c780287d5c80601dafa31f17bddb170232d85c066604d8558683711a2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e2/b8/412a9bb28d0a8988de3296e01efa0bd62068b33856cdda47fe1b5e890954/httptools-0.6.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:85071a1e8c2d051b507161f6c3e26155b5c790e4e28d7f236422dbacc2a9cc44" }, - { url = "https://mirrors.aliyun.com/pypi/packages/9b/01/6fb20be3196ffdc8eeec4e653bc2a275eca7f36634c86302242c4fbb2760/httptools-0.6.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69422b7f458c5af875922cdb5bd586cc1f1033295aa9ff63ee196a87519ac8e1" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f7/d8/b644c44acc1368938317d76ac991c9bba1166311880bcc0ac297cb9d6bd7/httptools-0.6.4-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:16e603a3bff50db08cd578d54f07032ca1631450ceb972c2f834c2b860c28ea2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/52/d8/254d16a31d543073a0e57f1c329ca7378d8924e7e292eda72d0064987486/httptools-0.6.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ec4f178901fa1834d4a060320d2f3abc5c9e39766953d038f1458cb885f47e81" }, - { url = "https://mirrors.aliyun.com/pypi/packages/5f/3c/4aee161b4b7a971660b8be71a92c24d6c64372c1ab3ae7f366b3680df20f/httptools-0.6.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f9eb89ecf8b290f2e293325c646a211ff1c2493222798bb80a530c5e7502494f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/12/b7/5cae71a8868e555f3f67a50ee7f673ce36eac970f029c0c5e9d584352961/httptools-0.6.4-cp312-cp312-win_amd64.whl", hash = "sha256:db78cb9ca56b59b016e64b6031eda5653be0589dba2b1b43453f6e8b405a0970" }, - { url = "https://mirrors.aliyun.com/pypi/packages/94/a3/9fe9ad23fd35f7de6b91eeb60848986058bd8b5a5c1e256f5860a160cc3e/httptools-0.6.4-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ade273d7e767d5fae13fa637f4d53b6e961fb7fd93c7797562663f0171c26660" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ea/d9/82d5e68bab783b632023f2fa31db20bebb4e89dfc4d2293945fd68484ee4/httptools-0.6.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:856f4bc0478ae143bad54a4242fccb1f3f86a6e1be5548fecfd4102061b3a083" }, - { url = "https://mirrors.aliyun.com/pypi/packages/96/c1/cb499655cbdbfb57b577734fde02f6fa0bbc3fe9fb4d87b742b512908dff/httptools-0.6.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:322d20ea9cdd1fa98bd6a74b77e2ec5b818abdc3d36695ab402a0de8ef2865a3" }, - { url = "https://mirrors.aliyun.com/pypi/packages/af/71/ee32fd358f8a3bb199b03261f10921716990808a675d8160b5383487a317/httptools-0.6.4-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4d87b29bd4486c0093fc64dea80231f7c7f7eb4dc70ae394d70a495ab8436071" }, - { url = "https://mirrors.aliyun.com/pypi/packages/8a/0a/0d4df132bfca1507114198b766f1737d57580c9ad1cf93c1ff673e3387be/httptools-0.6.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:342dd6946aa6bda4b8f18c734576106b8a31f2fe31492881a9a160ec84ff4bd5" }, - { url = "https://mirrors.aliyun.com/pypi/packages/1e/6a/787004fdef2cabea27bad1073bf6a33f2437b4dbd3b6fb4a9d71172b1c7c/httptools-0.6.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4b36913ba52008249223042dca46e69967985fb4051951f94357ea681e1f5dc0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/4d/dc/7decab5c404d1d2cdc1bb330b1bf70e83d6af0396fd4fc76fc60c0d522bf/httptools-0.6.4-cp313-cp313-win_amd64.whl", hash = "sha256:28908df1b9bb8187393d5b5db91435ccc9c8e891657f9cbb42a2541b44c82fc8" }, -] - [[package]] name = "httpx" version = "0.27.2" @@ -970,6 +774,20 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/56/95/9377bcb415797e44274b51d46e3249eba641711cf3348050f76ee7b15ffc/httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0" }, ] +[package.optional-dependencies] +http2 = [ + { name = "h2" }, +] + +[[package]] +name = "hyperframe" +version = "6.1.0" +source = { registry = "https://mirrors.aliyun.com/pypi/simple" } +sdist = { url = "https://mirrors.aliyun.com/pypi/packages/02/e7/94f8232d4a74cc99514c13a9f995811485a6903d48e5d952771ef6322e30/hyperframe-6.1.0.tar.gz", hash = "sha256:f630908a00854a7adeabd6382b43923a4c4cd4b821fcb527e6ab9e15382a3b08" } +wheels = [ + { url = "https://mirrors.aliyun.com/pypi/packages/48/30/47d0bf6072f7252e6521f3447ccfa40b421b6824517f82854703d0f5a98b/hyperframe-6.1.0-py3-none-any.whl", hash = "sha256:b03380493a519fce58ea5af42e4a42317bf9bd425596f7a0835ffce80f1a42e5" }, +] + [[package]] name = "idna" version = "3.10" @@ -1206,54 +1024,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8" }, ] -[[package]] -name = "msgpack" -version = "1.1.1" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/45/b1/ea4f68038a18c77c9467400d166d74c4ffa536f34761f7983a104357e614/msgpack-1.1.1.tar.gz", hash = "sha256:77b79ce34a2bdab2594f490c8e80dd62a02d650b91a75159a63ec413b8d104cd" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/33/52/f30da112c1dc92cf64f57d08a273ac771e7b29dea10b4b30369b2d7e8546/msgpack-1.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:353b6fc0c36fde68b661a12949d7d49f8f51ff5fa019c1e47c87c4ff34b080ed" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e4/35/7bfc0def2f04ab4145f7f108e3563f9b4abae4ab0ed78a61f350518cc4d2/msgpack-1.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:79c408fcf76a958491b4e3b103d1c417044544b68e96d06432a189b43d1215c8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e8/c5/df5d6c1c39856bc55f800bf82778fd4c11370667f9b9e9d51b2f5da88f20/msgpack-1.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78426096939c2c7482bf31ef15ca219a9e24460289c00dd0b94411040bb73ad2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/20/8e/0bb8c977efecfe6ea7116e2ed73a78a8d32a947f94d272586cf02a9757db/msgpack-1.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b17ba27727a36cb73aabacaa44b13090feb88a01d012c0f4be70c00f75048b4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/59/a1/731d52c1aeec52006be6d1f8027c49fdc2cfc3ab7cbe7c28335b2910d7b6/msgpack-1.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a17ac1ea6ec3c7687d70201cfda3b1e8061466f28f686c24f627cae4ea8efd0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/2b/92/b42911c52cda2ba67a6418ffa7d08969edf2e760b09015593c8a8a27a97d/msgpack-1.1.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:88d1e966c9235c1d4e2afac21ca83933ba59537e2e2727a999bf3f515ca2af26" }, - { url = "https://mirrors.aliyun.com/pypi/packages/61/dc/8ae165337e70118d4dab651b8b562dd5066dd1e6dd57b038f32ebc3e2f07/msgpack-1.1.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:f6d58656842e1b2ddbe07f43f56b10a60f2ba5826164910968f5933e5178af75" }, - { url = "https://mirrors.aliyun.com/pypi/packages/58/27/555851cb98dcbd6ce041df1eacb25ac30646575e9cd125681aa2f4b1b6f1/msgpack-1.1.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:96decdfc4adcbc087f5ea7ebdcfd3dee9a13358cae6e81d54be962efc38f6338" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d4/64/39a26add4ce16f24e99eabb9005e44c663db00e3fce17d4ae1ae9d61df99/msgpack-1.1.1-cp310-cp310-win32.whl", hash = "sha256:6640fd979ca9a212e4bcdf6eb74051ade2c690b862b679bfcb60ae46e6dc4bfd" }, - { url = "https://mirrors.aliyun.com/pypi/packages/7d/18/73dfa3e9d5d7450d39debde5b0d848139f7de23bd637a4506e36c9800fd6/msgpack-1.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:8b65b53204fe1bd037c40c4148d00ef918eb2108d24c9aaa20bc31f9810ce0a8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/7f/83/97f24bf9848af23fe2ba04380388216defc49a8af6da0c28cc636d722502/msgpack-1.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:71ef05c1726884e44f8b1d1773604ab5d4d17729d8491403a705e649116c9558" }, - { url = "https://mirrors.aliyun.com/pypi/packages/aa/7f/2eaa388267a78401f6e182662b08a588ef4f3de6f0eab1ec09736a7aaa2b/msgpack-1.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:36043272c6aede309d29d56851f8841ba907a1a3d04435e43e8a19928e243c1d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f8/46/31eb60f4452c96161e4dfd26dbca562b4ec68c72e4ad07d9566d7ea35e8a/msgpack-1.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a32747b1b39c3ac27d0670122b57e6e57f28eefb725e0b625618d1b59bf9d1e0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/45/16/a20fa8c32825cc7ae8457fab45670c7a8996d7746ce80ce41cc51e3b2bd7/msgpack-1.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a8b10fdb84a43e50d38057b06901ec9da52baac6983d3f709d8507f3889d43f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/86/ea/6c958e07692367feeb1a1594d35e22b62f7f476f3c568b002a5ea09d443d/msgpack-1.1.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba0c325c3f485dc54ec298d8b024e134acf07c10d494ffa24373bea729acf704" }, - { url = "https://mirrors.aliyun.com/pypi/packages/75/05/ac84063c5dae79722bda9f68b878dc31fc3059adb8633c79f1e82c2cd946/msgpack-1.1.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:88daaf7d146e48ec71212ce21109b66e06a98e5e44dca47d853cbfe171d6c8d2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/69/e8/fe86b082c781d3e1c09ca0f4dacd457ede60a13119b6ce939efe2ea77b76/msgpack-1.1.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:d8b55ea20dc59b181d3f47103f113e6f28a5e1c89fd5b67b9140edb442ab67f2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3b/2b/bafc9924df52d8f3bb7c00d24e57be477f4d0f967c0a31ef5e2225e035c7/msgpack-1.1.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4a28e8072ae9779f20427af07f53bbb8b4aa81151054e882aee333b158da8752" }, - { url = "https://mirrors.aliyun.com/pypi/packages/a2/3b/1f717e17e53e0ed0b68fa59e9188f3f610c79d7151f0e52ff3cd8eb6b2dc/msgpack-1.1.1-cp311-cp311-win32.whl", hash = "sha256:7da8831f9a0fdb526621ba09a281fadc58ea12701bc709e7b8cbc362feabc295" }, - { url = "https://mirrors.aliyun.com/pypi/packages/48/45/9d1780768d3b249accecc5a38c725eb1e203d44a191f7b7ff1941f7df60c/msgpack-1.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:5fd1b58e1431008a57247d6e7cc4faa41c3607e8e7d4aaf81f7c29ea013cb458" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e3/26/389b9c593eda2b8551b2e7126ad3a06af6f9b44274eb3a4f054d48ff7e47/msgpack-1.1.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ae497b11f4c21558d95de9f64fff7053544f4d1a17731c866143ed6bb4591238" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ab/65/7d1de38c8a22cf8b1551469159d4b6cf49be2126adc2482de50976084d78/msgpack-1.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:33be9ab121df9b6b461ff91baac6f2731f83d9b27ed948c5b9d1978ae28bf157" }, - { url = "https://mirrors.aliyun.com/pypi/packages/0f/bd/cacf208b64d9577a62c74b677e1ada005caa9b69a05a599889d6fc2ab20a/msgpack-1.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f64ae8fe7ffba251fecb8408540c34ee9df1c26674c50c4544d72dbf792e5ce" }, - { url = "https://mirrors.aliyun.com/pypi/packages/4d/ec/fd869e2567cc9c01278a736cfd1697941ba0d4b81a43e0aa2e8d71dab208/msgpack-1.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a494554874691720ba5891c9b0b39474ba43ffb1aaf32a5dac874effb1619e1a" }, - { url = "https://mirrors.aliyun.com/pypi/packages/55/2a/35860f33229075bce803a5593d046d8b489d7ba2fc85701e714fc1aaf898/msgpack-1.1.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cb643284ab0ed26f6957d969fe0dd8bb17beb567beb8998140b5e38a90974f6c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/8c/16/69ed8f3ada150bf92745fb4921bd621fd2cdf5a42e25eb50bcc57a5328f0/msgpack-1.1.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:d275a9e3c81b1093c060c3837e580c37f47c51eca031f7b5fb76f7b8470f5f9b" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c6/b6/0c398039e4c6d0b2e37c61d7e0e9d13439f91f780686deb8ee64ecf1ae71/msgpack-1.1.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:4fd6b577e4541676e0cc9ddc1709d25014d3ad9a66caa19962c4f5de30fc09ef" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b8/d0/0cf4a6ecb9bc960d624c93effaeaae75cbf00b3bc4a54f35c8507273cda1/msgpack-1.1.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb29aaa613c0a1c40d1af111abf025f1732cab333f96f285d6a93b934738a68a" }, - { url = "https://mirrors.aliyun.com/pypi/packages/62/83/9697c211720fa71a2dfb632cad6196a8af3abea56eece220fde4674dc44b/msgpack-1.1.1-cp312-cp312-win32.whl", hash = "sha256:870b9a626280c86cff9c576ec0d9cbcc54a1e5ebda9cd26dab12baf41fee218c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c0/23/0abb886e80eab08f5e8c485d6f13924028602829f63b8f5fa25a06636628/msgpack-1.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:5692095123007180dca3e788bb4c399cc26626da51629a31d40207cb262e67f4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/a1/38/561f01cf3577430b59b340b51329803d3a5bf6a45864a55f4ef308ac11e3/msgpack-1.1.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:3765afa6bd4832fc11c3749be4ba4b69a0e8d7b728f78e68120a157a4c5d41f0" }, - { url = "https://mirrors.aliyun.com/pypi/packages/09/48/54a89579ea36b6ae0ee001cba8c61f776451fad3c9306cd80f5b5c55be87/msgpack-1.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8ddb2bcfd1a8b9e431c8d6f4f7db0773084e107730ecf3472f1dfe9ad583f3d9" }, - { url = "https://mirrors.aliyun.com/pypi/packages/a0/60/daba2699b308e95ae792cdc2ef092a38eb5ee422f9d2fbd4101526d8a210/msgpack-1.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:196a736f0526a03653d829d7d4c5500a97eea3648aebfd4b6743875f28aa2af8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/20/22/2ebae7ae43cd8f2debc35c631172ddf14e2a87ffcc04cf43ff9df9fff0d3/msgpack-1.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d592d06e3cc2f537ceeeb23d38799c6ad83255289bb84c2e5792e5a8dea268a" }, - { url = "https://mirrors.aliyun.com/pypi/packages/40/1b/54c08dd5452427e1179a40b4b607e37e2664bca1c790c60c442c8e972e47/msgpack-1.1.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4df2311b0ce24f06ba253fda361f938dfecd7b961576f9be3f3fbd60e87130ac" }, - { url = "https://mirrors.aliyun.com/pypi/packages/2e/60/6bb17e9ffb080616a51f09928fdd5cac1353c9becc6c4a8abd4e57269a16/msgpack-1.1.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e4141c5a32b5e37905b5940aacbc59739f036930367d7acce7a64e4dec1f5e0b" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ee/97/88983e266572e8707c1f4b99c8fd04f9eb97b43f2db40e3172d87d8642db/msgpack-1.1.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:b1ce7f41670c5a69e1389420436f41385b1aa2504c3b0c30620764b15dded2e7" }, - { url = "https://mirrors.aliyun.com/pypi/packages/bc/66/36c78af2efaffcc15a5a61ae0df53a1d025f2680122e2a9eb8442fed3ae4/msgpack-1.1.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4147151acabb9caed4e474c3344181e91ff7a388b888f1e19ea04f7e73dc7ad5" }, - { url = "https://mirrors.aliyun.com/pypi/packages/8c/87/a75eb622b555708fe0427fab96056d39d4c9892b0c784b3a721088c7ee37/msgpack-1.1.1-cp313-cp313-win32.whl", hash = "sha256:500e85823a27d6d9bba1d057c871b4210c1dd6fb01fbb764e37e4e8847376323" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ca/91/7dc28d5e2a11a5ad804cf2b7f7a5fcb1eb5a4966d66a5d2b41aee6376543/msgpack-1.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:6d489fba546295983abd142812bda76b57e33d0b9f5d5b71c09a583285506f69" }, -] - [[package]] name = "msvc-runtime" version = "14.42.34433" @@ -1423,18 +1193,15 @@ wheels = [ ] [[package]] -name = "nonebot-adapter-onebot" -version = "2.4.6" +name = "nonebot-adapter-milky" +version = "0.4.1" source = { registry = "https://mirrors.aliyun.com/pypi/simple" } dependencies = [ - { name = "msgpack" }, { name = "nonebot2" }, - { name = "pydantic" }, - { name = "typing-extensions" }, ] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/11/97/504e898471c2ba18a5c0f8db99ed81e755f6b3cbf647ce804485d8b8f77e/nonebot_adapter_onebot-2.4.6.tar.gz", hash = "sha256:e33c93649ad11b320d8e9ff213635f29b23b4d0413c9158bd031c513c2f8f701" } +sdist = { url = "https://mirrors.aliyun.com/pypi/packages/41/ff/cfb6a28c7783b2131acc7633c49dd1c94ef3f015f797ab937a1b5940e514/nonebot_adapter_milky-0.4.1.tar.gz", hash = "sha256:f78d0e27137b8100c579887f7d26b33c2ab43862aff36a0ab98b729e83d65a32" } wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/60/a8/219fb6327b3395b9b05d2e46383795825d079d1c024660304037d3dc0448/nonebot_adapter_onebot-2.4.6-py3-none-any.whl", hash = "sha256:b1ec7023fd83d731f63b513217327a57d12893a261944934b9195f79173791ad" }, + { url = "https://mirrors.aliyun.com/pypi/packages/88/fb/e873a92aac03c6b54b8a3a0b1cf2aaf7befbe10232bf307bc4e8399c68ed/nonebot_adapter_milky-0.4.1-py3-none-any.whl", hash = "sha256:3c975a91fac94496d0f7d1e55f432c7cd72d994e5b19791950a74cc099d17d0f" }, ] [[package]] @@ -1575,12 +1342,8 @@ wheels = [ ] [package.optional-dependencies] -aiohttp = [ - { name = "aiohttp", extra = ["speedups"] }, -] -fastapi = [ - { name = "fastapi" }, - { name = "uvicorn", extra = ["standard"] }, +httpx = [ + { name = "httpx", extra = ["http2"] }, ] websockets = [ { name = "websockets" }, @@ -2100,86 +1863,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/13/2f/0f24b288e2ce56f51c920137620b4434a38fd80583dbbe24fc2a1656c388/pybind11-2.13.6-py3-none-any.whl", hash = "sha256:237c41e29157b962835d356b370ededd57594a26d5894a795960f0047cb5caf5" }, ] -[[package]] -name = "pycares" -version = "4.9.0" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -dependencies = [ - { name = "cffi" }, -] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/f5/37/4d4f8ac929e98aad64781f37d9429e82ba65372fc89da0473cdbecdbbb03/pycares-4.9.0.tar.gz", hash = "sha256:8ee484ddb23dbec4d88d14ed5b6d592c1960d2e93c385d5e52b6fad564d82395" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/71/e8/9fce41cf9b077c68c3c867c1950a37d0b1f23608ae6f70ca823938d284ed/pycares-4.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0b8bd9a3ee6e9bc990e1933dc7e7e2f44d4184f49a90fa444297ac12ab6c0c84" }, - { url = "https://mirrors.aliyun.com/pypi/packages/04/af/596a853dbdaab11ea8810bef01f68350d19b50cd3b5a8958b3d6ae91c93e/pycares-4.9.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:417a5c20861f35977240ad4961479a6778125bcac21eb2ad1c3aad47e2ff7fab" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f4/de/39f4d3bff6fd8965f0d15b273e4e5ed3f05dc33836eeaad6a358ea519c31/pycares-4.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ab290faa4ea53ce53e3ceea1b3a42822daffce2d260005533293a52525076750" }, - { url = "https://mirrors.aliyun.com/pypi/packages/4c/e0/3b02a2866b3c43f02e64e6784b38e7d923c0350670574c4f559829fe6717/pycares-4.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7b1df81193084c9717734e4615e8c5074b9852478c9007d1a8bb242f7f580e67" }, - { url = "https://mirrors.aliyun.com/pypi/packages/40/93/ef972f9691c2860fc9f64eb60cf1239286dea95e7eadac6bc13906d6dd06/pycares-4.9.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:20c7a6af0c2ccd17cc5a70d76e299a90e7ebd6c4d8a3d7fff5ae533339f61431" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c0/8a/e751d9574ca6e879b7b2ca75e882aa59228e4e50ed11d844bbb546c0b347/pycares-4.9.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:370f41442a5b034aebdb2719b04ee04d3e805454a20d3f64f688c1c49f9137c3" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ec/1c/e2af8de7f088962fd1436cb27e8602b320f5a6568d8b1ac45163f23d455a/pycares-4.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:340e4a3bbfd14d73c01ec0793a321b8a4a93f64c508225883291078b7ee17ac8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d6/d4/556d8f1ef10a65e2f22f98b07dc4fc5d7a3148354919316badb843083dac/pycares-4.9.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:f0ec94785856ea4f5556aa18f4c027361ba4b26cb36c4ad97d2105ef4eec68ba" }, - { url = "https://mirrors.aliyun.com/pypi/packages/f5/b0/d3eaa380e172953be60f6c57bf1d0c482a7606de8eb95802df038528a0ca/pycares-4.9.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:dd6b7e23a4a9e2039b5d67dfa0499d2d5f114667dc13fb5d7d03eed230c7ac4f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e5/6c/3505d253e2f1c2ffc2d4459393fc0cec44ae99564a683892f696c0ec953b/pycares-4.9.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:490c978b0be9d35a253a5e31dd598f6d66b453625f0eb7dc2d81b22b8c3bb3f4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/96/33/fad5aed6c87574557fb2bc40ad212864868224ffb656698d23ca2faab720/pycares-4.9.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:e433faaf07f44e44f1a1b839fee847480fe3db9431509dafc9f16d618d491d0f" }, - { url = "https://mirrors.aliyun.com/pypi/packages/67/8a/6a7951a33ff03188907627528e466984e090c8c006fd46d29151a7842d7b/pycares-4.9.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:cf6d8851a06b79d10089962c9dadcb34dad00bf027af000f7102297a54aaff2e" }, - { url = "https://mirrors.aliyun.com/pypi/packages/93/01/7fad8367b93e8c27572994946079254e521cf297a425bf6e76ed721a2e3a/pycares-4.9.0-cp310-cp310-win32.whl", hash = "sha256:4f803e7d66ac7d8342998b8b07393788991353a46b05bbaad0b253d6f3484ea8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/de/af/09a86285b86c443300180fbf63e4080face96412ab892ef5ac1a7ee86966/pycares-4.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:8e17bd32267e3870855de3baed7d0efa6337344d68f44853fd9195c919f39400" }, - { url = "https://mirrors.aliyun.com/pypi/packages/cd/9d/e5c621a014bc9d43430ce96bb4b791db34df51c020db2fc16ce0fe29c999/pycares-4.9.0-cp310-cp310-win_arm64.whl", hash = "sha256:6b74f75d8e430f9bb11a1cc99b2e328eed74b17d8d4b476de09126f38d419eb9" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3a/34/6ce1d521c41cb99ac3ec550f8590e122a749d9999cb7020259a93b987b6f/pycares-4.9.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:16a97ee83ec60d35c7f716f117719932c27d428b1bb56b242ba1c4aa55521747" }, - { url = "https://mirrors.aliyun.com/pypi/packages/fe/fd/0c533533c8805ca85dfa6a5f5a91cc776bb817b7e2cf05dffefd3c98ab55/pycares-4.9.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:78748521423a211ce699a50c27cc5c19e98b7db610ccea98daad652ace373990" }, - { url = "https://mirrors.aliyun.com/pypi/packages/c0/1b/0e9082d27ba1c3c5795c30d8edfb8dd57fe1f8e18cd7d70673325b8be693/pycares-4.9.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8818b2c7a57d9d6d41e8b64d9ff87992b8ea2522fc0799686725228bc3cff6c5" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3a/b7/1c137a3df0d992cbc292116ed4ad369d39fdfc504fe8c63427e42147f8fd/pycares-4.9.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:96df8990f16013ca5194d6ece19dddb4ef9cd7c3efaab9f196ec3ccd44b40f8d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/86/24/9f27732c0b6ebb36eb1d01e9bccff7f2540ae2c9e2a06987e762372132f6/pycares-4.9.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:61af86fd58b8326e723b0d20fb96b56acaec2261c3a7c9a1c29d0a79659d613a" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ce/f5/474438dd01f5deaddb4107d2106fc9e35c53b2fdfa48da85532cc9295f25/pycares-4.9.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ec72edb276bda559813cc807bc47b423d409ffab2402417a5381077e9c2c6be1" }, - { url = "https://mirrors.aliyun.com/pypi/packages/26/ae/9504d5b773e6d9c7da9ed324e3074d3b842a5db265994dd819f5469f367c/pycares-4.9.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:832fb122c7376c76cab62f8862fa5e398b9575fb7c9ff6bc9811086441ee64ca" }, - { url = "https://mirrors.aliyun.com/pypi/packages/54/74/30eaa7168fec4c6df906201f89cfaa47a4319ed5df4fbcaee5efbbfb1c3c/pycares-4.9.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cdcfaef24f771a471671470ccfd676c0366ab6b0616fd8217b8f356c40a02b83" }, - { url = "https://mirrors.aliyun.com/pypi/packages/16/25/97ce60be2e71a12b0fdc045144b3aa800ef6acef76727407344d12fe2c62/pycares-4.9.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:52cb056d06ff55d78a8665b97ae948abaaba2ca200ca59b10346d4526bce1e7d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/b8/a5/1882f565e0ffb1129d3b976aac1fdc3542f5bfa6524151abc95c473dc607/pycares-4.9.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:54985ed3f2e8a87315269f24cb73441622857a7830adfc3a27c675a94c3261c1" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d6/4e/721dae2c2bdeea3f7038dbe1c77c2405540ec3c4123c9468471b180fcabe/pycares-4.9.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:08048e223615d4aef3dac81fe0ea18fb18d6fc97881f1eb5be95bb1379969b8d" }, - { url = "https://mirrors.aliyun.com/pypi/packages/30/24/b4c2b6a4708dac5f99592f905bc4e20c183ff0c3c9eedc7eaf8468eeae40/pycares-4.9.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:cc60037421ce05a409484287b2cd428e1363cca73c999b5f119936bb8f255208" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3d/a4/63c3c4e3fdfa58d8e83f2976e4a0715476a1a77bb9032b4d050c689d575e/pycares-4.9.0-cp311-cp311-win32.whl", hash = "sha256:62b86895b60cfb91befb3086caa0792b53f949231c6c0c3053c7dfee3f1386ab" }, - { url = "https://mirrors.aliyun.com/pypi/packages/71/57/ccd375a8ea6c4e880aa191bbaf63b133e27441725a05f301c1f90eab76cd/pycares-4.9.0-cp311-cp311-win_amd64.whl", hash = "sha256:7046b3c80954beaabf2db52b09c3d6fe85f6c4646af973e61be79d1c51589932" }, - { url = "https://mirrors.aliyun.com/pypi/packages/9d/15/3fc962b2b8b38d5e916f42ba20fa2a147ddc181d3bac0665f7f6b8da9854/pycares-4.9.0-cp311-cp311-win_arm64.whl", hash = "sha256:fcbda3fdf44e94d3962ca74e6ba3dc18c0d7029106f030d61c04c0876f319403" }, - { url = "https://mirrors.aliyun.com/pypi/packages/75/96/9b147e40873ae3253a06e3080674c7fdd62ee3e7cbf7b47f43cd213db638/pycares-4.9.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d68ca2da1001aeccdc81c4a2fb1f1f6cfdafd3d00e44e7c1ed93e3e05437f666" }, - { url = "https://mirrors.aliyun.com/pypi/packages/02/df/94928bb701ee6b84a8a91db4da4b1dd008ece6f62ef58c149a3b410b5a11/pycares-4.9.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4f0c8fa5a384d79551a27eafa39eed29529e66ba8fa795ee432ab88d050432a3" }, - { url = "https://mirrors.aliyun.com/pypi/packages/1c/79/cd7b25ea35e15ae3dd10a1722f228c12abb9d0540a5056c0ce9ed639e29c/pycares-4.9.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0eb8c428cf3b9c6ff9c641ba50ab6357b4480cd737498733e6169b0ac8a1a89b" }, - { url = "https://mirrors.aliyun.com/pypi/packages/36/2c/fec91d98028a6c9a60b721238f787b95280c2e760716450834ba28ffdbe9/pycares-4.9.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6845bd4a43abf6dab7fedbf024ef458ac3750a25b25076ea9913e5ac5fec4548" }, - { url = "https://mirrors.aliyun.com/pypi/packages/26/27/aee4cfb25f285fe7d9c26be55a39f1605a63f947fcd0e65ae65cbfcfda3d/pycares-4.9.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5e28f4acc3b97e46610cf164665ebf914f709daea6ced0ca4358ce55bc1c3d6b" }, - { url = "https://mirrors.aliyun.com/pypi/packages/fa/61/97352377482512b379f1898fe2de038fa6d6774343423d1c03022a033f6b/pycares-4.9.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9464a39861840ce35a79352c34d653a9db44f9333af7c9feddb97998d3e00c07" }, - { url = "https://mirrors.aliyun.com/pypi/packages/40/bf/38779a4097d2d840b1f3f9ffa417d5b546dcba0702c8c73909bcb53d4965/pycares-4.9.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e0611c1bd46d1fc6bdd9305b8850eb84c77df485769f72c574ed7b8389dfbee2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/0a/83/01d18e21a8a70996959c9ce86bca863eebe76fa7bb54ff29b6b7346b898e/pycares-4.9.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:d4fb5a38a51d03b75ac4320357e632c2e72e03fdeb13263ee333a40621415fdc" }, - { url = "https://mirrors.aliyun.com/pypi/packages/54/08/8755dbe628e0335231e975abc47114b444b79eace488446dffd7667f3b22/pycares-4.9.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:df5edae05fb3e1370ab7639e67e8891fdaa9026cb10f05dbd57893713f7a9cfe" }, - { url = "https://mirrors.aliyun.com/pypi/packages/63/21/50db3e05eded5442b7c8426d8b956bdc5b1c210f14c8a22b6d01e6b81700/pycares-4.9.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:397123ea53d261007bb0aa7e767ef238778f45026db40bed8196436da2cc73de" }, - { url = "https://mirrors.aliyun.com/pypi/packages/9b/fc/139fc9a9ba32fd6052e50cbcae00bd7a2be60bdbf4555b5aae9a113f6f8c/pycares-4.9.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:bb0d874d0b131b29894fd8a0f842be91ac21d50f90ec04cff4bb3f598464b523" }, - { url = "https://mirrors.aliyun.com/pypi/packages/3d/bc/513a6c0d73dddaf3b17be9aee865b60b608cc6acb80f7da1a33a85608e85/pycares-4.9.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:497cc03a61ec1585eb17d2cb086a29a6a67d24babf1e9be519b47222916a3b06" }, - { url = "https://mirrors.aliyun.com/pypi/packages/93/ea/852ecd06739e0c54d2dea1935ff8bebbd7ca598fb98293700213b137e955/pycares-4.9.0-cp312-cp312-win32.whl", hash = "sha256:b46e46313fdb5e82da15478652aac0fd15e1c9f33e08153bad845aa4007d6f84" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ff/34/8cb69f8ac128d3a8635995c4ef9192dbe75a88e22794d9f466813229d782/pycares-4.9.0-cp312-cp312-win_amd64.whl", hash = "sha256:12547a06445777091605a7581da15a0da158058beb8a05a3ebbf7301fd1f58d4" }, - { url = "https://mirrors.aliyun.com/pypi/packages/12/e8/510cc7100b452443bb00785e0489b55694e61668cc14bb35801797218be7/pycares-4.9.0-cp312-cp312-win_arm64.whl", hash = "sha256:f1e10bf1e8eb80b08e5c828627dba1ebc4acd54803bd0a27d92b9063b6aa99d8" }, - { url = "https://mirrors.aliyun.com/pypi/packages/10/da/e0240d156c6089bf2b38afd01600fe9db8b1dd6e53fb776f1dca020b1124/pycares-4.9.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:574d815112a95ab09d75d0a9dc7dea737c06985e3125cf31c32ba6a3ed6ca006" }, - { url = "https://mirrors.aliyun.com/pypi/packages/27/c5/1d4abd1a33b7fbd4dc0e854fcd6c76c4236bdfe1359dafb0a8349694462d/pycares-4.9.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:50e5ab06361d59625a27a7ad93d27e067dc7c9f6aa529a07d691eb17f3b43605" }, - { url = "https://mirrors.aliyun.com/pypi/packages/24/4d/3ff037cd7fb7a6d9f1bf4289b96ff2d6ac59d098f02bbf3b18cb0a0ab576/pycares-4.9.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:785f5fd11ff40237d9bc8afa441551bb449e2812c74334d1d10859569e07515c" }, - { url = "https://mirrors.aliyun.com/pypi/packages/66/92/be8f527017769148687e45a4e5afd8d849aee2b145cda59003ad5a531aaf/pycares-4.9.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e194a500e403eba89b91fb863c917495c5b3dfcd1ce0ee8dc3a6f99a1360e2fc" }, - { url = "https://mirrors.aliyun.com/pypi/packages/a7/8d/e88cfdd08f7065ae52817b930834964320d0e43955f6ac68d2ab35728912/pycares-4.9.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:112dd49cdec4e6150a8d95b197e8b6b7b4468a3170b30738ed9b248cb2240c04" }, - { url = "https://mirrors.aliyun.com/pypi/packages/e0/9d/a2661f9c8e1e7fa842586d7b24710e78f068d26f768eea7a7437c249a2f6/pycares-4.9.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:94aa3c2f3eb0aa69160137134775501f06c901188e722aac63d2a210d4084f99" }, - { url = "https://mirrors.aliyun.com/pypi/packages/43/b9/d04ea1de2a7d4e8a00b2b00a0ee94d7b0434f00eb55f5941ffa287c1dab2/pycares-4.9.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b510d71255cf5a92ccc2643a553548fcb0623d6ed11c8c633b421d99d7fa4167" }, - { url = "https://mirrors.aliyun.com/pypi/packages/d9/c8/7f81ccdd856ddc383d3f82708b4f4022761640f3baec6d233549960348b8/pycares-4.9.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5c6aa30b1492b8130f7832bf95178642c710ce6b7ba610c2b17377f77177e3cd" }, - { url = "https://mirrors.aliyun.com/pypi/packages/fd/96/9386654a244caafd77748e626da487f1a56f831e3db5ef1337410be3e5f6/pycares-4.9.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:e5767988e044faffe2aff6a76aa08df99a8b6ef2641be8b00ea16334ce5dea93" }, - { url = "https://mirrors.aliyun.com/pypi/packages/76/bd/73286f329d03fef071e8517076dc62487e4478a3c85c4c59d652e6a663e5/pycares-4.9.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:b9928a942820a82daa3207509eaba9e0fa9660756ac56667ec2e062815331fcb" }, - { url = "https://mirrors.aliyun.com/pypi/packages/2f/2a/0f623426225828f2793c3f86463ef72f6ecf6df12fe240a4e68435e8212f/pycares-4.9.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:556c854174da76d544714cdfab10745ed5d4b99eec5899f7b13988cd26ff4763" }, - { url = "https://mirrors.aliyun.com/pypi/packages/04/d8/7db6eee011f414f21e3d53a0ad81593baa87a332403d781c2f86d3eef315/pycares-4.9.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:d42e2202ca9aa9a0a9a6e43a4a4408bbe0311aaa44800fa27b8fd7f82b20152a" }, - { url = "https://mirrors.aliyun.com/pypi/packages/72/a4/1a9b96678afb4f31651885129fbfa2cd44e78a438fd545c7b8d317a1f381/pycares-4.9.0-cp313-cp313-win32.whl", hash = "sha256:cce8ef72c9ed4982c84114e6148a4e42e989d745de7862a0ad8b3f1cdc05def2" }, - { url = "https://mirrors.aliyun.com/pypi/packages/79/e4/6724c71a08a91f2685ca60ca35d7950c187a2d79a776461130a6cb5b0d5e/pycares-4.9.0-cp313-cp313-win_amd64.whl", hash = "sha256:318cdf24f826f1d2f0c5a988730bd597e1683296628c8f1be1a5b96643c284fe" }, - { url = "https://mirrors.aliyun.com/pypi/packages/ee/f8/b4d4bf71ae92727a0b3a9b9092c2e722833c1ca50ebd0414824843cb84fd/pycares-4.9.0-cp313-cp313-win_arm64.whl", hash = "sha256:faa9de8e647ed06757a2c117b70a7645a755561def814da6aca0d766cf71a402" }, -] - -[[package]] -name = "pycparser" -version = "2.22" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc" }, -] - [[package]] name = "pydantic" version = "2.11.7" @@ -2377,6 +2060,12 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/fe/37/1a1c62d955e82adae588be8e374c7f77b165b6cb4203f7d581269959abbc/pyright-1.1.402-py3-none-any.whl", hash = "sha256:2c721f11869baac1884e846232800fe021c33f1b4acb3929cff321f7ea4e2982" }, ] +[[package]] +name = "pysilk" +version = "0.0.1" +source = { registry = "https://mirrors.aliyun.com/pypi/simple" } +sdist = { url = "https://mirrors.aliyun.com/pypi/packages/cf/c8/2a11cc67a03496670113557eb1c2a4fd25058614a732d91e400b4a71696b/pysilk-0.0.1.tar.gz", hash = "sha256:54a6c303e337e16163731a92bbdca10cce9825d165e298919e6c8bef2489cf34" } + [[package]] name = "python-dateutil" version = "2.9.0.post0" @@ -2475,6 +2164,18 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/fa/de/02b54f42487e3d3c6efb3f89428677074ca7bf43aae402517bc7cca949f3/PyYAML-6.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563" }, ] +[[package]] +name = "qrcode" +version = "8.2" +source = { registry = "https://mirrors.aliyun.com/pypi/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, +] +sdist = { url = "https://mirrors.aliyun.com/pypi/packages/8f/b2/7fc2931bfae0af02d5f53b174e9cf701adbb35f39d69c2af63d4a39f81a9/qrcode-8.2.tar.gz", hash = "sha256:35c3f2a4172b33136ab9f6b3ef1c00260dd2f66f858f24d88418a015f446506c" } +wheels = [ + { url = "https://mirrors.aliyun.com/pypi/packages/dd/b8/d2d6d731733f51684bbf76bf34dab3b70a9148e8f2cef2bb544fccec681a/qrcode-8.2-py3-none-any.whl", hash = "sha256:16e64e0716c14960108e85d853062c9e8bba5ca8252c0b4d0231b9df4060ff4f" }, +] + [[package]] name = "requests" version = "2.32.4" @@ -2617,18 +2318,6 @@ aiomysql = [ { name = "greenlet" }, ] -[[package]] -name = "starlette" -version = "0.46.2" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -dependencies = [ - { name = "anyio" }, -] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/ce/20/08dfcd9c983f6a6f4a1000d934b9e6d626cff8d2eeb77a89a68eef20a2b7/starlette-0.46.2.tar.gz", hash = "sha256:7f7361f34eed179294600af672f565727419830b54b7b084efe44bb82d2fccd5" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/8b/0c/9d30a4ebeb6db2b25a841afbb80f6ef9a854fc3b41be131d249a977b4959/starlette-0.46.2-py3-none-any.whl", hash = "sha256:595633ce89f8ffa71a015caed34a5b2dc1c0cdb3f0f1fbd1e69339cf2abeec35" }, -] - [[package]] name = "strenum" version = "0.4.15" @@ -2866,19 +2555,21 @@ dependencies = [ { name = "cookit" }, { name = "httpx" }, { name = "nb-cli" }, - { name = "nonebot-adapter-onebot" }, + { name = "nonebot-adapter-milky" }, { name = "nonebot-plugin-alconna" }, { name = "nonebot-plugin-apscheduler" }, { name = "nonebot-plugin-htmlrender" }, { name = "nonebot-plugin-localstore" }, { name = "nonebot-plugin-orm", extra = ["mysql"] }, { name = "nonebot-plugin-userinfo" }, - { name = "nonebot2", extra = ["aiohttp", "fastapi", "websockets"] }, + { name = "nonebot2", extra = ["httpx", "websockets"] }, { name = "openai" }, { name = "pil-utils" }, { name = "psutil" }, { name = "py-cpuinfo" }, { name = "pyncm" }, + { name = "pysilk" }, + { name = "qrcode" }, { name = "setuptools" }, { name = "tomlkit" }, { name = "tortoise-orm", extra = ["accel", "asyncmy"] }, @@ -2898,19 +2589,21 @@ requires-dist = [ { name = "cookit", specifier = ">=0.8.1" }, { name = "httpx", specifier = "==0.27.2" }, { name = "nb-cli", specifier = ">=1.4.2" }, - { name = "nonebot-adapter-onebot", specifier = ">=2.4.6" }, + { name = "nonebot-adapter-milky", specifier = ">=0.4.1" }, { name = "nonebot-plugin-alconna", specifier = ">=0.55.0" }, { name = "nonebot-plugin-apscheduler", specifier = ">=0.5.0" }, { name = "nonebot-plugin-htmlrender", specifier = "==0.4.0" }, { name = "nonebot-plugin-localstore", specifier = ">=0.7.1" }, { name = "nonebot-plugin-orm", extras = ["mysql"], specifier = ">=0.8.1" }, { name = "nonebot-plugin-userinfo", specifier = ">=0.2.6" }, - { name = "nonebot2", extras = ["fastapi", "aiohttp", "websockets"], specifier = ">=2.4.1" }, + { name = "nonebot2", extras = ["httpx", "websockets"], specifier = ">=2.4.2" }, { name = "openai", specifier = ">=1.76.0" }, { name = "pil-utils", specifier = ">=0.1.12" }, { name = "psutil", specifier = ">=6.1.0" }, { name = "py-cpuinfo", specifier = ">=9.0.0" }, { name = "pyncm", specifier = ">=1.6.17" }, + { name = "pysilk", specifier = ">=0.0.1" }, + { name = "qrcode", specifier = ">=8.2" }, { name = "setuptools", specifier = ">=75.8.0" }, { name = "tomlkit", specifier = ">=0.13.2" }, { name = "tortoise-orm", extras = ["accel", "asyncmy"], specifier = ">=0.24.2" }, @@ -2983,31 +2676,6 @@ wheels = [ { url = "https://mirrors.aliyun.com/pypi/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl", hash = "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc" }, ] -[[package]] -name = "uvicorn" -version = "0.34.3" -source = { registry = "https://mirrors.aliyun.com/pypi/simple" } -dependencies = [ - { name = "click" }, - { name = "h11" }, - { name = "typing-extensions", marker = "python_full_version < '3.11'" }, -] -sdist = { url = "https://mirrors.aliyun.com/pypi/packages/de/ad/713be230bcda622eaa35c28f0d328c3675c371238470abdea52417f17a8e/uvicorn-0.34.3.tar.gz", hash = "sha256:35919a9a979d7a59334b6b10e05d77c1d0d574c50e0fc98b8b1a0f165708b55a" } -wheels = [ - { url = "https://mirrors.aliyun.com/pypi/packages/6d/0d/8adfeaa62945f90d19ddc461c55f4a50c258af7662d34b6a3d5d1f8646f6/uvicorn-0.34.3-py3-none-any.whl", hash = "sha256:16246631db62bdfbf069b0645177d6e8a77ba950cfedbfd093acef9444e4d885" }, -] - -[package.optional-dependencies] -standard = [ - { name = "colorama", marker = "sys_platform == 'win32'" }, - { name = "httptools" }, - { name = "python-dotenv" }, - { name = "pyyaml" }, - { name = "uvloop", marker = "platform_python_implementation != 'PyPy' and sys_platform != 'cygwin' and sys_platform != 'win32'" }, - { name = "watchfiles" }, - { name = "websockets" }, -] - [[package]] name = "uvloop" version = "0.21.0"