nonebot-adapter-qq 1.4.1__tar.gz → 1.4.3__tar.gz

{nonebot_adapter_qq-1.4.1 → nonebot_adapter_qq-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-adapter-qq
-Version: 1.4.1
+Version: 1.4.3
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT

{nonebot_adapter_qq-1.4.1 → nonebot_adapter_qq-1.4.3}/nonebot/adapters/qq/bot.py

@@ -1,4 +1,5 @@
 import json
+from base64 import b64encode
 from typing_extensions import Never, override
 from datetime import datetime, timezone, timedelta
 from typing import (
@@ -15,9 +16,10 @@ from typing import (
     overload,
 )
 
+from pydantic import BaseModel
 from nonebot.message import handle_event
-from pydantic import BaseModel, parse_obj_as
 from nonebot.drivers import Request, Response
+from nonebot.compat import type_validate_python
 
 from nonebot.adapters import Bot as BaseBot
 
@@ -578,7 +580,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("users/@me"),
         )
-        return parse_obj_as(User, await self._request(request))
+        return type_validate_python(User, await self._request(request))
 
     @API
     async def guilds(
@@ -593,7 +595,7 @@ class Bot(BaseBot):
             self.adapter.get_api_base().joinpath("users", "@me", "guilds"),
             params=exclude_none({"before": before, "after": after, "limit": limit}),
         )
-        return parse_obj_as(List[Guild], await self._request(request))
+        return type_validate_python(List[Guild], await self._request(request))
 
     # Guild API
     @API
@@ -602,7 +604,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("guilds", guild_id),
         )
-        return parse_obj_as(Guild, await self._request(request))
+        return type_validate_python(Guild, await self._request(request))
 
     # Channel API
     @API
@@ -611,7 +613,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("guilds", guild_id, "channels"),
         )
-        return parse_obj_as(List[Channel], await self._request(request))
+        return type_validate_python(List[Channel], await self._request(request))
 
     @API
     async def get_channel(self, *, channel_id: str) -> Channel:
@@ -619,7 +621,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("channels", channel_id),
         )
-        return parse_obj_as(Channel, await self._request(request))
+        return type_validate_python(Channel, await self._request(request))
 
     @API
     async def post_channels(
@@ -653,7 +655,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(List[Channel], await self._request(request))
+        return type_validate_python(List[Channel], await self._request(request))
 
     @API
     async def patch_channel(
@@ -685,7 +687,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(Channel, await self._request(request))
+        return type_validate_python(Channel, await self._request(request))
 
     @API
     async def delete_channel(self, *, channel_id: str) -> None:
@@ -709,7 +711,7 @@ class Bot(BaseBot):
             self.adapter.get_api_base().joinpath("guilds", guild_id, "members"),
             params=exclude_none({"after": after, "limit": limit}),
         )
-        return parse_obj_as(List[Member], await self._request(request))
+        return type_validate_python(List[Member], await self._request(request))
 
     @API
     async def get_role_members(
@@ -727,7 +729,7 @@ class Bot(BaseBot):
             ),
             params=exclude_none({"start_index": start_index, "limit": limit}),
         )
-        return parse_obj_as(GetRoleMembersReturn, await self._request(request))
+        return type_validate_python(GetRoleMembersReturn, await self._request(request))
 
     @API
     async def get_member(self, *, guild_id: str, user_id: str) -> Member:
@@ -737,7 +739,7 @@ class Bot(BaseBot):
                 "guilds", guild_id, "members", user_id
             ),
         )
-        return parse_obj_as(Member, await self._request(request))
+        return type_validate_python(Member, await self._request(request))
 
     @API
     async def delete_member(
@@ -769,7 +771,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("guilds", guild_id, "roles"),
         )
-        return parse_obj_as(GetGuildRolesReturn, await self._request(request))
+        return type_validate_python(GetGuildRolesReturn, await self._request(request))
 
     @API
     async def post_guild_role(
@@ -791,7 +793,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(PostGuildRoleReturn, await self._request(request))
+        return type_validate_python(PostGuildRoleReturn, await self._request(request))
 
     @API
     async def patch_guild_role(
@@ -814,7 +816,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(PatchGuildRoleReturn, await self._request(request))
+        return type_validate_python(PatchGuildRoleReturn, await self._request(request))
 
     @API
     async def delete_guild_role(self, *, guild_id: str, role_id: str) -> None:
@@ -871,7 +873,7 @@ class Bot(BaseBot):
                 "channels", channel_id, "members", user_id, "permissions"
             ),
         )
-        return parse_obj_as(ChannelPermissions, await self._request(request))
+        return type_validate_python(ChannelPermissions, await self._request(request))
 
     @API
     async def put_channel_permissions(
@@ -901,7 +903,7 @@ class Bot(BaseBot):
                 "channels", channel_id, "roles", role_id, "permissions"
             ),
         )
-        return parse_obj_as(ChannelPermissions, await self._request(request))
+        return type_validate_python(ChannelPermissions, await self._request(request))
 
     @API
     async def put_channel_roles_permissions(
@@ -935,7 +937,7 @@ class Bot(BaseBot):
         result = await self._request(request)
         if isinstance(result, dict) and "message" in result:
             result = result["message"]
-        return parse_obj_as(GuildMessage, result)
+        return type_validate_python(GuildMessage, result)
 
     @staticmethod
     def _parse_send_message(data: Dict[str, Any]) -> Dict[str, Any]:
@@ -999,7 +1001,7 @@ class Bot(BaseBot):
             self.adapter.get_api_base().joinpath("channels", channel_id, "messages"),
             **params,
         )
-        return parse_obj_as(GuildMessage, await self._request(request))
+        return type_validate_python(GuildMessage, await self._request(request))
 
     @API
     async def delete_message(
@@ -1027,7 +1029,7 @@ class Bot(BaseBot):
                 "guilds", guild_id, "message", "setting"
             ),
         )
-        return parse_obj_as(MessageSetting, await self._request(request))
+        return type_validate_python(MessageSetting, await self._request(request))
 
     # DMS API
     @API
@@ -1039,7 +1041,7 @@ class Bot(BaseBot):
                 {"recipient_id": recipient_id, "source_guild_id": source_guild_id}
             ),
         )
-        return parse_obj_as(DMS, await self._request(request))
+        return type_validate_python(DMS, await self._request(request))
 
     @API
     async def post_dms_messages(
@@ -1076,7 +1078,7 @@ class Bot(BaseBot):
             self.adapter.get_api_base().joinpath("dms", guild_id, "messages"),
             **params,
         )
-        return parse_obj_as(GuildMessage, await self._request(request))
+        return type_validate_python(GuildMessage, await self._request(request))
 
     @API
     async def delete_dms_message(
@@ -1173,7 +1175,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(List[int], await self._request(request))
+        return type_validate_python(List[int], await self._request(request))
 
     # Announce API
     @API
@@ -1225,7 +1227,7 @@ class Bot(BaseBot):
                 "channels", channel_id, "pins", message_id
             ),
         )
-        return parse_obj_as(PinsMessage, await self._request(request))
+        return type_validate_python(PinsMessage, await self._request(request))
 
     @API
     async def delete_pins_message(self, *, channel_id: str, message_id: str) -> None:
@@ -1243,7 +1245,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("channels", channel_id, "pins"),
         )
-        return parse_obj_as(PinsMessage, await self._request(request))
+        return type_validate_python(PinsMessage, await self._request(request))
 
     # Schedule API
     @API
@@ -1258,7 +1260,7 @@ class Bot(BaseBot):
             self.adapter.get_api_base() / f"channels/{channel_id}/schedules",
             json=exclude_none({"since": since}),
         )
-        return parse_obj_as(List[Schedule], await self._request(request))
+        return type_validate_python(List[Schedule], await self._request(request))
 
     @API
     async def get_schedule(self, *, channel_id: str, schedule_id: str) -> Schedule:
@@ -1268,7 +1270,7 @@ class Bot(BaseBot):
                 "channels", channel_id, "schedules", schedule_id
             ),
         )
-        return parse_obj_as(Schedule, await self._request(request))
+        return type_validate_python(Schedule, await self._request(request))
 
     @API
     async def post_schedule(
@@ -1310,7 +1312,7 @@ class Bot(BaseBot):
                 )
             },
         )
-        return parse_obj_as(Schedule, await self._request(request))
+        return type_validate_python(Schedule, await self._request(request))
 
     @API
     async def patch_schedule(
@@ -1357,7 +1359,7 @@ class Bot(BaseBot):
                 )
             },
         )
-        return parse_obj_as(Schedule, await self._request(request))
+        return type_validate_python(Schedule, await self._request(request))
 
     @API
     async def delete_schedule(self, *, channel_id: str, schedule_id: str) -> None:
@@ -1473,7 +1475,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("channels", channel_id, "threads"),
         )
-        return parse_obj_as(GetThreadsListReturn, await self._request(request))
+        return type_validate_python(GetThreadsListReturn, await self._request(request))
 
     @API
     async def get_thread(self, *, channel_id: str, thread_id: str) -> GetThreadReturn:
@@ -1483,7 +1485,7 @@ class Bot(BaseBot):
                 "channels", channel_id, "threads", thread_id
             ),
         )
-        return parse_obj_as(GetThreadReturn, await self._request(request))
+        return type_validate_python(GetThreadReturn, await self._request(request))
 
     @overload
     async def put_thread(
@@ -1529,7 +1531,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(PutThreadReturn, await self._request(request))
+        return type_validate_python(PutThreadReturn, await self._request(request))
 
     @API
     async def delete_thread(self, *, channel_id: str, thread_id: str) -> None:
@@ -1550,7 +1552,9 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("guilds", guild_id, "api_permission"),
         )
-        return parse_obj_as(GetGuildAPIPermissionReturn, await self._request(request))
+        return type_validate_python(
+            GetGuildAPIPermissionReturn, await self._request(request)
+        )
 
     @API
     async def post_api_permission_demand(
@@ -1574,7 +1578,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(APIPermissionDemand, await self._request(request))
+        return type_validate_python(APIPermissionDemand, await self._request(request))
 
     # WebSocket API
     @API
@@ -1583,7 +1587,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("gateway"),
         )
-        return parse_obj_as(UrlGetReturn, await self._request(request))
+        return type_validate_python(UrlGetReturn, await self._request(request))
 
     @API
     async def shard_url_get(self) -> ShardUrlGetReturn:
@@ -1591,7 +1595,7 @@ class Bot(BaseBot):
             "GET",
             self.adapter.get_api_base().joinpath("gateway", "bot"),
         )
-        return parse_obj_as(ShardUrlGetReturn, await self._request(request))
+        return type_validate_python(ShardUrlGetReturn, await self._request(request))
 
     # Interaction API
     @API
@@ -1667,7 +1671,7 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(PostC2CMessagesReturn, await self._request(request))
+        return type_validate_python(PostC2CMessagesReturn, await self._request(request))
 
     @API
     async def post_c2c_files(
@@ -1675,10 +1679,12 @@ class Bot(BaseBot):
         *,
         openid: str,
         file_type: Literal[1, 2, 3, 4],
-        url: str,
+        url: Optional[str] = None,
         srv_send_msg: bool = True,
-        file_data: None = None,
+        file_data: Optional[Union[str, bytes]] = None,
     ) -> PostC2CFilesReturn:
+        if isinstance(file_data, bytes):
+            file_data = b64encode(file_data).decode()
         request = Request(
             "POST",
             self.adapter.get_api_base().joinpath("v2", "users", openid, "files"),
@@ -1691,7 +1697,17 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(PostC2CFilesReturn, await self._request(request))
+        return type_validate_python(PostC2CFilesReturn, await self._request(request))
+
+    @API
+    async def delete_c2c_message(self, *, openid: str, message_id: str) -> None:
+        request = Request(
+            "DELETE",
+            self.adapter.get_api_base().joinpath(
+                "v2", "users", openid, "messages", message_id
+            ),
+        )
+        return await self._request(request)
 
     # Group API
     @API
@@ -1757,7 +1773,9 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(PostGroupMessagesReturn, await self._request(request))
+        return type_validate_python(
+            PostGroupMessagesReturn, await self._request(request)
+        )
 
     @API
     async def post_group_files(
@@ -1765,10 +1783,12 @@ class Bot(BaseBot):
         *,
         group_openid: str,
         file_type: Literal[1, 2, 3, 4],
-        url: str,
+        url: Optional[str] = None,
         srv_send_msg: bool = True,
-        file_data: None = None,
+        file_data: Optional[Union[str, bytes]] = None,
     ) -> PostGroupFilesReturn:
+        if isinstance(file_data, bytes):
+            file_data = b64encode(file_data).decode()
         request = Request(
             "POST",
             self.adapter.get_api_base().joinpath("v2", "groups", group_openid, "files"),
@@ -1781,7 +1801,17 @@ class Bot(BaseBot):
                 }
             ),
         )
-        return parse_obj_as(PostGroupFilesReturn, await self._request(request))
+        return type_validate_python(PostGroupFilesReturn, await self._request(request))
+
+    @API
+    async def delete_group_message(self, *, group_openid: str, message_id: str) -> None:
+        request = Request(
+            "DELETE",
+            self.adapter.get_api_base().joinpath(
+                "v2", "groups", group_openid, "messages", message_id
+            ),
+        )
+        return await self._request(request)
 
     @API
     async def post_group_members(
@@ -1796,4 +1826,6 @@ class Bot(BaseBot):
             self.adapter.get_api_base().joinpath("v2", "groups", group_id, "members"),
             json=exclude_none({"limit": limit, "start_index": start_index}),
         )
-        return parse_obj_as(PostGroupMembersReturn, await self._request(request))
+        return type_validate_python(
+            PostGroupMembersReturn, await self._request(request)
+        )

{nonebot_adapter_qq-1.4.1 → nonebot_adapter_qq-1.4.3}/nonebot/adapters/qq/models/qq.py

@@ -20,9 +20,9 @@ class GroupMemberAuthor(BaseModel):
 class Attachment(BaseModel):
     content_type: str
     filename: Optional[str] = None
-    height: Optional[str] = None
-    width: Optional[str] = None
-    size: Optional[str] = None
+    height: Optional[int] = None
+    width: Optional[int] = None
+    size: Optional[int] = None
     url: Optional[str] = None
 
     @field_validator("url", mode="after")

{nonebot_adapter_qq-1.4.1 → nonebot_adapter_qq-1.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.4.1"
+version = "1.4.3"
 description = "QQ adapter for nonebot2"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -26,7 +26,7 @@ typing-extensions = ">=4.4.0, <5.0.0"
 pydantic = ">=1.10.0,<3.0.0,!=2.5.0,!=2.5.1"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.2.0"
+ruff = "^0.3.0"
 isort = "^5.10.1"
 black = "^24.0.0"
 nonemoji = "^0.1.3"