nonebot-adapter-qq 1.3.4__tar.gz → 1.4.0__tar.gz

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-adapter-qq
-Version: 1.3.4
+Version: 1.4.0
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT
@@ -19,8 +19,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: nonebot2 (>=2.1.0,<3.0.0)
-Requires-Dist: pydantic (>=1.9.0,<2.0.0)
+Requires-Dist: nonebot2 (>=2.2.0,<3.0.0)
+Requires-Dist: pydantic (>=1.10.0,<3.0.0,!=2.5.0,!=2.5.1)
 Requires-Dist: typing-extensions (>=4.4.0,<5.0.0)
 Requires-Dist: yarl (>=1.9.0,<2.0.0)
 Project-URL: Documentation, https://github.com/nonebot/adapter-qq#readme

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/adapter.py

@@ -1,11 +1,12 @@
 import sys
+import json
 import asyncio
 from typing_extensions import override
 from typing import Any, List, Tuple, Literal, Optional
 
-from pydantic import parse_raw_as
 from nonebot.utils import escape_tag
 from nonebot.exception import WebSocketClosed
+from nonebot.compat import PYDANTIC_V2, type_validate_python
 from nonebot.drivers import (
     URL,
     Driver,
@@ -376,36 +377,37 @@ class Adapter(BaseAdapter):
                 )
 
     def get_auth_base(self) -> URL:
-        return URL(self.qq_config.qq_auth_base)
+        return URL(str(self.qq_config.qq_auth_base))
 
     def get_api_base(self) -> URL:
         if self.qq_config.qq_is_sandbox:
-            return URL(self.qq_config.qq_sandbox_api_base)
+            return URL(str(self.qq_config.qq_sandbox_api_base))
         else:
-            return URL(self.qq_config.qq_api_base)
+            return URL(str(self.qq_config.qq_api_base))
 
     @staticmethod
     async def receive_payload(bot: Bot, ws: WebSocket) -> Payload:
-        payload = parse_raw_as(PayloadType, await ws.receive())
+        payload = type_validate_python(PayloadType, json.loads(await ws.receive()))
         if isinstance(payload, Dispatch):
             bot.on_dispatch(payload)
         return payload
 
     @staticmethod
     def payload_to_json(payload: Payload) -> str:
-        return payload.__config__.json_dumps(
-            payload.dict(), default=payload.__json_encoder__
-        )
+        if PYDANTIC_V2:
+            return payload.model_dump_json(by_alias=True)
+
+        return payload.json(by_alias=True)
 
     @staticmethod
     def payload_to_event(payload: Dispatch) -> Event:
         EventClass = EVENT_CLASSES.get(payload.type, None)
         if EventClass is None:
             log("WARNING", f"Unknown payload type: {payload.type}")
-            event = Event.parse_obj(payload.data)
+            event = type_validate_python(Event, payload.data)
             event.__type__ = payload.type  # type: ignore
             return event
-        return EventClass.parse_obj(payload.data)
+        return type_validate_python(EventClass, payload.data)
 
     @override
     async def _call_api(self, bot: Bot, api: str, **data: Any) -> Any:

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/bot.py

@@ -1296,12 +1296,14 @@ class Bot(BaseBot):
                     {
                         "name": name,
                         "description": description,
-                        "start_timestamp": str(start_timestamp)
-                        if start_timestamp is not None
-                        else None,
-                        "end_timestamp": str(end_timestamp)
-                        if end_timestamp is not None
-                        else None,
+                        "start_timestamp": (
+                            str(start_timestamp)
+                            if start_timestamp is not None
+                            else None
+                        ),
+                        "end_timestamp": (
+                            str(end_timestamp) if end_timestamp is not None else None
+                        ),
                         "jump_channel_id": jump_channel_id,
                         "remind_type": str(remind_type),
                     }
@@ -1339,16 +1341,18 @@ class Bot(BaseBot):
                     {
                         "name": name,
                         "description": description,
-                        "start_timestamp": str(start_timestamp)
-                        if start_timestamp is not None
-                        else None,
-                        "end_timestamp": str(end_timestamp)
-                        if end_timestamp is not None
-                        else None,
+                        "start_timestamp": (
+                            str(start_timestamp)
+                            if start_timestamp is not None
+                            else None
+                        ),
+                        "end_timestamp": (
+                            str(end_timestamp) if end_timestamp is not None else None
+                        ),
                         "jump_channel_id": jump_channel_id,
-                        "remind_type": str(remind_type)
-                        if remind_type is not None
-                        else None,
+                        "remind_type": (
+                            str(remind_type) if remind_type is not None else None
+                        ),
                     }
                 )
             },
@@ -1489,8 +1493,7 @@ class Bot(BaseBot):
         title: str,
         content: str,
         format: Literal[1, 2, 3],
-    ) -> PutThreadReturn:
-        ...
+    ) -> PutThreadReturn: ...
 
     @overload
     async def put_thread(
@@ -1500,8 +1503,7 @@ class Bot(BaseBot):
         title: str,
         content: RichText,
         format: Literal[4],
-    ) -> PutThreadReturn:
-        ...
+    ) -> PutThreadReturn: ...
 
     @API
     async def put_thread(

nonebot_adapter_qq-1.4.0/nonebot/adapters/qq/compat.py

@@ -0,0 +1,23 @@
+from typing import Literal, overload
+
+from nonebot.compat import PYDANTIC_V2
+
+__all__ = ("model_validator", "field_validator")
+
+if PYDANTIC_V2:
+    from pydantic import field_validator as field_validator
+    from pydantic import model_validator as model_validator
+else:
+    from pydantic import validator, root_validator
+
+    @overload
+    def model_validator(*, mode: Literal["before"]): ...
+
+    @overload
+    def model_validator(*, mode: Literal["after"]): ...
+
+    def model_validator(*, mode: Literal["before", "after"]):
+        return root_validator(pre=mode == "before", allow_reuse=True)
+
+    def field_validator(__field, *fields, mode: Literal["before", "after"] = "after"):
+        return validator(__field, *fields, pre=mode == "before", allow_reuse=True)

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/config.py

@@ -1,6 +1,7 @@
 from typing import List, Tuple, Optional
 
-from pydantic import Extra, Field, HttpUrl, BaseModel
+from pydantic import Field, HttpUrl, BaseModel
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 
 
 class Intents(BaseModel):
@@ -18,6 +19,13 @@ class Intents(BaseModel):
     audio_action: bool = False
     at_messages: bool = True
 
+    if PYDANTIC_V2:
+        model_config: ConfigDict = ConfigDict(extra="forbid")
+    else:
+
+        class Config:
+            extra = "forbid"
+
     def to_int(self):
         return (
             self.guilds << 0
@@ -54,7 +62,7 @@ class BotInfo(BaseModel):
         return self.intent.is_group_enabled
 
 
-class Config(BaseModel, extra=Extra.ignore):
+class Config(BaseModel):
     qq_is_sandbox: bool = False
     qq_api_base: HttpUrl = Field("https://api.sgroup.qq.com/")
     qq_sandbox_api_base: HttpUrl = Field("https://sandbox.api.sgroup.qq.com")

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/event.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from datetime import datetime
 from typing_extensions import override
-from typing import Dict, Type, Tuple, TypeVar, Optional
+from typing import Dict, Type, Tuple, TypeVar, Optional, cast
 
 from nonebot.utils import escape_tag
 
@@ -420,19 +420,30 @@ class InteractionCreateEvent(NoticeEvent, ButtonInteraction):
 
     @override
     def get_user_id(self) -> str:
-        return self.data.resolved.user_id
+        if self.chat_type == 0:
+            return cast(str, self.data.resolved.user_id)
+        elif self.chat_type == 1:
+            return cast(str, self.group_member_openid)
+        elif self.chat_type == 2:
+            return cast(str, self.user_openid)
+        raise ValueError(f"Unknown chat_type: {self.chat_type}")
 
     @override
     def get_session_id(self) -> str:
-        return (
-            f"guild_{self.guild_id}_channel_{self.channel_id}"
-            f"_{self.data.resolved.user_id}"
-        )
+        if self.chat_type == 0:
+            return (
+                f"guild_{self.guild_id}_channel_{self.channel_id}"
+                f"_{self.data.resolved.user_id}"
+            )
+        elif self.chat_type == 1:
+            return f"group_{self.group_openid}_{self.group_member_openid}"
+        elif self.chat_type == 2:
+            return f"friend_{self.user_openid}"
+        raise ValueError(f"Unknown chat_type: {self.chat_type}")
 
 
 # Message Audit Event
-class MessageAuditEvent(NoticeEvent, MessageAudited):
-    ...
+class MessageAuditEvent(NoticeEvent, MessageAudited): ...
 
 
 @register_event_class
@@ -467,8 +478,7 @@ class MessageReactionRemoveEvent(MessageReactionEvent):
 
 
 # Audio Event
-class AudioEvent(NoticeEvent, AudioAction):
-    ...
+class AudioEvent(NoticeEvent, AudioAction): ...
 
 
 @register_event_class
@@ -502,8 +512,7 @@ class ForumEvent(NoticeEvent, ForumSourceInfo):
         return f"guild_{self.guild_id}_channel_{self.channel_id}_{self.author_id}"
 
 
-class ForumThreadEvent(ForumEvent, Thread[RichText]):
-    ...
+class ForumThreadEvent(ForumEvent, Thread[RichText]): ...
 
 
 @register_event_class
@@ -521,8 +530,7 @@ class ForumThreadDeleteEvent(ForumThreadEvent):
     __type__ = EventType.FORUM_THREAD_DELETE
 
 
-class ForumPostEvent(ForumEvent, Post):
-    ...
+class ForumPostEvent(ForumEvent, Post): ...
 
 
 @register_event_class
@@ -535,8 +543,7 @@ class ForumPostDeleteEvent(ForumPostEvent):
     __type__ = EventType.FORUM_POST_DELETE
 
 
-class ForumReplyEvent(ForumEvent, Reply):
-    ...
+class ForumReplyEvent(ForumEvent, Reply): ...
 
 
 @register_event_class

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/message.py

@@ -108,9 +108,11 @@ class MessageSegment(BaseMessageSegment["Message"]):
         return Markdown(
             "markdown",
             data={
-                "markdown": MessageMarkdown(content=markdown)
-                if isinstance(markdown, str)
-                else markdown
+                "markdown": (
+                    MessageMarkdown(content=markdown)
+                    if isinstance(markdown, str)
+                    else markdown
+                )
             },
         )
 
@@ -120,13 +122,13 @@ class MessageSegment(BaseMessageSegment["Message"]):
 
     @overload
     @staticmethod
-    def reference(reference: MessageReference) -> "Reference":
-        ...
+    def reference(reference: MessageReference) -> "Reference": ...
 
     @overload
     @staticmethod
-    def reference(reference: str, ignore_error: Optional[bool] = None) -> "Reference":
-        ...
+    def reference(
+        reference: str, ignore_error: Optional[bool] = None
+    ) -> "Reference": ...
 
     @staticmethod
     def reference(
@@ -381,7 +383,7 @@ class Message(BaseMessage[MessageSegment]):
 
     @classmethod
     def from_guild_message(cls, message: GuildMessage) -> Self:
-        msg = Message()
+        msg = cls()
         if message.mention_everyone:
             msg.append(MessageSegment.mention_everyone())
         if message.content:
@@ -398,7 +400,7 @@ class Message(BaseMessage[MessageSegment]):
 
     @classmethod
     def from_qq_message(cls, message: QQMessage) -> Self:
-        msg = Message()
+        msg = cls()
         if message.content:
             msg.extend(Message(message.content))
         if message.attachments:

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/models/common.py

@@ -1,14 +1,17 @@
-from typing import List, Optional
 from urllib.parse import urlparse
+from typing import List, Literal, Optional
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel
+
+from nonebot.adapters.qq.compat import field_validator
 
 
 # Message Attachment
 class MessageAttachment(BaseModel):
     url: str
 
-    @validator("url", allow_reuse=True)
+    @field_validator("url", mode="after")
+    @classmethod
     def check_url(cls, v: str):
         if v and not urlparse(v).hostname:
             return f"https://{v}"
@@ -82,10 +85,13 @@ class Permission(BaseModel):
 class Action(BaseModel):
     type: Optional[int] = None
     permission: Optional[Permission] = None
-    click_limit: Optional[int] = None
-    unsupport_tips: Optional[str] = None
     data: Optional[str] = None
-    at_bot_show_channel_list: Optional[bool] = None
+    reply: Optional[bool] = None
+    enter: Optional[bool] = None
+    anchor: Optional[int] = None
+    unsupport_tips: Optional[str] = None
+    click_limit: Optional[int] = None  # deprecated
+    at_bot_show_channel_list: Optional[bool] = None  # deprecated
 
 
 class RenderData(BaseModel):
@@ -113,6 +119,35 @@ class MessageKeyboard(BaseModel):
     content: Optional[InlineKeyboard] = None
 
 
+# Interaction Event
+class ButtonInteractionContent(BaseModel):
+    user_id: Optional[str] = None
+    message_id: Optional[str] = None
+    feature_id: Optional[str] = None
+    button_id: Optional[str] = None
+    button_data: Optional[str] = None
+
+
+class ButtonInteractionData(BaseModel):
+    resolved: ButtonInteractionContent
+
+
+class ButtonInteraction(BaseModel):
+    id: str
+    type: Literal[11, 12]
+    version: int
+    timestamp: str
+    scene: str
+    chat_type: int
+    guild_id: Optional[str] = None
+    channel_id: Optional[str] = None
+    user_openid: Optional[str] = None
+    group_openid: Optional[str] = None
+    group_member_openid: Optional[str] = None
+    application_id: str
+    data: ButtonInteractionData
+
+
 __all__ = [
     "MessageAttachment",
     "MessageEmbedThumbnail",
@@ -132,4 +167,7 @@ __all__ = [
     "InlineKeyboardRow",
     "InlineKeyboard",
     "MessageKeyboard",
+    "ButtonInteractionContent",
+    "ButtonInteractionData",
+    "ButtonInteraction",
 ]

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/models/guild.py

@@ -1,12 +1,20 @@
+import json
 from enum import IntEnum
 from datetime import datetime
 from typing import List, Union, Generic, TypeVar, Optional
 
-from pydantic.generics import GenericModel
-from pydantic import BaseModel, validator, root_validator
+from pydantic import BaseModel
+from nonebot.compat import PYDANTIC_V2, model_fields, type_validate_python
+
+from nonebot.adapters.qq.compat import field_validator, model_validator
 
 from .common import MessageArk, MessageEmbed, MessageReference, MessageAttachment
 
+if PYDANTIC_V2:
+    GenericModel = BaseModel
+else:
+    from pydantic.generics import GenericModel
+
 T = TypeVar("T")
 
 
@@ -329,7 +337,8 @@ class Elem(BaseModel):
     video: Optional[VideoElem] = None
     url: Optional[URLElem] = None
 
-    @root_validator(pre=True, allow_reuse=True)
+    @model_validator(mode="before")
+    @classmethod
     def infer_type(cls, values: dict):
         if values.get("type") is not None:
             return values
@@ -373,10 +382,11 @@ class ThreadObjectInfo(BaseModel):
     content: RichText
     date_time: datetime
 
-    @validator("content", pre=True, allow_reuse=True)
+    @field_validator("content", model="before")
+    @classmethod
     def parse_content(cls, v):
         if isinstance(v, str):
-            return RichText.parse_raw(v, content_type="json")
+            return type_validate_python(RichText, json.loads(v))
         return v
 
 
@@ -387,10 +397,15 @@ class ThreadInfo(ThreadObjectInfo, GenericModel, Generic[_T_Title]):
     # 事件推送拿到的title实际上是RichText的JSON字符串，而API调用返回的title是普通文本
     title: _T_Title
 
-    @validator("title", pre=True, allow_reuse=True)
+    @field_validator("title", mode="before")
+    @classmethod
     def parse_title(cls, v):
-        if isinstance(v, str) and cls.__fields__["title"].type_ is RichText:
-            return RichText.parse_raw(v, content_type="json")
+        if (
+            isinstance(v, str)
+            and next(f for f in model_fields(cls) if f.name == "title").annotation
+            is RichText
+        ):
+            return type_validate_python(RichText, json.loads(v))
         return v
 
 

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/models/payload.py

@@ -2,9 +2,8 @@ from enum import IntEnum
 from typing import Tuple, Union
 from typing_extensions import Literal, Annotated
 
-from pydantic import Extra, Field, BaseModel
-
-from ._transformer import BoolToIntTransformer, AliasExportTransformer
+from pydantic import Field, BaseModel
+from nonebot.compat import PYDANTIC_V2, ConfigDict
 
 PAYLOAD_FIELD_ALIASES = {"opcode": "op", "data": "d", "sequence": "s", "type": "t"}
 
@@ -21,14 +20,22 @@ class Opcode(IntEnum):
     HTTP_CALLBACK_ACK = 12
 
 
-class Payload(AliasExportTransformer, BaseModel):
-    class Config:
-        extra = Extra.allow
-        allow_population_by_field_name = True
+class Payload(BaseModel):
+    if PYDANTIC_V2:
+        model_config: ConfigDict = ConfigDict(
+            extra="allow",
+            populate_by_name=True,
+            alias_generator=lambda x: PAYLOAD_FIELD_ALIASES.get(x, x),
+        )
+    else:
+
+        class Config:
+            extra = "allow"
+            allow_population_by_field_name = True
 
-        @classmethod
-        def alias_generator(cls, string: str) -> str:
-            return PAYLOAD_FIELD_ALIASES.get(string, string)
+            @classmethod
+            def alias_generator(cls, string: str) -> str:
+                return PAYLOAD_FIELD_ALIASES.get(string, string)
 
 
 class Dispatch(Payload):
@@ -43,23 +50,37 @@ class Heartbeat(Payload):
     data: int
 
 
-class IdentifyData(BaseModel, extra=Extra.allow):
+class IdentifyData(BaseModel):
     token: str
     intents: int
     shard: Tuple[int, int]
     properties: dict
 
+    if PYDANTIC_V2:
+        model_config: ConfigDict = ConfigDict(extra="allow")
+    else:
+
+        class Config:
+            extra = "allow"
+
 
 class Identify(Payload):
     opcode: Literal[Opcode.IDENTIFY] = Field(Opcode.IDENTIFY)
     data: IdentifyData
 
 
-class ResumeData(BaseModel, extra=Extra.allow):
+class ResumeData(BaseModel):
     token: str
     session_id: str
     seq: int
 
+    if PYDANTIC_V2:
+        model_config: ConfigDict = ConfigDict(extra="allow")
+    else:
+
+        class Config:
+            extra = "allow"
+
 
 class Resume(Payload):
     opcode: Literal[Opcode.RESUME] = Field(Opcode.RESUME)
@@ -74,9 +95,16 @@ class InvalidSession(Payload):
     opcode: Literal[Opcode.INVALID_SESSION] = Field(Opcode.INVALID_SESSION)
 
 
-class HelloData(BaseModel, extra=Extra.allow):
+class HelloData(BaseModel):
     heartbeat_interval: int
 
+    if PYDANTIC_V2:
+        model_config: ConfigDict = ConfigDict(extra="allow")
+    else:
+
+        class Config:
+            extra = "allow"
+
 
 class Hello(Payload):
     opcode: Literal[Opcode.HELLO] = Field(Opcode.HELLO)
@@ -87,9 +115,9 @@ class HeartbeatAck(Payload):
     opcode: Literal[Opcode.HEARTBEAT_ACK] = Field(Opcode.HEARTBEAT_ACK)
 
 
-class HTTPCallbackAck(BoolToIntTransformer, Payload):
+class HTTPCallbackAck(Payload):
     opcode: Literal[Opcode.HTTP_CALLBACK_ACK] = Field(Opcode.HTTP_CALLBACK_ACK)
-    data: bool
+    data: int
 
 
 PayloadType = Union[

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/models/qq.py

@@ -1,8 +1,10 @@
 from datetime import datetime
+from typing import List, Optional
 from urllib.parse import urlparse
-from typing import List, Literal, Optional
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel
+
+from nonebot.adapters.qq.compat import field_validator
 
 
 class FriendAuthor(BaseModel):
@@ -23,7 +25,7 @@ class Attachment(BaseModel):
     size: Optional[str] = None
     url: Optional[str] = None
 
-    @validator("url", allow_reuse=True)
+    @field_validator("url", mode="after")
     def check_url(cls, v: str):
         if v and not urlparse(v).hostname:
             return f"https://{v}"
@@ -73,31 +75,6 @@ class PostGroupMembersReturn(BaseModel):
     next_index: Optional[int] = None
 
 
-# Interaction Event
-class ButtonInteractionContent(BaseModel):
-    user_id: str
-    message_id: str
-    button_id: str
-    button_data: str
-
-
-class ButtonInteractionData(BaseModel):
-    resolved: ButtonInteractionContent
-
-
-class ButtonInteraction(BaseModel):
-    id: str
-    type: Literal[11]
-    version: int
-    timestamp: str
-    chat_type: int
-    guild_id: Optional[str] = None
-    channel_id: Optional[str] = None
-    group_open_id: Optional[str] = None
-    application_id: str
-    data: ButtonInteractionData
-
-
 __all__ = [
     "FriendAuthor",
     "GroupMemberAuthor",
@@ -110,7 +87,4 @@ __all__ = [
     "GroupMember",
     "PostGroupMembersReturn",
     "PostGroupFilesReturn",
-    "ButtonInteractionContent",
-    "ButtonInteractionData",
-    "ButtonInteraction",
 ]

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/nonebot/adapters/qq/utils.py

@@ -45,12 +45,12 @@ class API(Generic[B, P, R]):
         self.name = name
 
     @overload
-    def __get__(self, obj: None, objtype: Type[B]) -> "API[B, P, R]":
-        ...
+    def __get__(self, obj: None, objtype: Type[B]) -> "API[B, P, R]": ...
 
     @overload
-    def __get__(self, obj: B, objtype: Optional[Type[B]]) -> Callable[P, Awaitable[R]]:
-        ...
+    def __get__(
+        self, obj: B, objtype: Optional[Type[B]]
+    ) -> Callable[P, Awaitable[R]]: ...
 
     def __get__(
         self, obj: Optional[B], objtype: Optional[Type[B]] = None

{nonebot_adapter_qq-1.3.4 → nonebot_adapter_qq-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.3.4"
+version = "1.4.0"
 description = "QQ adapter for nonebot2"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -21,14 +21,14 @@ packages = [{ include = "nonebot" }]
 [tool.poetry.dependencies]
 python = "^3.8"
 yarl = "^1.9.0"
-pydantic = "^1.9.0"
-nonebot2 = "^2.1.0"
+nonebot2 = "^2.2.0"
 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.1.0"
+ruff = "^0.2.0"
 isort = "^5.10.1"
-black = "^23.1.0"
+black = "^24.0.0"
 nonemoji = "^0.1.3"
 pre-commit = "^3.3.0"
 
@@ -47,15 +47,17 @@ force_sort_within_sections = true
 extra_standard_library = ["typing_extensions"]
 
 [tool.ruff]
-select = ["E", "W", "F", "UP", "C", "T", "Q"]
-ignore = ["E402", "F403", "F405", "C901", "UP037"]
-
 line-length = 88
 target-version = "py38"
 
+[tool.ruff.lint]
+select = ["E", "W", "F", "UP", "C", "T", "Q"]
+ignore = ["E402", "F403", "F405", "C901", "UP037"]
+
 [tool.pyright]
 pythonPlatform = "All"
 pythonVersion = "3.8"
+defineConstant = { PYDANTIC_V2 = true }
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

nonebot_adapter_qq-1.3.4/nonebot/adapters/qq/models/_transformer.py

@@ -1,106 +0,0 @@
-from typing import TYPE_CHECKING, Any, Union, Optional
-
-from pydantic import BaseModel
-
-if TYPE_CHECKING:
-    from pydantic.typing import DictStrAny, MappingIntStrAny, AbstractSetIntStr
-
-
-class ExcludeNoneTransformer(BaseModel):
-    def dict(
-        self,
-        *,
-        include: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        exclude: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        by_alias: bool = False,
-        skip_defaults: Optional[bool] = None,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        **kwargs: Any,
-    ) -> "DictStrAny":
-        return super().dict(
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            skip_defaults=skip_defaults,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=True,
-        )
-
-
-class BoolToIntTransformer(BaseModel):
-    def dict(
-        self,
-        *,
-        include: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        exclude: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        by_alias: bool = False,
-        skip_defaults: Optional[bool] = None,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-    ) -> "DictStrAny":
-        data = super().dict(
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            skip_defaults=skip_defaults,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-        )
-        for key, value in data.items():
-            if isinstance(value, bool):
-                data[key] = int(value)
-        return data
-
-
-class IntToStrTransformer(BaseModel):
-    def dict(
-        self,
-        *,
-        include: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        exclude: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        by_alias: bool = False,
-        skip_defaults: Optional[bool] = None,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-    ) -> "DictStrAny":
-        data = super().dict(
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            skip_defaults=skip_defaults,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-        )
-        for key, value in data.items():
-            if isinstance(value, int):
-                data[key] = str(value)
-        return data
-
-
-class AliasExportTransformer(BaseModel):
-    def dict(
-        self,
-        *,
-        include: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        exclude: Union["AbstractSetIntStr", "MappingIntStrAny", None] = None,
-        skip_defaults: Optional[bool] = None,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        **kwargs: Any,
-    ) -> "DictStrAny":
-        return super().dict(
-            include=include,
-            exclude=exclude,
-            by_alias=True,
-            skip_defaults=skip_defaults,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-        )