nonebot-adapter-qq 1.6.1__tar.gz → 1.6.3__tar.gz

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: nonebot-adapter-qq
-Version: 1.6.1
+Version: 1.6.3
 Summary: QQ adapter for nonebot2
-Home-page: https://github.com/nonebot/adapter-qq
 License: MIT
 Keywords: bot,qq,qqbot,qqguild
 Author: yanyongyu
@@ -25,6 +24,7 @@ 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
+Project-URL: Homepage, https://github.com/nonebot/adapter-qq
 Project-URL: Repository, https://github.com/nonebot/adapter-qq
 Description-Content-Type: text/markdown
 

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/adapter.py

@@ -1,49 +1,49 @@
-import sys
-import json
 import asyncio
 import binascii
+import json
+import sys
+from typing import Any, Literal, Optional, Union, cast
 from typing_extensions import override
-from typing import Any, Union, Literal, Optional, cast
 
-from nonebot.utils import escape_tag
-from nonebot.exception import WebSocketClosed
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
+
+from nonebot import get_plugin_config
+from nonebot.adapters import Adapter as BaseAdapter
 from nonebot.compat import PYDANTIC_V2, type_validate_json, type_validate_python
 from nonebot.drivers import (
     URL,
+    ASGIMixin,
     Driver,
+    HTTPClientMixin,
+    HTTPServerSetup,
     Request,
     Response,
-    ASGIMixin,
     WebSocket,
-    HTTPClientMixin,
-    HTTPServerSetup,
     WebSocketClientMixin,
 )
-
-from nonebot import get_plugin_config
-from nonebot.adapters import Adapter as BaseAdapter
+from nonebot.exception import WebSocketClosed
+from nonebot.utils import escape_tag
 
 from .bot import Bot
-from .utils import API, log
-from .store import audit_result
-from .config import Config, BotInfo
+from .config import BotInfo, Config
+from .event import EVENT_CLASSES, Event, MessageAuditEvent, ReadyEvent
 from .exception import ApiNotAvailable
-from .event import EVENT_CLASSES, Event, ReadyEvent, MessageAuditEvent
 from .models import (
-    Hello,
-    Resume,
-    Payload,
     Dispatch,
-    Identify,
     Heartbeat,
-    Reconnect,
-    PayloadType,
     HeartbeatAck,
-    WebhookVerify,
+    Hello,
+    Identify,
     InvalidSession,
+    Payload,
+    PayloadType,
+    Reconnect,
+    Resume,
+    WebhookVerify,
 )
+from .store import audit_result
+from .utils import API, log
 
 RECONNECT_INTERVAL = 3.0
 
@@ -268,9 +268,9 @@ class Adapter(BaseAdapter):
         """接收并处理服务器的 Hello 事件"""
         try:
             payload = await self.receive_payload(bot, ws)
-            assert isinstance(
-                payload, Hello
-            ), f"Received unexpected payload: {payload!r}"
+            assert isinstance(payload, Hello), (
+                f"Received unexpected payload: {payload!r}"
+            )
             return payload.data.heartbeat_interval
         except Exception as e:
             log(

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/bot.py

@@ -1,89 +1,95 @@
-import json
 from base64 import b64encode
-from typing_extensions import Never, override
-from datetime import datetime, timezone, timedelta
+from contextlib import suppress
+from datetime import datetime, timedelta, timezone
+import json
 from typing import (
     IO,
     TYPE_CHECKING,
     Any,
-    Union,
     Literal,
     NoReturn,
     Optional,
+    Union,
     cast,
     overload,
 )
+from typing_extensions import Never, override
 
 from pydantic import BaseModel
-from nonebot.message import handle_event
-from nonebot.drivers import Request, Response
-from nonebot.compat import type_validate_python
 
 from nonebot.adapters import Bot as BaseBot
+from nonebot.compat import type_validate_python
+from nonebot.drivers import Request, Response
+from nonebot.message import handle_event
 
 from .config import BotInfo
-from .utils import API, log, exclude_none
-from .models import Message as GuildMessage
-from .message import Message, MessageSegment
-from .models import DMS, User, Guild, Media, Member, Channel
+from .event import (
+    C2CMessageCreateEvent,
+    DirectMessageCreateEvent,
+    Event,
+    GroupAtMessageCreateEvent,
+    GuildMessageEvent,
+    InteractionCreateEvent,
+    QQMessageEvent,
+    ReadyEvent,
+)
 from .exception import (
     ActionFailed,
-    NetworkError,
-    AuditException,
     ApiNotAvailable,
+    AuditException,
+    NetworkError,
     RateLimitException,
     UnauthorizedException,
 )
-from .event import (
-    Event,
-    ReadyEvent,
-    QQMessageEvent,
-    GuildMessageEvent,
-    C2CMessageCreateEvent,
-    InteractionCreateEvent,
-    DirectMessageCreateEvent,
-    GroupAtMessageCreateEvent,
-)
+from .message import Message, MessageSegment
 from .models import (
+    DMS,
+    APIPermissionDemand,
+    APIPermissionDemandIdentify,
+    AudioControl,
+    AudioStatus,
+    Channel,
+    ChannelPermissions,
+    ChannelSubType,
+    ChannelType,
     Dispatch,
-    RichText,
-    Schedule,
     EmojiType,
+    GetGuildAPIPermissionReturn,
+    GetGuildRolesReturn,
+    GetReactionUsersReturn,
+    GetRoleMembersReturn,
+    GetThreadReturn,
+    GetThreadsListReturn,
+    Guild,
+    Media,
+    Member,
     MessageArk,
-    RemindType,
-    AudioStatus,
-    ChannelType,
-    PinsMessage,
-    PrivateType,
-    AudioControl,
     MessageEmbed,
-    UrlGetReturn,
-    ChannelSubType,
-    MessageSetting,
-    GetThreadReturn,
     MessageKeyboard,
     MessageMarkdown,
-    PutThreadReturn,
-    SpeakPermission,
     MessageReference,
-    RecommendChannel,
-    ShardUrlGetReturn,
-    ChannelPermissions,
-    PostC2CFilesReturn,
-    APIPermissionDemand,
-    GetGuildRolesReturn,
-    PostGuildRoleReturn,
-    GetRoleMembersReturn,
-    GetThreadsListReturn,
+    MessageSetting,
     PatchGuildRoleReturn,
-    PostGroupFilesReturn,
+    PinsMessage,
+    PostC2CFilesReturn,
     PostC2CMessagesReturn,
-    GetReactionUsersReturn,
+    PostGroupFilesReturn,
     PostGroupMembersReturn,
     PostGroupMessagesReturn,
-    APIPermissionDemandIdentify,
-    GetGuildAPIPermissionReturn,
+    PostGuildRoleReturn,
+    PrivateType,
+    PutThreadReturn,
+    RecommendChannel,
+    RemindType,
+    RichText,
+    Schedule,
+    ShardUrlGetReturn,
+    SpeakPermission,
+    UrlGetReturn,
+    User,
 )
+from .models import Message as GuildMessage
+from .utils import API, exclude_none, log
 
 if TYPE_CHECKING:
     from .adapter import Adapter
@@ -255,6 +261,15 @@ class Bot(BaseBot):
                     " Please check your config."
                 )
             data = json.loads(resp.content)
+            if (
+                not isinstance(data, dict)
+                or "access_token" not in data
+                or "expires_in" not in data
+            ):
+                raise NetworkError(
+                    f"Get authorization failed with invalid response {data!r}."
+                    " Please check your config."
+                )
             self._access_token = cast(str, data["access_token"])
             self._expires_in = datetime.now(timezone.utc) + timedelta(
                 seconds=int(data["expires_in"])
@@ -387,7 +402,7 @@ class Bot(BaseBot):
             msg_type = 4
         elif kwargs.get("ark"):
             msg_type = 3
-        elif kwargs.get("markdown"):
+        elif kwargs.get("markdown") or kwargs.get("keyboard"):
             msg_type = 2
         elif (
             message["image"]
@@ -531,6 +546,23 @@ class Bot(BaseBot):
         raise RuntimeError("Event cannot be replied to!")
 
     # API request methods
+    def _handle_audit(self, response: Response) -> None:
+        if 200 <= response.status_code <= 202:
+            with suppress(json.JSONDecodeError):
+                if (
+                    response.content
+                    and (content := json.loads(response.content))
+                    and isinstance(content, dict)
+                    and (
+                        audit_id := (
+                            content.get("data", {})
+                            .get("message_audit", {})
+                            .get("audit_id", None)
+                        )
+                    )
+                ):
+                    raise AuditException(audit_id)
+
     def _handle_response(self, response: Response) -> Any:
         if trace_id := response.headers.get("X-Tps-trace-ID", None):
             log(
@@ -538,15 +570,10 @@ class Bot(BaseBot):
                 f"Called API {response.request and response.request.url} "
                 f"response {response.status_code} with trace id {trace_id}",
             )
+
+        self._handle_audit(response)
+
         if response.status_code == 201 or response.status_code == 202:
-            if response.content and (content := json.loads(response.content)):
-                audit_id = (
-                    content.get("data", {})
-                    .get("message_audit", {})
-                    .get("audit_id", None)
-                )
-                if audit_id:
-                    raise AuditException(audit_id)
             raise ActionFailed(response)
         elif 200 <= response.status_code < 300:
             return response.content and json.loads(response.content)
@@ -1680,7 +1707,11 @@ class Bot(BaseBot):
                         embed.dict(exclude_none=True) if embed is not None else None
                     ),
                     "image": image,
-                    "message_reference": message_reference,
+                    "message_reference": (
+                        message_reference.dict(exclude_none=True)
+                        if message_reference is not None
+                        else None
+                    ),
                     "event_id": event_id,
                     "msg_id": msg_id,
                     "msg_seq": msg_seq,
@@ -1782,7 +1813,11 @@ class Bot(BaseBot):
                         embed.dict(exclude_none=True) if embed is not None else None
                     ),
                     "image": image,
-                    "message_reference": message_reference,
+                    "message_reference": (
+                        message_reference.dict(exclude_none=True)
+                        if message_reference is not None
+                        else None
+                    ),
                     "event_id": event_id,
                     "msg_id": msg_id,
                     "msg_seq": msg_seq,

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/compat.py

@@ -8,7 +8,7 @@ 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
+    from pydantic import root_validator, validator
 
     @overload
     def model_validator(*, mode: Literal["before"]): ...

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/config.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
-from pydantic import Field, HttpUrl, BaseModel
+from pydantic import BaseModel, Field, HttpUrl
+
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
 

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/event.py

@@ -1,28 +1,33 @@
-from enum import Enum
 from datetime import datetime
+from enum import Enum
+from typing import Optional, TypeVar, cast
 from typing_extensions import override
-from typing import TypeVar, Optional, cast
-
-from nonebot.utils import escape_tag
 
 from nonebot.adapters import Event as BaseEvent
+from nonebot.utils import escape_tag
 
 from .message import Message
-from .models import Message as GuildMessage
-from .models import Post, User, Guild, Reply, Member, Thread, Channel
 from .models import (
-    RichText,
-    QQMessage,
     AudioAction,
+    ButtonInteraction,
+    Channel,
+    ForumAuditResult,
+    ForumSourceInfo,
     FriendAuthor,
-    MessageDelete,
+    GroupMemberAuthor,
+    Guild,
+    Member,
     MessageAudited,
-    ForumSourceInfo,
+    MessageDelete,
     MessageReaction,
-    ForumAuditResult,
-    ButtonInteraction,
-    GroupMemberAuthor,
+    Post,
+    QQMessage,
+    Reply,
+    RichText,
+    Thread,
+    User,
 )
+from .models import Message as GuildMessage
 
 E = TypeVar("E", bound="Event")
 

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/message.py

@@ -1,27 +1,26 @@
-import re
+from collections.abc import Iterable
+from dataclasses import dataclass
 from io import BytesIO
 from pathlib import Path
-from dataclasses import dataclass
-from collections.abc import Iterable
+import re
+from typing import TYPE_CHECKING, Optional, TypedDict, Union, overload
 from typing_extensions import Self, override
-from typing import TYPE_CHECKING, Union, Optional, TypedDict, overload
-
-from nonebot.compat import type_validate_python
 
 from nonebot.adapters import Message as BaseMessage
 from nonebot.adapters import MessageSegment as BaseMessageSegment
+from nonebot.compat import type_validate_python
 
-from .models import QQMessage
-from .utils import escape, unescape
-from .models import Message as GuildMessage
 from .models import Attachment as QQAttachment
+from .models import Message as GuildMessage
 from .models import (
     MessageArk,
     MessageEmbed,
     MessageKeyboard,
     MessageMarkdown,
     MessageReference,
+    QQMessage,
 )
+from .utils import escape, unescape
 
 
 class MessageSegment(BaseMessageSegment["Message"]):

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/models/guild.py

@@ -1,14 +1,14 @@
-import json
-from enum import IntEnum
 from datetime import datetime
-from typing import Union, Generic, TypeVar, Optional
+from enum import IntEnum
+import json
+from typing import Generic, Optional, TypeVar, Union
 
 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 nonebot.compat import PYDANTIC_V2, model_fields, type_validate_python
 
-from .common import MessageArk, MessageEmbed, MessageReference, MessageAttachment
+from .common import MessageArk, MessageAttachment, MessageEmbed, MessageReference
 
 if PYDANTIC_V2:
     GenericModel = BaseModel
@@ -363,7 +363,7 @@ class Paragraph(BaseModel):
 
 
 class RichText(BaseModel):
-    paragraphs: list[Paragraph]
+    paragraphs: Optional[list[Paragraph]] = None
 
 
 class ThreadObjectInfo(BaseModel):

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/models/payload.py

@@ -1,8 +1,9 @@
 from enum import IntEnum
+from typing import Annotated, Optional, Union
 from typing_extensions import Literal
-from typing import Union, Optional, Annotated
 
-from pydantic import Field, BaseModel
+from pydantic import BaseModel, Field
+
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
 PAYLOAD_FIELD_ALIASES = {"opcode": "op", "data": "d", "sequence": "s", "type": "t"}

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/permission.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from nonebot.permission import Permission
 
-from .event import MessageCreateEvent, AtMessageCreateEvent
+from .event import AtMessageCreateEvent, MessageCreateEvent
 
 
 async def _guild_channel_admin(

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/utils.py

@@ -1,7 +1,7 @@
-from functools import partial
 from collections.abc import Awaitable
-from typing_extensions import ParamSpec, Concatenate
-from typing import TYPE_CHECKING, Any, Generic, TypeVar, Callable, Optional, overload
+from functools import partial
+from typing import TYPE_CHECKING, Any, Callable, Generic, Optional, TypeVar, overload
+from typing_extensions import Concatenate, ParamSpec
 
 from nonebot.utils import logger_wrapper
 

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.6.1"
+version = "1.6.3"
 description = "QQ adapter for nonebot2"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -27,8 +27,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.9.0"
-isort = "^5.10.1"
+ruff = "^0.11.0"
 nonemoji = "^0.1.3"
 pre-commit = "^4.0.0"
 
@@ -49,6 +48,7 @@ select = [
   "F",     # Pyflakes
   "W",     # pycodestyle warnings
   "E",     # pycodestyle errors
+  "I",     # isort
   "UP",    # pyupgrade
   "ASYNC", # flake8-async
   "C4",    # flake8-comprehensions
@@ -67,10 +67,17 @@ ignore = [
   "RUF003", # ambiguous-unicode-character-comment
 ]
 
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
+extra-standard-library = ["typing_extensions"]
+
 [tool.ruff.lint.flake8-pytest-style]
 fixture-parentheses = false
 mark-parentheses = false
 
+[tool.ruff.lint.pyupgrade]
+keep-runtime-typing = true
+
 [tool.pyright]
 pythonVersion = "3.9"
 pythonPlatform = "All"

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/__init__.py

@@ -1,17 +1,17 @@
+from .adapter import Adapter as Adapter
 from .bot import Bot as Bot
-from .utils import log as log
 from .event import *  # noqa: F403
-from .utils import escape as escape
-from .adapter import Adapter as Adapter
-from .message import Message as Message
-from .permission import *  # noqa: F403
-from .utils import unescape as unescape
 from .exception import ActionFailed as ActionFailed
-from .exception import NetworkError as NetworkError
-from .message import MessageSegment as MessageSegment
+from .exception import ApiNotAvailable as ApiNotAvailable
 from .exception import AuditException as AuditException
+from .exception import NetworkError as NetworkError
 from .exception import NoLogException as NoLogException
-from .exception import ApiNotAvailable as ApiNotAvailable
 from .exception import QQAdapterException as QQAdapterException
 from .exception import RateLimitException as RateLimitException
 from .exception import UnauthorizedException as UnauthorizedException
+from .message import Message as Message
+from .message import MessageSegment as MessageSegment
+from .permission import *  # noqa: F403
+from .utils import escape as escape
+from .utils import log as log
+from .utils import unescape as unescape

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/exception.py

@@ -2,11 +2,11 @@ import json
 from typing import Optional
 
 from nonebot.drivers import Response
-from nonebot.exception import AdapterException
 from nonebot.exception import ActionFailed as BaseActionFailed
+from nonebot.exception import AdapterException
+from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable
 from nonebot.exception import NetworkError as BaseNetworkError
 from nonebot.exception import NoLogException as BaseNoLogException
-from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable
 
 from .store import audit_result
 

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/models/__init__.py

@@ -1,15 +1,15 @@
-from .qq import *  # noqa: F403
-from .guild import *  # noqa: F403
 from .common import *  # noqa: F403
+from .guild import *  # noqa: F403
+from .payload import Dispatch as Dispatch
+from .payload import Heartbeat as Heartbeat
+from .payload import HeartbeatAck as HeartbeatAck
 from .payload import Hello as Hello
+from .payload import Identify as Identify
+from .payload import InvalidSession as InvalidSession
 from .payload import Opcode as Opcode
-from .payload import Resume as Resume
 from .payload import Payload as Payload
-from .payload import Dispatch as Dispatch
-from .payload import Identify as Identify
-from .payload import Heartbeat as Heartbeat
-from .payload import Reconnect as Reconnect
 from .payload import PayloadType as PayloadType
-from .payload import HeartbeatAck as HeartbeatAck
+from .payload import Reconnect as Reconnect
+from .payload import Resume as Resume
 from .payload import WebhookVerify as WebhookVerify
-from .payload import InvalidSession as InvalidSession
+from .qq import *  # noqa: F403

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/models/common.py

@@ -1,6 +1,6 @@
 from datetime import datetime
-from urllib.parse import urlparse
 from typing import Literal, Optional
+from urllib.parse import urlparse
 
 from pydantic import BaseModel
 

{nonebot_adapter_qq-1.6.1 → nonebot_adapter_qq-1.6.3}/nonebot/adapters/qq/models/qq.py

@@ -1,5 +1,5 @@
-from typing import Optional
 from datetime import datetime
+from typing import Optional
 from urllib.parse import urlparse
 
 from pydantic import BaseModel