qqbotsdk-py 2.2.0__tar.gz → 2.2.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/PKG-INFO +3 -3
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/pyproject.toml +3 -3
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/pyproject.toml.orig +3 -3
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/bot.py +28 -8
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/README.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/agent.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/bot.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/group/agent.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/group/blacklist.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/group/join_request.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/group/manage.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/group/messages.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/group/mute.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/group/strategy.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/interaction.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/media.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/menu.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/panel.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/api/user.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/__init__.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/agent.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/api.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/context.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/dispatch.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/keyboard.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/app/types.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/agent.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/bot.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/event/__init__.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/event/agent.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/event/c2c.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/event/group.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/event/interaction.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/group/agent.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/group/blacklist.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/group/join_request.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/group/member.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/group/messages.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/group/mute.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/group/strategy.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/interaction.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/media.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/menu.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/panel.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/user/agent.md +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/user/messages.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/model/user/stream_messages.py +0 -0
- {qqbotsdk_py-2.2.0 → qqbotsdk_py-2.2.1}/src/qqbotsdk/testing.py +0 -0
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
Metadata-Version: 2.3
|
|
2
2
|
Name: qqbotsdk-py
|
|
3
|
-
Version: 2.2.
|
|
3
|
+
Version: 2.2.1
|
|
4
4
|
Summary: QQ 官方机器人 SDK:群聊 / 单聊 / 素材 / 互动
|
|
5
5
|
Author: snowy-yang
|
|
6
6
|
Author-email: snowy-yang <102860110+snowy-yang@users.noreply.github.com>
|
|
7
|
-
Requires-Dist: qqbotsdk-base-py>=2.2.
|
|
8
|
-
Requires-Dist: qqbotsdk-guild-py>=2.2.
|
|
7
|
+
Requires-Dist: qqbotsdk-base-py>=2.2.1
|
|
8
|
+
Requires-Dist: qqbotsdk-guild-py>=2.2.1 ; extra == 'guild'
|
|
9
9
|
Requires-Python: >=3.12
|
|
10
10
|
Provides-Extra: guild
|
|
11
11
|
Description-Content-Type: text/markdown
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "qqbotsdk-py"
|
|
3
|
-
version = "2.2.
|
|
3
|
+
version = "2.2.1"
|
|
4
4
|
description = "QQ 官方机器人 SDK:群聊 / 单聊 / 素材 / 互动"
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
requires-python = ">=3.12"
|
|
7
|
-
dependencies = ["qqbotsdk-base-py>=2.2.
|
|
7
|
+
dependencies = ["qqbotsdk-base-py>=2.2.1"]
|
|
8
8
|
|
|
9
9
|
[[project.authors]]
|
|
10
10
|
name = "snowy-yang"
|
|
11
11
|
email = "102860110+snowy-yang@users.noreply.github.com"
|
|
12
12
|
|
|
13
13
|
[project.optional-dependencies]
|
|
14
|
-
guild = ["qqbotsdk-guild-py>=2.2.
|
|
14
|
+
guild = ["qqbotsdk-guild-py>=2.2.1"]
|
|
15
15
|
|
|
16
16
|
[build-system]
|
|
17
17
|
requires = ["uv_build>=0.13.5,<0.14.0"]
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "qqbotsdk-py"
|
|
3
|
-
version = "2.2.
|
|
3
|
+
version = "2.2.1"
|
|
4
4
|
description = "QQ 官方机器人 SDK:群聊 / 单聊 / 素材 / 互动"
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
authors = [
|
|
@@ -8,11 +8,11 @@ authors = [
|
|
|
8
8
|
]
|
|
9
9
|
requires-python = ">=3.12"
|
|
10
10
|
dependencies = [
|
|
11
|
-
"qqbotsdk-base-py>=2.2.
|
|
11
|
+
"qqbotsdk-base-py>=2.2.1",
|
|
12
12
|
]
|
|
13
13
|
|
|
14
14
|
[project.optional-dependencies]
|
|
15
|
-
guild = ["qqbotsdk-guild-py>=2.2.
|
|
15
|
+
guild = ["qqbotsdk-guild-py>=2.2.1"]
|
|
16
16
|
|
|
17
17
|
[build-system]
|
|
18
18
|
requires = ["uv_build>=0.13.5,<0.14.0"]
|
|
@@ -75,23 +75,24 @@ def _remember_msg_seq(key: str, seq: int) -> None:
|
|
|
75
75
|
_MSG_SEQ_CACHE.pop(next(iter(_MSG_SEQ_CACHE)))
|
|
76
76
|
|
|
77
77
|
|
|
78
|
-
def
|
|
79
|
-
"""
|
|
78
|
+
def _resolve_intents_with_source(intents: Intents | None) -> tuple[Intents, str]:
|
|
79
|
+
"""解析订阅位, 同时返回它的来源(用于启动日志).
|
|
80
80
|
|
|
81
81
|
Args:
|
|
82
|
-
intents:
|
|
82
|
+
intents: 代码里显式指定的订阅位; 传 None 表示没指定.
|
|
83
83
|
|
|
84
84
|
Returns:
|
|
85
|
-
|
|
85
|
+
``(订阅位, 来源说明)``, 来源是 ``"显式入参"`` / ``"INTENTS 环境变量"`` /
|
|
86
|
+
``"默认值"`` 之一.
|
|
86
87
|
|
|
87
88
|
Raises:
|
|
88
89
|
ValueError: ``INTENTS`` 环境变量不是合法的十进制 / ``0x`` 十六进制掩码.
|
|
89
90
|
"""
|
|
90
91
|
if intents is not None:
|
|
91
|
-
return intents
|
|
92
|
+
return intents, "显式入参"
|
|
92
93
|
raw = os.getenv(INTENTS_ENV, "").strip()
|
|
93
94
|
if not raw:
|
|
94
|
-
return DEFAULT_INTENTS
|
|
95
|
+
return DEFAULT_INTENTS, "默认值"
|
|
95
96
|
try:
|
|
96
97
|
mask = int(raw, 0) # 十进制或 0x 十六进制
|
|
97
98
|
except ValueError:
|
|
@@ -100,7 +101,22 @@ def resolve_intents(intents: Intents | None = None) -> Intents:
|
|
|
100
101
|
) from None
|
|
101
102
|
if mask < 0:
|
|
102
103
|
raise ValueError(f"{INTENTS_ENV} 不能为负数,实际: {mask}")
|
|
103
|
-
return Intents(mask)
|
|
104
|
+
return Intents(mask), f"{INTENTS_ENV} 环境变量"
|
|
105
|
+
|
|
106
|
+
|
|
107
|
+
def resolve_intents(intents: Intents | None = None) -> Intents:
|
|
108
|
+
"""决定本次使用的订阅位: 显式入参 > ``INTENTS`` 环境变量 > ``DEFAULT_INTENTS``.
|
|
109
|
+
|
|
110
|
+
Args:
|
|
111
|
+
intents: 代码里显式指定的订阅位, 传了就直接用, 不读环境变量.
|
|
112
|
+
|
|
113
|
+
Returns:
|
|
114
|
+
最终生效的 :class:`Intents`.
|
|
115
|
+
|
|
116
|
+
Raises:
|
|
117
|
+
ValueError: ``INTENTS`` 环境变量不是合法的十进制 / ``0x`` 十六进制掩码.
|
|
118
|
+
"""
|
|
119
|
+
return _resolve_intents_with_source(intents)[0]
|
|
104
120
|
|
|
105
121
|
|
|
106
122
|
class Bot:
|
|
@@ -120,13 +136,17 @@ class Bot:
|
|
|
120
136
|
url: str | None = None,
|
|
121
137
|
auto_reconnect: bool = True,
|
|
122
138
|
) -> None:
|
|
123
|
-
|
|
139
|
+
resolved, source = _resolve_intents_with_source(intents)
|
|
140
|
+
self._intents = resolved
|
|
124
141
|
self._url = url
|
|
125
142
|
self._auto_reconnect = auto_reconnect
|
|
126
143
|
self._dispatcher = Dispatcher()
|
|
127
144
|
self._ws: QQBotWebSocket | None = None
|
|
128
145
|
self._stop_event = asyncio.Event()
|
|
129
146
|
self._running = False
|
|
147
|
+
# 订阅位来源写进启动日志: INTENTS 环境变量是运维侧的静默覆盖开关,
|
|
148
|
+
# 出错时(例如误收窄导致收不到事件)要能一眼看出订阅范围是从哪来的.
|
|
149
|
+
logger.info(f"订阅位 intents={int(self._intents)} 来源={source}")
|
|
130
150
|
|
|
131
151
|
@property
|
|
132
152
|
def intents(self) -> Intents:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|