nonebot-adapter-qq 1.6.4__tar.gz → 1.6.5__tar.gz

{nonebot_adapter_qq-1.6.4 → nonebot_adapter_qq-1.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-adapter-qq
-Version: 1.6.4
+Version: 1.6.5
 Summary: QQ adapter for nonebot2
 License: MIT
 Keywords: bot,qq,qqbot,qqguild

{nonebot_adapter_qq-1.6.4 → nonebot_adapter_qq-1.6.5}/nonebot/adapters/qq/bot.py

@@ -63,12 +63,15 @@ from .models import (
     Guild,
     Media,
     Member,
+    MessageActionButton,
     MessageArk,
     MessageEmbed,
     MessageKeyboard,
     MessageMarkdown,
+    MessagePromptKeyboard,
     MessageReference,
     MessageSetting,
+    MessageStream,
     PatchGuildRoleReturn,
     PinsMessage,
     PostC2CFilesReturn,
@@ -316,6 +319,12 @@ class Bot(BaseBot):
             kwargs["message_reference"] = reference[-1].data["reference"]
         if keyboard := (message["keyboard"] or None):
             kwargs["keyboard"] = keyboard[-1].data["keyboard"]
+        if stream := (message["stream"] or None):
+            kwargs["stream"] = stream[-1].data["stream"]
+        if prompt_keyboard := (message["prompt_keyboard"] or None):
+            kwargs["prompt_keyboard"] = prompt_keyboard[-1].data["prompt_keyboard"]
+        if action_button := (message["action_button"] or None):
+            kwargs["action_button"] = action_button[-1].data["action_button"]
         return kwargs
 
     @staticmethod
@@ -402,7 +411,12 @@ class Bot(BaseBot):
             msg_type = 4
         elif kwargs.get("ark"):
             msg_type = 3
-        elif kwargs.get("markdown") or kwargs.get("keyboard"):
+        elif (
+            kwargs.get("markdown")
+            or kwargs.get("keyboard")
+            or kwargs.get("prompt_keyboard")
+            or kwargs.get("action_button")
+        ):
             msg_type = 2
         elif (
             message["image"]
@@ -1668,6 +1682,9 @@ class Bot(BaseBot):
         embed: Optional[MessageEmbed] = None,
         image: None = None,
         message_reference: None = None,
+        stream: Optional[MessageStream] = None,
+        prompt_keyboard: Optional[MessagePromptKeyboard] = None,
+        action_button: Optional[MessageActionButton] = None,
         event_id: Optional[str] = None,
         msg_id: Optional[str] = None,
         msg_seq: Optional[int] = None,
@@ -1682,42 +1699,50 @@ class Bot(BaseBot):
         elif timestamp is None:
             timestamp = int(datetime.now(timezone.utc).timestamp())
 
+        json_data = exclude_none(
+            {
+                "msg_type": msg_type,
+                "content": content,
+                "markdown": (
+                    markdown.dict(exclude_none=True) if markdown is not None else None
+                ),
+                "keyboard": (
+                    keyboard.dict(exclude_none=True) if keyboard is not None else None
+                ),
+                "media": (media.dict(exclude_none=True) if media is not None else None),
+                "ark": ark.dict(exclude_none=True) if ark is not None else None,
+                "embed": (embed.dict(exclude_none=True) if embed is not None else None),
+                "image": image,
+                "message_reference": (
+                    message_reference.dict(exclude_none=True)
+                    if message_reference is not None
+                    else None
+                ),
+                "stream": (
+                    stream.dict(exclude_none=True, exclude_unset=True)
+                    if stream is not None
+                    else None
+                ),
+                "prompt_keyboard": (
+                    prompt_keyboard.dict(exclude_none=True, exclude_unset=True)
+                    if prompt_keyboard is not None
+                    else None
+                ),
+                "action_button": (
+                    action_button.dict(exclude_none=True)
+                    if action_button is not None
+                    else None
+                ),
+                "event_id": event_id,
+                "msg_id": msg_id,
+                "msg_seq": msg_seq,
+                "timestamp": timestamp,
+            }
+        )
         request = Request(
             "POST",
             self.adapter.get_api_base().joinpath("v2", "users", openid, "messages"),
-            json=exclude_none(
-                {
-                    "msg_type": msg_type,
-                    "content": content,
-                    "markdown": (
-                        markdown.dict(exclude_none=True)
-                        if markdown is not None
-                        else None
-                    ),
-                    "keyboard": (
-                        keyboard.dict(exclude_none=True)
-                        if keyboard is not None
-                        else None
-                    ),
-                    "media": (
-                        media.dict(exclude_none=True) if media is not None else None
-                    ),
-                    "ark": ark.dict(exclude_none=True) if ark is not None else None,
-                    "embed": (
-                        embed.dict(exclude_none=True) if embed is not None else None
-                    ),
-                    "image": image,
-                    "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,
-                    "timestamp": timestamp,
-                }
-            ),
+            json=json_data,
         )
         return type_validate_python(PostC2CMessagesReturn, await self._request(request))
 

{nonebot_adapter_qq-1.6.4 → nonebot_adapter_qq-1.6.5}/nonebot/adapters/qq/event.py

@@ -356,7 +356,7 @@ class DirectMessageDeleteEvent(MessageDeleteEvent):
 
 
 class QQMessageEvent(MessageEvent, QQMessage):
-    _reply_seq: int = -1
+    _reply_seq: int = 0
 
     @override
     def get_message(self) -> Message:

{nonebot_adapter_qq-1.6.4 → nonebot_adapter_qq-1.6.5}/nonebot/adapters/qq/message.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from io import BytesIO
 from pathlib import Path
 import re
-from typing import TYPE_CHECKING, Optional, TypedDict, Union, overload
+from typing import TYPE_CHECKING, Literal, Optional, TypedDict, Union, overload
 from typing_extensions import Self, override
 
 from nonebot.adapters import Message as BaseMessage
@@ -13,11 +13,14 @@ from nonebot.compat import type_validate_python
 from .models import Attachment as QQAttachment
 from .models import Message as GuildMessage
 from .models import (
+    MessageActionButton,
     MessageArk,
     MessageEmbed,
     MessageKeyboard,
     MessageMarkdown,
+    MessagePromptKeyboard,
     MessageReference,
+    MessageStream,
     QQMessage,
 )
 from .utils import escape, unescape
@@ -148,6 +151,35 @@ class MessageSegment(BaseMessageSegment["Message"]):
             },
         )
 
+    @staticmethod
+    def stream(
+        state: Literal[1, 10, 11, 20],
+        _id: Optional[str],
+        index: int,
+        reset: Optional[bool] = None,
+    ) -> "Stream":
+        _data = {
+            "state": state,
+            "index": index,
+        }
+        if _id is not None:
+            _data["id"] = _id
+
+        if reset is not None:
+            _data["reset"] = reset
+
+        return Stream("stream", data={"stream": MessageStream(**_data)})
+
+    @staticmethod
+    def prompt_keyboard(prompt_keyboard: MessagePromptKeyboard) -> "PromptKeyboard":
+        return PromptKeyboard(
+            "prompt_keyboard", data={"prompt_keyboard": prompt_keyboard}
+        )
+
+    @staticmethod
+    def action_button(action_button: MessageActionButton) -> "ActionButton":
+        return ActionButton("action_button", data={"action_button": action_button})
+
     @override
     def __add__(
         self, other: Union[str, "MessageSegment", Iterable["MessageSegment"]]
@@ -445,6 +477,48 @@ SEGMENT_TYPE_MAP: dict[str, type[MessageSegment]] = {
 }
 
 
+class _ActionButtonData(TypedDict):
+    action_button: MessageActionButton
+
+
+@dataclass
+class ActionButton(MessageSegment):
+    if TYPE_CHECKING:
+        data: _ActionButtonData
+
+    @override
+    def __str__(self) -> str:
+        return f"<action_button:{self.data['action_button']!r}>"
+
+
+class _PromptKeyboardData(TypedDict):
+    prompt_keyboard: MessagePromptKeyboard
+
+
+@dataclass
+class PromptKeyboard(MessageSegment):
+    if TYPE_CHECKING:
+        data: _PromptKeyboardData
+
+    @override
+    def __str__(self) -> str:
+        return f"<prompt_keyboard:{self.data['prompt_keyboard']!r}>"
+
+
+class _StreamData(TypedDict):
+    stream: MessageStream
+
+
+@dataclass
+class Stream(MessageSegment):
+    if TYPE_CHECKING:
+        data: _StreamData
+
+    @override
+    def __str__(self) -> str:
+        return f"<stream:{self.data['stream']!r}>"
+
+
 class Message(BaseMessage[MessageSegment]):
     @classmethod
     @override

{nonebot_adapter_qq-1.6.4 → nonebot_adapter_qq-1.6.5}/nonebot/adapters/qq/models/qq.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Optional
+from typing import Literal, Optional
 from urllib.parse import urlparse
 
 from pydantic import BaseModel
@@ -77,16 +77,75 @@ class PostGroupMembersReturn(BaseModel):
     next_index: Optional[int] = None
 
 
+class MessageActionButton(BaseModel):
+    template_id: Literal["1", "10"] = "1"  # 待废弃字段！！！
+    callback_data: Optional[str] = None
+    feedback: Optional[bool] = None  # 反馈按钮（赞踩按钮）
+    tts: Optional[bool] = None  # TTS 语音播放按钮
+    re_generate: Optional[bool] = None  # 重新生成按钮
+    stop_generate: Optional[bool] = None  # 停止生成按钮
+
+
+class PromptAction(BaseModel):
+    type: Literal[2] = 2
+
+
+class PromptRenderData(BaseModel):
+    label: str
+    style: Literal[2] = 2
+
+
+class PromptButton(BaseModel):
+    render_data: PromptRenderData
+    action: PromptAction
+
+
+class PromptRow(BaseModel):
+    buttons: list[PromptButton]
+
+
+class PromptContent(BaseModel):
+    rows: list[PromptRow]
+
+
+class PromptKeyboardModel(BaseModel):
+    content: PromptContent
+
+
+class MessagePromptKeyboard(BaseModel):
+    keyboard: PromptKeyboardModel
+
+
+class MessageStream(BaseModel):
+    state: Literal[1, 10, 11, 20]
+    """1: 正文生成中, 10: 正文生成结束, 11: 引志消息生成中, 20: 引导消息生成结束。"""
+    id: Optional[str] = None
+    """第一条不用填写，第二条需要填写第一个分片返回的 msgID"""
+    index: int
+    """从 1 开始"""
+    reset: Optional[bool] = None
+    """只能用于流式消息没有发送完成时，reset 时 index 需要从 0 开始，需要填写流式 id"""
+
+
 __all__ = [
     "Attachment",
     "FriendAuthor",
     "GroupMember",
     "GroupMemberAuthor",
     "Media",
+    "MessageActionButton",
+    "MessagePromptKeyboard",
+    "MessageStream",
     "PostC2CFilesReturn",
     "PostC2CMessagesReturn",
     "PostGroupFilesReturn",
     "PostGroupMembersReturn",
     "PostGroupMessagesReturn",
+    "PromptAction",
+    "PromptButton",
+    "PromptContent",
+    "PromptKeyboardModel",
+    "PromptRenderData",
+    "PromptRow",
     "QQMessage",
 ]

{nonebot_adapter_qq-1.6.4 → nonebot_adapter_qq-1.6.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.6.4"
+version = "1.6.5"
 description = "QQ adapter for nonebot2"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -27,7 +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.11.0"
+ruff = "^0.12.0"
 nonemoji = "^0.1.3"
 pre-commit = "^4.0.0"