From 507000b63b9002e1777a3b6ef712000387b823bc Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 23 Feb 2021 22:50:25 +0800 Subject: [PATCH 01/24] :bug: fix command match #235 --- nonebot/plugin/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nonebot/plugin/__init__.py b/nonebot/plugin/__init__.py index 439067af..38269e4c 100644 --- a/nonebot/plugin/__init__.py +++ b/nonebot/plugin/__init__.py @@ -5,9 +5,6 @@ 为 NoneBot 插件开发提供便携的定义函数。 """ import re -import sys -import pkgutil -import importlib from types import ModuleType from dataclasses import dataclass from importlib._bootstrap import _load @@ -426,7 +423,7 @@ def on_command(cmd: Union[str, Tuple[str, ...]], message = event.get_message() segment = message.pop(0) new_message = message.__class__( - str(segment) + str(segment).lstrip() [len(state["_prefix"]["raw_command"]):].lstrip()) # type: ignore for new_segment in reversed(new_message): message.insert(0, new_segment) From 869df38238b4d2ceb47bb7fdd87568ee060b4611 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 23 Feb 2021 23:34:24 +0800 Subject: [PATCH 02/24] :pencil2: fix typo --- .../nonebot/adapters/mirai/message.py | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py index 645c919f..bf3c077d 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py @@ -27,7 +27,7 @@ class MessageType(str, Enum): class MessageSegment(BaseMessageSegment): """ - CQHTTP 协议 MessageSegment 适配。具体方法参考 `mirai-api-http 消息类型`_ + Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 `mirai-api-http 消息类型`_ .. _mirai-api-http 消息类型: https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md @@ -81,7 +81,7 @@ class MessageSegment(BaseMessageSegment): """ :说明: - 生成回复引用消息段 + 生成回复引用消息段 :参数: @@ -103,7 +103,7 @@ class MessageSegment(BaseMessageSegment): """ :说明: - @某个人 + @某个人 :参数: @@ -125,8 +125,8 @@ class MessageSegment(BaseMessageSegment): """ :说明: - 发送QQ表情 - + 发送QQ表情 + :参数: * ``face_id: Optional[int]``: QQ表情编号，可选，优先高于name @@ -139,7 +139,7 @@ class MessageSegment(BaseMessageSegment): """ :说明: - 纯文本消息 + 纯文本消息 :参数: @@ -155,8 +155,8 @@ class MessageSegment(BaseMessageSegment): """ :说明: - 图片消息 - + 图片消息 + :参数: * ``image_id: Optional[str]``: 图片的image_id，群图片与好友图片格式不同。不为空时将忽略url属性 @@ -173,10 +173,10 @@ class MessageSegment(BaseMessageSegment): """ :说明: - 闪照消息 - + 闪照消息 + :参数: - + 同 ``image`` """ return cls(type=MessageType.FLASH_IMAGE, @@ -194,7 +194,7 @@ class MessageSegment(BaseMessageSegment): 语音消息 - :参数: + :参数: * ``voice_id: Optional[str]``: 语音的voice_id，不为空时将忽略url属性 * ``url: Optional[str]``: 语音的URL，发送时可作网络语音的链接 @@ -210,7 +210,7 @@ class MessageSegment(BaseMessageSegment): """ :说明: - XML消息 + XML消息 :参数: @@ -223,7 +223,7 @@ class MessageSegment(BaseMessageSegment): """ :说明: - Json消息 + Json消息 :参数: @@ -236,7 +236,7 @@ class MessageSegment(BaseMessageSegment): """ :说明: - 应用程序消息 + 应用程序消息 :参数: @@ -249,7 +249,7 @@ class MessageSegment(BaseMessageSegment): """ :说明: - 戳一戳消息 + 戳一戳消息 :参数: @@ -269,7 +269,7 @@ class MessageSegment(BaseMessageSegment): class MessageChain(BaseMessage): """ Mirai 协议 Message 适配 - + 由于Mirai协议的Message实现较为特殊, 故使用MessageChain命名 """ @@ -327,7 +327,7 @@ class MessageChain(BaseMessage): :说明: 弹出该消息链的第一个消息 - + :参数: * `*type: MessageType`: 指定的消息类型, 当指定后如类型不匹配不弹出 From eb8e5aa39dca6a3c50c613b4d44a245c03889397 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 24 Feb 2021 17:48:08 +0800 Subject: [PATCH 03/24] :wheelchair: add plugin loading using json/toml --- nonebot/__init__.py | 3 +++ nonebot/drivers/__init__.py | 2 ++ nonebot/plugin/__init__.py | 29 ++++++++++++++++++++++++++++- nonebot/plugin/__init__.pyi | 8 ++++++++ poetry.lock | 19 ++++++++++++++++++- pyproject.toml | 1 + tests/bot.py | 5 ++--- tests/plugins.toml | 3 +++ 8 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 tests/plugins.toml diff --git a/nonebot/__init__.py b/nonebot/__init__.py index 9c65b5a0..aaf5ca77 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -19,6 +19,8 @@ - ``load_plugin`` => ``nonebot.plugin.load_plugin`` - ``load_plugins`` => ``nonebot.plugin.load_plugins`` - ``load_all_plugins`` => ``nonebot.plugin.load_all_plugins`` +- ``load_from_json`` => ``nonebot.plugin.load_from_json`` +- ``load_from_toml`` => ``nonebot.plugin.load_from_toml`` - ``load_builtin_plugins`` => ``nonebot.plugin.load_builtin_plugins`` - ``get_plugin`` => ``nonebot.plugin.get_plugin`` - ``get_loaded_plugins`` => ``nonebot.plugin.get_loaded_plugins`` @@ -228,4 +230,5 @@ def run(host: Optional[str] = None, from nonebot.plugin import on_message, on_notice, on_request, on_metaevent, CommandGroup, MatcherGroup from nonebot.plugin import on_startswith, on_endswith, on_keyword, on_command, on_shell_command, on_regex from nonebot.plugin import load_plugin, load_plugins, load_all_plugins, load_builtin_plugins +from nonebot.plugin import load_from_json, load_from_toml from nonebot.plugin import export, require, get_plugin, get_loaded_plugins diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 134b2078..fd435704 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -73,6 +73,8 @@ class Driver(abc.ABC): * ``name: str``: 适配器名称，用于在连接时进行识别 * ``adapter: Type[Bot]``: 适配器 Class """ + if name in self._adapters: + print("============", name) self._adapters[name] = adapter adapter.register(self, self.config, **kwargs) logger.opt( diff --git a/nonebot/plugin/__init__.py b/nonebot/plugin/__init__.py index 38269e4c..be96ecfd 100644 --- a/nonebot/plugin/__init__.py +++ b/nonebot/plugin/__init__.py @@ -5,12 +5,13 @@ 为 NoneBot 插件开发提供便携的定义函数。 """ import re +import json from types import ModuleType from dataclasses import dataclass -from importlib._bootstrap import _load from contextvars import Context, ContextVar, copy_context from typing import Any, Set, List, Dict, Type, Tuple, Union, Optional, TYPE_CHECKING +import tomlkit from nonebot.log import logger from nonebot.matcher import Matcher from nonebot.permission import Permission @@ -1069,6 +1070,32 @@ def load_all_plugins(module_path: Set[str], return loaded_plugins +def load_from_json(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: + with open(file_path, "r", encoding=encoding) as f: + data = json.load(f) + plugins = data.get("plugins") + plugin_dirs = data.get("plugin_dirs") + assert isinstance(plugins, list), "plugins must be a list of plugin name" + assert isinstance(plugin_dirs, + list), "plugin_dirs must be a list of directories" + return load_all_plugins(set(plugins), set(plugin_dirs)) + + +def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: + with open(file_path, "r", encoding=encoding) as f: + data = tomlkit.parse(f.read()) + + nonebot_data = data.get("nonebot", {}).get("plugins") + if not nonebot_data: + raise ValueError("Cannot find '[nonebot.plugins]' in given toml file!") + plugins = nonebot_data.get("plugins", []) + plugin_dirs = nonebot_data.get("plugin_dirs", []) + assert isinstance(plugins, list), "plugins must be a list of plugin name" + assert isinstance(plugin_dirs, + list), "plugin_dirs must be a list of directories" + return load_all_plugins(set(plugins), set(plugin_dirs)) + + def load_builtin_plugins(name: str = "echo") -> Optional[Plugin]: """ :说明: diff --git a/nonebot/plugin/__init__.pyi b/nonebot/plugin/__init__.pyi index 9549d45e..02cc6b96 100644 --- a/nonebot/plugin/__init__.pyi +++ b/nonebot/plugin/__init__.pyi @@ -181,6 +181,14 @@ def load_all_plugins(module_path: Set[str], ... +def load_from_json(file_path: str, encoding: str = ...) -> Set[Plugin]: + ... + + +def load_from_toml(file_path: str, encoding: str = ...) -> Set[Plugin]: + ... + + def load_builtin_plugins(name: str = ...): ... diff --git a/poetry.lock b/poetry.lock index 72dfa941..1b3c0b95 100644 --- a/poetry.lock +++ b/poetry.lock @@ -857,6 +857,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "tomlkit" +version = "0.7.0" +description = "Style preserving TOML library" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "typing-extensions" version = "3.7.4.3" @@ -1040,7 +1053,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "5ed7961113ab7fb77bae986bb67280715f852822bb25f51725dcb5382bdfd08c" +content-hash = "472f4191d75922660770d7a4f8669a5dbde12586970daebf188b23cf605dec0d" [metadata.files] aiofiles = [ @@ -1317,6 +1330,10 @@ toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] +tomlkit = [ + {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, + {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, +] typing-extensions = [ {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, diff --git a/pyproject.toml b/pyproject.toml index 7db8f57f..8fc0c490 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,7 @@ fastapi = "^0.63.0" uvicorn = "^0.11.5" Quart = { version = "^0.14.1", optional = true } pydantic = { extras = ["dotenv", "typing_extensions"], version = "^1.7.3" } +tomlkit = "^0.7.0" [tool.poetry.dev-dependencies] yapf = "^0.30.0" diff --git a/tests/bot.py b/tests/bot.py index e4ec39e4..f60c1878 100644 --- a/tests/bot.py +++ b/tests/bot.py @@ -27,8 +27,7 @@ driver.register_adapter("mirai", MiraiBot) nonebot.load_builtin_plugins() # load all plugins -nonebot.load_all_plugins({"nonebot_plugin_apscheduler", "nonebot_plugin_test"}, - {"test_plugins"}) +nonebot.load_from_toml("plugins.toml") # modify some config / config depends on loaded configs config = driver.config @@ -36,4 +35,4 @@ config.custom_config3 = config.custom_config1 config.custom_config4 = "New custom config" if __name__ == "__main__": - nonebot.run(app="bot:app") + nonebot.run(app="__mp_main__:app") diff --git a/tests/plugins.toml b/tests/plugins.toml new file mode 100644 index 00000000..85eefe30 --- /dev/null +++ b/tests/plugins.toml @@ -0,0 +1,3 @@ +[nonebot.plugins] +plugins = ["nonebot_plugin_test"] +plugin_dirs = ["test_plugins"] From 04e11c3b3e6f4d84045efcda68bb1ecef0400d1b Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 24 Feb 2021 17:56:43 +0800 Subject: [PATCH 04/24] :bulb: update docstring --- docs/api/adapters/mirai.md | 2 +- docs/api/nonebot.md | 6 +++++ docs/api/plugin.md | 53 +++++++++++++++++++++++++++++++++++++ nonebot/drivers/__init__.py | 2 -- nonebot/drivers/quart.py | 1 - nonebot/plugin/__init__.py | 29 ++++++++++++++++++++ 6 files changed, 89 insertions(+), 4 deletions(-) diff --git a/docs/api/adapters/mirai.md b/docs/api/adapters/mirai.md index 0a304f8f..1f05088b 100644 --- a/docs/api/adapters/mirai.md +++ b/docs/api/adapters/mirai.md @@ -724,7 +724,7 @@ mirai-api-http 正向 Websocket 协议 Bot 适配。 基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment) -CQHTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) +Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) ### `as_dict()` diff --git a/docs/api/nonebot.md b/docs/api/nonebot.md index c11cf2be..b726f5bd 100644 --- a/docs/api/nonebot.md +++ b/docs/api/nonebot.md @@ -55,6 +55,12 @@ sidebarDepth: 0 * `load_all_plugins` => `nonebot.plugin.load_all_plugins` +* `load_from_json` => `nonebot.plugin.load_from_json` + + +* `load_from_toml` => `nonebot.plugin.load_from_toml` + + * `load_builtin_plugins` => `nonebot.plugin.load_builtin_plugins` diff --git a/docs/api/plugin.md b/docs/api/plugin.md index 8b16427a..a924bb6b 100644 --- a/docs/api/plugin.md +++ b/docs/api/plugin.md @@ -1334,6 +1334,59 @@ def something_else(): +## `load_from_json(file_path, encoding='utf-8')` + + +* **说明** + + 导入指定 json 文件中的 `plugins` 以及 `plugin_dirs` 下多个插件，以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `file_path: str`: 指定 json 文件路径 + + + * `encoding: str`: 指定 json 文件编码 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_from_toml(file_path, encoding='utf-8')` + + +* **说明** + + 导入指定 toml 文件 `[nonebot.plugins]` 中的 `plugins` 以及 `plugin_dirs` 下多个插件， + 以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `file_path: str`: 指定 toml 文件路径 + + + * `encoding: str`: 指定 toml 文件编码 + + + +* **返回** + + + * `Set[Plugin]` + + + ## `load_builtin_plugins(name='echo')` diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index fd435704..134b2078 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -73,8 +73,6 @@ class Driver(abc.ABC): * ``name: str``: 适配器名称，用于在连接时进行识别 * ``adapter: Type[Bot]``: 适配器 Class """ - if name in self._adapters: - print("============", name) self._adapters[name] = adapter adapter.register(self, self.config, **kwargs) logger.opt( diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 9d189d64..d3c0ad42 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -172,7 +172,6 @@ class Driver(BaseDriver): self_id = await BotClass.check_permission(self, 'websocket', headers, None) except RequestDenied as e: - print(e.reason) raise exceptions.HTTPException(status_code=e.status_code, description=e.reason, name='Request Denied') diff --git a/nonebot/plugin/__init__.py b/nonebot/plugin/__init__.py index be96ecfd..b9ed77ed 100644 --- a/nonebot/plugin/__init__.py +++ b/nonebot/plugin/__init__.py @@ -1071,6 +1071,20 @@ def load_all_plugins(module_path: Set[str], def load_from_json(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: + """ + :说明: + + 导入指定 json 文件中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件，以 ``_`` 开头的插件不会被导入！ + + :参数: + + - ``file_path: str``: 指定 json 文件路径 + - ``encoding: str``: 指定 json 文件编码 + + :返回: + + - ``Set[Plugin]`` + """ with open(file_path, "r", encoding=encoding) as f: data = json.load(f) plugins = data.get("plugins") @@ -1082,6 +1096,21 @@ def load_from_json(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: + """ + :说明: + + 导入指定 toml 文件 ``[nonebot.plugins]`` 中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件， + 以 ``_`` 开头的插件不会被导入！ + + :参数: + + - ``file_path: str``: 指定 toml 文件路径 + - ``encoding: str``: 指定 toml 文件编码 + + :返回: + + - ``Set[Plugin]`` + """ with open(file_path, "r", encoding=encoding) as f: data = tomlkit.parse(f.read()) From 6f2b9a1d13e5108a707bbb0dec3b7a23918380cb Mon Sep 17 00:00:00 2001 From: AkiraXie Date: Wed, 24 Feb 2021 22:21:47 +0800 Subject: [PATCH 05/24] :bug: fix single_session bug --- nonebot/plugins/single_session.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nonebot/plugins/single_session.py b/nonebot/plugins/single_session.py index 8516b0c1..94558553 100644 --- a/nonebot/plugins/single_session.py +++ b/nonebot/plugins/single_session.py @@ -10,17 +10,23 @@ _running_matcher: Dict[str, int] = {} @run_preprocessor async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State): - session_id = event.get_session_id() - event_id = id(event) - - if _running_matcher.get(session_id, None) != event_id: + try: + session_id = event.get_session_id() + except ValueError: + return + current_event_id = id(event) + event_id = _running_matcher.get(session_id, None) + if event_id and event_id != current_event_id: raise IgnoredException("Annother matcher running") - _running_matcher[session_id] = event_id + _running_matcher[session_id] = current_event_id @run_postprocessor async def _(matcher: Matcher, exception: Optional[Exception], bot: Bot, event: Event, state: T_State): - session_id = event.get_session_id() + try: + session_id = event.get_session_id() + except ValueError: + return if session_id in _running_matcher: del _running_matcher[session_id] From 00daaed074c21988da365d7ffe9fc03f5767b2e4 Mon Sep 17 00:00:00 2001 From: AkiraXie Date: Wed, 24 Feb 2021 14:27:44 +0000 Subject: [PATCH 06/24] :memo: update api docs --- docs/api/adapters/mirai.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/adapters/mirai.md b/docs/api/adapters/mirai.md index 0a304f8f..1f05088b 100644 --- a/docs/api/adapters/mirai.md +++ b/docs/api/adapters/mirai.md @@ -724,7 +724,7 @@ mirai-api-http 正向 Websocket 协议 Bot 适配。 基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment) -CQHTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) +Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) ### `as_dict()` From da290dad07b748be52764d25d8b5b9615c6a714e Mon Sep 17 00:00:00 2001 From: AkiraXie Date: Wed, 24 Feb 2021 23:56:52 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=F0=9F=A5=85=20=20fix=20ValueError=20to?= =?UTF-8?q?=20Exception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nonebot/plugins/single_session.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot/plugins/single_session.py b/nonebot/plugins/single_session.py index 94558553..30fdc496 100644 --- a/nonebot/plugins/single_session.py +++ b/nonebot/plugins/single_session.py @@ -12,7 +12,7 @@ _running_matcher: Dict[str, int] = {} async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State): try: session_id = event.get_session_id() - except ValueError: + except Exception: return current_event_id = id(event) event_id = _running_matcher.get(session_id, None) @@ -26,7 +26,7 @@ async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State): async def _(matcher: Matcher, exception: Optional[Exception], bot: Bot, event: Event, state: T_State): try: session_id = event.get_session_id() - except ValueError: + except Exception: return if session_id in _running_matcher: del _running_matcher[session_id] From bb37d757dab49547063880cb021353f5f17e05c0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 26 Feb 2021 12:03:48 +0800 Subject: [PATCH 08/24] :bulb: remove comment --- .gitignore | 1 + nonebot/permission.py | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5e140b2f..ff398cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,4 @@ typings/ dev docs_build/_build !tests/.env +*.xmind diff --git a/nonebot/permission.py b/nonebot/permission.py index 04337c67..55e9f16b 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -141,7 +141,3 @@ SUPERUSER = Permission(_superuser) """ - **说明**: 匹配任意超级用户消息类型事件 """ -# EVERYBODY = MESSAGE -# """ -# - **说明**: 匹配任意消息类型事件 -# """ From 3c312d97590de90daa7ecc74e9c5d5ee9a10194c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 26 Feb 2021 17:00:38 +0800 Subject: [PATCH 09/24] :memo: update how to work doc Co-authored-by: AkiraXie --- docs/advanced/README.md | 166 ++++++++++++++++++++++++++++- docs/api/matcher.md | 9 ++ docs/guide/creating-a-matcher.md | 2 + docs/guide/images/Handle-Event.png | Bin 0 -> 126466 bytes nonebot/matcher.py | 5 + 5 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 docs/guide/images/Handle-Event.png diff --git a/docs/advanced/README.md b/docs/advanced/README.md index 92c6af3e..6d34007c 100644 --- a/docs/advanced/README.md +++ b/docs/advanced/README.md @@ -2,6 +2,168 @@ ## 它如何工作？ - +如同[概览](../guide/README.md)所言: -~~未填坑~~ +> NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 + +`Nonebot2` 是一个可以对机器人上报的事件进行处理并完成具体功能的机器人框架，在这里，我们将简要讲述它的工作内容。 + +**便捷起见，以下内容对 `Nonebot2` 会被称为 `nonebot`，与 `Nonebot2` 交互的机器人实现会被称为 `协议端`**。 + +在实际应用中，`nonebot` 会充当一个高性能，轻量级的 Python 微服务框架。协议端可以通过 `http`, `websocket` 等方式与之通信，这个通信往往是双向的：一方面，协议端可以上报数据给 `nonebot`，`nonebot` 会处理数据并返回响应给协议端；另一方面，`nonebot` 可以主动推送数据给协议端。而 `nonebot` 便是围绕上述的双向通信进行工作的。 + +在开始工作之前，`nonebot` 会依照**配置文件或初始化配置**启动，并会注册**协议适配器** `adapter`，之后便会加载**插件**， 随后，倘若一个协议端与 `nonebot` 进行了连接，`nonebot` 的后端驱动 `driver` 就会将 `adapter` 实例化为 `bot`，`nonebot` 便会利用 `bot` 开始工作，它的工作内容分为两个方面： + +1. **事件处理**，`bot` 会将协议端上报的数据转化为 `事件`(`Event`)，之后 `nonebot` 会根据一套既定流程来处理 `事件`。 + +2. **调用 `API`**, 在**事件处理**的过程中，`nonebot` 可以通过 `bot` 调用协议端指定的 `API` 来获取更多数据，或者反馈响应给协议端; `nonebot` 也可以通过调用 `API` 向协议端主动请求数据或者主动推送数据。 + +在**指南**模块， 我们已经叙述了[如何配置 nonebot](../guide/basic-configuration.md), [如何注册协议适配器](../guide/getting-started.md)，[如何加载插件](../guide/loading-a-plugin.md), 在这里便不再赘述。 + +下面，我们将对**事件处理**， **调用 API**进行说明。 + +## 事件处理 + +我们可以先看事件处理的流程图： + +![handle-event](../guide/images/Handle-Event.png) + +在流程图里，我们可以看到，`nonebot` 会有三个阶段来处理事件： + +1. **driver 处理上报数据** +2. **adapter 处理原始数据** +3. **nonebot 处理 Event** + +我们将顺序说明这三个阶段。其中，会将第三个阶段拆分成**概念解释**，**处理 Event**，**特殊异常处理**三个部分来说明。 + +### driver 处理上报数据 + +1. 协议端会通过 `websocket` 或者 `http` 等方式与 `nonebot` 的后端驱动 `driver` 连接，`driver` 会根据之前注册的 `adapter` 和配置文件的内容来进行鉴权，从而获得这个连接的唯一识别 id `self-id`，随后 `adapter` 就会利用 `self-id` 实例化为 `bot` 对象。 + + ::: tip + 需要注意的是，如果协议端通过 `websocket` 与 `nonebot` 连接，这个步骤只会在建立连接时进行；通过 `http` 方式连接时，会在协议端每次上报数据时都进行这个步骤。 + ::: + + ::: warning + 连接之前必须要注册 `adapter` + ::: + + ::: warning + `self-id` 是帐号的唯一识别 ID，这意味着不能出现相同的 `self-id`。 + ::: + +2. `driver` 会将接收到的数据转交给 `bot` 对象进一步处理。 + +### adapter 处理原始数据 + +1. `bot` 会利用事先定义好的 `Event Model` 对上报的数据进行分析处理，将数据转化为 `nonebot` 可以处理的 `Event` 对象。 + + ::: tip + `adapter` 在转换数据格式的同时可以进行一系列的特殊操作，例如 `CQHTTP` 会对 `reply` 信息进行提取。 + ::: + +2. `Event` 会传入 `nonebot` 做进一步处理。 + +### nonebot 处理 Event + +在讲述这个阶段之前，我们需要先对几个概念进行解释。 + +#### 概念解释 + +1. **hook**，或者说**钩子函数**，它们可以在 `nonebot` 处理 `Event` 的不同时刻进行拦截，修改或者扩展，在 `nonebot` 中，钩子函数分为 `事件预处理hook`，`运行预处理hook`，`运行后处理hook` 和 `事件后处理hook`。 + + ::: tip + 关于`hook`的更多信息，可以查阅[这里](./runtime-hook.md) + ::: + +2. **Matcher**与**matcher**，在**指南**中，我们讲述了[如何注册事件响应器](../guide/creating-a-matcher)，这里的事件响应器或者说 `Matcher` 并不是一个具体的实例 `instance`，而是一个具有特定属性的类 `class`。只有当 `Matcher` **响应事件**时，才会实例化为具体的 `instance`，也就是 `matcher`。`matcher` 可以认为是 `nonebot` 处理 `Event` 的基本单位，运行 `matcher` 是`nonebot`工作的主要内容。 + +3. **handler**，或者说**事件处理函数**, 它们可以认为是 `nonebot` 处理 `Event` 的最小单位。在不考虑 `hook` 的情况下，**运行 matcher 就是顺序运行 matcher.handlers**，这句话换种表达方式就是，`handler` 只有添加到 `matcher.handlers` 时，才可以参与到 `nonebot` 的工作中来。 + + ::: tip + 如何让 `handler` 添加到 `matcher.handlers`？ + + 一方面，我们可以参照[这里](../guide/creating-a-handler)利用装饰器来添加；另一方面，我们在用 `on()` 或者 `on_*()` 注册事件响应器时，可以添加 `handlers=[handler1, handler2, ...]` 这样的关键词参数来添加。 + ::: + +#### 处理 Event + +1. **执行事件预处理 hook**， `nonebot` 接收到 `Event` 后，会传入到 `事件预处理hook` 中进行处理。 + + ::: warning + 需要注意的是，执行多个 `事件预处理hook` 时并无顺序可言，它们是**并行运行**的。这个原则同样适用于其他的 `hook`。 + ::: + +2. **按优先级升序选出同一优先级的 Matcher**，`nonebot` 提供了一个全局字典 `matchers`，这个字典的 `key` 是优先级 `priority`，`value` 是一个 `list`，里面存放着同一优先级的 `Matcher`。在注册 `Matcher` 时，它和优先级 `priority` 会添加到里面。 + + 在执行 `事件预处理hook` 后，`nonebot` 会对 `matchers` 的 `key` 升序排序并选择出当前最小优先级的 `Matcher`。 + +3. **根据 Matcher 定义的 Rule, Permission 判断是否运行**，在选出 `Matcher` 后，`nonebot` 会将 `bot`，`Event` 传入到 `Matcher.check_rule` 和 `Matcher.check_perm` 两个函数中，两个函数分别对 Matcher 定义的 Rule, Permission 进行 check，当 check 通过后，这个 `Matcher` 就会响应事件。但是当同一个优先级的所有 `Matcher` 均没有响应时，`nonebot` 会返回到上一个步骤，选择出下一优先级的 `Matcher`。 + +4. **实例化 matcher 并执行运行预处理 hook**，当 `Matcher` 响应事件后，它便会实例化为 `matcher`，并执行 `运行预处理hook`。 + +5. **顺序运行 matcher 的所有 handlers**，`运行预处理hook` 执行完毕后，便会运行 `matcher`，也就是**顺序运行**它的 `handlers`。 + + ::: tip + `matcher` 运行 `handlers` 的顺序是: 先运行该 `matcher` 的类 `Matcher` 注册时添加的 `handlers`(如果有的话)，再按照装饰器装饰顺序运行装饰的 `handlers`。 + ::: + +6. **执行运行后处理 hook**，`matcher` 的 `handlers` 运行完毕后，会执行 `运行后处理hook`。 + +7. **判断是否停止事件传播**，`nonebot` 会根据当前优先级所有 `matcher` 的 `block` 参数或者 `StopPropagation` 异常判断是否停止传播 `Event`，如果事件没有停止传播，`nonebot` 便会返回到第 2 步， 选择出下一优先级的 `Matcher`。 + +8. **执行事件后处理 hook**，在 `Event` 停止传播或执行完所有响应的 `Matcher` 后，`nonebot` 会执行 `事件后处理hook`。 + + 当 `事件后处理hook` 执行完毕后，当前`Event`的处理周期就顺利结束了。 + +#### 特殊异常处理 + +在这个阶段，`nonebot` 规定了几个特殊的异常，当 `nonebot` 捕获到它们时，会用特定的行为来处理它们。 + +1. **IgnoredException** + + 这个异常可以在 `事件预处理hook` 和 `运行预处理hook` 抛出。 + + 当 `事件预处理hook` 抛出它时，`nonebot` 会忽略当前的 `Event`，不进行处理。 + + 当 `运行预处理hook` 抛出它时，`nonebot` 会忽略当前的 `matcher`，结束当前 `matcher` 的运行。 + + ::: warning + 当 `hook` 需要抛出这个异常时，要写明原因。 + ::: + +2. **PausedException** + + 这个异常可以在 `handler` 中由 `Matcher.pause` 抛出。 + + 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将后续的 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行后续的 handlers。 + +3. **RejectedException** + + 这个异常可以在 `handler` 中由 `Matcher.reject` 抛出。 + + 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将**当前 handler 和后续 `handler`**交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行当前 `handler` 和后续的 `handler`。 + +4. **FinishedException** + + 这个异常可以在 `handler` 中由 `Matcher.finish` 抛出。 + + 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行。 + +5. **StopPropagation** + + 这个异常一般会在执行 `运行后处理hook` 后抛出。 + + 当 `nonebot` 捕获到它时， 会停止传播当前 `Event`，不再寻找下一优先级的 `Matcher`，直接执行 `事件后处理hook`。 + +## 调用 API + +`nonebot` 可以通过 `bot` 来调用 API，API 可以向协议端发送数据，也可以向协议端请求更多的数据。 + +::: tip +不同 `adapter` 规定了不同的 API，对应的 API 列表请参照协议规范。 +::: + +一般来说，我们可以用 `bot.*` 来调用 `API`(\*是 `API` 的 `action` 或者 `endpoint`)。 + +对于发送消息而言，一方面可以调用既有的 API；另一方面 `nonebot` 实现了两个便捷方法，`bot.send(event, message, **kwargs)` 方法和可以在 `handler` 中使用的 `Matcher.send(message, **kwargs)` 方法，来向事件主体发送消息。 diff --git a/docs/api/matcher.md b/docs/api/matcher.md index 22eabc3b..9283f8a7 100644 --- a/docs/api/matcher.md +++ b/docs/api/matcher.md @@ -468,3 +468,12 @@ sidebarDepth: 0 * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api + + + +### `stop_propagation()` + + +* **说明** + + 阻止事件传播 diff --git a/docs/guide/creating-a-matcher.md b/docs/guide/creating-a-matcher.md index 83debe13..61a5143d 100644 --- a/docs/guide/creating-a-matcher.md +++ b/docs/guide/creating-a-matcher.md @@ -101,6 +101,8 @@ nb plugin install nonebot_plugin_test NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默认会阻断事件传递，其他则不会。 +在部分情况中，可以使用 `matcher.stop_propagation()` 方法动态阻止事件传播，该方法需要 `handler` 在参数中获取 `matcher` 实例后调用方法。 + ## 自定义 rule rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： diff --git a/docs/guide/images/Handle-Event.png b/docs/guide/images/Handle-Event.png new file mode 100644 index 0000000000000000000000000000000000000000..6546632c62c9dfee7d4f8e0ad5d2a7a082929542 GIT binary patch literal 126466 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 z zHuSyaZaZg}!X+LOdpdDN1$Z}?6&M}49`qn#(3rlv@b%lwihqvI-~aemLjCpZ&D+2ZIHJa223EOs;i^^ZDOwjQv#&s+;z1{>NxD6k zelzS3FqMxVGt6j1>>e&U8=;_{^1EZg6rgRJP2*|WT=oG!i0)lX<1aFNy$4p}L0btE zE!Z)A;D;QIOBlfOVkt&%XrZy+D>xqs0n=s(# zGuY~rH$UX$C})DEv~SZte!O+)___Dbn-9};0tf(r$bp9Mp(^fW)ry(+j~8}e^xl(`K$8C~ z8$5d%Xj0gZdL|aY5nTJg5fTODf%T9qX!XY?X8pi_&sELeQwal8VK-o>bwU`8*i*H< zIZ?0wYru!{faU$Hjea%Sq;2~LT9bL&zZ_^Qp`*S2-|P=4p6wq$@%*n`fPc{$|1Apt zEeiiba{uKN{p*ka<0Lq5e;{7ORG8MO7Y{mSBYJfW3$9hu`VOzm=fPVmX3_*wWjsme z{EI!DzKk7W6SaJc2Y)Q=4_Im8bs?1Xx6&Gzf%@a^?Bm^d_!=|9|h|KRKp@Y zFakvPnUqX#&-kQxjR)Vg;FHKJEZGJ&P0`?wRa%$z1unAUi;CU+5_B{O06ZcMSTK5n z$y^F=ll`r?I`Vg4 z9;CnXdK*;6f6BT84tl3Je73eJbiJ3>8sM~w{kym|FXb;LuFDOq@V&EdFNOayU;9vdIb&$v(!(*047j$2w(?gRCQt!}mI= z*L!?!zuWhByM6!t{DtG3^L&i!aXqf^348D3Ba{fDVi?D(zo ze$s&fC=Sa0dGJFWTu^U)&2l}XGhw}-LDln$GJbt)^%=9@Km;K(*>CXlV?bqE+>5^| z&g0iRs^mux?+Djyh73bx{e`b1JEgUW42q|y1@Yk{k6ejX9*YND2E*?X_sg+Jkwmv+ zZL6wXVuqi8Z2ySy!!NvbTiV^8mhL~9*f%{d_n33K%YCtI8j7JVpmM?f+}(DkJ}`wz zqGqVGz(^H2`k(An_}nHGuKc)8w>jo%g9M9R#X{-9)S89Tp$X`!UGN0+4QpE##)mYi^enXd_#;qv zq(+ZIBP$+}U%m@?g!1kVfhvb+`+eT+JDzfPWr^|9U;FtC@n)d-z5Tt7)v8c00OJ@v zHKS!mrGeUy#+L?dcc#iwt?w{{-IwaB+)r`BXrcm&9~g}g3;eTtjCY}^%7em8fXUM6 zAT9>=&RN22;p)lj>G;k{!y8}&86i{-ZmD_49-Iw;Mpc3WJ_fIL;-s$3Y?fmkBlXYTVXzEG1f)4pP>6tif87>@CHT= zr+EvgihK}Udvou7J`RiNWRR%M*j!I;X{8TGj=lD?+dj%4=TOQ6RoiEc`ad=tg}0*dX)1Ry}9%ADqe-%jf%keUFh{%0c%_ z3;Qf4gu2i6z41QT)&Go~a5{f6W&DKaw4P_lH>;oDKiPiUV8ah@|2}qMr0|&INSVVl zjUxN;8e&T|yMD64>#Q;!{apw1y+v9~f;&T@o3kH&2vhEtRhlTk#I|ZU?MOcmPwkjh zVCxm;C31=S;?`4Ryxfbd5ov6}mz+?i*$!6*=BmE=l;8{F!XjUYdmnZi9`qS>8YgTY&iym!GDK5lm% z|Gg|X!T!t-X4LyP173z@8BX`t%;)?5&C+DK0hnWrfP?XWSZiOwOr=deM*Gh8b*k+-6fa#4ozI}!<4^Q_umA*gmjI&a%!e8H{md|lthU+tJ9v% zD031kL~-%0KEe+=9d)JguQRxv$U1>!E^Vku#keQEkMH4 znfrHbWc*+hn@vJ&Pi3ayw>UM<1H>b}FW?~zd;fuVqA*D@*b *}eYX-4FxSv>JU5 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

*N@WS@+EN$Q;{@LQ)Z!7WSW2|_;9z|pPtZ1U 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 VK6&fZIU5*&z|+;wWt~$(698!sxRL+> literal 0 HcmV?d00001 diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 0fda9f3d..2b7775f6 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -484,6 +484,11 @@ class Matcher(metaclass=MatcherMeta): raise RejectedException def stop_propagation(self): + """ + :说明: + + 阻止事件传播 + """ self.block = True async def run_handler(self, handler: T_Handler, bot: "Bot", event: "Event", From 8c9e096a8441e73d4a2d965e20385f723ab31f9d Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 26 Feb 2021 17:22:39 +0800 Subject: [PATCH 10/24] :bug: ignore adapter register with same name --- nonebot/drivers/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 134b2078..efa6bc71 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -73,6 +73,10 @@ class Driver(abc.ABC): * ``name: str``: 适配器名称，用于在连接时进行识别 * ``adapter: Type[Bot]``: 适配器 Class """ + if name in self._adapters: + logger.opt( + colors=True).debug(f'Adapter "{name}" already exists') + return self._adapters[name] = adapter adapter.register(self, self.config, **kwargs) logger.opt( From 01af05742cc48a3e48080e1c36c5e48bbf6d6780 Mon Sep 17 00:00:00 2001 From: StarHeart Date: Fri, 26 Feb 2021 22:51:33 +0800 Subject: [PATCH 11/24] :memo: Add link to docs mirror (hosted on Vercel) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9a09894e..80c07c84 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,8 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 nb plugin install nonebot_plugin_docs ``` + 或者尝试 [文档镜像](https://nonebot2-vercel-mirror.vercel.app) + - 其他插件请查看 [插件商店](https://v2.nonebot.dev/plugin-store.html) ## 贡献 From dc38a9818048f5dfa86d80c73142d63dae41b918 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 28 Feb 2021 00:35:40 +0800 Subject: [PATCH 12/24] :arrow_up: bump and fit pydantic 1.8 --- nonebot/config.py | 75 ++++++++++++++++++--------------------------- poetry.lock | 77 +++++++++++++++++++++++------------------------ pyproject.toml | 2 +- 3 files changed, 69 insertions(+), 85 deletions(-) diff --git a/nonebot/config.py b/nonebot/config.py index 9fb09e46..f99b4705 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -13,76 +13,44 @@ NoneBot 使用 `pydantic`_ 以及 `python-dotenv`_ 来读取配置。 .. _pydantic Field Type: https://pydantic-docs.helpmanual.io/usage/types/ """ - import os from pathlib import Path + from datetime import timedelta from ipaddress import IPv4Address -from typing import Any, Set, Dict, Union, Mapping, Optional +from typing import Any, Set, Dict, Tuple, Mapping, Optional -from pydantic.utils import deep_update from pydantic import BaseSettings, IPvAnyAddress -from pydantic.env_settings import SettingsError, env_file_sentinel, read_env_file +from pydantic.env_settings import env_file_sentinel, SettingsSourceCallable +from pydantic.env_settings import read_env_file, SettingsError, EnvSettingsSource -class BaseConfig(BaseSettings): +class CustomEnvSettings(EnvSettingsSource): - def __init__( - __pydantic_self__, # type: ignore - _common_config: Optional[Dict[Any, Any]] = None, - _env_file: Union[Path, str, None] = env_file_sentinel, - _env_file_encoding: Optional[str] = None, - _secrets_dir: Union[Path, str, None] = None, - **values: Any) -> None: - super(BaseSettings, - __pydantic_self__).__init__(**__pydantic_self__._build_values( - values, - _common_config=_common_config, - _env_file=_env_file, - _env_file_encoding=_env_file_encoding, - _secrets_dir=_secrets_dir)) - - def _build_values( - self, - init_kwargs: Dict[str, Any], - _common_config: Optional[Dict[Any, Any]] = None, - _env_file: Union[Path, str, None] = None, - _env_file_encoding: Optional[str] = None, - _secrets_dir: Union[Path, str, None] = None, - ) -> Dict[str, Any]: - return deep_update(self._build_secrets_files(_secrets_dir), - _common_config or {}, - self._build_environ(_env_file, - _env_file_encoding), init_kwargs) - - def _build_environ( - self, - _env_file: Union[Path, str, None] = None, - _env_file_encoding: Optional[str] = None - ) -> Dict[str, Optional[str]]: + def __call__(self, settings: BaseSettings) -> Dict[str, Any]: """ Build environment variables suitable for passing to the Model. """ d: Dict[str, Optional[str]] = {} - if self.__config__.case_sensitive: + if settings.__config__.case_sensitive: env_vars: Mapping[str, Optional[str]] = os.environ else: env_vars = {k.lower(): v for k, v in os.environ.items()} env_file_vars: Dict[str, Optional[str]] = {} - env_file = _env_file if _env_file != env_file_sentinel else self.__config__.env_file - env_file_encoding = _env_file_encoding if _env_file_encoding is not None else self.__config__.env_file_encoding + env_file = self.env_file if self.env_file != env_file_sentinel else settings.__config__.env_file + env_file_encoding = self.env_file_encoding if self.env_file_encoding is not None else settings.__config__.env_file_encoding if env_file is not None: env_path = Path(env_file) if env_path.is_file(): env_file_vars = read_env_file( env_path, encoding=env_file_encoding, - case_sensitive=self.__config__.case_sensitive) + case_sensitive=settings.__config__.case_sensitive) env_vars = {**env_file_vars, **env_vars} - for field in self.__fields__.values(): + for field in settings.__fields__.values(): env_val: Optional[str] = None for env_name in field.field_info.extra["env_names"]: env_val = env_vars.get(env_name) @@ -96,7 +64,7 @@ class BaseConfig(BaseSettings): if field.is_complex(): try: - env_val = self.__config__.json_loads(env_val) + env_val = settings.__config__.json_loads(env_val) except ValueError as e: raise SettingsError( f'error parsing JSON for "{env_name}"' # type: ignore @@ -109,7 +77,8 @@ class BaseConfig(BaseSettings): len(env_val) == 0) and env_name in env_vars: env_val = env_vars[env_name] try: - env_val = self.__config__.json_loads(env_val) + if env_val: + env_val = settings.__config__.json_loads(env_val) except ValueError as e: pass @@ -117,9 +86,25 @@ class BaseConfig(BaseSettings): return d + +class BaseConfig(BaseSettings): + def __getattr__(self, name: str) -> Any: return self.__dict__.get(name) + class Config: + + @classmethod + def customise_sources( + cls, + init_settings: SettingsSourceCallable, + env_settings: SettingsSourceCallable, + file_secret_settings: SettingsSourceCallable, + ) -> Tuple[SettingsSourceCallable, ...]: + return init_settings, CustomEnvSettings( + env_settings.env_file, + env_settings.env_file_encoding), file_secret_settings + class Env(BaseConfig): """ diff --git a/poetry.lock b/poetry.lock index 1b3c0b95..c0a6b17d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -470,20 +470,19 @@ reference = "aliyun" [[package]] name = "pydantic" -version = "1.7.3" +version = "1.8" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = {version = ">=3.7.2", optional = true, markers = "extra == \"typing_extensions\""} +typing-extensions = ">=3.7.4.3" [package.extras] dotenv = ["python-dotenv (>=0.10.4)"] email = ["email-validator (>=1.0.3)"] -typing_extensions = ["typing-extensions (>=3.7.2)"] [package.source] type = "legacy" @@ -955,11 +954,11 @@ reference = "aliyun" [[package]] name = "uvloop" -version = "0.15.1" +version = "0.15.2" description = "Fast implementation of asyncio event loop on top of libuv" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.7" [package.extras] dev = ["Cython (>=0.29.20,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=1.7.3,<1.8.0)", "sphinxcontrib-asyncio (>=0.2.0,<0.3.0)", "sphinx_rtd_theme (>=0.2.4,<0.3.0)", "aiohttp", "flake8 (>=3.8.4,<3.9.0)", "psutil", "pycodestyle (>=2.6.0,<2.7.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] @@ -1053,7 +1052,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "472f4191d75922660770d7a4f8669a5dbde12586970daebf188b23cf605dec0d" +content-hash = "6a7da1a6cb4a22146298b53f5bd6d3da87104d4bb0f445a363b30467a684f4a1" [metadata.files] aiofiles = [ @@ -1227,28 +1226,28 @@ priority = [ {file = "priority-1.3.0.tar.gz", hash = "sha256:6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe"}, ] pydantic = [ - {file = "pydantic-1.7.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c59ea046aea25be14dc22d69c97bee629e6d48d2b2ecb724d7fe8806bf5f61cd"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a4143c8d0c456a093387b96e0f5ee941a950992904d88bc816b4f0e72c9a0009"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:d8df4b9090b595511906fa48deda47af04e7d092318bfb291f4d45dfb6bb2127"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:514b473d264671a5c672dfb28bdfe1bf1afd390f6b206aa2ec9fed7fc592c48e"}, - {file = "pydantic-1.7.3-cp36-cp36m-win_amd64.whl", hash = "sha256:dba5c1f0a3aeea5083e75db9660935da90216f8a81b6d68e67f54e135ed5eb23"}, - {file = "pydantic-1.7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:59e45f3b694b05a69032a0d603c32d453a23f0de80844fb14d55ab0c6c78ff2f"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:5b24e8a572e4b4c18f614004dda8c9f2c07328cb5b6e314d6e1bbd536cb1a6c1"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:b2b054d095b6431cdda2f852a6d2f0fdec77686b305c57961b4c5dd6d863bf3c"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:025bf13ce27990acc059d0c5be46f416fc9b293f45363b3d19855165fee1874f"}, - {file = "pydantic-1.7.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6e3874aa7e8babd37b40c4504e3a94cc2023696ced5a0500949f3347664ff8e2"}, - {file = "pydantic-1.7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e682f6442ebe4e50cb5e1cfde7dda6766fb586631c3e5569f6aa1951fd1a76ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:185e18134bec5ef43351149fe34fda4758e53d05bb8ea4d5928f0720997b79ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:f5b06f5099e163295b8ff5b1b71132ecf5866cc6e7f586d78d7d3fd6e8084608"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:24ca47365be2a5a3cc3f4a26dcc755bcdc9f0036f55dcedbd55663662ba145ec"}, - {file = "pydantic-1.7.3-cp38-cp38-win_amd64.whl", hash = "sha256:d1fe3f0df8ac0f3a9792666c69a7cd70530f329036426d06b4f899c025aca74e"}, - {file = "pydantic-1.7.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f6864844b039805add62ebe8a8c676286340ba0c6d043ae5dea24114b82a319e"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:ecb54491f98544c12c66ff3d15e701612fc388161fd455242447083350904730"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:ffd180ebd5dd2a9ac0da4e8b995c9c99e7c74c31f985ba090ee01d681b1c4b95"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:8d72e814c7821125b16f1553124d12faba88e85405b0864328899aceaad7282b"}, - {file = "pydantic-1.7.3-cp39-cp39-win_amd64.whl", hash = "sha256:475f2fa134cf272d6631072554f845d0630907fce053926ff634cc6bc45bf1af"}, - {file = "pydantic-1.7.3-py3-none-any.whl", hash = "sha256:38be427ea01a78206bcaf9a56f835784afcba9e5b88fbdce33bbbfbcd7841229"}, - {file = "pydantic-1.7.3.tar.gz", hash = "sha256:213125b7e9e64713d16d988d10997dabc6a1f73f3991e1ff8e35ebb1409c7dc9"}, + {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, + {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, + {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, + {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, + {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, + {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, + {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, + {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, + {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, + {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, + {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, + {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, ] pydash = [ {file = "pydash-4.9.2-py2.py3-none-any.whl", hash = "sha256:dab98145502528369bd05034f6fb2b520297d49f942cfd51dc9cdc2cd47ec368"}, @@ -1354,16 +1353,16 @@ uvicorn = [ {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, ] uvloop = [ - {file = "uvloop-0.15.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:9541dc3f391941796ae95c9c3bb16b813acf9e3d4beebfd3b623f1acb22d318d"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e178c255622d928d464187e3ceba94db88465f6b17909c651483fb73af8d8b85"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:47ec567151070ed770211d359ad9250b59368548c60212c7ef6dda3f5b1778f6"}, - {file = "uvloop-0.15.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:66881fe8a2187334c4dd5010c56310bdf32fe426613f9ca727f090bc31280624"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:e72779681f839b6a069d7e7a9f7962a1d1927612c5c2e33071415478bdc1b91b"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ed073d24e0c383c24d17d3a2bb209b999ff0a8130e89b7c3f033db9e0c3bd04f"}, - {file = "uvloop-0.15.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:236a3c31096e0845029856f7bc07a938340c2cdb35d9d39b38c9253b672bf948"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ca8a9e982f0bfbe331f41902cdd721c6e749e4685a403685e792b86a584f5969"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1ae1ad731c8c0dcee80e0ecf06274f0f7293244d2cef81fa2747321a370a6aba"}, - {file = "uvloop-0.15.1.tar.gz", hash = "sha256:7846828112bfb49abc5fdfc47d0e4dfd7402115c9fde3c14c31818cfbeeb63dc"}, + {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e5e5f855c9bf483ee6cd1eb9a179b740de80cb0ae2988e3fa22309b78e2ea0e7"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:42eda9f525a208fbc4f7cecd00fa15c57cc57646c76632b3ba2fe005004f051d"}, + {file = "uvloop-0.15.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:90e56f17755e41b425ad19a08c41dc358fa7bf1226c0f8e54d4d02d556f7af7c"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7ae39b11a5f4cec1432d706c21ecc62f9e04d116883178b09671aa29c46f7a47"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:b45218c99795803fb8bdbc9435ff7f54e3a591b44cd4c121b02fa83affb61c7c"}, + {file = "uvloop-0.15.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:114543c84e95df1b4ff546e6e3a27521580466a30127f12172a3278172ad68bc"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44cac8575bf168601424302045234d74e3561fbdbac39b2b54cc1d1d00b70760"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, + {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, diff --git a/pyproject.toml b/pyproject.toml index 8fc0c490..be79c9f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ pygtrie = "^2.4.1" fastapi = "^0.63.0" uvicorn = "^0.11.5" Quart = { version = "^0.14.1", optional = true } -pydantic = { extras = ["dotenv", "typing_extensions"], version = "^1.7.3" } +pydantic = { extras = ["dotenv", "typing_extensions"], version = "~1.8.0" } tomlkit = "^0.7.0" [tool.poetry.dev-dependencies] From b23e845726e38e19e84560f62245515a1ec3c367 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 1 Mar 2021 00:30:06 +0800 Subject: [PATCH 13/24] :arrow_up: fit pydantic 1.8 --- nonebot/config.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nonebot/config.py b/nonebot/config.py index f99b4705..26e832c5 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -21,8 +21,8 @@ from ipaddress import IPv4Address from typing import Any, Set, Dict, Tuple, Mapping, Optional from pydantic import BaseSettings, IPvAnyAddress -from pydantic.env_settings import env_file_sentinel, SettingsSourceCallable -from pydantic.env_settings import read_env_file, SettingsError, EnvSettingsSource +from pydantic.env_settings import SettingsError, InitSettingsSource, EnvSettingsSource +from pydantic.env_settings import read_env_file, env_file_sentinel, SettingsSourceCallable class CustomEnvSettings(EnvSettingsSource): @@ -97,13 +97,15 @@ class BaseConfig(BaseSettings): @classmethod def customise_sources( cls, - init_settings: SettingsSourceCallable, - env_settings: SettingsSourceCallable, + init_settings: InitSettingsSource, + env_settings: EnvSettingsSource, file_secret_settings: SettingsSourceCallable, ) -> Tuple[SettingsSourceCallable, ...]: - return init_settings, CustomEnvSettings( - env_settings.env_file, - env_settings.env_file_encoding), file_secret_settings + common_config = init_settings.init_kwargs.pop("_common_config", {}) + return (init_settings, + CustomEnvSettings(env_settings.env_file, + env_settings.env_file_encoding), + InitSettingsSource(common_config), file_secret_settings) class Env(BaseConfig): From b962bc43e632ddc2d25f3a880ff2813b054d0cb8 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 1 Mar 2021 17:39:44 +0800 Subject: [PATCH 14/24] :arrow_up: bump httpx --- packages/nonebot-adapter-cqhttp/poetry.lock | 103 ++++++++++-------- .../nonebot-adapter-cqhttp/pyproject.toml | 2 +- packages/nonebot-adapter-ding/poetry.lock | 103 ++++++++++-------- packages/nonebot-adapter-ding/pyproject.toml | 2 +- packages/nonebot-adapter-mirai/poetry.lock | 103 ++++++++++-------- packages/nonebot-adapter-mirai/pyproject.toml | 2 +- 6 files changed, 183 insertions(+), 132 deletions(-) diff --git a/packages/nonebot-adapter-cqhttp/poetry.lock b/packages/nonebot-adapter-cqhttp/poetry.lock index 5148b9fe..1bea9aa8 100644 --- a/packages/nonebot-adapter-cqhttp/poetry.lock +++ b/packages/nonebot-adapter-cqhttp/poetry.lock @@ -111,7 +111,7 @@ reference = "aliyun" [[package]] name = "httpx" -version = "0.16.1" +version = "0.17.0" description = "The next generation HTTP client." category = "main" optional = false @@ -177,8 +177,9 @@ develop = true [package.dependencies] fastapi = "^0.63.0" loguru = "^0.5.1" -pydantic = {version = "^1.7.3", extras = ["dotenv", "typing_extensions"]} +pydantic = {version = "~1.8.0", extras = ["dotenv", "typing_extensions"]} pygtrie = "^2.4.1" +tomlkit = "^0.7.0" uvicorn = "^0.11.5" [package.extras] @@ -191,20 +192,19 @@ url = "../.." [[package]] name = "pydantic" -version = "1.7.3" +version = "1.8" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = {version = ">=3.7.2", optional = true, markers = "extra == \"typing_extensions\""} +typing-extensions = ">=3.7.4.3" [package.extras] dotenv = ["python-dotenv (>=0.10.4)"] email = ["email-validator (>=1.0.3)"] -typing_extensions = ["typing-extensions (>=3.7.2)"] [package.source] type = "legacy" @@ -288,6 +288,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "tomlkit" +version = "0.7.0" +description = "Style preserving TOML library" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "typing-extensions" version = "3.7.4.3" @@ -326,11 +339,11 @@ reference = "aliyun" [[package]] name = "uvloop" -version = "0.15.1" +version = "0.15.2" description = "Fast implementation of asyncio event loop on top of libuv" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.7" [package.extras] dev = ["Cython (>=0.29.20,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=1.7.3,<1.8.0)", "sphinxcontrib-asyncio (>=0.2.0,<0.3.0)", "sphinx_rtd_theme (>=0.2.4,<0.3.0)", "aiohttp", "flake8 (>=3.8.4,<3.9.0)", "psutil", "pycodestyle (>=2.6.0,<2.7.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] @@ -374,7 +387,7 @@ reference = "aliyun" [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "4d84038e60c7936ec34d35c777c879ef0cf2cb6fd549a1b3ee279d450b362785" +content-hash = "ae76a0cd32e545123a695be630a2ca223a84f59e660d858b69940a3281957068" [metadata.files] certifi = [ @@ -416,8 +429,8 @@ httptools = [ {file = "httptools-0.1.1.tar.gz", hash = "sha256:41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"}, ] httpx = [ - {file = "httpx-0.16.1-py3-none-any.whl", hash = "sha256:9cffb8ba31fac6536f2c8cde30df859013f59e4bcc5b8d43901cb3654a8e0a5b"}, - {file = "httpx-0.16.1.tar.gz", hash = "sha256:126424c279c842738805974687e0518a94c7ae8d140cd65b9c4f77ac46ffa537"}, + {file = "httpx-0.17.0-py3-none-any.whl", hash = "sha256:fe19522f7b0861a1f6ac83306360bb5b7fb1ed64633a1a04a33f04102a1bea60"}, + {file = "httpx-0.17.0.tar.gz", hash = "sha256:4f7ab2fef7f929c5531abd4f413b41ce2c820e3202f2eeee498f2d92b6849f8d"}, ] idna = [ {file = "idna-3.1-py3-none-any.whl", hash = "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16"}, @@ -429,28 +442,28 @@ loguru = [ ] nonebot2 = [] pydantic = [ - {file = "pydantic-1.7.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c59ea046aea25be14dc22d69c97bee629e6d48d2b2ecb724d7fe8806bf5f61cd"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a4143c8d0c456a093387b96e0f5ee941a950992904d88bc816b4f0e72c9a0009"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:d8df4b9090b595511906fa48deda47af04e7d092318bfb291f4d45dfb6bb2127"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:514b473d264671a5c672dfb28bdfe1bf1afd390f6b206aa2ec9fed7fc592c48e"}, - {file = "pydantic-1.7.3-cp36-cp36m-win_amd64.whl", hash = "sha256:dba5c1f0a3aeea5083e75db9660935da90216f8a81b6d68e67f54e135ed5eb23"}, - {file = "pydantic-1.7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:59e45f3b694b05a69032a0d603c32d453a23f0de80844fb14d55ab0c6c78ff2f"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:5b24e8a572e4b4c18f614004dda8c9f2c07328cb5b6e314d6e1bbd536cb1a6c1"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:b2b054d095b6431cdda2f852a6d2f0fdec77686b305c57961b4c5dd6d863bf3c"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:025bf13ce27990acc059d0c5be46f416fc9b293f45363b3d19855165fee1874f"}, - {file = "pydantic-1.7.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6e3874aa7e8babd37b40c4504e3a94cc2023696ced5a0500949f3347664ff8e2"}, - {file = "pydantic-1.7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e682f6442ebe4e50cb5e1cfde7dda6766fb586631c3e5569f6aa1951fd1a76ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:185e18134bec5ef43351149fe34fda4758e53d05bb8ea4d5928f0720997b79ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:f5b06f5099e163295b8ff5b1b71132ecf5866cc6e7f586d78d7d3fd6e8084608"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:24ca47365be2a5a3cc3f4a26dcc755bcdc9f0036f55dcedbd55663662ba145ec"}, - {file = "pydantic-1.7.3-cp38-cp38-win_amd64.whl", hash = "sha256:d1fe3f0df8ac0f3a9792666c69a7cd70530f329036426d06b4f899c025aca74e"}, - {file = "pydantic-1.7.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f6864844b039805add62ebe8a8c676286340ba0c6d043ae5dea24114b82a319e"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:ecb54491f98544c12c66ff3d15e701612fc388161fd455242447083350904730"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:ffd180ebd5dd2a9ac0da4e8b995c9c99e7c74c31f985ba090ee01d681b1c4b95"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:8d72e814c7821125b16f1553124d12faba88e85405b0864328899aceaad7282b"}, - {file = "pydantic-1.7.3-cp39-cp39-win_amd64.whl", hash = "sha256:475f2fa134cf272d6631072554f845d0630907fce053926ff634cc6bc45bf1af"}, - {file = "pydantic-1.7.3-py3-none-any.whl", hash = "sha256:38be427ea01a78206bcaf9a56f835784afcba9e5b88fbdce33bbbfbcd7841229"}, - {file = "pydantic-1.7.3.tar.gz", hash = "sha256:213125b7e9e64713d16d988d10997dabc6a1f73f3991e1ff8e35ebb1409c7dc9"}, + {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, + {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, + {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, + {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, + {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, + {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, + {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, + {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, + {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, + {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, + {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, + {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -471,6 +484,10 @@ starlette = [ {file = "starlette-0.13.6-py3-none-any.whl", hash = "sha256:bd2ffe5e37fb75d014728511f8e68ebf2c80b0fa3d04ca1479f4dc752ae31ac9"}, {file = "starlette-0.13.6.tar.gz", hash = "sha256:ebe8ee08d9be96a3c9f31b2cb2a24dbdf845247b745664bd8a3f9bd0c977fdbc"}, ] +tomlkit = [ + {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, + {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, +] typing-extensions = [ {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, @@ -481,16 +498,16 @@ uvicorn = [ {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, ] uvloop = [ - {file = "uvloop-0.15.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:9541dc3f391941796ae95c9c3bb16b813acf9e3d4beebfd3b623f1acb22d318d"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e178c255622d928d464187e3ceba94db88465f6b17909c651483fb73af8d8b85"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:47ec567151070ed770211d359ad9250b59368548c60212c7ef6dda3f5b1778f6"}, - {file = "uvloop-0.15.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:66881fe8a2187334c4dd5010c56310bdf32fe426613f9ca727f090bc31280624"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:e72779681f839b6a069d7e7a9f7962a1d1927612c5c2e33071415478bdc1b91b"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ed073d24e0c383c24d17d3a2bb209b999ff0a8130e89b7c3f033db9e0c3bd04f"}, - {file = "uvloop-0.15.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:236a3c31096e0845029856f7bc07a938340c2cdb35d9d39b38c9253b672bf948"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ca8a9e982f0bfbe331f41902cdd721c6e749e4685a403685e792b86a584f5969"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1ae1ad731c8c0dcee80e0ecf06274f0f7293244d2cef81fa2747321a370a6aba"}, - {file = "uvloop-0.15.1.tar.gz", hash = "sha256:7846828112bfb49abc5fdfc47d0e4dfd7402115c9fde3c14c31818cfbeeb63dc"}, + {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e5e5f855c9bf483ee6cd1eb9a179b740de80cb0ae2988e3fa22309b78e2ea0e7"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:42eda9f525a208fbc4f7cecd00fa15c57cc57646c76632b3ba2fe005004f051d"}, + {file = "uvloop-0.15.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:90e56f17755e41b425ad19a08c41dc358fa7bf1226c0f8e54d4d02d556f7af7c"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7ae39b11a5f4cec1432d706c21ecc62f9e04d116883178b09671aa29c46f7a47"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:b45218c99795803fb8bdbc9435ff7f54e3a591b44cd4c121b02fa83affb61c7c"}, + {file = "uvloop-0.15.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:114543c84e95df1b4ff546e6e3a27521580466a30127f12172a3278172ad68bc"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44cac8575bf168601424302045234d74e3561fbdbac39b2b54cc1d1d00b70760"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, + {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, diff --git a/packages/nonebot-adapter-cqhttp/pyproject.toml b/packages/nonebot-adapter-cqhttp/pyproject.toml index bb4f0715..18e77b28 100644 --- a/packages/nonebot-adapter-cqhttp/pyproject.toml +++ b/packages/nonebot-adapter-cqhttp/pyproject.toml @@ -23,7 +23,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.7.3" -httpx = "^0.16.1" +httpx = "^0.17.0" nonebot2 = "^2.0.0-alpha.10" [tool.poetry.dev-dependencies] diff --git a/packages/nonebot-adapter-ding/poetry.lock b/packages/nonebot-adapter-ding/poetry.lock index 5148b9fe..1bea9aa8 100644 --- a/packages/nonebot-adapter-ding/poetry.lock +++ b/packages/nonebot-adapter-ding/poetry.lock @@ -111,7 +111,7 @@ reference = "aliyun" [[package]] name = "httpx" -version = "0.16.1" +version = "0.17.0" description = "The next generation HTTP client." category = "main" optional = false @@ -177,8 +177,9 @@ develop = true [package.dependencies] fastapi = "^0.63.0" loguru = "^0.5.1" -pydantic = {version = "^1.7.3", extras = ["dotenv", "typing_extensions"]} +pydantic = {version = "~1.8.0", extras = ["dotenv", "typing_extensions"]} pygtrie = "^2.4.1" +tomlkit = "^0.7.0" uvicorn = "^0.11.5" [package.extras] @@ -191,20 +192,19 @@ url = "../.." [[package]] name = "pydantic" -version = "1.7.3" +version = "1.8" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = {version = ">=3.7.2", optional = true, markers = "extra == \"typing_extensions\""} +typing-extensions = ">=3.7.4.3" [package.extras] dotenv = ["python-dotenv (>=0.10.4)"] email = ["email-validator (>=1.0.3)"] -typing_extensions = ["typing-extensions (>=3.7.2)"] [package.source] type = "legacy" @@ -288,6 +288,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "tomlkit" +version = "0.7.0" +description = "Style preserving TOML library" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "typing-extensions" version = "3.7.4.3" @@ -326,11 +339,11 @@ reference = "aliyun" [[package]] name = "uvloop" -version = "0.15.1" +version = "0.15.2" description = "Fast implementation of asyncio event loop on top of libuv" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.7" [package.extras] dev = ["Cython (>=0.29.20,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=1.7.3,<1.8.0)", "sphinxcontrib-asyncio (>=0.2.0,<0.3.0)", "sphinx_rtd_theme (>=0.2.4,<0.3.0)", "aiohttp", "flake8 (>=3.8.4,<3.9.0)", "psutil", "pycodestyle (>=2.6.0,<2.7.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] @@ -374,7 +387,7 @@ reference = "aliyun" [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "4d84038e60c7936ec34d35c777c879ef0cf2cb6fd549a1b3ee279d450b362785" +content-hash = "ae76a0cd32e545123a695be630a2ca223a84f59e660d858b69940a3281957068" [metadata.files] certifi = [ @@ -416,8 +429,8 @@ httptools = [ {file = "httptools-0.1.1.tar.gz", hash = "sha256:41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"}, ] httpx = [ - {file = "httpx-0.16.1-py3-none-any.whl", hash = "sha256:9cffb8ba31fac6536f2c8cde30df859013f59e4bcc5b8d43901cb3654a8e0a5b"}, - {file = "httpx-0.16.1.tar.gz", hash = "sha256:126424c279c842738805974687e0518a94c7ae8d140cd65b9c4f77ac46ffa537"}, + {file = "httpx-0.17.0-py3-none-any.whl", hash = "sha256:fe19522f7b0861a1f6ac83306360bb5b7fb1ed64633a1a04a33f04102a1bea60"}, + {file = "httpx-0.17.0.tar.gz", hash = "sha256:4f7ab2fef7f929c5531abd4f413b41ce2c820e3202f2eeee498f2d92b6849f8d"}, ] idna = [ {file = "idna-3.1-py3-none-any.whl", hash = "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16"}, @@ -429,28 +442,28 @@ loguru = [ ] nonebot2 = [] pydantic = [ - {file = "pydantic-1.7.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c59ea046aea25be14dc22d69c97bee629e6d48d2b2ecb724d7fe8806bf5f61cd"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a4143c8d0c456a093387b96e0f5ee941a950992904d88bc816b4f0e72c9a0009"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:d8df4b9090b595511906fa48deda47af04e7d092318bfb291f4d45dfb6bb2127"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:514b473d264671a5c672dfb28bdfe1bf1afd390f6b206aa2ec9fed7fc592c48e"}, - {file = "pydantic-1.7.3-cp36-cp36m-win_amd64.whl", hash = "sha256:dba5c1f0a3aeea5083e75db9660935da90216f8a81b6d68e67f54e135ed5eb23"}, - {file = "pydantic-1.7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:59e45f3b694b05a69032a0d603c32d453a23f0de80844fb14d55ab0c6c78ff2f"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:5b24e8a572e4b4c18f614004dda8c9f2c07328cb5b6e314d6e1bbd536cb1a6c1"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:b2b054d095b6431cdda2f852a6d2f0fdec77686b305c57961b4c5dd6d863bf3c"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:025bf13ce27990acc059d0c5be46f416fc9b293f45363b3d19855165fee1874f"}, - {file = "pydantic-1.7.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6e3874aa7e8babd37b40c4504e3a94cc2023696ced5a0500949f3347664ff8e2"}, - {file = "pydantic-1.7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e682f6442ebe4e50cb5e1cfde7dda6766fb586631c3e5569f6aa1951fd1a76ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:185e18134bec5ef43351149fe34fda4758e53d05bb8ea4d5928f0720997b79ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:f5b06f5099e163295b8ff5b1b71132ecf5866cc6e7f586d78d7d3fd6e8084608"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:24ca47365be2a5a3cc3f4a26dcc755bcdc9f0036f55dcedbd55663662ba145ec"}, - {file = "pydantic-1.7.3-cp38-cp38-win_amd64.whl", hash = "sha256:d1fe3f0df8ac0f3a9792666c69a7cd70530f329036426d06b4f899c025aca74e"}, - {file = "pydantic-1.7.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f6864844b039805add62ebe8a8c676286340ba0c6d043ae5dea24114b82a319e"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:ecb54491f98544c12c66ff3d15e701612fc388161fd455242447083350904730"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:ffd180ebd5dd2a9ac0da4e8b995c9c99e7c74c31f985ba090ee01d681b1c4b95"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:8d72e814c7821125b16f1553124d12faba88e85405b0864328899aceaad7282b"}, - {file = "pydantic-1.7.3-cp39-cp39-win_amd64.whl", hash = "sha256:475f2fa134cf272d6631072554f845d0630907fce053926ff634cc6bc45bf1af"}, - {file = "pydantic-1.7.3-py3-none-any.whl", hash = "sha256:38be427ea01a78206bcaf9a56f835784afcba9e5b88fbdce33bbbfbcd7841229"}, - {file = "pydantic-1.7.3.tar.gz", hash = "sha256:213125b7e9e64713d16d988d10997dabc6a1f73f3991e1ff8e35ebb1409c7dc9"}, + {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, + {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, + {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, + {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, + {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, + {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, + {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, + {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, + {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, + {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, + {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, + {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -471,6 +484,10 @@ starlette = [ {file = "starlette-0.13.6-py3-none-any.whl", hash = "sha256:bd2ffe5e37fb75d014728511f8e68ebf2c80b0fa3d04ca1479f4dc752ae31ac9"}, {file = "starlette-0.13.6.tar.gz", hash = "sha256:ebe8ee08d9be96a3c9f31b2cb2a24dbdf845247b745664bd8a3f9bd0c977fdbc"}, ] +tomlkit = [ + {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, + {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, +] typing-extensions = [ {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, @@ -481,16 +498,16 @@ uvicorn = [ {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, ] uvloop = [ - {file = "uvloop-0.15.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:9541dc3f391941796ae95c9c3bb16b813acf9e3d4beebfd3b623f1acb22d318d"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e178c255622d928d464187e3ceba94db88465f6b17909c651483fb73af8d8b85"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:47ec567151070ed770211d359ad9250b59368548c60212c7ef6dda3f5b1778f6"}, - {file = "uvloop-0.15.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:66881fe8a2187334c4dd5010c56310bdf32fe426613f9ca727f090bc31280624"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:e72779681f839b6a069d7e7a9f7962a1d1927612c5c2e33071415478bdc1b91b"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ed073d24e0c383c24d17d3a2bb209b999ff0a8130e89b7c3f033db9e0c3bd04f"}, - {file = "uvloop-0.15.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:236a3c31096e0845029856f7bc07a938340c2cdb35d9d39b38c9253b672bf948"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ca8a9e982f0bfbe331f41902cdd721c6e749e4685a403685e792b86a584f5969"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1ae1ad731c8c0dcee80e0ecf06274f0f7293244d2cef81fa2747321a370a6aba"}, - {file = "uvloop-0.15.1.tar.gz", hash = "sha256:7846828112bfb49abc5fdfc47d0e4dfd7402115c9fde3c14c31818cfbeeb63dc"}, + {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e5e5f855c9bf483ee6cd1eb9a179b740de80cb0ae2988e3fa22309b78e2ea0e7"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:42eda9f525a208fbc4f7cecd00fa15c57cc57646c76632b3ba2fe005004f051d"}, + {file = "uvloop-0.15.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:90e56f17755e41b425ad19a08c41dc358fa7bf1226c0f8e54d4d02d556f7af7c"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7ae39b11a5f4cec1432d706c21ecc62f9e04d116883178b09671aa29c46f7a47"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:b45218c99795803fb8bdbc9435ff7f54e3a591b44cd4c121b02fa83affb61c7c"}, + {file = "uvloop-0.15.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:114543c84e95df1b4ff546e6e3a27521580466a30127f12172a3278172ad68bc"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44cac8575bf168601424302045234d74e3561fbdbac39b2b54cc1d1d00b70760"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, + {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, diff --git a/packages/nonebot-adapter-ding/pyproject.toml b/packages/nonebot-adapter-ding/pyproject.toml index 8191d991..0bfd589d 100644 --- a/packages/nonebot-adapter-ding/pyproject.toml +++ b/packages/nonebot-adapter-ding/pyproject.toml @@ -23,7 +23,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.7.3" -httpx = "^0.16.1" +httpx = "^0.17.0" nonebot2 = "^2.0.0-alpha.10" [tool.poetry.dev-dependencies] diff --git a/packages/nonebot-adapter-mirai/poetry.lock b/packages/nonebot-adapter-mirai/poetry.lock index e461a4ad..1f2d7be3 100644 --- a/packages/nonebot-adapter-mirai/poetry.lock +++ b/packages/nonebot-adapter-mirai/poetry.lock @@ -111,7 +111,7 @@ reference = "aliyun" [[package]] name = "httpx" -version = "0.16.1" +version = "0.17.0" description = "The next generation HTTP client." category = "main" optional = false @@ -177,8 +177,9 @@ develop = true [package.dependencies] fastapi = "^0.63.0" loguru = "^0.5.1" -pydantic = {version = "^1.7.3", extras = ["dotenv", "typing_extensions"]} +pydantic = {version = "~1.8.0", extras = ["dotenv", "typing_extensions"]} pygtrie = "^2.4.1" +tomlkit = "^0.7.0" uvicorn = "^0.11.5" [package.extras] @@ -191,20 +192,19 @@ url = "../.." [[package]] name = "pydantic" -version = "1.7.3" +version = "1.8" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = {version = ">=3.7.2", optional = true, markers = "extra == \"typing_extensions\""} +typing-extensions = ">=3.7.4.3" [package.extras] dotenv = ["python-dotenv (>=0.10.4)"] email = ["email-validator (>=1.0.3)"] -typing_extensions = ["typing-extensions (>=3.7.2)"] [package.source] type = "legacy" @@ -288,6 +288,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "tomlkit" +version = "0.7.0" +description = "Style preserving TOML library" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "typing-extensions" version = "3.7.4.3" @@ -326,11 +339,11 @@ reference = "aliyun" [[package]] name = "uvloop" -version = "0.15.1" +version = "0.15.2" description = "Fast implementation of asyncio event loop on top of libuv" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.7" [package.extras] dev = ["Cython (>=0.29.20,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=1.7.3,<1.8.0)", "sphinxcontrib-asyncio (>=0.2.0,<0.3.0)", "sphinx_rtd_theme (>=0.2.4,<0.3.0)", "aiohttp", "flake8 (>=3.8.4,<3.9.0)", "psutil", "pycodestyle (>=2.6.0,<2.7.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] @@ -374,7 +387,7 @@ reference = "aliyun" [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "307bd9f04236e36ccb1fd851c7e0aa5bf5366cf4021b0b81fe47fbb5b71a60a2" +content-hash = "8851125fb5acd0c4f12b72f5d99b2565335923baf1d574970f1d551600157f96" [metadata.files] certifi = [ @@ -416,8 +429,8 @@ httptools = [ {file = "httptools-0.1.1.tar.gz", hash = "sha256:41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"}, ] httpx = [ - {file = "httpx-0.16.1-py3-none-any.whl", hash = "sha256:9cffb8ba31fac6536f2c8cde30df859013f59e4bcc5b8d43901cb3654a8e0a5b"}, - {file = "httpx-0.16.1.tar.gz", hash = "sha256:126424c279c842738805974687e0518a94c7ae8d140cd65b9c4f77ac46ffa537"}, + {file = "httpx-0.17.0-py3-none-any.whl", hash = "sha256:fe19522f7b0861a1f6ac83306360bb5b7fb1ed64633a1a04a33f04102a1bea60"}, + {file = "httpx-0.17.0.tar.gz", hash = "sha256:4f7ab2fef7f929c5531abd4f413b41ce2c820e3202f2eeee498f2d92b6849f8d"}, ] idna = [ {file = "idna-3.1-py3-none-any.whl", hash = "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16"}, @@ -429,28 +442,28 @@ loguru = [ ] nonebot2 = [] pydantic = [ - {file = "pydantic-1.7.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c59ea046aea25be14dc22d69c97bee629e6d48d2b2ecb724d7fe8806bf5f61cd"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a4143c8d0c456a093387b96e0f5ee941a950992904d88bc816b4f0e72c9a0009"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:d8df4b9090b595511906fa48deda47af04e7d092318bfb291f4d45dfb6bb2127"}, - {file = "pydantic-1.7.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:514b473d264671a5c672dfb28bdfe1bf1afd390f6b206aa2ec9fed7fc592c48e"}, - {file = "pydantic-1.7.3-cp36-cp36m-win_amd64.whl", hash = "sha256:dba5c1f0a3aeea5083e75db9660935da90216f8a81b6d68e67f54e135ed5eb23"}, - {file = "pydantic-1.7.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:59e45f3b694b05a69032a0d603c32d453a23f0de80844fb14d55ab0c6c78ff2f"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:5b24e8a572e4b4c18f614004dda8c9f2c07328cb5b6e314d6e1bbd536cb1a6c1"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:b2b054d095b6431cdda2f852a6d2f0fdec77686b305c57961b4c5dd6d863bf3c"}, - {file = "pydantic-1.7.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:025bf13ce27990acc059d0c5be46f416fc9b293f45363b3d19855165fee1874f"}, - {file = "pydantic-1.7.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6e3874aa7e8babd37b40c4504e3a94cc2023696ced5a0500949f3347664ff8e2"}, - {file = "pydantic-1.7.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e682f6442ebe4e50cb5e1cfde7dda6766fb586631c3e5569f6aa1951fd1a76ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:185e18134bec5ef43351149fe34fda4758e53d05bb8ea4d5928f0720997b79ef"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:f5b06f5099e163295b8ff5b1b71132ecf5866cc6e7f586d78d7d3fd6e8084608"}, - {file = "pydantic-1.7.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:24ca47365be2a5a3cc3f4a26dcc755bcdc9f0036f55dcedbd55663662ba145ec"}, - {file = "pydantic-1.7.3-cp38-cp38-win_amd64.whl", hash = "sha256:d1fe3f0df8ac0f3a9792666c69a7cd70530f329036426d06b4f899c025aca74e"}, - {file = "pydantic-1.7.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f6864844b039805add62ebe8a8c676286340ba0c6d043ae5dea24114b82a319e"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:ecb54491f98544c12c66ff3d15e701612fc388161fd455242447083350904730"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:ffd180ebd5dd2a9ac0da4e8b995c9c99e7c74c31f985ba090ee01d681b1c4b95"}, - {file = "pydantic-1.7.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:8d72e814c7821125b16f1553124d12faba88e85405b0864328899aceaad7282b"}, - {file = "pydantic-1.7.3-cp39-cp39-win_amd64.whl", hash = "sha256:475f2fa134cf272d6631072554f845d0630907fce053926ff634cc6bc45bf1af"}, - {file = "pydantic-1.7.3-py3-none-any.whl", hash = "sha256:38be427ea01a78206bcaf9a56f835784afcba9e5b88fbdce33bbbfbcd7841229"}, - {file = "pydantic-1.7.3.tar.gz", hash = "sha256:213125b7e9e64713d16d988d10997dabc6a1f73f3991e1ff8e35ebb1409c7dc9"}, + {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, + {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, + {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, + {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, + {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, + {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, + {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, + {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, + {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, + {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, + {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, + {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, + {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, + {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, + {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, + {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -471,6 +484,10 @@ starlette = [ {file = "starlette-0.13.6-py3-none-any.whl", hash = "sha256:bd2ffe5e37fb75d014728511f8e68ebf2c80b0fa3d04ca1479f4dc752ae31ac9"}, {file = "starlette-0.13.6.tar.gz", hash = "sha256:ebe8ee08d9be96a3c9f31b2cb2a24dbdf845247b745664bd8a3f9bd0c977fdbc"}, ] +tomlkit = [ + {file = "tomlkit-0.7.0-py2.py3-none-any.whl", hash = "sha256:6babbd33b17d5c9691896b0e68159215a9387ebfa938aa3ac42f4a4beeb2b831"}, + {file = "tomlkit-0.7.0.tar.gz", hash = "sha256:ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"}, +] typing-extensions = [ {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, @@ -481,16 +498,16 @@ uvicorn = [ {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, ] uvloop = [ - {file = "uvloop-0.15.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:9541dc3f391941796ae95c9c3bb16b813acf9e3d4beebfd3b623f1acb22d318d"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e178c255622d928d464187e3ceba94db88465f6b17909c651483fb73af8d8b85"}, - {file = "uvloop-0.15.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:47ec567151070ed770211d359ad9250b59368548c60212c7ef6dda3f5b1778f6"}, - {file = "uvloop-0.15.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:66881fe8a2187334c4dd5010c56310bdf32fe426613f9ca727f090bc31280624"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:e72779681f839b6a069d7e7a9f7962a1d1927612c5c2e33071415478bdc1b91b"}, - {file = "uvloop-0.15.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ed073d24e0c383c24d17d3a2bb209b999ff0a8130e89b7c3f033db9e0c3bd04f"}, - {file = "uvloop-0.15.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:236a3c31096e0845029856f7bc07a938340c2cdb35d9d39b38c9253b672bf948"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ca8a9e982f0bfbe331f41902cdd721c6e749e4685a403685e792b86a584f5969"}, - {file = "uvloop-0.15.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1ae1ad731c8c0dcee80e0ecf06274f0f7293244d2cef81fa2747321a370a6aba"}, - {file = "uvloop-0.15.1.tar.gz", hash = "sha256:7846828112bfb49abc5fdfc47d0e4dfd7402115c9fde3c14c31818cfbeeb63dc"}, + {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e5e5f855c9bf483ee6cd1eb9a179b740de80cb0ae2988e3fa22309b78e2ea0e7"}, + {file = "uvloop-0.15.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:42eda9f525a208fbc4f7cecd00fa15c57cc57646c76632b3ba2fe005004f051d"}, + {file = "uvloop-0.15.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:90e56f17755e41b425ad19a08c41dc358fa7bf1226c0f8e54d4d02d556f7af7c"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7ae39b11a5f4cec1432d706c21ecc62f9e04d116883178b09671aa29c46f7a47"}, + {file = "uvloop-0.15.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:b45218c99795803fb8bdbc9435ff7f54e3a591b44cd4c121b02fa83affb61c7c"}, + {file = "uvloop-0.15.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:114543c84e95df1b4ff546e6e3a27521580466a30127f12172a3278172ad68bc"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:44cac8575bf168601424302045234d74e3561fbdbac39b2b54cc1d1d00b70760"}, + {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, + {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, diff --git a/packages/nonebot-adapter-mirai/pyproject.toml b/packages/nonebot-adapter-mirai/pyproject.toml index 1706770d..b3afe6fa 100644 --- a/packages/nonebot-adapter-mirai/pyproject.toml +++ b/packages/nonebot-adapter-mirai/pyproject.toml @@ -23,7 +23,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.7.3" -httpx = "^0.16.1" +httpx = "^0.17.0" websockets = "^8.1" nonebot2 = "^2.0.0-alpha.10" From 3c8dca67fa20421498f85b70a15233de3e04c848 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 1 Mar 2021 19:24:03 +0800 Subject: [PATCH 15/24] :arrow_up: bump dependency --- pages/changelog.md | 1 + poetry.lock | 96 +++++++++++++++++++++++++++++++++++++--------- pyproject.toml | 8 ++-- 3 files changed, 82 insertions(+), 23 deletions(-) diff --git a/pages/changelog.md b/pages/changelog.md index 71a8c679..02db557c 100644 --- a/pages/changelog.md +++ b/pages/changelog.md @@ -8,6 +8,7 @@ sidebar: auto - 修改 `nonebot` 项目结构，分离所有 `adapter` - 修改插件加载逻辑，使用 `import hook` (PEP 302) +- 适配 `pydantic` ~1.8 ## v2.0.0a10 diff --git a/poetry.lock b/poetry.lock index c0a6b17d..2a143855 100644 --- a/poetry.lock +++ b/poetry.lock @@ -143,11 +143,11 @@ reference = "aliyun" [[package]] name = "h11" -version = "0.9.0" +version = "0.12.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [package.source] type = "legacy" @@ -235,7 +235,7 @@ reference = "aliyun" [[package]] name = "httpx" -version = "0.16.1" +version = "0.17.0" description = "The next generation HTTP client." category = "dev" optional = false @@ -397,7 +397,7 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -httpx = "^0.16.1" +httpx = "^0.17.0" nonebot2 = "^2.0.0-alpha.10" [package.source] @@ -414,7 +414,7 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -httpx = "^0.16.1" +httpx = "^0.17.0" nonebot2 = "^2.0.0-alpha.10" [package.source] @@ -431,7 +431,7 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -httpx = "^0.16.1" +httpx = "^0.17.0" nonebot2 = "^2.0.0-alpha.10" websockets = "^8.1" @@ -573,6 +573,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "pyyaml" +version = "5.4.1" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "quart" version = "0.14.1" @@ -931,7 +944,7 @@ reference = "aliyun" [[package]] name = "uvicorn" -version = "0.11.8" +version = "0.13.4" description = "The lightning-fast ASGI server." category = "main" optional = false @@ -939,13 +952,18 @@ python-versions = "*" [package.dependencies] click = ">=7.0.0,<8.0.0" -h11 = ">=0.8,<0.10" -httptools = {version = ">=0.1.0,<0.2.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -uvloop = {version = ">=0.14.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -websockets = ">=8.0.0,<9.0.0" +colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} +h11 = ">=0.8" +httptools = {version = ">=0.1.0,<0.2.0", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} +PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} +websockets = {version = ">=8.0.0,<9.0.0", optional = true, markers = "extra == \"standard\""} [package.extras] -watchgodreload = ["watchgod (>=0.6,<0.7)"] +standard = ["websockets (>=8.0.0,<9.0.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "httptools (>=0.1.0,<0.2.0)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] [package.source] type = "legacy" @@ -970,6 +988,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "watchgod" +version = "0.7" +description = "Simple, modern file watching and code reload in python." +category = "main" +optional = false +python-versions = ">=3.5" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "websockets" version = "8.1" @@ -1052,7 +1083,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "6a7da1a6cb4a22146298b53f5bd6d3da87104d4bb0f445a363b30467a684f4a1" +content-hash = "f4e49d25ac5c37b3c7527935b52acf5d0d6d0261a645f4247120f9e28c5ca282" [metadata.files] aiofiles = [ @@ -1095,8 +1126,8 @@ fastapi = [ {file = "fastapi-0.63.0.tar.gz", hash = "sha256:63c4592f5ef3edf30afa9a44fa7c6b7ccb20e0d3f68cd9eba07b44d552058dcb"}, ] h11 = [ - {file = "h11-0.9.0-py2.py3-none-any.whl", hash = "sha256:4bc6d6a1238b7615b266ada57e0618568066f57dd6fa967d1290ec9309b2f2f1"}, - {file = "h11-0.9.0.tar.gz", hash = "sha256:33d4bca7be0fa039f4e84d50ab00531047e53d6ee8ffbc83501ea602c169cae1"}, + {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, + {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] h2 = [ {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"}, @@ -1129,8 +1160,8 @@ httptools = [ {file = "httptools-0.1.1.tar.gz", hash = "sha256:41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"}, ] httpx = [ - {file = "httpx-0.16.1-py3-none-any.whl", hash = "sha256:9cffb8ba31fac6536f2c8cde30df859013f59e4bcc5b8d43901cb3654a8e0a5b"}, - {file = "httpx-0.16.1.tar.gz", hash = "sha256:126424c279c842738805974687e0518a94c7ae8d140cd65b9c4f77ac46ffa537"}, + {file = "httpx-0.17.0-py3-none-any.whl", hash = "sha256:fe19522f7b0861a1f6ac83306360bb5b7fb1ed64633a1a04a33f04102a1bea60"}, + {file = "httpx-0.17.0.tar.gz", hash = "sha256:4f7ab2fef7f929c5531abd4f413b41ce2c820e3202f2eeee498f2d92b6849f8d"}, ] hypercorn = [ {file = "Hypercorn-0.11.2-py3-none-any.whl", hash = "sha256:8007c10f81566920f8ae12c0e26e146f94ca70506da964b5a727ad610aa1d821"}, @@ -1272,6 +1303,29 @@ pytz = [ {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, {file = "pytz-2021.1.tar.gz", hash = "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da"}, ] +pyyaml = [ + {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, + {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, + {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, + {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, + {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, + {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, + {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, + {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, + {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, + {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, + {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, +] quart = [ {file = "Quart-0.14.1-py3-none-any.whl", hash = "sha256:7b13786e07541cc9ce1466fdc6a6ccd5f36eb39118edd25a42d617593cd17707"}, {file = "Quart-0.14.1.tar.gz", hash = "sha256:429c5b4ff27e1d2f9ca0aacc38f6aba0ff49b38b815448bf24b613d3de12ea02"}, @@ -1349,8 +1403,8 @@ urllib3 = [ {file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"}, ] uvicorn = [ - {file = "uvicorn-0.11.8-py3-none-any.whl", hash = "sha256:4b70ddb4c1946e39db9f3082d53e323dfd50634b95fd83625d778729ef1730ef"}, - {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, + {file = "uvicorn-0.13.4-py3-none-any.whl", hash = "sha256:7587f7b08bd1efd2b9bad809a3d333e972f1d11af8a5e52a9371ee3a5de71524"}, + {file = "uvicorn-0.13.4.tar.gz", hash = "sha256:3292251b3c7978e8e4a7868f4baf7f7f7bb7e40c759ecc125c37e99cdea34202"}, ] uvloop = [ {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, @@ -1364,6 +1418,10 @@ uvloop = [ {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] +watchgod = [ + {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, + {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, +] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, {file = "websockets-8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:3db87421956f1b0779a7564915875ba774295cc86e81bc671631379371af1170"}, diff --git a/pyproject.toml b/pyproject.toml index be79c9f3..196e0b9c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,11 +26,11 @@ include = ["nonebot/py.typed"] python = "^3.7.3" loguru = "^0.5.1" pygtrie = "^2.4.1" -fastapi = "^0.63.0" -uvicorn = "^0.11.5" -Quart = { version = "^0.14.1", optional = true } -pydantic = { extras = ["dotenv", "typing_extensions"], version = "~1.8.0" } tomlkit = "^0.7.0" +fastapi = "^0.63.0" +Quart = { version = "^0.14.1", optional = true } +pydantic = { extras = ["dotenv"], version = "~1.8.0" } +uvicorn = { version = "^0.13.0", extras = ["standard"] } [tool.poetry.dev-dependencies] yapf = "^0.30.0" From f6289ff1b36c15f57ecda8dfae331503bc62e515 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 2 Mar 2021 14:35:02 +0800 Subject: [PATCH 16/24] :bug: fix prompt error --- nonebot/adapters/_base.py | 27 ++++++++++++++++++++++++--- nonebot/matcher.py | 21 ++++++++++++++++++--- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/nonebot/adapters/_base.py b/nonebot/adapters/_base.py index 328883c8..5ef603d3 100644 --- a/nonebot/adapters/_base.py +++ b/nonebot/adapters/_base.py @@ -152,7 +152,7 @@ T_MessageSegment = TypeVar("T_MessageSegment", bound="MessageSegment") @dataclass -class MessageSegment(abc.ABC): +class MessageSegment(abc.ABC, Mapping): """消息段基类""" type: str """ @@ -166,10 +166,16 @@ class MessageSegment(abc.ABC): """ @abc.abstractmethod - def __str__(self: T_MessageSegment) -> str: + def __str__(self) -> str: """该消息段所代表的 str，在命令匹配部分使用""" raise NotImplementedError + def __len__(self) -> int: + return len(str(self)) + + def __ne__(self: T_MessageSegment, other: T_MessageSegment) -> bool: + return not self == other + @abc.abstractmethod def __add__(self: T_MessageSegment, other: Union[str, T_MessageSegment, T_Message]) -> T_Message: @@ -203,9 +209,24 @@ class MessageSegment(abc.ABC): def __setitem__(self, key, value): return setattr(self, key, value) - def get(self, key, default=None): + def __iter__(self): + yield from self.data.__iter__() + + def __contains__(self, key: object) -> bool: + return key in self.data + + def get(self, key: str, default=None): return getattr(self, key, default) + def keys(self): + return self.data.keys() + + def values(self): + return self.data.values() + + def items(self): + return self.data.items() + def copy(self: T_MessageSegment) -> T_MessageSegment: return copy(self) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 2b7775f6..8a76eb52 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -10,7 +10,7 @@ from functools import wraps from datetime import datetime from contextvars import ContextVar from collections import defaultdict -from typing import Type, List, Dict, Union, Callable, Optional, NoReturn, TYPE_CHECKING +from typing import Type, List, Dict, Union, Mapping, Iterable, Callable, Optional, NoReturn, TYPE_CHECKING from nonebot.rule import Rule from nonebot.log import logger @@ -345,8 +345,23 @@ class Matcher(metaclass=MatcherMeta): state["_current_key"] = key if key not in state: if prompt: - await bot.send(event=event, - message=str(prompt).format(**state)) + if isinstance(prompt, str): + await bot.send(event=event, + message=prompt.format(**state)) + elif isinstance(prompt, Mapping): + if prompt.is_text(): + await bot.send(event=event, + message=str(prompt).format(**state)) + else: + await bot.send(event=event, message=prompt) + elif isinstance(prompt, Iterable): + await bot.send( + event=event, + message=prompt.__class__( + str(prompt).format(**state)) # type: ignore + ) + else: + logger.warning("Unknown prompt type, ignored.") raise PausedException else: state["_skip_key"] = True From 873aa628254114a54b6d0a0d0af866355c498b77 Mon Sep 17 00:00:00 2001 From: nonebot Date: Tue, 2 Mar 2021 07:41:23 +0000 Subject: [PATCH 17/24] :memo: update api docs --- docs/api/adapters/README.md | 2 +- docs/api/adapters/cqhttp.md | 2 +- docs/api/adapters/ding.md | 2 +- docs/api/adapters/mirai.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api/adapters/README.md b/docs/api/adapters/README.md index b6d728d5..85430ba9 100644 --- a/docs/api/adapters/README.md +++ b/docs/api/adapters/README.md @@ -179,7 +179,7 @@ await bot.send_msg(message="hello world") ## _class_ `MessageSegment` -基类：`abc.ABC` +基类：`abc.ABC`, `Mapping` 消息段基类 diff --git a/docs/api/adapters/cqhttp.md b/docs/api/adapters/cqhttp.md index 104b6981..6e6e938b 100644 --- a/docs/api/adapters/cqhttp.md +++ b/docs/api/adapters/cqhttp.md @@ -307,7 +307,7 @@ CQHTTP 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 ## _class_ `MessageSegment` -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment) +基类：`abc.ABC`, `Mapping` CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 diff --git a/docs/api/adapters/ding.md b/docs/api/adapters/ding.md index 93d6519e..7bb07c8a 100644 --- a/docs/api/adapters/ding.md +++ b/docs/api/adapters/ding.md @@ -199,7 +199,7 @@ sidebarDepth: 0 ## _class_ `MessageSegment` -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment) +基类：`abc.ABC`, `Mapping` 钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 diff --git a/docs/api/adapters/mirai.md b/docs/api/adapters/mirai.md index 1f05088b..1851ed91 100644 --- a/docs/api/adapters/mirai.md +++ b/docs/api/adapters/mirai.md @@ -722,7 +722,7 @@ mirai-api-http 正向 Websocket 协议 Bot 适配。 ## _class_ `MessageSegment` -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment) +基类：`abc.ABC`, `Mapping` Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) From 9e04e497b7c6f160044521815316a9baf85b5f9c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 3 Mar 2021 16:06:19 +0800 Subject: [PATCH 18/24] :alembic: add type and permission updater hook --- docs/api/adapters/README.md | 2 +- docs/api/matcher.md | 62 +++++++++++++++++++++ docs/api/typing.md | 32 +++++++++++ nonebot/adapters/_base.py | 4 +- nonebot/matcher.py | 107 +++++++++++++++++++++++++++--------- nonebot/typing.py | 20 ++++++- pages/changelog.md | 2 + 7 files changed, 200 insertions(+), 29 deletions(-) diff --git a/docs/api/adapters/README.md b/docs/api/adapters/README.md index 85430ba9..172e87a4 100644 --- a/docs/api/adapters/README.md +++ b/docs/api/adapters/README.md @@ -291,7 +291,7 @@ Event 基类。提供获取关键信息的方法，其余信息可直接获取 * `Literal["message", "notice", "request", "meta_event"]` - * `str` + * 其他自定义 `str` diff --git a/docs/api/matcher.md b/docs/api/matcher.md index 9283f8a7..509ab6e9 100644 --- a/docs/api/matcher.md +++ b/docs/api/matcher.md @@ -197,6 +197,36 @@ sidebarDepth: 0 +### `_default_type_updater` + + +* **类型** + + `Optional[T_ArgsParser]` + + + +* **说明** + + 事件响应器类型更新函数 + + + +### `_default_permission_updater` + + +* **类型** + + `Optional[T_ArgsParser]` + + + +* **说明** + + 事件响应器权限更新函数 + + + ### `__init__()` 实例化 Matcher 以便运行 @@ -341,6 +371,38 @@ sidebarDepth: 0 +### _classmethod_ `type_updater(func)` + + +* **说明** + + 装饰一个函数来更改当前事件响应器的默认响应事件类型更新函数 + + + +* **参数** + + + * `func: T_TypeUpdater`: 响应事件类型更新函数 + + + +### _classmethod_ `permission_updater(func)` + + +* **说明** + + 装饰一个函数来更改当前事件响应器的默认会话权限更新函数 + + + +* **参数** + + + * `func: T_PermissionUpdater`: 会话权限更新函数 + + + ### _classmethod_ `handle()` diff --git a/docs/api/typing.md b/docs/api/typing.md index 5d1b3d7b..c3ec95bf 100644 --- a/docs/api/typing.md +++ b/docs/api/typing.md @@ -212,3 +212,35 @@ sidebarDepth: 0 * **说明** ArgsParser 即消息参数解析函数，在 Matcher.got 获取参数时被运行。 + + + + +## `T_TypeUpdater` + + +* **类型** + + `Callable[[Bot, Event, T_State, str], Awaitable[str]]` + + + +* **说明** + + TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 `message`。 + + + + +## `T_PermissionUpdater` + + +* **类型** + + `Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]` + + + +* **说明** + + PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 diff --git a/nonebot/adapters/_base.py b/nonebot/adapters/_base.py index 5ef603d3..5983838a 100644 --- a/nonebot/adapters/_base.py +++ b/nonebot/adapters/_base.py @@ -381,7 +381,7 @@ class Event(abc.ABC, BaseModel): :返回: * ``Literal["message", "notice", "request", "meta_event"]`` - * ``str`` + * 其他自定义 ``str`` """ raise NotImplementedError @@ -457,7 +457,7 @@ class Event(abc.ABC, BaseModel): raise NotImplementedError @abc.abstractmethod - def get_message(self) -> "Message": + def get_message(self) -> Message: """ :说明: diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 8a76eb52..942d4a2c 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -15,7 +15,7 @@ from typing import Type, List, Dict, Union, Mapping, Iterable, Callable, Optiona from nonebot.rule import Rule from nonebot.log import logger from nonebot.permission import Permission, USER -from nonebot.typing import T_State, T_StateFactory, T_Handler, T_ArgsParser +from nonebot.typing import T_State, T_StateFactory, T_Handler, T_ArgsParser, T_TypeUpdater, T_PermissionUpdater from nonebot.exception import PausedException, RejectedException, FinishedException, StopPropagation if TYPE_CHECKING: @@ -106,6 +106,16 @@ class Matcher(metaclass=MatcherMeta): :类型: ``Optional[T_ArgsParser]`` :说明: 事件响应器默认参数解析函数 """ + _default_type_updater: Optional[T_TypeUpdater] = None + """ + :类型: ``Optional[T_ArgsParser]`` + :说明: 事件响应器类型更新函数 + """ + _default_permission_updater: Optional[T_PermissionUpdater] = None + """ + :类型: ``Optional[T_ArgsParser]`` + :说明: 事件响应器权限更新函数 + """ def __init__(self): """实例化 Matcher 以便运行""" @@ -245,6 +255,35 @@ class Matcher(metaclass=MatcherMeta): cls._default_parser = func return func + @classmethod + def type_updater(cls, func: T_TypeUpdater) -> T_TypeUpdater: + """ + :说明: + + 装饰一个函数来更改当前事件响应器的默认响应事件类型更新函数 + + :参数: + + * ``func: T_TypeUpdater``: 响应事件类型更新函数 + """ + cls._default_type_updater = func + return func + + @classmethod + def permission_updater(cls, + func: T_PermissionUpdater) -> T_PermissionUpdater: + """ + :说明: + + 装饰一个函数来更改当前事件响应器的默认会话权限更新函数 + + :参数: + + * ``func: T_PermissionUpdater``: 会话权限更新函数 + """ + cls._default_permission_updater = func + return func + @staticmethod def process_handler(handler: T_Handler) -> T_Handler: signature = inspect.signature(handler, follow_wrapped=False) @@ -548,31 +587,49 @@ class Matcher(metaclass=MatcherMeta): except RejectedException: self.handlers.insert(0, handler) # type: ignore - Matcher.new( - "message", - Rule(), - USER(event.get_session_id(), - perm=self.permission), # type:ignore - self.handlers, - temp=True, - priority=0, - block=True, - module=self.module, - default_state=self.state, - expire_time=datetime.now() + bot.config.session_expire_timeout) + if self._default_type_updater: + type_ = await self._default_type_updater( + bot, event, state, self.type) + else: + type_ = "message" + if self._default_permission_updater: + permission = await self._default_permission_updater( + bot, event, state, self.permission) + else: + permission = USER(event.get_session_id(), perm=self.permission) + Matcher.new(type_, + Rule(), + permission, + self.handlers, + temp=True, + priority=0, + block=True, + module=self.module, + default_state=self.state, + expire_time=datetime.now() + + bot.config.session_expire_timeout) except PausedException: - Matcher.new( - "message", - Rule(), - USER(event.get_session_id(), - perm=self.permission), # type:ignore - self.handlers, - temp=True, - priority=0, - block=True, - module=self.module, - default_state=self.state, - expire_time=datetime.now() + bot.config.session_expire_timeout) + if self._default_type_updater: + type_ = await self._default_type_updater( + bot, event, state, self.type) + else: + type_ = "message" + if self._default_permission_updater: + permission = await self._default_permission_updater( + bot, event, state, self.permission) + else: + permission = USER(event.get_session_id(), perm=self.permission) + Matcher.new(type_, + Rule(), + permission, + self.handlers, + temp=True, + priority=0, + block=True, + module=self.module, + default_state=self.state, + expire_time=datetime.now() + + bot.config.session_expire_timeout) except FinishedException: pass except StopPropagation: diff --git a/nonebot/typing.py b/nonebot/typing.py index f92d1379..dd2f24c5 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -21,8 +21,9 @@ from collections.abc import Callable as BaseCallable from typing import Any, Dict, Union, TypeVar, Optional, Callable, NoReturn, Awaitable, TYPE_CHECKING if TYPE_CHECKING: - from nonebot.adapters import Bot, Event from nonebot.matcher import Matcher + from nonebot.adapters import Bot, Event + from nonebot.permission import Permission T_Wrapped = TypeVar("T_Wrapped", bound=BaseCallable) @@ -152,3 +153,20 @@ T_ArgsParser = Callable[["Bot", "Event", T_State], Union[Awaitable[None], ArgsParser 即消息参数解析函数，在 Matcher.got 获取参数时被运行。 """ +T_TypeUpdater = Callable[["Bot", "Event", T_State, str], Awaitable[str]] +""" +:类型: ``Callable[[Bot, Event, T_State, str], Awaitable[str]]`` + +:说明: + + TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 ``message``。 +""" +T_PermissionUpdater = Callable[["Bot", "Event", T_State, "Permission"], + Awaitable["Permission"]] +""" +:类型: ``Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]`` + +:说明: + + PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 +""" diff --git a/pages/changelog.md b/pages/changelog.md index 02db557c..74356bfc 100644 --- a/pages/changelog.md +++ b/pages/changelog.md @@ -9,6 +9,8 @@ sidebar: auto - 修改 `nonebot` 项目结构，分离所有 `adapter` - 修改插件加载逻辑，使用 `import hook` (PEP 302) - 适配 `pydantic` ~1.8 +- 移除 4 种内置事件类型限制，允许自定义事件类型 +- 新增会话权限更新自定义，会话中断时更新权限以做到多人会话 ## v2.0.0a10 From 4ed5b06db00a827bfc3fc76e92c74dd51ecca316 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 3 Mar 2021 16:09:37 +0800 Subject: [PATCH 19/24] :memo: update changelog --- pages/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/changelog.md b/pages/changelog.md index 74356bfc..713f722d 100644 --- a/pages/changelog.md +++ b/pages/changelog.md @@ -8,6 +8,7 @@ sidebar: auto - 修改 `nonebot` 项目结构，分离所有 `adapter` - 修改插件加载逻辑，使用 `import hook` (PEP 302) +- 新增插件加载方式: `json`, `toml` - 适配 `pydantic` ~1.8 - 移除 4 种内置事件类型限制，允许自定义事件类型 - 新增会话权限更新自定义，会话中断时更新权限以做到多人会话 From 611049681a6df108f871d37855ca3581e3f5748b Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 5 Mar 2021 16:27:43 +0800 Subject: [PATCH 20/24] :sparkles: change publish and issue --- .github/ISSUE_TEMPLATE/adapter-publish.md | 46 ----- .github/ISSUE_TEMPLATE/config.yml | 11 ++ .github/ISSUE_TEMPLATE/plugin-publish.md | 44 ----- archive/2.0.0a10/sidebar.config.json | 16 +- archive/2.0.0a7/sidebar.config.json | 10 +- archive/2.0.0a8.post2/sidebar.config.json | 15 +- docs/.vuepress/components/Adapter.vue | 221 +++++++++++++++++++++ docs/.vuepress/components/Bot.vue | 190 ++++++++++++++++++ docs/.vuepress/components/Plugin.vue | 223 ++++++++++++++++++++++ docs/.vuepress/components/Plugins.vue | 165 ---------------- docs/.vuepress/components/PublishCard.vue | 84 ++++++++ docs/.vuepress/components/Store.vue | 70 +++++++ docs/.vuepress/config.js | 2 +- docs/.vuepress/public/bots.json | 1 + pages/plugin-store.md | 6 - pages/store.md | 6 + 16 files changed, 821 insertions(+), 289 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/adapter-publish.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/plugin-publish.md create mode 100644 docs/.vuepress/components/Adapter.vue create mode 100644 docs/.vuepress/components/Bot.vue create mode 100644 docs/.vuepress/components/Plugin.vue delete mode 100644 docs/.vuepress/components/Plugins.vue create mode 100644 docs/.vuepress/components/PublishCard.vue create mode 100644 docs/.vuepress/components/Store.vue create mode 100644 docs/.vuepress/public/bots.json delete mode 100644 pages/plugin-store.md create mode 100644 pages/store.md diff --git a/.github/ISSUE_TEMPLATE/adapter-publish.md b/.github/ISSUE_TEMPLATE/adapter-publish.md deleted file mode 100644 index e82f8b6d..00000000 --- a/.github/ISSUE_TEMPLATE/adapter-publish.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -name: Adapter Publish -about: Publish your adapter to nonebot homepage and nb-cli -title: "Adapter: blabla 协议" -labels: Adapter -assignees: "" - ---- - -**你的协议名称：** - -example - - - -**简短描述协议：** - -Example 协议 - -**插件 import 使用的名称** - -nonebot.adapters.example - - - -**插件 install 使用的名称** - -nonebot-adapter-example - - - -**插件项目仓库/主页链接** - -nonebot/nonebot2 - - diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..3d5c6b2f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,11 @@ +blank_issues_enabled: false +contact_links: + - name: Plugin Publish + url: https://v2.nonebot.dev/store.html + about: Publish your plugin to nonebot homepage and nb-cli + - name: Adapter Publish + url: https://v2.nonebot.dev/store.html + about: Publish your adapter to nonebot homepage and nb-cli + - name: Bot Publish + url: https://v2.nonebot.dev/store.html + about: Publish your bot to nonebot homepage and nb-cli diff --git a/.github/ISSUE_TEMPLATE/plugin-publish.md b/.github/ISSUE_TEMPLATE/plugin-publish.md deleted file mode 100644 index 2504c56a..00000000 --- a/.github/ISSUE_TEMPLATE/plugin-publish.md +++ /dev/null @@ -1,44 +0,0 @@ ---- -name: Plugin Publish -about: Publish your plugin to nonebot homepage and nb-cli -title: "Plugin: blabla 的插件" -labels: Plugin -assignees: "" - ---- - -**你的插件名称：** - -例：复读机 - -**简短描述插件功能：** - -例：复读群友的消息 - -**插件 import 使用的名称** - -nonebot_plugin_example - - - -**插件 install 使用的名称** - -nonebot-plugin-example - - - -**插件项目仓库/主页链接** - -nonebot/nonebot2 - - diff --git a/archive/2.0.0a10/sidebar.config.json b/archive/2.0.0a10/sidebar.config.json index 5c4ef15c..8906eb68 100644 --- a/archive/2.0.0a10/sidebar.config.json +++ b/archive/2.0.0a10/sidebar.config.json @@ -24,8 +24,8 @@ "link": "/api/" }, { - "text": "插件广场", - "link": "/plugin-store" + "text": "商店", + "link": "/store" }, { "text": "更新日志", @@ -63,11 +63,7 @@ "title": "协议适配", "collapsable": false, "sidebar": "auto", - "children": [ - "cqhttp-guide", - "ding-guide", - "mirai-guide" - ] + "children": ["cqhttp-guide", "ding-guide", "mirai-guide"] } ], "/advanced/": [ @@ -88,9 +84,7 @@ "title": "发布", "collapsable": false, "sidebar": "auto", - "children": [ - "publish-plugin" - ] + "children": ["publish-plugin"] } ], "/api/": [ @@ -177,4 +171,4 @@ } } } -} \ No newline at end of file +} diff --git a/archive/2.0.0a7/sidebar.config.json b/archive/2.0.0a7/sidebar.config.json index d01b84e1..1e615846 100644 --- a/archive/2.0.0a7/sidebar.config.json +++ b/archive/2.0.0a7/sidebar.config.json @@ -24,8 +24,8 @@ "link": "/api/" }, { - "text": "插件广场", - "link": "/plugin-store" + "text": "商店", + "link": "/store" }, { "text": "更新日志", @@ -77,9 +77,7 @@ "title": "发布", "collapsable": false, "sidebar": "auto", - "children": [ - "publish-plugin" - ] + "children": ["publish-plugin"] } ], "/api/": [ @@ -158,4 +156,4 @@ } } } -} \ No newline at end of file +} diff --git a/archive/2.0.0a8.post2/sidebar.config.json b/archive/2.0.0a8.post2/sidebar.config.json index 9d660a4b..0d0103e1 100644 --- a/archive/2.0.0a8.post2/sidebar.config.json +++ b/archive/2.0.0a8.post2/sidebar.config.json @@ -24,8 +24,8 @@ "link": "/api/" }, { - "text": "插件广场", - "link": "/plugin-store" + "text": "商店", + "link": "/store" }, { "text": "更新日志", @@ -63,10 +63,7 @@ "title": "协议适配", "collapsable": false, "sidebar": "auto", - "children": [ - "cqhttp-guide", - "ding-guide" - ] + "children": ["cqhttp-guide", "ding-guide"] } ], "/advanced/": [ @@ -87,9 +84,7 @@ "title": "发布", "collapsable": false, "sidebar": "auto", - "children": [ - "publish-plugin" - ] + "children": ["publish-plugin"] } ], "/api/": [ @@ -168,4 +163,4 @@ } } } -} \ No newline at end of file +} diff --git a/docs/.vuepress/components/Adapter.vue b/docs/.vuepress/components/Adapter.vue new file mode 100644 index 00000000..7cb4d3cc --- /dev/null +++ b/docs/.vuepress/components/Adapter.vue @@ -0,0 +1,221 @@ + + + diff --git a/docs/.vuepress/components/Bot.vue b/docs/.vuepress/components/Bot.vue new file mode 100644 index 00000000..f2fad299 --- /dev/null +++ b/docs/.vuepress/components/Bot.vue @@ -0,0 +1,190 @@ + + + diff --git a/docs/.vuepress/components/Plugin.vue b/docs/.vuepress/components/Plugin.vue new file mode 100644 index 00000000..7e52e108 --- /dev/null +++ b/docs/.vuepress/components/Plugin.vue @@ -0,0 +1,223 @@ + + + diff --git a/docs/.vuepress/components/Plugins.vue b/docs/.vuepress/components/Plugins.vue deleted file mode 100644 index 59e6a449..00000000 --- a/docs/.vuepress/components/Plugins.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - diff --git a/docs/.vuepress/components/PublishCard.vue b/docs/.vuepress/components/PublishCard.vue new file mode 100644 index 00000000..98e15bca --- /dev/null +++ b/docs/.vuepress/components/PublishCard.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/docs/.vuepress/components/Store.vue b/docs/.vuepress/components/Store.vue new file mode 100644 index 00000000..be73fe65 --- /dev/null +++ b/docs/.vuepress/components/Store.vue @@ -0,0 +1,70 @@ + + + + + + + diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 97d3ac9b..c2efeb3e 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -82,7 +82,7 @@ module.exports = context => ({ { text: "指南", link: "/guide/" }, { text: "进阶", link: "/advanced/" }, { text: "API", link: "/api/" }, - { text: "插件广场", link: "/plugin-store" }, + { text: "商店", link: "/store" }, { text: "更新日志", link: "/changelog" } ], sidebarDepth: 2, diff --git a/docs/.vuepress/public/bots.json b/docs/.vuepress/public/bots.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/docs/.vuepress/public/bots.json @@ -0,0 +1 @@ +[] diff --git a/pages/plugin-store.md b/pages/plugin-store.md deleted file mode 100644 index 28b142e2..00000000 --- a/pages/plugin-store.md +++ /dev/null @@ -1,6 +0,0 @@ ---- ---- - -# 插件广场 - - diff --git a/pages/store.md b/pages/store.md new file mode 100644 index 00000000..1621816a --- /dev/null +++ b/pages/store.md @@ -0,0 +1,6 @@ +--- +--- + +# 商店 + + From f1f510604ef4e50e208a4d9d0db84129a053de03 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 5 Mar 2021 20:01:55 +0800 Subject: [PATCH 21/24] :memo: archive 2.0.0a11 doc --- archive/2.0.0a11/README.md | 15 + archive/2.0.0a11/advanced/README.md | 169 ++ .../2.0.0a11/advanced/export-and-require.md | 117 + .../2.0.0a11/advanced/overloaded-handlers.md | 1 + archive/2.0.0a11/advanced/permission.md | 2 + archive/2.0.0a11/advanced/publish-plugin.md | 1 + archive/2.0.0a11/advanced/runtime-hook.md | 60 + archive/2.0.0a11/advanced/scheduler.md | 135 ++ archive/2.0.0a11/api/README.md | 58 + archive/2.0.0a11/api/adapters/README.md | 429 ++++ archive/2.0.0a11/api/adapters/cqhttp.md | 581 +++++ archive/2.0.0a11/api/adapters/ding.md | 325 +++ archive/2.0.0a11/api/adapters/mirai.md | 1917 +++++++++++++++++ archive/2.0.0a11/api/config.md | 285 +++ archive/2.0.0a11/api/drivers/README.md | 318 +++ archive/2.0.0a11/api/drivers/fastapi.md | 120 ++ archive/2.0.0a11/api/drivers/quart.md | 62 + archive/2.0.0a11/api/exception.md | 214 ++ archive/2.0.0a11/api/log.md | 42 + archive/2.0.0a11/api/matcher.md | 541 +++++ archive/2.0.0a11/api/message.md | 143 ++ archive/2.0.0a11/api/nonebot.md | 278 +++ archive/2.0.0a11/api/permission.md | 63 + archive/2.0.0a11/api/plugin.md | 1480 +++++++++++++ archive/2.0.0a11/api/rule.md | 266 +++ archive/2.0.0a11/api/typing.md | 246 +++ archive/2.0.0a11/api/utils.md | 84 + archive/2.0.0a11/guide/README.md | 31 + archive/2.0.0a11/guide/basic-configuration.md | 86 + archive/2.0.0a11/guide/cqhttp-guide.md | 101 + archive/2.0.0a11/guide/creating-a-handler.md | 197 ++ archive/2.0.0a11/guide/creating-a-matcher.md | 148 ++ archive/2.0.0a11/guide/creating-a-plugin.md | 119 + archive/2.0.0a11/guide/creating-a-project.md | 57 + archive/2.0.0a11/guide/ding-guide.md | 119 + archive/2.0.0a11/guide/end-or-start.md | 9 + archive/2.0.0a11/guide/getting-started.md | 87 + .../2.0.0a11/guide/images/Handle-Event.png | Bin 0 -> 126466 bytes archive/2.0.0a11/guide/installation.md | 95 + archive/2.0.0a11/guide/loading-a-plugin.md | 125 ++ archive/2.0.0a11/guide/mirai-guide.md | 228 ++ archive/2.0.0a11/sidebar.config.json | 180 ++ docs/.vuepress/versions.json | 1 + 43 files changed, 9535 insertions(+) create mode 100644 archive/2.0.0a11/README.md create mode 100644 archive/2.0.0a11/advanced/README.md create mode 100644 archive/2.0.0a11/advanced/export-and-require.md create mode 100644 archive/2.0.0a11/advanced/overloaded-handlers.md create mode 100644 archive/2.0.0a11/advanced/permission.md create mode 100644 archive/2.0.0a11/advanced/publish-plugin.md create mode 100644 archive/2.0.0a11/advanced/runtime-hook.md create mode 100644 archive/2.0.0a11/advanced/scheduler.md create mode 100644 archive/2.0.0a11/api/README.md create mode 100644 archive/2.0.0a11/api/adapters/README.md create mode 100644 archive/2.0.0a11/api/adapters/cqhttp.md create mode 100644 archive/2.0.0a11/api/adapters/ding.md create mode 100644 archive/2.0.0a11/api/adapters/mirai.md create mode 100644 archive/2.0.0a11/api/config.md create mode 100644 archive/2.0.0a11/api/drivers/README.md create mode 100644 archive/2.0.0a11/api/drivers/fastapi.md create mode 100644 archive/2.0.0a11/api/drivers/quart.md create mode 100644 archive/2.0.0a11/api/exception.md create mode 100644 archive/2.0.0a11/api/log.md create mode 100644 archive/2.0.0a11/api/matcher.md create mode 100644 archive/2.0.0a11/api/message.md create mode 100644 archive/2.0.0a11/api/nonebot.md create mode 100644 archive/2.0.0a11/api/permission.md create mode 100644 archive/2.0.0a11/api/plugin.md create mode 100644 archive/2.0.0a11/api/rule.md create mode 100644 archive/2.0.0a11/api/typing.md create mode 100644 archive/2.0.0a11/api/utils.md create mode 100644 archive/2.0.0a11/guide/README.md create mode 100644 archive/2.0.0a11/guide/basic-configuration.md create mode 100644 archive/2.0.0a11/guide/cqhttp-guide.md create mode 100644 archive/2.0.0a11/guide/creating-a-handler.md create mode 100644 archive/2.0.0a11/guide/creating-a-matcher.md create mode 100644 archive/2.0.0a11/guide/creating-a-plugin.md create mode 100644 archive/2.0.0a11/guide/creating-a-project.md create mode 100644 archive/2.0.0a11/guide/ding-guide.md create mode 100644 archive/2.0.0a11/guide/end-or-start.md create mode 100644 archive/2.0.0a11/guide/getting-started.md create mode 100644 archive/2.0.0a11/guide/images/Handle-Event.png create mode 100644 archive/2.0.0a11/guide/installation.md create mode 100644 archive/2.0.0a11/guide/loading-a-plugin.md create mode 100644 archive/2.0.0a11/guide/mirai-guide.md create mode 100644 archive/2.0.0a11/sidebar.config.json diff --git a/archive/2.0.0a11/README.md b/archive/2.0.0a11/README.md new file mode 100644 index 00000000..891eb832 --- /dev/null +++ b/archive/2.0.0a11/README.md @@ -0,0 +1,15 @@ +--- +home: true +heroImage: /logo.png +tagline: 跨平台 Python 异步 QQ 机器人框架 +actionText: 开始使用 +actionLink: guide/ +features: + - title: 简洁 + details: 提供极其简洁易懂的 API，使你可以毫无压力地开始验证你的绝佳创意，只需编写最少量的代码，即可实现丰富的功能。 + - title: 易于扩展 + details: 精心设计的消息处理流程使得你可以很方便地将原型扩充为具有大量实用功能的完整聊天机器人，并持续保证扩展性。 + - title: 高性能 + details: 采用异步 I/O，利用 WebSocket 进行通信，以获得极高的性能；同时，支持使用多账号同时接入，减少业务宕机的可能。 +footer: MIT Licensed | Copyright © 2018 - 2020 NoneBot Team +--- diff --git a/archive/2.0.0a11/advanced/README.md b/archive/2.0.0a11/advanced/README.md new file mode 100644 index 00000000..6d34007c --- /dev/null +++ b/archive/2.0.0a11/advanced/README.md @@ -0,0 +1,169 @@ +# 深入 + +## 它如何工作？ + +如同[概览](../guide/README.md)所言: + +> NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 + +`Nonebot2` 是一个可以对机器人上报的事件进行处理并完成具体功能的机器人框架，在这里，我们将简要讲述它的工作内容。 + +**便捷起见，以下内容对 `Nonebot2` 会被称为 `nonebot`，与 `Nonebot2` 交互的机器人实现会被称为 `协议端`**。 + +在实际应用中，`nonebot` 会充当一个高性能，轻量级的 Python 微服务框架。协议端可以通过 `http`, `websocket` 等方式与之通信，这个通信往往是双向的：一方面，协议端可以上报数据给 `nonebot`，`nonebot` 会处理数据并返回响应给协议端；另一方面，`nonebot` 可以主动推送数据给协议端。而 `nonebot` 便是围绕上述的双向通信进行工作的。 + +在开始工作之前，`nonebot` 会依照**配置文件或初始化配置**启动，并会注册**协议适配器** `adapter`，之后便会加载**插件**， 随后，倘若一个协议端与 `nonebot` 进行了连接，`nonebot` 的后端驱动 `driver` 就会将 `adapter` 实例化为 `bot`，`nonebot` 便会利用 `bot` 开始工作，它的工作内容分为两个方面： + +1. **事件处理**，`bot` 会将协议端上报的数据转化为 `事件`(`Event`)，之后 `nonebot` 会根据一套既定流程来处理 `事件`。 + +2. **调用 `API`**, 在**事件处理**的过程中，`nonebot` 可以通过 `bot` 调用协议端指定的 `API` 来获取更多数据，或者反馈响应给协议端; `nonebot` 也可以通过调用 `API` 向协议端主动请求数据或者主动推送数据。 + +在**指南**模块， 我们已经叙述了[如何配置 nonebot](../guide/basic-configuration.md), [如何注册协议适配器](../guide/getting-started.md)，[如何加载插件](../guide/loading-a-plugin.md), 在这里便不再赘述。 + +下面，我们将对**事件处理**， **调用 API**进行说明。 + +## 事件处理 + +我们可以先看事件处理的流程图： + +![handle-event](../guide/images/Handle-Event.png) + +在流程图里，我们可以看到，`nonebot` 会有三个阶段来处理事件： + +1. **driver 处理上报数据** +2. **adapter 处理原始数据** +3. **nonebot 处理 Event** + +我们将顺序说明这三个阶段。其中，会将第三个阶段拆分成**概念解释**，**处理 Event**，**特殊异常处理**三个部分来说明。 + +### driver 处理上报数据 + +1. 协议端会通过 `websocket` 或者 `http` 等方式与 `nonebot` 的后端驱动 `driver` 连接，`driver` 会根据之前注册的 `adapter` 和配置文件的内容来进行鉴权，从而获得这个连接的唯一识别 id `self-id`，随后 `adapter` 就会利用 `self-id` 实例化为 `bot` 对象。 + + ::: tip + 需要注意的是，如果协议端通过 `websocket` 与 `nonebot` 连接，这个步骤只会在建立连接时进行；通过 `http` 方式连接时，会在协议端每次上报数据时都进行这个步骤。 + ::: + + ::: warning + 连接之前必须要注册 `adapter` + ::: + + ::: warning + `self-id` 是帐号的唯一识别 ID，这意味着不能出现相同的 `self-id`。 + ::: + +2. `driver` 会将接收到的数据转交给 `bot` 对象进一步处理。 + +### adapter 处理原始数据 + +1. `bot` 会利用事先定义好的 `Event Model` 对上报的数据进行分析处理，将数据转化为 `nonebot` 可以处理的 `Event` 对象。 + + ::: tip + `adapter` 在转换数据格式的同时可以进行一系列的特殊操作，例如 `CQHTTP` 会对 `reply` 信息进行提取。 + ::: + +2. `Event` 会传入 `nonebot` 做进一步处理。 + +### nonebot 处理 Event + +在讲述这个阶段之前，我们需要先对几个概念进行解释。 + +#### 概念解释 + +1. **hook**，或者说**钩子函数**，它们可以在 `nonebot` 处理 `Event` 的不同时刻进行拦截，修改或者扩展，在 `nonebot` 中，钩子函数分为 `事件预处理hook`，`运行预处理hook`，`运行后处理hook` 和 `事件后处理hook`。 + + ::: tip + 关于`hook`的更多信息，可以查阅[这里](./runtime-hook.md) + ::: + +2. **Matcher**与**matcher**，在**指南**中，我们讲述了[如何注册事件响应器](../guide/creating-a-matcher)，这里的事件响应器或者说 `Matcher` 并不是一个具体的实例 `instance`，而是一个具有特定属性的类 `class`。只有当 `Matcher` **响应事件**时，才会实例化为具体的 `instance`，也就是 `matcher`。`matcher` 可以认为是 `nonebot` 处理 `Event` 的基本单位，运行 `matcher` 是`nonebot`工作的主要内容。 + +3. **handler**，或者说**事件处理函数**, 它们可以认为是 `nonebot` 处理 `Event` 的最小单位。在不考虑 `hook` 的情况下，**运行 matcher 就是顺序运行 matcher.handlers**，这句话换种表达方式就是，`handler` 只有添加到 `matcher.handlers` 时，才可以参与到 `nonebot` 的工作中来。 + + ::: tip + 如何让 `handler` 添加到 `matcher.handlers`？ + + 一方面，我们可以参照[这里](../guide/creating-a-handler)利用装饰器来添加；另一方面，我们在用 `on()` 或者 `on_*()` 注册事件响应器时，可以添加 `handlers=[handler1, handler2, ...]` 这样的关键词参数来添加。 + ::: + +#### 处理 Event + +1. **执行事件预处理 hook**， `nonebot` 接收到 `Event` 后，会传入到 `事件预处理hook` 中进行处理。 + + ::: warning + 需要注意的是，执行多个 `事件预处理hook` 时并无顺序可言，它们是**并行运行**的。这个原则同样适用于其他的 `hook`。 + ::: + +2. **按优先级升序选出同一优先级的 Matcher**，`nonebot` 提供了一个全局字典 `matchers`，这个字典的 `key` 是优先级 `priority`，`value` 是一个 `list`，里面存放着同一优先级的 `Matcher`。在注册 `Matcher` 时，它和优先级 `priority` 会添加到里面。 + + 在执行 `事件预处理hook` 后，`nonebot` 会对 `matchers` 的 `key` 升序排序并选择出当前最小优先级的 `Matcher`。 + +3. **根据 Matcher 定义的 Rule, Permission 判断是否运行**，在选出 `Matcher` 后，`nonebot` 会将 `bot`，`Event` 传入到 `Matcher.check_rule` 和 `Matcher.check_perm` 两个函数中，两个函数分别对 Matcher 定义的 Rule, Permission 进行 check，当 check 通过后，这个 `Matcher` 就会响应事件。但是当同一个优先级的所有 `Matcher` 均没有响应时，`nonebot` 会返回到上一个步骤，选择出下一优先级的 `Matcher`。 + +4. **实例化 matcher 并执行运行预处理 hook**，当 `Matcher` 响应事件后，它便会实例化为 `matcher`，并执行 `运行预处理hook`。 + +5. **顺序运行 matcher 的所有 handlers**，`运行预处理hook` 执行完毕后，便会运行 `matcher`，也就是**顺序运行**它的 `handlers`。 + + ::: tip + `matcher` 运行 `handlers` 的顺序是: 先运行该 `matcher` 的类 `Matcher` 注册时添加的 `handlers`(如果有的话)，再按照装饰器装饰顺序运行装饰的 `handlers`。 + ::: + +6. **执行运行后处理 hook**，`matcher` 的 `handlers` 运行完毕后，会执行 `运行后处理hook`。 + +7. **判断是否停止事件传播**，`nonebot` 会根据当前优先级所有 `matcher` 的 `block` 参数或者 `StopPropagation` 异常判断是否停止传播 `Event`，如果事件没有停止传播，`nonebot` 便会返回到第 2 步， 选择出下一优先级的 `Matcher`。 + +8. **执行事件后处理 hook**，在 `Event` 停止传播或执行完所有响应的 `Matcher` 后，`nonebot` 会执行 `事件后处理hook`。 + + 当 `事件后处理hook` 执行完毕后，当前`Event`的处理周期就顺利结束了。 + +#### 特殊异常处理 + +在这个阶段，`nonebot` 规定了几个特殊的异常，当 `nonebot` 捕获到它们时，会用特定的行为来处理它们。 + +1. **IgnoredException** + + 这个异常可以在 `事件预处理hook` 和 `运行预处理hook` 抛出。 + + 当 `事件预处理hook` 抛出它时，`nonebot` 会忽略当前的 `Event`，不进行处理。 + + 当 `运行预处理hook` 抛出它时，`nonebot` 会忽略当前的 `matcher`，结束当前 `matcher` 的运行。 + + ::: warning + 当 `hook` 需要抛出这个异常时，要写明原因。 + ::: + +2. **PausedException** + + 这个异常可以在 `handler` 中由 `Matcher.pause` 抛出。 + + 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将后续的 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行后续的 handlers。 + +3. **RejectedException** + + 这个异常可以在 `handler` 中由 `Matcher.reject` 抛出。 + + 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将**当前 handler 和后续 `handler`**交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行当前 `handler` 和后续的 `handler`。 + +4. **FinishedException** + + 这个异常可以在 `handler` 中由 `Matcher.finish` 抛出。 + + 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行。 + +5. **StopPropagation** + + 这个异常一般会在执行 `运行后处理hook` 后抛出。 + + 当 `nonebot` 捕获到它时， 会停止传播当前 `Event`，不再寻找下一优先级的 `Matcher`，直接执行 `事件后处理hook`。 + +## 调用 API + +`nonebot` 可以通过 `bot` 来调用 API，API 可以向协议端发送数据，也可以向协议端请求更多的数据。 + +::: tip +不同 `adapter` 规定了不同的 API，对应的 API 列表请参照协议规范。 +::: + +一般来说，我们可以用 `bot.*` 来调用 `API`(\*是 `API` 的 `action` 或者 `endpoint`)。 + +对于发送消息而言，一方面可以调用既有的 API；另一方面 `nonebot` 实现了两个便捷方法，`bot.send(event, message, **kwargs)` 方法和可以在 `handler` 中使用的 `Matcher.send(message, **kwargs)` 方法，来向事件主体发送消息。 diff --git a/archive/2.0.0a11/advanced/export-and-require.md b/archive/2.0.0a11/advanced/export-and-require.md new file mode 100644 index 00000000..eef88990 --- /dev/null +++ b/archive/2.0.0a11/advanced/export-and-require.md @@ -0,0 +1,117 @@ +# 跨插件访问 + +由于 `nonebot2` 独特的插件加载机制，在使用 python 原有的 import 机制来进行插件之间的访问时，很可能会有奇怪的或者意料以外的情况发生。为了避免这种情况的发生，您可以有两种方法来实现跨插件访问： + +1. 将插件间的要使用的公共代码剥离出来，作为公共文件或者文件夹，提供给插件加以调用。 +2. 使用 `nonebot2` 提供的 `export` 和 `require` 机制，来实现插件间的互相调用。 + +第一种方法比较容易理解和实现，这里不再赘述，但需要注意的是，请不要将公共文件或者公共文件夹作为**插件**被 `nonebot2` 加载。 + +下面将介绍第二种方法—— `export` 和 `require` 机制： + +## 使用 export 和 require + +现在，假定有两个插件 `pluginA` 和 `pluginB`，需要在 `pluginB` 中调用 `pluginA` 中的一个变量 `varA` 和一个函数 `funcA`。 + +在上面的条件中涉及到了两种操作：一种是在 `pluginA` 的 `导出对象` 操作；而另一种是在 `pluginB` 的 `导入对象` 操作。在 `nonebot2` 中，`导出对象` 的操作用 `export` 机制来实现，`导入对象` 的操作用 `require` 机制来实现。下面，我们将逐一进行介绍。 + +:::warning 警告 + +使用这个方法进行跨插件访问时，**需要先加载`导出对象`的插件，再加载`导入对象`的插件。** + +::: + +### 使用 export + +在 `pluginA` 中，我们调用 `export` 机制 `导出对象`。 + +在 `export` 机制调用前，我们需要保证导出的对象已经被定义，比如： + +```python +varA = "varA" + + +def funcA(): + return "funcA" +``` + +在确保定义之后，我们可以从 `nonebot.plugin` 导入 `export()` 方法, `export()` 方法会返回一个特殊的字典 `export`： + +```python +from nonebot.plugin import export + +export=export() +``` + +这个字典可以用来装载导出的对象，它的 key 是对象导出后的命名，value 是对象本身，我们可以直接创建新的 `key` - `value` 对导出对象： + +```python +export.vA = varA +export.fA = funcA +``` + +除此之外，也支持 `嵌套` 导出对象： + +```python +export.sub.vA = varA +export.sub.fA = funcA +``` + +特别地，对于 `函数对象` 而言，`export` 支持用 `装饰器` 的方法来导出，因此，我们可以这样定义 `funcA`： + +```python +@export.sub +def funcA(): + return "funcA" +``` + +或者: + +```python +@export +def funcA(): + return "funcA" +``` + +通过 `装饰器` 的方法导出函数时，命名固定为函数的命名，也就是说，上面的两个例子等同于： + +```python +export.sub.funcA = funcA + +export.funcA = funcA +``` + +这样，我们就成功导出 `varA` 和 `funcA` 对象了。 + +下面我们将介绍如何在 `pluginB` 中导入这些对象。 + +### 使用 require + +在 `pluginB` 中，我们调用 `require` 机制 `导入对象`。 + +:::warning 警告 + +在导入来自其他插件的对象时, 请确保导出该对象的插件在引用该对象的插件之前加载。如果该插件并未被加载，则会尝试加载，加载失败则会返回 `None`。 + +::: + +我们可以从 `nonebot.plugin` 中导入 `require()` 方法： + +```python +from nonebot.plugin import require +``` + +`require()` 方法的参数是插件名, 它会返回在指定插件中，用 `export()` 方法创建的字典。 + +```python +require_A = require('pluginA') +``` + +在之前，这个字典已经存入了 `'vA'` - `varA`, `'fA'` - `funcA` 或 `'funcA'` - `funcA` 这样的 `key` - `value` 对。因此在这里我们直接用 `属性` 的方法来获取导入对象: + +```python +varA = require_A.vA +funcA = require_A.fA or require_A.funcA +``` + +这样，我们就在 `pluginB` 中成功导入了 `varA` 和 `funcA` 对象了。 diff --git a/archive/2.0.0a11/advanced/overloaded-handlers.md b/archive/2.0.0a11/advanced/overloaded-handlers.md new file mode 100644 index 00000000..97ff3116 --- /dev/null +++ b/archive/2.0.0a11/advanced/overloaded-handlers.md @@ -0,0 +1 @@ +# 事件处理函数重载 diff --git a/archive/2.0.0a11/advanced/permission.md b/archive/2.0.0a11/advanced/permission.md new file mode 100644 index 00000000..de198e6e --- /dev/null +++ b/archive/2.0.0a11/advanced/permission.md @@ -0,0 +1,2 @@ +# 权限控制 + diff --git a/archive/2.0.0a11/advanced/publish-plugin.md b/archive/2.0.0a11/advanced/publish-plugin.md new file mode 100644 index 00000000..68e2e6f9 --- /dev/null +++ b/archive/2.0.0a11/advanced/publish-plugin.md @@ -0,0 +1 @@ +# 发布插件 diff --git a/archive/2.0.0a11/advanced/runtime-hook.md b/archive/2.0.0a11/advanced/runtime-hook.md new file mode 100644 index 00000000..b5cc8b6d --- /dev/null +++ b/archive/2.0.0a11/advanced/runtime-hook.md @@ -0,0 +1,60 @@ +# 钩子函数 + +[`钩子编程`](https://zh.wikipedia.org/wiki/%E9%92%A9%E5%AD%90%E7%BC%96%E7%A8%8B) + +> 钩子编程（hooking），也称作“挂钩”，是计算机程序设计术语，指通过拦截软件模块间的函数调用、消息传递、事件传递来修改或扩展操作系统、应用程序或其他软件组件的行为的各种技术。处理被拦截的函数调用、事件、消息的代码，被称为钩子（hook）。 + +在 `nonebot2` 中有一系列预定义的钩子函数，这些函数位于 [`nonebot.message`](https://v2.nonebot.dev/api/message.html) 模块下，我们可以以装饰器的形式利用这些函数，进行以下四种操作： + +:::warning 注意 +1.在钩子函数中，与 `matcher` 运行状态相关的函数将不可用，如 `matcher.finish()` + +2.如果需要在钩子函数中打断整个对话的执行，请参考以下范例： +```python +from nonebot.exception import IgnoredException + + +@event_preprocessor +async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): + raise IgnoredException("reason") +``` +::: + +## 事件预处理 + +```python +from nonebot.message import event_preprocessor + +@event_preprocessor +async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): + pass +``` + +## 事件后处理 + +```python +from nonebot.message import event_postprocessor + +@event_postprocessor +async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): + pass +``` + +## 运行预处理 + +```python +from nonebot.message import run_preprocessor + +@run_preprocessor +async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): + pass +``` + +## 运行后处理 +```python +from nonebot.message import run_postprocessor + +@run_postprocessor +async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): + pass +``` \ No newline at end of file diff --git a/archive/2.0.0a11/advanced/scheduler.md b/archive/2.0.0a11/advanced/scheduler.md new file mode 100644 index 00000000..93d5be99 --- /dev/null +++ b/archive/2.0.0a11/advanced/scheduler.md @@ -0,0 +1,135 @@ +# 定时任务 + +[`APScheduler`](https://apscheduler.readthedocs.io/en/latest/index.html) —— Advanced Python Scheduler + +> Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed later, either just once or periodically. You can add new jobs or remove old ones on the fly as you please. If you store your jobs in a database, they will also survive scheduler restarts and maintain their state. When the scheduler is restarted, it will then run all the jobs it should have run while it was offline. + +## 从 NoneBot v1 迁移 + +`APScheduler` 作为 `nonebot` v1 的可选依赖，为众多 bot 提供了方便的定时任务功能。`nonebot2` 已将 `APScheduler` 独立为 `nonebot_plugin_apscheduler` 插件，你可以在 [插件广场](https://v2.nonebot.dev/plugin-store.html) 中找到它。 + +相比于 `nonebot` v1，`nonebot` v2只需要安装插件并修改 `scheduler` 的导入方式即可完成迁移。 + +## 安装插件 + +### 通过 nb-cli + +如正在使用 `nb-cli` 构建项目，你可以从插件市场复制安装命令或手动输入以下命令以添加 `nonebot_plugin_apscheduler`。 + +```bash +nb plugin install nonebot_plugin_apscheduler +``` + +:::tip 提示 +`nb-cli` 默认通过 `pypi` 安装，你可以添加命令参数 `-i [mirror]` 或 `--index [mirror]` 以使用镜像源安装。 +::: + +### 通过 poetry + +执行以下命令以添加 `nonebot_plugin_apscheduler` + +```bash +poetry add nonebot-plugin-apscheduler +``` + +:::tip 提示 +由于稍后我们将使用 `nonebot.require()` 方法进行导入，所以无需额外的 `nonebot.load_plugin()` +::: + +## 快速上手 + +1. 在需要设置定时任务的插件中，通过 `nonebot.require` 从 `nonebot_plugin_apscheduler` 导入 `scheduler` 对象 + +2. 在该对象的基础上，根据 `APScheduler` 的使用方法进一步配置定时任务 + +将上述步骤归纳为最小实现的代码如下： + +```python +from nonebot import require + +scheduler = require('nonebot_plugin_apscheduler').scheduler + +@scheduler.scheduled_job('cron', hour='*/2', id='xxx', args=[1], kwargs={arg2: 2}) +async def run_every_2_hour(arg1, arg2): + pass + +scheduler.add_job(run_every_day_from_program_start, "interval", days=1, id="xxx") +``` + +## 分步进行 + +### 导入 scheduler 对象 + +为了使插件能够实现定时任务，需要先将 `scheduler` 对象导入插件。 + +`nonebot2` 提供了 `nonebot.require` 方法来实现导入其他插件的内容，此处我们使用这个方法来导入 `scheduler` 对象。 + +`nonebot` 使用的 `scheduler` 对象为 `AsyncScheduler` 。 + +> 使用该方法传入的插件本身也需要有对应实现，关于该方法的更多介绍可以参阅 [这里](./export-and-require.md) + +```python +from nonebot import require + +scheduler = require('nonebot_plugin_apscheduler').scheduler +``` + +### 编写定时任务 + +由于本部分为标准的通过 `APScheduler` 配置定时任务，有关指南请参阅 [APScheduler 官方文档](https://apscheduler.readthedocs.io/en/latest/userguide.html#adding-jobs)。 + +### 配置插件选项 + +根据项目的 `.env` 文件设置，向 `.env.*` 或 `bot.py` 文件添加 `nonebot_plugin_apscheduler` 的可选配置项 + +:::warning 注意 +`.env.*` 文件的编写应遵循 nonebot2 对 `.env.*` 文件的编写要求 +::: + +#### `apscheduler_autostart` + +类型：`bool` + +默认值：`True` + +是否自动启动 `APScheduler`。 + +对于大多数情况，我们需要在 `nonebot2` 项目被启动时启动定时任务，则此处设为 `true` + +##### 在 `.env` 中添加 + +```bash +APSCHEDULER_AUTOSTART=true +``` + +##### 在 `bot.py` 中添加 + +```python +nonebot.init(apscheduler_autostart=True) +``` + +#### `apscheduler_config` + +类型：`dict` + +默认值：`{"apscheduler.timezone": "Asia/Shanghai"}` + +`APScheduler` 相关配置。修改/增加其中配置项需要确保 `prefix: apscheduler`。 + +对于 `APScheduler` 的相关配置，请参阅 [scheduler-config](https://apscheduler.readthedocs.io/en/latest/userguide.html#scheduler-config) 和 [BaseScheduler](https://apscheduler.readthedocs.io/en/latest/modules/schedulers/base.html#apscheduler.schedulers.base.BaseScheduler) + +> 官方文档在绝大多数时候能提供最准确和最具时效性的指南 + +##### 在 `.env` 中添加 + +```bash +APSCHEDULER_CONFIG={"apscheduler.timezone": "Asia/Shanghai"} +``` + +##### 在 `bot.py` 中添加 + +```python +nonebot.init(apscheduler_config={ + "apscheduler.timezone": "Asia/Shanghai" +}) +``` diff --git a/archive/2.0.0a11/api/README.md b/archive/2.0.0a11/api/README.md new file mode 100644 index 00000000..e12dd0ff --- /dev/null +++ b/archive/2.0.0a11/api/README.md @@ -0,0 +1,58 @@ +# NoneBot Api Reference + + +* **模块索引** + + + * [nonebot](nonebot.html) + + + * [nonebot.config](config.html) + + + * [nonebot.plugin](plugin.html) + + + * [nonebot.message](message.html) + + + * [nonebot.matcher](matcher.html) + + + * [nonebot.rule](rule.html) + + + * [nonebot.permission](permission.html) + + + * [nonebot.log](log.html) + + + * [nonebot.utils](utils.html) + + + * [nonebot.typing](typing.html) + + + * [nonebot.exception](exception.html) + + + * [nonebot.drivers](drivers/) + + + * [nonebot.drivers.fastapi](drivers/fastapi.html) + + + * [nonebot.drivers.quart](drivers/quart.html) + + + * [nonebot.adapters](adapters/) + + + * [nonebot.adapters.cqhttp](adapters/cqhttp.html) + + + * [nonebot.adapters.ding](adapters/ding.html) + + + * [nonebot.adapters.mirai](adapters/mirai.html) diff --git a/archive/2.0.0a11/api/adapters/README.md b/archive/2.0.0a11/api/adapters/README.md new file mode 100644 index 00000000..172e87a4 --- /dev/null +++ b/archive/2.0.0a11/api/adapters/README.md @@ -0,0 +1,429 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.adapters 模块 + +## 协议适配基类 + +各协议请继承以下基类，并使用 `driver.register_adapter` 注册适配器 + + +## _class_ `Bot` + +基类：`abc.ABC` + +Bot 基类。用于处理上报消息，并提供 API 调用接口。 + + +### `driver` + +Driver 对象 + + +### `config` + +Config 配置对象 + + +### _abstract_ `__init__(connection_type, self_id, *, websocket=None)` + + +* **参数** + + + * `connection_type: str`: http 或者 websocket + + + * `self_id: str`: 机器人 ID + + + * `websocket: Optional[WebSocket]`: Websocket 连接对象 + + + +### `connection_type` + +连接类型 + + +### `self_id` + +机器人 ID + + +### `websocket` + +Websocket 连接对象 + + +### _abstract property_ `type` + +Adapter 类型 + + +### _classmethod_ `register(driver, config)` + + +* **说明** + + register 方法会在 driver.register_adapter 时被调用，用于初始化相关配置 + + + +### _abstract async classmethod_ `check_permission(driver, connection_type, headers, body)` + + +* **说明** + + 检查连接请求是否合法的函数，如果合法则返回当前连接 `唯一标识符`，通常为机器人 ID；如果不合法则抛出 `RequestDenied` 异常。 + + + +* **参数** + + + * `driver: Driver`: Driver 对象 + + + * `connection_type: str`: 连接类型 + + + * `headers: dict`: 请求头 + + + * `body: Optional[dict]`: 请求数据，WebSocket 连接该部分为空 + + + +* **返回** + + + * `str`: 连接唯一标识符 + + + +* **异常** + + + * `RequestDenied`: 请求非法 + + + +### _abstract async_ `handle_message(message)` + + +* **说明** + + 处理上报消息的函数，转换为 `Event` 事件后调用 `nonebot.message.handle_event` 进一步处理事件。 + + + +* **参数** + + + * `message: dict`: 收到的上报消息 + + + +### _abstract async_ `call_api(api, **data)` + + +* **说明** + + 调用机器人 API 接口，可以通过该函数或直接通过 bot 属性进行调用 + + + +* **参数** + + + * `api: str`: API 名称 + + + * `**data`: API 数据 + + + +* **示例** + + +```python +await bot.call_api("send_msg", message="hello world") +await bot.send_msg(message="hello world") +``` + + +### _abstract async_ `send(event, message, **kwargs)` + + +* **说明** + + 调用机器人基础发送消息接口 + + + +* **参数** + + + * `event: Event`: 上报事件 + + + * `message: Union[str, Message, MessageSegment]`: 要发送的消息 + + + * `**kwargs` + + + +## _class_ `MessageSegment` + +基类：`abc.ABC`, `Mapping` + +消息段基类 + + +### `type` + + +* 类型: `str` + + +* 说明: 消息段类型 + + +### `data` + + +* 类型: `Dict[str, Union[str, list]]` + + +* 说明: 消息段数据 + + +## _class_ `Message` + +基类：`list`, `abc.ABC` + +消息数组 + + +### `__init__(message=None, *args, **kwargs)` + + +* **参数** + + + * `message: Union[str, list, dict, MessageSegment, Message, Any]`: 消息内容 + + + +### `append(obj)` + + +* **说明** + + 添加一个消息段到消息数组末尾 + + + +* **参数** + + + * `obj: Union[str, MessageSegment]`: 要添加的消息段 + + + +### `extend(obj)` + + +* **说明** + + 拼接一个消息数组或多个消息段到消息数组末尾 + + + +* **参数** + + + * `obj: Union[Message, Iterable[MessageSegment]]`: 要添加的消息数组 + + + +### `reduce()` + + +* **说明** + + 缩减消息数组，即按 MessageSegment 的实现拼接相邻消息段 + + + +### `extract_plain_text()` + + +* **说明** + + 提取消息内纯文本消息 + + + +## _class_ `Event` + +基类：`abc.ABC`, `pydantic.main.BaseModel` + +Event 基类。提供获取关键信息的方法，其余信息可直接获取。 + + +### _abstract_ `get_type()` + + +* **说明** + + 获取事件类型的方法，类型通常为 NoneBot 内置的四种类型。 + + + +* **返回** + + + * `Literal["message", "notice", "request", "meta_event"]` + + + * 其他自定义 `str` + + + +### _abstract_ `get_event_name()` + + +* **说明** + + 获取事件名称的方法。 + + + +* **返回** + + + * `str` + + + +### _abstract_ `get_event_description()` + + +* **说明** + + 获取事件描述的方法，通常为事件具体内容。 + + + +* **返回** + + + * `str` + + + +### `get_log_string()` + + +* **说明** + + 获取事件日志信息的方法，通常你不需要修改这个方法，只有当希望 NoneBot 隐藏该事件日志时，可以抛出 `NoLogException` 异常。 + + + +* **返回** + + + * `str` + + + +* **异常** + + + * `NoLogException` + + + +### _abstract_ `get_user_id()` + + +* **说明** + + 获取事件主体 id 的方法，通常是用户 id 。 + + + +* **返回** + + + * `str` + + + +### _abstract_ `get_session_id()` + + +* **说明** + + 获取会话 id 的方法，用于判断当前事件属于哪一个会话，通常是用户 id、群组 id 组合。 + + + +* **返回** + + + * `str` + + + +### _abstract_ `get_message()` + + +* **说明** + + 获取事件消息内容的方法。 + + + +* **返回** + + + * `Message` + + + +### `get_plaintext()` + + +* **说明** + + 获取消息纯文本的方法，通常不需要修改，默认通过 `get_message().extract_plain_text` 获取。 + + + +* **返回** + + + * `str` + + + +### _abstract_ `is_tome()` + + +* **说明** + + 获取事件是否与机器人有关的方法。 + + + +* **返回** + + + * `bool` diff --git a/archive/2.0.0a11/api/adapters/cqhttp.md b/archive/2.0.0a11/api/adapters/cqhttp.md new file mode 100644 index 00000000..6e6e938b --- /dev/null +++ b/archive/2.0.0a11/api/adapters/cqhttp.md @@ -0,0 +1,581 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.adapters.cqhttp 模块 + +## CQHTTP (OneBot) v11 协议适配 + +协议详情请看: [CQHTTP](https://github.com/howmanybots/onebot/blob/master/README.md) | [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) + +# NoneBot.adapters.cqhttp.config 模块 + + +## _class_ `Config` + +CQHTTP 配置类 + + +* **配置项** + + + * `access_token` / `cqhttp_access_token`: CQHTTP 协议授权令牌 + + + * `secret` / `cqhttp_secret`: CQHTTP HTTP 上报数据签名口令 + + +# NoneBot.adapters.cqhttp.utils 模块 + + +## `escape(s, *, escape_comma=True)` + + +* **说明** + + 对字符串进行 CQ 码转义。 + + + +* **参数** + + + * `s: str`: 需要转义的字符串 + + + * `escape_comma: bool`: 是否转义逗号（`,`）。 + + + +## `unescape(s)` + + +* **说明** + + 对字符串进行 CQ 码去转义。 + + + +* **参数** + + + * `s: str`: 需要转义的字符串 + + +# NoneBot.adapters.cqhttp.exception 模块 + + +## _exception_ `ActionFailed` + +基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` + + +* **说明** + + API 请求返回错误信息。 + + + +* **参数** + + + * `retcode: Optional[int]`: 错误码 + + + +## _exception_ `NetworkError` + +基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` + + +* **说明** + + 网络错误。 + + + +* **参数** + + + * `retcode: Optional[int]`: 错误码 + + +# NoneBot.adapters.cqhttp.bot 模块 + + +## _async_ `_check_reply(bot, event)` + + +* **说明** + + 检查消息中存在的回复，去除并赋值 `event.reply`, `event.to_me` + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + +## `_check_at_me(bot, event)` + + +* **说明** + + 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.to_me` + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + +## `_check_nickname(bot, event)` + + +* **说明** + + 检查消息开头是否存在，去除并赋值 `event.to_me` + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + +## `_handle_api_result(result)` + + +* **说明** + + 处理 API 请求返回值。 + + + +* **参数** + + + * `result: Optional[Dict[str, Any]]`: API 返回数据 + + + +* **返回** + + + * `Any`: API 调用返回数据 + + + +* **异常** + + + * `ActionFailed`: API 调用失败 + + + +## _class_ `Bot` + +基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) + +CQHTTP 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 + + +### _property_ `type` + + +* 返回: `"cqhttp"` + + +### _async classmethod_ `check_permission(driver, connection_type, headers, body)` + + +* **说明** + + CQHTTP (OneBot) 协议鉴权。参考 [鉴权](https://github.com/howmanybots/onebot/blob/master/v11/specs/communication/authorization.md) + + + +### _async_ `handle_message(message)` + + +* **说明** + + 调用 [_check_reply](#async-check-reply-bot-event), [_check_at_me](#check-at-me-bot-event), [_check_nickname](#check-nickname-bot-event) 处理事件并转换为 [Event](#class-event) + + + +### _async_ `call_api(api, **data)` + + +* **说明** + + 调用 CQHTTP 协议 API + + + +* **参数** + + + * `api: str`: API 名称 + + + * `**data: Any`: API 参数 + + + +* **返回** + + + * `Any`: API 调用返回数据 + + + +* **异常** + + + * `NetworkError`: 网络错误 + + + * `ActionFailed`: API 调用失败 + + + +### _async_ `send(event, message, at_sender=False, **kwargs)` + + +* **说明** + + 根据 `event` 向触发事件的主体发送消息。 + + + +* **参数** + + + * `event: Event`: Event 对象 + + + * `message: Union[str, Message, MessageSegment]`: 要发送的消息 + + + * `at_sender: bool`: 是否 @ 事件主体 + + + * `**kwargs`: 覆盖默认参数 + + + +* **返回** + + + * `Any`: API 调用返回数据 + + + +* **异常** + + + * `ValueError`: 缺少 `user_id`, `group_id` + + + * `NetworkError`: 网络错误 + + + * `ActionFailed`: API 调用失败 + + +# NoneBot.adapters.cqhttp.message 模块 + + +## _class_ `MessageSegment` + +基类：`abc.ABC`, `Mapping` + +CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 + + +## _class_ `Message` + +基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message) + +CQHTTP 协议 Message 适配。 + +# NoneBot.adapters.cqhttp.permission 模块 + + +## `PRIVATE` + + +* **说明**: 匹配任意私聊消息类型事件 + + +## `PRIVATE_FRIEND` + + +* **说明**: 匹配任意好友私聊消息类型事件 + + +## `PRIVATE_GROUP` + + +* **说明**: 匹配任意群临时私聊消息类型事件 + + +## `PRIVATE_OTHER` + + +* **说明**: 匹配任意其他私聊消息类型事件 + + +## `GROUP` + + +* **说明**: 匹配任意群聊消息类型事件 + + +## `GROUP_MEMBER` + + +* **说明**: 匹配任意群员群聊消息类型事件 + +:::warning 警告 +该权限通过 event.sender 进行判断且不包含管理员以及群主！ +::: + + +## `GROUP_ADMIN` + + +* **说明**: 匹配任意群管理员群聊消息类型事件 + + +## `GROUP_OWNER` + + +* **说明**: 匹配任意群主群聊消息类型事件 + +# NoneBot.adapters.cqhttp.event 模块 + + +## _class_ `Event` + +基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) + +CQHTTP 协议事件，字段与 CQHTTP 一致。各事件字段参考 [CQHTTP 文档](https://github.com/howmanybots/onebot/blob/master/README.md) + + +## _class_ `MessageEvent` + +基类：`nonebot.adapters.cqhttp.event.Event` + +消息事件 + + +### `to_me` + + +* **说明** + + 消息是否与机器人有关 + + + +* **类型** + + `bool` + + + +### `reply` + + +* **说明** + + 消息中提取的回复消息，内容为 `get_msg` API 返回结果 + + + +* **类型** + + `Optional[Reply]` + + + +## _class_ `PrivateMessageEvent` + +基类：`nonebot.adapters.cqhttp.event.MessageEvent` + +私聊消息 + + +## _class_ `GroupMessageEvent` + +基类：`nonebot.adapters.cqhttp.event.MessageEvent` + +群消息 + + +## _class_ `NoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.Event` + +通知事件 + + +## _class_ `GroupUploadNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +群文件上传事件 + + +## _class_ `GroupAdminNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +群管理员变动 + + +## _class_ `GroupDecreaseNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +群成员减少事件 + + +## _class_ `GroupIncreaseNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +群成员增加事件 + + +## _class_ `GroupBanNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +群禁言事件 + + +## _class_ `FriendAddNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +好友添加事件 + + +## _class_ `GroupRecallNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +群消息撤回事件 + + +## _class_ `FriendRecallNoticeEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +好友消息撤回事件 + + +## _class_ `NotifyEvent` + +基类：`nonebot.adapters.cqhttp.event.NoticeEvent` + +提醒事件 + + +## _class_ `PokeNotifyEvent` + +基类：`nonebot.adapters.cqhttp.event.NotifyEvent` + +戳一戳提醒事件 + + +## _class_ `LuckyKingNotifyEvent` + +基类：`nonebot.adapters.cqhttp.event.NotifyEvent` + +群红包运气王提醒事件 + + +## _class_ `HonorNotifyEvent` + +基类：`nonebot.adapters.cqhttp.event.NotifyEvent` + +群荣誉变更提醒事件 + + +## _class_ `RequestEvent` + +基类：`nonebot.adapters.cqhttp.event.Event` + +请求事件 + + +## _class_ `FriendRequestEvent` + +基类：`nonebot.adapters.cqhttp.event.RequestEvent` + +加好友请求事件 + + +## _class_ `GroupRequestEvent` + +基类：`nonebot.adapters.cqhttp.event.RequestEvent` + +加群请求/邀请事件 + + +## _class_ `MetaEvent` + +基类：`nonebot.adapters.cqhttp.event.Event` + +元事件 + + +## _class_ `LifecycleMetaEvent` + +基类：`nonebot.adapters.cqhttp.event.MetaEvent` + +生命周期元事件 + + +## _class_ `HeartbeatMetaEvent` + +基类：`nonebot.adapters.cqhttp.event.MetaEvent` + +心跳元事件 + + +## `get_event_model(event_name)` + + +* **说明** + + 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 + + + +* **返回** + + + * `List[Type[Event]]` diff --git a/archive/2.0.0a11/api/adapters/ding.md b/archive/2.0.0a11/api/adapters/ding.md new file mode 100644 index 00000000..7bb07c8a --- /dev/null +++ b/archive/2.0.0a11/api/adapters/ding.md @@ -0,0 +1,325 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.adapters.ding 模块 + +## 钉钉群机器人 协议适配 + +协议详情请看: [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) + +# NoneBot.adapters.ding.config 模块 + + +## _class_ `Config` + +钉钉配置类 + + +* **配置项** + + + * `access_token` / `ding_access_token`: 钉钉令牌 + + + * `secret` / `ding_secret`: 钉钉 HTTP 上报数据签名口令 + + +# NoneBot.adapters.ding.exception 模块 + + +## _exception_ `DingAdapterException` + +基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) + + +* **说明** + + 钉钉 Adapter 错误基类 + + + +## _exception_ `ActionFailed` + +基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.ding.exception.DingAdapterException` + + +* **说明** + + API 请求返回错误信息。 + + + +* **参数** + + + * `errcode: Optional[int]`: 错误码 + + + * `errmsg: Optional[str]`: 错误信息 + + + +## _exception_ `NetworkError` + +基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.ding.exception.DingAdapterException` + + +* **说明** + + 网络错误。 + + + +* **参数** + + + * `retcode: Optional[int]`: 错误码 + + + +## _exception_ `SessionExpired` + +基类：`nonebot.adapters.ding.exception.ApiNotAvailable`, `nonebot.adapters.ding.exception.DingAdapterException` + + +* **说明** + + 发消息的 session 已经过期。 + + +# NoneBot.adapters.ding.bot 模块 + + +## _class_ `Bot` + +基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) + +钉钉 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 + + +### _property_ `type` + + +* 返回: `"ding"` + + +### _async classmethod_ `check_permission(driver, connection_type, headers, body)` + + +* **说明** + + 钉钉协议鉴权。参考 [鉴权](https://ding-doc.dingtalk.com/doc#/serverapi2/elzz1p) + + + +### _async_ `call_api(api, event=None, **data)` + + +* **说明** + + 调用 钉钉 协议 API + + + +* **参数** + + + * `api: str`: API 名称 + + + * `**data: Any`: API 参数 + + + +* **返回** + + + * `Any`: API 调用返回数据 + + + +* **异常** + + + * `NetworkError`: 网络错误 + + + * `ActionFailed`: API 调用失败 + + + +### _async_ `send(event, message, at_sender=False, **kwargs)` + + +* **说明** + + 根据 `event` 向触发事件的主体发送消息。 + + + +* **参数** + + + * `event: Event`: Event 对象 + + + * `message: Union[str, Message, MessageSegment]`: 要发送的消息 + + + * `at_sender: bool`: 是否 @ 事件主体 + + + * `**kwargs`: 覆盖默认参数 + + + +* **返回** + + + * `Any`: API 调用返回数据 + + + +* **异常** + + + * `ValueError`: 缺少 `user_id`, `group_id` + + + * `NetworkError`: 网络错误 + + + * `ActionFailed`: API 调用失败 + + +# NoneBot.adapters.ding.message 模块 + + +## _class_ `MessageSegment` + +基类：`abc.ABC`, `Mapping` + +钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 + + +### _static_ `atAll()` + +@全体 + + +### _static_ `atMobiles(*mobileNumber)` + +@指定手机号人员 + + +### _static_ `atDingtalkIds(*dingtalkIds)` + +@指定 id，@ 默认会在消息段末尾。 +所以你可以在消息中使用 @{senderId} 占位，发送出去之后 @ 就会出现在占位的位置： +``python +message = MessageSegment.text(f"@{event.senderId}，你好") +message += MessageSegment.atDingtalkIds(event.senderId) +`` + + +### _static_ `text(text)` + +发送 `text` 类型消息 + + +### _static_ `image(picURL)` + +发送 `image` 类型消息 + + +### _static_ `extension(dict_)` + +"标记 text 文本的 extension 属性，需要与 text 消息段相加。 + + +### _static_ `code(code_language, code)` + +"发送 code 消息段 + + +### _static_ `markdown(title, text)` + +发送 `markdown` 类型消息 + + +### _static_ `actionCardSingleBtn(title, text, singleTitle, singleURL)` + +发送 `actionCardSingleBtn` 类型消息 + + +### _static_ `actionCardMultiBtns(title, text, btns, hideAvatar=False, btnOrientation='1')` + +发送 `actionCardMultiBtn` 类型消息 + + +* **参数** + + + * `btnOrientation`: 0：按钮竖直排列 1：按钮横向排列 + + + * `btns`: [{ "title": title, "actionURL": actionURL }, ...] + + + +### _static_ `feedCard(links)` + +发送 `feedCard` 类型消息 + + +* **参数** + + + * `links`: [{ "title": xxx, "messageURL": xxx, "picURL": xxx }, ...] + + + +## _class_ `Message` + +基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message) + +钉钉 协议 Message 适配。 + +# NoneBot.adapters.ding.event 模块 + + +## _class_ `Event` + +基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) + +钉钉协议事件。各事件字段参考 [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) + + +## _class_ `ConversationType` + +基类：`str`, `enum.Enum` + +An enumeration. + + +## _class_ `MessageEvent` + +基类：`nonebot.adapters.ding.event.Event` + +消息事件 + + +## _class_ `PrivateMessageEvent` + +基类：`nonebot.adapters.ding.event.MessageEvent` + +私聊消息事件 + + +## _class_ `GroupMessageEvent` + +基类：`nonebot.adapters.ding.event.MessageEvent` + +群消息事件 diff --git a/archive/2.0.0a11/api/adapters/mirai.md b/archive/2.0.0a11/api/adapters/mirai.md new file mode 100644 index 00000000..1851ed91 --- /dev/null +++ b/archive/2.0.0a11/api/adapters/mirai.md @@ -0,0 +1,1917 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.adapters.mirai 模块 + +## Mirai-API-HTTP 协议适配 + +协议详情请看: [mirai-api-http 文档](https://github.com/project-mirai/mirai-api-http/tree/master/docs) + +::: tip +该Adapter目前仍然处在早期实验性阶段, 并未经过充分测试 + +如果你在使用过程中遇到了任何问题, 请前往 [Issue页面](https://github.com/nonebot/nonebot2/issues) 为我们提供反馈 +::: + +::: danger +Mirai-API-HTTP 的适配器以 [AGPLv3许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 + +这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** +::: + +# NoneBot.adapters.mirai.config 模块 + + +## _class_ `Config` + +Mirai 配置类 + + +* **必填** + + + * `auth_key` / `mirai_auth_key`: mirai-api-http 的 auth_key + + + * `mirai_host`: mirai-api-http 的地址 + + + * `mirai_port`: mirai-api-http 的端口 + + +# NoneBot.adapters.mirai.bot 模块 + + +## _class_ `SessionManager` + +基类：`object` + +Bot会话管理器, 提供API主动调用接口 + + +### _async_ `post(path, *, params=None)` + + +* **说明** + + 以POST方式主动提交API请求 + + + +* **参数** + + + * `path: str`: 对应API路径 + + + * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) + + + +* **返回** + + + * `Dict[str, Any]`: API 返回值 + + + +### _async_ `request(path, *, params=None)` + + +* **说明** + + 以GET方式主动提交API请求 + + + +* **参数** + + + * `path: str`: 对应API路径 + + + * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) + + + +### _async_ `upload(path, *, params)` + + +* **说明** + + 以表单(`multipart/form-data`)形式主动提交API请求 + + + +* **参数** + + + * `path: str`: 对应API路径 + + + * `params: Dict[str, Any]`: 请求参数 (无需sessionKey) + + + +## _class_ `Bot` + +基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) + +mirai-api-http 协议 Bot 适配。 + +::: warning +API中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 + +部分字段可能与文档在符号上不一致 +::: + + +### _property_ `api` + +返回该Bot对象的会话管理实例以提供API主动调用 + + +### _async_ `call_api(api, **data)` + +::: danger +由于Mirai的HTTP API特殊性, 该API暂时无法实现 +::: + +::: tip +你可以使用 `MiraiBot.api` 中提供的调用方法来代替 +::: + + +### `send(event, message, at_sender=False)` + + +* **说明** + + 根据 `event` 向触发事件的主体发送信息 + + + +* **参数** + + + * `event: Event`: Event对象 + + + * `message: Union[MessageChain, MessageSegment, str]`: 要发送的消息 + + + * `at_sender: bool`: 是否 @ 事件主体 + + + +### `send_friend_message(target, message_chain)` + + +* **说明** + + 使用此方法向指定好友发送消息 + + + +* **参数** + + + * `target: int`: 发送消息目标好友的 QQ 号 + + + * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 + + + +### `send_temp_message(qq, group, message_chain)` + + +* **说明** + + 使用此方法向临时会话对象发送消息 + + + +* **参数** + + + * `qq: int`: 临时会话对象 QQ 号 + + + * `group: int`: 临时会话群号 + + + * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 + + + +### `send_group_message(group, message_chain, quote=None)` + + +* **说明** + + 使用此方法向指定群发送消息 + + + +* **参数** + + + * `group: int`: 发送消息目标群的群号 + + + * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 + + + * `quote: Optional[int]`: 引用一条消息的 message_id 进行回复 + + + +### `recall(target)` + + +* **说明** + + 使用此方法撤回指定消息。对于bot发送的消息，有2分钟时间限制。对于撤回群聊中群员的消息，需要有相应权限 + + + +* **参数** + + + * `target: int`: 需要撤回的消息的message_id + + + +### `send_image_message(target, qq, group, urls)` + + +* **说明** + + 使用此方法向指定对象（群或好友）发送图片消息 + 除非需要通过此手段获取image_id，否则不推荐使用该接口 + + > 当qq和group同时存在时，表示发送临时会话图片，qq为临时会话对象QQ号，group为临时会话发起的群号 + + + +* **参数** + + + * `target: int`: 发送对象的QQ号或群号，可能存在歧义 + + + * `qq: int`: 发送对象的QQ号 + + + * `group: int`: 发送对象的群号 + + + * `urls: List[str]`: 是一个url字符串构成的数组 + + + +* **返回** + + + * `List[str]`: 一个包含图片imageId的数组 + + + +### `upload_image(type, img)` + + +* **说明** + + 使用此方法上传图片文件至服务器并返回Image_id + + + +* **参数** + + + * `type: str`: "friend" 或 "group" 或 "temp" + + + * `img: BytesIO`: 图片的BytesIO对象 + + + +### `upload_voice(type, voice)` + + +* **说明** + + 使用此方法上传语音文件至服务器并返回voice_id + + + +* **参数** + + + * `type: str`: 当前仅支持 "group" + + + * `voice: BytesIO`: 语音的BytesIO对象 + + + +### `fetch_message(count=10)` + + +* **说明** + + 使用此方法获取bot接收到的最老消息和最老各类事件 + (会从MiraiApiHttp消息记录中删除) + + + +* **参数** + + + * `count: int`: 获取消息和事件的数量 + + + +### `fetch_latest_message(count=10)` + + +* **说明** + + 使用此方法获取bot接收到的最新消息和最新各类事件 + (会从MiraiApiHttp消息记录中删除) + + + +* **参数** + + + * `count: int`: 获取消息和事件的数量 + + + +### `peek_message(count=10)` + + +* **说明** + + 使用此方法获取bot接收到的最老消息和最老各类事件 + (不会从MiraiApiHttp消息记录中删除) + + + +* **参数** + + + * `count: int`: 获取消息和事件的数量 + + + +### `peek_latest_message(count=10)` + + +* **说明** + + 使用此方法获取bot接收到的最新消息和最新各类事件 + (不会从MiraiApiHttp消息记录中删除) + + + +* **参数** + + + * `count: int`: 获取消息和事件的数量 + + + +### `messsage_from_id(id)` + + +* **说明** + + 通过messageId获取一条被缓存的消息 + 使用此方法获取bot接收到的消息和各类事件 + + + +* **参数** + + + * `id: int`: 获取消息的message_id + + + +### `count_message()` + + +* **说明** + + 使用此方法获取bot接收并缓存的消息总数，注意不包含被删除的 + + + +### `friend_list()` + + +* **说明** + + 使用此方法获取bot的好友列表 + + + +* **返回** + + + * `List[Dict[str, Any]]`: 返回的好友列表数据 + + + +### `group_list()` + + +* **说明** + + 使用此方法获取bot的群列表 + + + +* **返回** + + + * `List[Dict[str, Any]]`: 返回的群列表数据 + + + +### `member_list(target)` + + +* **说明** + + 使用此方法获取bot指定群种的成员列表 + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + +* **返回** + + + * `List[Dict[str, Any]]`: 返回的群成员列表数据 + + + +### `mute(target, member_id, time)` + + +* **说明** + + 使用此方法指定群禁言指定群员（需要有相关权限） + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + * `member_id: int`: 指定群员QQ号 + + + * `time: int`: 禁言时长，单位为秒，最多30天 + + + +### `unmute(target, member_id)` + + +* **说明** + + 使用此方法指定群解除群成员禁言（需要有相关权限） + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + * `member_id: int`: 指定群员QQ号 + + + +### `kick(target, member_id, msg)` + + +* **说明** + + 使用此方法移除指定群成员（需要有相关权限） + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + * `member_id: int`: 指定群员QQ号 + + + * `msg: str`: 信息 + + + +### `quit(target)` + + +* **说明** + + 使用此方法使Bot退出群聊 + + + +* **参数** + + + * `target: int`: 退出的群号 + + + +### `mute_all(target)` + + +* **说明** + + 使用此方法令指定群进行全体禁言（需要有相关权限） + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + +### `unmute_all(target)` + + +* **说明** + + 使用此方法令指定群解除全体禁言（需要有相关权限） + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + +### `group_config(target)` + + +* **说明** + + 使用此方法获取群设置 + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + +* **返回** + + +```json +{ + "name": "群名称", + "announcement": "群公告", + "confessTalk": true, + "allowMemberInvite": true, + "autoApprove": true, + "anonymousChat": true +} +``` + + +### `modify_group_config(target, config)` + + +* **说明** + + 使用此方法修改群设置（需要有相关权限） + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + * `config: Dict[str, Any]`: 群设置, 格式见 `group_config` 的返回值 + + + +### `member_info(target, member_id)` + + +* **说明** + + 使用此方法获取群员资料 + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + * `member_id: int`: 群员QQ号 + + + +* **返回** + + +```json +{ + "name": "群名片", + "specialTitle": "群头衔" +} +``` + + +### `modify_member_info(target, member_id, info)` + + +* **说明** + + 使用此方法修改群员资料（需要有相关权限） + + + +* **参数** + + + * `target: int`: 指定群的群号 + + + * `member_id: int`: 群员QQ号 + + + * `info: Dict[str, Any]`: 群员资料, 格式见 `member_info` 的返回值 + + +# NoneBot.adapters.mirai.bot_ws 模块 + + +## _class_ `WebsocketBot` + +基类：`nonebot.adapters.mirai.bot.Bot` + +mirai-api-http 正向 Websocket 协议 Bot 适配。 + + +### _classmethod_ `register(driver, config, qq)` + + +* **说明** + + 注册该Adapter + + + +* **参数** + + + * `driver: Driver`: 程序所使用的\`\`Driver\`\` + + + * `config: Config`: 程序配置对象 + + + * `qq: int`: 要使用的Bot的QQ号 **注意: 在使用正向Websocket时必须指定该值!** + + +# NoneBot.adapters.mirai.message 模块 + + +## _class_ `MessageType` + +基类：`str`, `enum.Enum` + +消息类型枚举类 + + +## _class_ `MessageSegment` + +基类：`abc.ABC`, `Mapping` + +Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) + + +### `as_dict()` + +导出可以被正常json序列化的结构体 + + +### _classmethod_ `quote(id, group_id, sender_id, target_id, origin)` + + +* **说明** + + 生成回复引用消息段 + + + +* **参数** + + + * `id: int`: 被引用回复的原消息的message_id + + + * `group_id: int`: 被引用回复的原消息所接收的群号，当为好友消息时为0 + + + * `sender_id: int`: 被引用回复的原消息的发送者的QQ号 + + + * `target_id: int`: 被引用回复的原消息的接收者者的QQ号（或群号） + + + * `origin: MessageChain`: 被引用回复的原消息的消息链对象 + + + +### _classmethod_ `at(target)` + + +* **说明** + + @某个人 + + + +* **参数** + + + * `target: int`: 群员QQ号 + + + +### _classmethod_ `at_all()` + + +* **说明** + + @全体成员 + + + +### _classmethod_ `face(face_id=None, name=None)` + + +* **说明** + + 发送QQ表情 + + + +* **参数** + + + * `face_id: Optional[int]`: QQ表情编号，可选，优先高于name + + + * `name: Optional[str]`: QQ表情拼音，可选 + + + +### _classmethod_ `plain(text)` + + +* **说明** + + 纯文本消息 + + + +* **参数** + + + * `text: str`: 文字消息 + + + +### _classmethod_ `image(image_id=None, url=None, path=None)` + + +* **说明** + + 图片消息 + + + +* **参数** + + + * `image_id: Optional[str]`: 图片的image_id，群图片与好友图片格式不同。不为空时将忽略url属性 + + + * `url: Optional[str]`: 图片的URL，发送时可作网络图片的链接 + + + * `path: Optional[str]`: 图片的路径，发送本地图片 + + + +### _classmethod_ `flash_image(image_id=None, url=None, path=None)` + + +* **说明** + + 闪照消息 + + + +* **参数** + + 同 `image` + + + +### _classmethod_ `voice(voice_id=None, url=None, path=None)` + + +* **说明** + + 语音消息 + + + +* **参数** + + + * `voice_id: Optional[str]`: 语音的voice_id，不为空时将忽略url属性 + + + * `url: Optional[str]`: 语音的URL，发送时可作网络语音的链接 + + + * `path: Optional[str]`: 语音的路径，发送本地语音 + + + +### _classmethod_ `xml(xml)` + + +* **说明** + + XML消息 + + + +* **参数** + + + * `xml: str`: XML文本 + + + +### _classmethod_ `json(json)` + + +* **说明** + + Json消息 + + + +* **参数** + + + * `json: str`: Json文本 + + + +### _classmethod_ `app(content)` + + +* **说明** + + 应用程序消息 + + + +* **参数** + + + * `content: str`: 内容 + + + +### _classmethod_ `poke(name)` + + +* **说明** + + 戳一戳消息 + + + +* **参数** + + + * `name: str`: 戳一戳的类型 + + + * `Poke`: 戳一戳 + + + * `ShowLove`: 比心 + + + * `Like`: 点赞 + + + * `Heartbroken`: 心碎 + + + * `SixSixSix`: 666 + + + * `FangDaZhao`: 放大招 + + + +## _class_ `MessageChain` + +基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message) + +Mirai 协议 Message 适配 + +由于Mirai协议的Message实现较为特殊, 故使用MessageChain命名 + + +### `reduce()` + + +* **说明** + + 忽略为空的消息段, 合并相邻的纯文本消息段 + + + +### `export()` + +导出为可以被正常json序列化的数组 + + +### `extract_first(*type)` + + +* **说明** + + 弹出该消息链的第一个消息 + + + +* **参数** + + + * \*type: MessageType: 指定的消息类型, 当指定后如类型不匹配不弹出 + + +# NoneBot.adapters.mirai.utils 模块 + + +## _exception_ `ActionFailed` + +基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed) + + +* **说明** + + API 请求成功返回数据，但 API 操作失败。 + + + +## _exception_ `InvalidArgument` + +基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) + + +* **说明** + + 调用API的参数出错 + + + +## `catch_network_error(function)` + + +* **说明** + + 捕捉函数抛出的httpx网络异常并释放 `NetworkError` 异常 + + 处理返回数据, 在code不为0时释放 `ActionFailed` 异常 + + +::: warning +此装饰器只支持使用了httpx的异步函数 +::: + + +## `argument_validation(function)` + + +* **说明** + + 通过函数签名中的类型注解来对传入参数进行运行时校验 + + 会在参数出错时释放 `InvalidArgument` 异常 + + +# NoneBot.adapters.mirai.event 模块 + +::: warning +事件中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 + +部分字段可能与文档在符号上不一致 +::: + + +## _class_ `Event` + +基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) + +mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) + + +### _classmethod_ `new(data)` + +此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 + + +### `normalize_dict(**kwargs)` + +返回可以被json正常反序列化的结构体 + + +## _class_ `UserPermission` + +基类：`str`, `enum.Enum` + + +* **说明** + + +用户权限枚举类 + +> +> * `OWNER`: 群主 + + +> * `ADMINISTRATOR`: 群管理 + + +> * `MEMBER`: 普通群成员 + + +## _class_ `MessageEvent` + +基类：`nonebot.adapters.mirai.event.base.Event` + +消息事件基类 + + +## _class_ `GroupMessage` + +基类：`nonebot.adapters.mirai.event.message.MessageEvent` + +群消息事件 + + +## _class_ `FriendMessage` + +基类：`nonebot.adapters.mirai.event.message.MessageEvent` + +好友消息事件 + + +## _class_ `TempMessage` + +基类：`nonebot.adapters.mirai.event.message.MessageEvent` + +临时会话消息事件 + + +## _class_ `NoticeEvent` + +基类：`nonebot.adapters.mirai.event.base.Event` + +通知事件基类 + + +## _class_ `MuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +禁言类事件基类 + + +## _class_ `BotMuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +Bot被禁言 + + +## _class_ `BotUnmuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +Bot被取消禁言 + + +## _class_ `MemberMuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +群成员被禁言事件（该成员不是Bot） + + +## _class_ `MemberUnmuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +群成员被取消禁言事件（该成员不是Bot） + + +## _class_ `BotJoinGroupEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +Bot加入了一个新群 + + +## _class_ `BotLeaveEventActive` + +基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` + +Bot主动退出一个群 + + +## _class_ `BotLeaveEventKick` + +基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` + +Bot被踢出一个群 + + +## _class_ `MemberJoinEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +新人入群的事件 + + +## _class_ `MemberLeaveEventKick` + +基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` + +成员被踢出群（该成员不是Bot） + + +## _class_ `MemberLeaveEventQuit` + +基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` + +成员主动离群（该成员不是Bot） + + +## _class_ `FriendRecallEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +好友消息撤回 + + +## _class_ `GroupRecallEvent` + +基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` + +群消息撤回 + + +## _class_ `GroupStateChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +群变化事件基类 + + +## _class_ `GroupNameChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +某个群名改变 + + +## _class_ `GroupEntranceAnnouncementChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +某群入群公告改变 + + +## _class_ `GroupMuteAllEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +全员禁言 + + +## _class_ `GroupAllowAnonymousChatEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +匿名聊天 + + +## _class_ `GroupAllowConfessTalkEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +坦白说 + + +## _class_ `GroupAllowMemberInviteEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +允许群员邀请好友加群 + + +## _class_ `MemberStateChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +群成员变化事件基类 + + +## _class_ `MemberCardChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +群名片改动 + + +## _class_ `MemberSpecialTitleChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +群头衔改动（只有群主有操作限权） + + +## _class_ `BotGroupPermissionChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +Bot在群里的权限被改变 + + +## _class_ `MemberPermissionChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +成员权限改变的事件（该成员不是Bot） + + +## _class_ `RequestEvent` + +基类：`nonebot.adapters.mirai.event.base.Event` + +请求事件基类 + + +## _class_ `NewFriendRequestEvent` + +基类：`nonebot.adapters.mirai.event.request.RequestEvent` + +添加好友申请 + + +### _async_ `approve(bot)` + + +* **说明** + + 通过此人的好友申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + +### _async_ `reject(bot, operate=1, message='')` + + +* **说明** + + 拒绝此人的好友申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + * `operate: Literal[1, 2]`: 响应的操作类型 + + + * `1`: 拒绝添加好友 + + + * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 + + + * `message: str`: 回复的信息 + + + +## _class_ `MemberJoinRequestEvent` + +基类：`nonebot.adapters.mirai.event.request.RequestEvent` + +用户入群申请（Bot需要有管理员权限） + + +### _async_ `approve(bot)` + + +* **说明** + + 通过此人的加群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + +### _async_ `reject(bot, operate=1, message='')` + + +* **说明** + + 拒绝(忽略)此人的加群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 + + + * `1`: 拒绝入群 + + + * `2`: 忽略请求 + + + * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 + + + * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 + + + * `message: str`: 回复的信息 + + + +## _class_ `BotInvitedJoinGroupRequestEvent` + +基类：`nonebot.adapters.mirai.event.request.RequestEvent` + +Bot被邀请入群申请 + + +### _async_ `approve(bot)` + + +* **说明** + + 通过这份被邀请入群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + +### _async_ `reject(bot, message='')` + + +* **说明** + + 拒绝这份被邀请入群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + * `message: str`: 邀请消息 + + +# NoneBot.adapters.mirai.event.base 模块 + + +## _class_ `UserPermission` + +基类：`str`, `enum.Enum` + + +* **说明** + + +用户权限枚举类 + +> +> * `OWNER`: 群主 + + +> * `ADMINISTRATOR`: 群管理 + + +> * `MEMBER`: 普通群成员 + + +## _class_ `Event` + +基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) + +mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) + + +### _classmethod_ `new(data)` + +此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 + + +### `normalize_dict(**kwargs)` + +返回可以被json正常反序列化的结构体 + +# NoneBot.adapters.mirai.event.meta 模块 + + +## _class_ `MetaEvent` + +基类：`nonebot.adapters.mirai.event.base.Event` + +元事件基类 + + +## _class_ `BotOnlineEvent` + +基类：`nonebot.adapters.mirai.event.meta.MetaEvent` + +Bot登录成功 + + +## _class_ `BotOfflineEventActive` + +基类：`nonebot.adapters.mirai.event.meta.MetaEvent` + +Bot主动离线 + + +## _class_ `BotOfflineEventForce` + +基类：`nonebot.adapters.mirai.event.meta.MetaEvent` + +Bot被挤下线 + + +## _class_ `BotOfflineEventDropped` + +基类：`nonebot.adapters.mirai.event.meta.MetaEvent` + +Bot被服务器断开或因网络问题而掉线 + + +## _class_ `BotReloginEvent` + +基类：`nonebot.adapters.mirai.event.meta.MetaEvent` + +Bot主动重新登录 + +# NoneBot.adapters.mirai.event.message 模块 + + +## _class_ `MessageEvent` + +基类：`nonebot.adapters.mirai.event.base.Event` + +消息事件基类 + + +## _class_ `GroupMessage` + +基类：`nonebot.adapters.mirai.event.message.MessageEvent` + +群消息事件 + + +## _class_ `FriendMessage` + +基类：`nonebot.adapters.mirai.event.message.MessageEvent` + +好友消息事件 + + +## _class_ `TempMessage` + +基类：`nonebot.adapters.mirai.event.message.MessageEvent` + +临时会话消息事件 + +# NoneBot.adapters.mirai.event.notice 模块 + + +## _class_ `NoticeEvent` + +基类：`nonebot.adapters.mirai.event.base.Event` + +通知事件基类 + + +## _class_ `MuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +禁言类事件基类 + + +## _class_ `BotMuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +Bot被禁言 + + +## _class_ `BotUnmuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +Bot被取消禁言 + + +## _class_ `MemberMuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +群成员被禁言事件（该成员不是Bot） + + +## _class_ `MemberUnmuteEvent` + +基类：`nonebot.adapters.mirai.event.notice.MuteEvent` + +群成员被取消禁言事件（该成员不是Bot） + + +## _class_ `BotJoinGroupEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +Bot加入了一个新群 + + +## _class_ `BotLeaveEventActive` + +基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` + +Bot主动退出一个群 + + +## _class_ `BotLeaveEventKick` + +基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` + +Bot被踢出一个群 + + +## _class_ `MemberJoinEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +新人入群的事件 + + +## _class_ `MemberLeaveEventKick` + +基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` + +成员被踢出群（该成员不是Bot） + + +## _class_ `MemberLeaveEventQuit` + +基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` + +成员主动离群（该成员不是Bot） + + +## _class_ `FriendRecallEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +好友消息撤回 + + +## _class_ `GroupRecallEvent` + +基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` + +群消息撤回 + + +## _class_ `GroupStateChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +群变化事件基类 + + +## _class_ `GroupNameChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +某个群名改变 + + +## _class_ `GroupEntranceAnnouncementChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +某群入群公告改变 + + +## _class_ `GroupMuteAllEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +全员禁言 + + +## _class_ `GroupAllowAnonymousChatEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +匿名聊天 + + +## _class_ `GroupAllowConfessTalkEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +坦白说 + + +## _class_ `GroupAllowMemberInviteEvent` + +基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` + +允许群员邀请好友加群 + + +## _class_ `MemberStateChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` + +群成员变化事件基类 + + +## _class_ `MemberCardChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +群名片改动 + + +## _class_ `MemberSpecialTitleChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +群头衔改动（只有群主有操作限权） + + +## _class_ `BotGroupPermissionChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +Bot在群里的权限被改变 + + +## _class_ `MemberPermissionChangeEvent` + +基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` + +成员权限改变的事件（该成员不是Bot） + +# NoneBot.adapters.mirai.event.request 模块 + + +## _class_ `RequestEvent` + +基类：`nonebot.adapters.mirai.event.base.Event` + +请求事件基类 + + +## _class_ `NewFriendRequestEvent` + +基类：`nonebot.adapters.mirai.event.request.RequestEvent` + +添加好友申请 + + +### _async_ `approve(bot)` + + +* **说明** + + 通过此人的好友申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + +### _async_ `reject(bot, operate=1, message='')` + + +* **说明** + + 拒绝此人的好友申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + * `operate: Literal[1, 2]`: 响应的操作类型 + + + * `1`: 拒绝添加好友 + + + * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 + + + * `message: str`: 回复的信息 + + + +## _class_ `MemberJoinRequestEvent` + +基类：`nonebot.adapters.mirai.event.request.RequestEvent` + +用户入群申请（Bot需要有管理员权限） + + +### _async_ `approve(bot)` + + +* **说明** + + 通过此人的加群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + +### _async_ `reject(bot, operate=1, message='')` + + +* **说明** + + 拒绝(忽略)此人的加群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 + + + * `1`: 拒绝入群 + + + * `2`: 忽略请求 + + + * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 + + + * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 + + + * `message: str`: 回复的信息 + + + +## _class_ `BotInvitedJoinGroupRequestEvent` + +基类：`nonebot.adapters.mirai.event.request.RequestEvent` + +Bot被邀请入群申请 + + +### _async_ `approve(bot)` + + +* **说明** + + 通过这份被邀请入群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + +### _async_ `reject(bot, message='')` + + +* **说明** + + 拒绝这份被邀请入群申请 + + + +* **参数** + + + * `bot: Bot`: 当前的 `Bot` 对象 + + + * `message: str`: 邀请消息 diff --git a/archive/2.0.0a11/api/config.md b/archive/2.0.0a11/api/config.md new file mode 100644 index 00000000..654ea628 --- /dev/null +++ b/archive/2.0.0a11/api/config.md @@ -0,0 +1,285 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.config 模块 + +## 配置 + +NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 以及 [python-dotenv](https://saurabh-kumar.com/python-dotenv/) 来读取配置。 + +配置项需符合特殊格式或 json 序列化格式。详情见 [pydantic Field Type](https://pydantic-docs.helpmanual.io/usage/types/) 文档。 + + +## _class_ `Env` + +基类：`nonebot.config.BaseConfig` + +运行环境配置。大小写不敏感。 + +将会从 `nonebot.init 参数` > `环境变量` > `.env 环境配置文件` 的优先级读取配置。 + + +### `environment` + + +* **类型**: `str` + + +* **默认值**: `"prod"` + + +* **说明** + + 当前环境名。 NoneBot 将从 `.env.{environment}` 文件中加载配置。 + + + +## _class_ `Config` + +基类：`nonebot.config.BaseConfig` + +NoneBot 主要配置。大小写不敏感。 + +除了 NoneBot 的配置项外，还可以自行添加配置项到 `.env.{environment}` 文件中。 +这些配置将会在 json 反序列化后一起带入 `Config` 类中。 + + +### `driver` + + +* **类型**: `str` + + +* **默认值**: `"nonebot.drivers.fastapi"` + + +* **说明** + + NoneBot 运行所使用的 `Driver` 。继承自 `nonebot.driver.BaseDriver` 。 + + + +### `host` + + +* **类型**: `IPvAnyAddress` + + +* **默认值**: `127.0.0.1` + + +* **说明** + + NoneBot 的 HTTP 和 WebSocket 服务端监听的 IP/主机名。 + + + +### `port` + + +* **类型**: `int` + + +* **默认值**: `8080` + + +* **说明** + + NoneBot 的 HTTP 和 WebSocket 服务端监听的端口。 + + + +### `debug` + + +* **类型**: `bool` + + +* **默认值**: `False` + + +* **说明** + + 是否以调试模式运行 NoneBot。 + + + +### `api_root` + + +* **类型**: `Dict[str, str]` + + +* **默认值**: `{}` + + +* **说明** + + 以机器人 ID 为键，上报地址为值的字典，环境变量或文件中应使用 json 序列化。 + + + +* **示例** + + +```default +API_ROOT={"123456": "http://127.0.0.1:5700"} +``` + + +### `api_timeout` + + +* **类型**: `Optional[float]` + + +* **默认值**: `30.` + + +* **说明** + + API 请求超时时间，单位: 秒。 + + + +### `access_token` + + +* **类型**: `Optional[str]` + + +* **默认值**: `None` + + +* **说明** + + API 请求以及上报所需密钥，在请求头中携带。 + + + +* **示例** + + +```http +POST /cqhttp/ HTTP/1.1 +Authorization: Bearer kSLuTF2GC2Q4q4ugm3 +``` + + +### `secret` + + +* **类型**: `Optional[str]` + + +* **默认值**: `None` + + +* **说明** + + HTTP POST 形式上报所需签名，在请求头中携带。 + + + +* **示例** + + +```http +POST /cqhttp/ HTTP/1.1 +X-Signature: sha1=f9ddd4863ace61e64f462d41ca311e3d2c1176e2 +``` + + +### `superusers` + + +* **类型**: `Set[str]` + + +* **默认值**: `set()` + + +* **说明** + + 机器人超级用户。 + + + +* **示例** + + +```default +SUPERUSERS=["12345789"] +``` + + +### `nickname` + + +* **类型**: `Set[str]` + + +* **默认值**: `set()` + + +* **说明** + + 机器人昵称。 + + + +### `command_start` + + +* **类型**: `Set[str]` + + +* **默认值**: `{"/"}` + + +* **说明** + + 命令的起始标记，用于判断一条消息是不是命令。 + + + +### `command_sep` + + +* **类型**: `Set[str]` + + +* **默认值**: `{"."}` + + +* **说明** + + 命令的分隔标记，用于将文本形式的命令切分为元组（实际的命令名）。 + + + +### `session_expire_timeout` + + +* **类型**: `timedelta` + + +* **默认值**: `timedelta(minutes=2)` + + +* **说明** + + 等待用户回复的超时时间。 + + + +* **示例** + + +```default +SESSION_EXPIRE_TIMEOUT=120 # 单位: 秒 +SESSION_EXPIRE_TIMEOUT=[DD ][HH:MM]SS[.ffffff] +SESSION_EXPIRE_TIMEOUT=P[DD]DT[HH]H[MM]M[SS]S # ISO 8601 +``` diff --git a/archive/2.0.0a11/api/drivers/README.md b/archive/2.0.0a11/api/drivers/README.md new file mode 100644 index 00000000..673697b4 --- /dev/null +++ b/archive/2.0.0a11/api/drivers/README.md @@ -0,0 +1,318 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.drivers 模块 + +## 后端驱动适配基类 + +各驱动请继承以下基类 + + +## _class_ `Driver` + +基类：`abc.ABC` + +Driver 基类。将后端框架封装，以满足适配器使用。 + + +### `_adapters` + + +* **类型** + + `Dict[str, Type[Bot]]` + + + +* **说明** + + 已注册的适配器列表 + + + +### `_ws_connection_hook` + + +* **类型** + + `Set[T_WebSocketConnectionHook]` + + + +* **说明** + + WebSocket 连接建立时执行的函数 + + + +### `_ws_disconnection_hook` + + +* **类型** + + `Set[T_WebSocketDisconnectionHook]` + + + +* **说明** + + WebSocket 连接断开时执行的函数 + + + +### _abstract_ `__init__(env, config)` + + +* **参数** + + + * `env: Env`: 包含环境信息的 Env 对象 + + + * `config: Config`: 包含配置信息的 Config 对象 + + + +### `env` + + +* **类型** + + `str` + + + +* **说明** + + 环境名称 + + + +### `config` + + +* **类型** + + `Config` + + + +* **说明** + + 配置对象 + + + +### `_clients` + + +* **类型** + + `Dict[str, Bot]` + + + +* **说明** + + 已连接的 Bot + + + +### `register_adapter(name, adapter, **kwargs)` + + +* **说明** + + 注册一个协议适配器 + + + +* **参数** + + + * `name: str`: 适配器名称，用于在连接时进行识别 + + + * `adapter: Type[Bot]`: 适配器 Class + + + +### _abstract property_ `type` + +驱动类型名称 + + +### _abstract property_ `server_app` + +驱动 APP 对象 + + +### _abstract property_ `asgi` + +驱动 ASGI 对象 + + +### _abstract property_ `logger` + +驱动专属 logger 日志记录器 + + +### _property_ `bots` + + +* **类型** + + `Dict[str, Bot]` + + + +* **说明** + + 获取当前所有已连接的 Bot + + + +### _abstract_ `on_startup(func)` + +注册一个在驱动启动时运行的函数 + + +### _abstract_ `on_shutdown(func)` + +注册一个在驱动停止时运行的函数 + + +### `on_bot_connect(func)` + + +* **说明** + + 装饰一个函数使他在 bot 通过 WebSocket 连接成功时执行。 + + + +* **函数参数** + + + * `bot: Bot`: 当前连接上的 Bot 对象 + + + +### `on_bot_disconnect(func)` + + +* **说明** + + 装饰一个函数使他在 bot 通过 WebSocket 连接断开时执行。 + + + +* **函数参数** + + + * `bot: Bot`: 当前连接上的 Bot 对象 + + + +### `_bot_connect(bot)` + +在 WebSocket 连接成功后，调用该函数来注册 bot 对象 + + +### `_bot_disconnect(bot)` + +在 WebSocket 连接断开后，调用该函数来注销 bot 对象 + + +### _abstract_ `run(host=None, port=None, *args, **kwargs)` + + +* **说明** + + 启动驱动框架 + + + +* **参数** + + + * `host: Optional[str]`: 驱动绑定 IP + + + * `post: Optional[int]`: 驱动绑定端口 + + + * `*args` + + + * `**kwargs` + + + +### _abstract async_ `_handle_http()` + +用于处理 HTTP 类型请求的函数 + + +### _abstract async_ `_handle_ws_reverse()` + +用于处理 WebSocket 类型请求的函数 + + +## _class_ `WebSocket` + +基类：`object` + +WebSocket 连接封装，统一接口方便外部调用。 + + +### _abstract_ `__init__(websocket)` + + +* **参数** + + + * `websocket: Any`: WebSocket 连接对象 + + + +### _property_ `websocket` + +WebSocket 连接对象 + + +### _abstract property_ `closed` + + +* **类型** + + `bool` + + + +* **说明** + + 连接是否已经关闭 + + + +### _abstract async_ `accept()` + +接受 WebSocket 连接请求 + + +### _abstract async_ `close(code)` + +关闭 WebSocket 连接请求 + + +### _abstract async_ `receive()` + +接收一条 WebSocket 信息 + + +### _abstract async_ `send(data)` + +发送一条 WebSocket 信息 diff --git a/archive/2.0.0a11/api/drivers/fastapi.md b/archive/2.0.0a11/api/drivers/fastapi.md new file mode 100644 index 00000000..fba15c68 --- /dev/null +++ b/archive/2.0.0a11/api/drivers/fastapi.md @@ -0,0 +1,120 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.drivers.fastapi 模块 + +## FastAPI 驱动适配 + +后端使用方法请参考: [FastAPI 文档](https://fastapi.tiangolo.com/) + + +## _class_ `Config` + +基类：`pydantic.env_settings.BaseSettings` + +FastAPI 驱动框架设置，详情参考 FastAPI 文档 + + +### `fastapi_openapi_url` + + +* **类型** + + `Optional[str]` + + + +* **说明** + + openapi.json 地址，默认为 None 即关闭 + + + +### `fastapi_docs_url` + + +* **类型** + + `Optional[str]` + + + +* **说明** + + swagger 地址，默认为 None 即关闭 + + + +### `fastapi_redoc_url` + + +* **类型** + + `Optional[str]` + + + +* **说明** + + redoc 地址，默认为 None 即关闭 + + + +## _class_ `Driver` + +基类：[`nonebot.drivers.Driver`](README.md#nonebot.drivers.Driver) + +FastAPI 驱动框架 + + +* **上报地址** + + + * `/{adapter name}/`: HTTP POST 上报 + + + * `/{adapter name}/http/`: HTTP POST 上报 + + + * `/{adapter name}/ws`: WebSocket 上报 + + + * `/{adapter name}/ws/`: WebSocket 上报 + + + +### _property_ `type` + +驱动名称: `fastapi` + + +### _property_ `server_app` + +`FastAPI APP` 对象 + + +### _property_ `asgi` + +`FastAPI APP` 对象 + + +### _property_ `logger` + +fastapi 使用的 logger + + +### `on_startup(func)` + +参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) + + +### `on_shutdown(func)` + +参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) + + +### `run(host=None, port=None, *, app=None, **kwargs)` + +使用 `uvicorn` 启动 FastAPI diff --git a/archive/2.0.0a11/api/drivers/quart.md b/archive/2.0.0a11/api/drivers/quart.md new file mode 100644 index 00000000..068769e0 --- /dev/null +++ b/archive/2.0.0a11/api/drivers/quart.md @@ -0,0 +1,62 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.drivers.quart 模块 + +## Quart 驱动适配 + +后端使用方法请参考: [Quart 文档](https://pgjones.gitlab.io/quart/index.html) + + +## _class_ `Driver` + +基类：[`nonebot.drivers.Driver`](README.md#nonebot.drivers.Driver) + +Quart 驱动框架 + + +* **上报地址** + + + * `/{adapter name}/http`: HTTP POST 上报 + + + * `/{adapter name}/ws`: WebSocket 上报 + + + +### _property_ `type` + +驱动名称: `quart` + + +### _property_ `server_app` + +`Quart` 对象 + + +### _property_ `asgi` + +`Quart` 对象 + + +### _property_ `logger` + +fastapi 使用的 logger + + +### `on_startup(func)` + +参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) + + +### `on_shutdown(func)` + +参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) + + +### `run(host=None, port=None, *, app=None, **kwargs)` + +使用 `uvicorn` 启动 Quart diff --git a/archive/2.0.0a11/api/exception.md b/archive/2.0.0a11/api/exception.md new file mode 100644 index 00000000..817c02a9 --- /dev/null +++ b/archive/2.0.0a11/api/exception.md @@ -0,0 +1,214 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.exception 模块 + +## 异常 + +下列文档中的异常是所有 NoneBot 运行时可能会抛出的。 +这些异常并非所有需要用户处理，在 NoneBot 内部运行时被捕获，并进行对应操作。 + + +## _exception_ `NoneBotException` + +基类：`Exception` + + +* **说明** + + 所有 NoneBot 发生的异常基类。 + + + +## _exception_ `IgnoredException` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + 指示 NoneBot 应该忽略该事件。可由 PreProcessor 抛出。 + + + +* **参数** + + + * `reason`: 忽略事件的原因 + + + +## _exception_ `ParserExit` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + `shell command` 处理消息失败时返回的异常 + + + +* **参数** + + + * `status` + + + * `message` + + + +## _exception_ `PausedException` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后继续下一个 `Handler`。 + 可用于用户输入新信息。 + + + +* **用法** + + 可以在 `Handler` 中通过 `Matcher.pause()` 抛出。 + + + +## _exception_ `RejectedException` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后重新运行当前 `Handler`。 + 可用于用户重新输入。 + + + +* **用法** + + 可以在 `Handler` 中通过 `Matcher.reject()` 抛出。 + + + +## _exception_ `FinishedException` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + 指示 NoneBot 结束当前 `Handler` 且后续 `Handler` 不再被运行。 + 可用于结束用户会话。 + + + +* **用法** + + 可以在 `Handler` 中通过 `Matcher.finish()` 抛出。 + + + +## _exception_ `StopPropagation` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + 指示 NoneBot 终止事件向下层传播。 + + + +* **用法** + + 在 `Matcher.block == True` 时抛出。 + + + +## _exception_ `RequestDenied` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + Bot 连接请求不合法。 + + + +* **参数** + + + * `status_code: int`: HTTP 状态码 + + + * `reason: str`: 拒绝原因 + + + +## _exception_ `AdapterException` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + 代表 `Adapter` 抛出的异常，所有的 `Adapter` 都要在内部继承自这个 `Exception` + + + +* **参数** + + + * `adapter_name: str`: 标识 adapter + + + +## _exception_ `NoLogException` + +基类：`Exception` + + +* **说明** + + 指示 NoneBot 对当前 `Event` 进行处理但不显示 Log 信息，可在 `get_log_string` 时抛出 + + + +## _exception_ `ApiNotAvailable` + +基类：`nonebot.exception.AdapterException` + + +* **说明** + + 在 API 连接不可用时抛出。 + + + +## _exception_ `NetworkError` + +基类：`nonebot.exception.AdapterException` + + +* **说明** + + 在网络出现问题时抛出，如: API 请求地址不正确, API 请求无返回或返回状态非正常等。 + + + +## _exception_ `ActionFailed` + +基类：`nonebot.exception.AdapterException` + + +* **说明** + + API 请求成功返回数据，但 API 操作失败。 diff --git a/archive/2.0.0a11/api/log.md b/archive/2.0.0a11/api/log.md new file mode 100644 index 00000000..e6096cff --- /dev/null +++ b/archive/2.0.0a11/api/log.md @@ -0,0 +1,42 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.log 模块 + +## 日志 + +NoneBot 使用 [loguru](https://github.com/Delgan/loguru) 来记录日志信息。 + +自定义 logger 请参考 [loguru](https://github.com/Delgan/loguru) 文档。 + + +## `logger` + + +* **说明** + + NoneBot 日志记录器对象。 + + + +* **默认信息** + + + * 格式: `[%(asctime)s %(name)s] %(levelname)s: %(message)s` + + + * 等级: `DEBUG` / `INFO` ，根据 config 配置改变 + + + * 输出: 输出至 stdout + + + +* **用法** + + +```python +from nonebot.log import logger +``` diff --git a/archive/2.0.0a11/api/matcher.md b/archive/2.0.0a11/api/matcher.md new file mode 100644 index 00000000..509ab6e9 --- /dev/null +++ b/archive/2.0.0a11/api/matcher.md @@ -0,0 +1,541 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.matcher 模块 + +## 事件响应器 + +该模块实现事件响应器的创建与运行，并提供一些快捷方法来帮助用户更好的与机器人进行 对话 。 + + +## `matchers` + + +* **类型** + + `Dict[int, List[Type[Matcher]]]` + + + +* **说明** + + 用于存储当前所有的事件响应器 + + + +## _class_ `Matcher` + +基类：`object` + +事件响应器类 + + +### `module` + + +* **类型** + + `Optional[str]` + + + +* **说明** + + 事件响应器所在模块名称 + + + +### `type` + + +* **类型** + + `str` + + + +* **说明** + + 事件响应器类型 + + + +### `rule` + + +* **类型** + + `Rule` + + + +* **说明** + + 事件响应器匹配规则 + + + +### `permission` + + +* **类型** + + `Permission` + + + +* **说明** + + 事件响应器触发权限 + + + +### `priority` + + +* **类型** + + `int` + + + +* **说明** + + 事件响应器优先级 + + + +### `block` + + +* **类型** + + `bool` + + + +* **说明** + + 事件响应器是否阻止事件传播 + + + +### `temp` + + +* **类型** + + `bool` + + + +* **说明** + + 事件响应器是否为临时 + + + +### `expire_time` + + +* **类型** + + `Optional[datetime]` + + + +* **说明** + + 事件响应器过期时间点 + + + +### `_default_state` + + +* **类型** + + `T_State` + + + +* **说明** + + 事件响应器默认状态 + + + +### `_default_state_factory` + + +* **类型** + + `Optional[T_State]` + + + +* **说明** + + 事件响应器默认工厂函数 + + + +### `_default_parser` + + +* **类型** + + `Optional[T_ArgsParser]` + + + +* **说明** + + 事件响应器默认参数解析函数 + + + +### `_default_type_updater` + + +* **类型** + + `Optional[T_ArgsParser]` + + + +* **说明** + + 事件响应器类型更新函数 + + + +### `_default_permission_updater` + + +* **类型** + + `Optional[T_ArgsParser]` + + + +* **说明** + + 事件响应器权限更新函数 + + + +### `__init__()` + +实例化 Matcher 以便运行 + + +### `handlers` + + +* **类型** + + `List[T_Handler]` + + + +* **说明** + + 事件响应器拥有的事件处理函数列表 + + + +### _classmethod_ `new(type_='', rule=None, permission=None, handlers=None, temp=False, priority=1, block=False, *, module=None, default_state=None, default_state_factory=None, expire_time=None)` + + +* **说明** + + 创建一个新的事件响应器，并存储至 [matchers](#matchers) + + + +* **参数** + + + * `type_: str`: 事件响应器类型，与 `event.get_type()` 一致时触发，空字符串表示任意 + + + * `rule: Optional[Rule]`: 匹配规则 + + + * `permission: Optional[Permission]`: 权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器，即触发一次后删除 + + + * `priority: int`: 响应优先级 + + + * `block: bool`: 是否阻止事件向更低优先级的响应器传播 + + + * `module: Optional[str]`: 事件响应器所在模块名称 + + + * `default_state: Optional[T_State]`: 默认状态 `state` + + + * `default_state_factory: Optional[T_StateFactory]`: 默认状态 `state` 的工厂函数 + + + * `expire_time: Optional[datetime]`: 事件响应器最终有效时间点，过时即被删除 + + + +* **返回** + + + * `Type[Matcher]`: 新的事件响应器类 + + + +### _async classmethod_ `check_perm(bot, event)` + + +* **说明** + + 检查是否满足触发权限 + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: 上报事件 + + + +* **返回** + + + * `bool`: 是否满足权限 + + + +### _async classmethod_ `check_rule(bot, event, state)` + + +* **说明** + + 检查是否满足匹配规则 + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: 上报事件 + + + * `state: T_State`: 当前状态 + + + +* **返回** + + + * `bool`: 是否满足匹配规则 + + + +### _classmethod_ `args_parser(func)` + + +* **说明** + + 装饰一个函数来更改当前事件响应器的默认参数解析函数 + + + +* **参数** + + + * `func: T_ArgsParser`: 参数解析函数 + + + +### _classmethod_ `type_updater(func)` + + +* **说明** + + 装饰一个函数来更改当前事件响应器的默认响应事件类型更新函数 + + + +* **参数** + + + * `func: T_TypeUpdater`: 响应事件类型更新函数 + + + +### _classmethod_ `permission_updater(func)` + + +* **说明** + + 装饰一个函数来更改当前事件响应器的默认会话权限更新函数 + + + +* **参数** + + + * `func: T_PermissionUpdater`: 会话权限更新函数 + + + +### _classmethod_ `handle()` + + +* **说明** + + 装饰一个函数来向事件响应器直接添加一个处理函数 + + + +* **参数** + + + * 无 + + + +### _classmethod_ `receive()` + + +* **说明** + + 装饰一个函数来指示 NoneBot 在接收用户新的一条消息后继续运行该函数 + + + +* **参数** + + + * 无 + + + +### _classmethod_ `got(key, prompt=None, args_parser=None)` + + +* **说明** + + 装饰一个函数来指示 NoneBot 当要获取的 `key` 不存在时接收用户新的一条消息并经过 `ArgsParser` 处理后再运行该函数，如果 `key` 已存在则直接继续运行 + + + +* **参数** + + + * `key: str`: 参数名 + + + * `prompt: Optional[Union[str, Message, MessageSegment]]`: 在参数不存在时向用户发送的消息 + + + * `args_parser: Optional[T_ArgsParser]`: 可选参数解析函数，空则使用默认解析函数 + + + +### _async classmethod_ `send(message, **kwargs)` + + +* **说明** + + 发送一条消息给当前交互用户 + + + +* **参数** + + + * `message: Union[str, Message, MessageSegment]`: 消息内容 + + + * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api + + + +### _async classmethod_ `finish(message=None, **kwargs)` + + +* **说明** + + 发送一条消息给当前交互用户并结束当前事件响应器 + + + +* **参数** + + + * `message: Union[str, Message, MessageSegment]`: 消息内容 + + + * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api + + + +### _async classmethod_ `pause(prompt=None, **kwargs)` + + +* **说明** + + 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后继续下一个处理函数 + + + +* **参数** + + + * `prompt: Union[str, Message, MessageSegment]`: 消息内容 + + + * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api + + + +### _async classmethod_ `reject(prompt=None, **kwargs)` + + +* **说明** + + 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后重新运行当前处理函数 + + + +* **参数** + + + * `prompt: Union[str, Message, MessageSegment]`: 消息内容 + + + * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api + + + +### `stop_propagation()` + + +* **说明** + + 阻止事件传播 diff --git a/archive/2.0.0a11/api/message.md b/archive/2.0.0a11/api/message.md new file mode 100644 index 00000000..5bd6c332 --- /dev/null +++ b/archive/2.0.0a11/api/message.md @@ -0,0 +1,143 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.message 模块 + +## 事件处理 + +NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供了多个插槽以进行事件的预处理等。 + + +## `event_preprocessor(func)` + + +* **说明** + + 事件预处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之前执行。 + + + +* **参数** + + 事件预处理函数接收三个参数。 + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + * `state: T_State`: 当前 State + + + +## `event_postprocessor(func)` + + +* **说明** + + 事件后处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之后执行。 + + + +* **参数** + + 事件后处理函数接收三个参数。 + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + * `state: T_State`: 当前事件运行前 State + + + +## `run_preprocessor(func)` + + +* **说明** + + 运行预处理。装饰一个函数，使它在每次事件响应器运行前执行。 + + + +* **参数** + + 运行预处理函数接收四个参数。 + + + * `matcher: Matcher`: 当前要运行的事件响应器 + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + * `state: T_State`: 当前 State + + + +## `run_postprocessor(func)` + + +* **说明** + + 运行后处理。装饰一个函数，使它在每次事件响应器运行后执行。 + + + +* **参数** + + 运行后处理函数接收五个参数。 + + + * `matcher: Matcher`: 运行完毕的事件响应器 + + + * `exception: Optional[Exception]`: 事件响应器运行错误（如果存在） + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + * `state: T_State`: 当前 State + + + +## _async_ `handle_event(bot, event)` + + +* **说明** + + 处理一个事件。调用该函数以实现分发事件。 + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + +* **示例** + + +```python +import asyncio +asyncio.create_task(handle_event(bot, event)) +``` diff --git a/archive/2.0.0a11/api/nonebot.md b/archive/2.0.0a11/api/nonebot.md new file mode 100644 index 00000000..b726f5bd --- /dev/null +++ b/archive/2.0.0a11/api/nonebot.md @@ -0,0 +1,278 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot 模块 + +## 快捷导入 + +为方便使用，`nonebot` 模块从子模块导入了部分内容 + + +* `on_message` => `nonebot.plugin.on_message` + + +* `on_notice` => `nonebot.plugin.on_notice` + + +* `on_request` => `nonebot.plugin.on_request` + + +* `on_metaevent` => `nonebot.plugin.on_metaevent` + + +* `on_startswith` => `nonebot.plugin.on_startswith` + + +* `on_endswith` => `nonebot.plugin.on_endswith` + + +* `on_keyword` => `nonebot.plugin.on_keyword` + + +* `on_command` => `nonebot.plugin.on_command` + + +* `on_shell_command` => `nonebot.plugin.on_shell_command` + + +* `on_regex` => `nonebot.plugin.on_regex` + + +* `CommandGroup` => `nonebot.plugin.CommandGroup` + + +* `Matchergroup` => `nonebot.plugin.MatcherGroup` + + +* `load_plugin` => `nonebot.plugin.load_plugin` + + +* `load_plugins` => `nonebot.plugin.load_plugins` + + +* `load_all_plugins` => `nonebot.plugin.load_all_plugins` + + +* `load_from_json` => `nonebot.plugin.load_from_json` + + +* `load_from_toml` => `nonebot.plugin.load_from_toml` + + +* `load_builtin_plugins` => `nonebot.plugin.load_builtin_plugins` + + +* `get_plugin` => `nonebot.plugin.get_plugin` + + +* `get_loaded_plugins` => `nonebot.plugin.get_loaded_plugins` + + +* `export` => `nonebot.plugin.export` + + +* `require` => `nonebot.plugin.require` + + +## `get_app()` + + +* **说明** + + 获取全局 Driver 对应 Server App 对象。 + + + +* **返回** + + + * `Any`: Server App 对象 + + + +* **异常** + + + * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) + + + +* **用法** + + +```python +app = nonebot.get_app() +``` + + +## `get_asgi()` + + +* **说明** + + 获取全局 Driver 对应 Asgi 对象。 + + + +* **返回** + + + * `Any`: Asgi 对象 + + + +* **异常** + + + * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) + + + +* **用法** + + +```python +asgi = nonebot.get_asgi() +``` + + +## `get_bots()` + + +* **说明** + + 获取所有通过 ws 连接 NoneBot 的 Bot 对象。 + + + +* **返回** + + + * `Dict[str, Bot]`: 一个以字符串 ID 为键，Bot 对象为值的字典 + + + +* **异常** + + + * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) + + + +* **用法** + + +```python +bots = nonebot.get_bots() +``` + + +## `get_driver()` + + +* **说明** + + 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 + + + +* **返回** + + + * `Driver`: 全局 Driver 对象 + + + +* **异常** + + + * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) + + + +* **用法** + + +```python +driver = nonebot.get_driver() +``` + + +## `init(*, _env_file=None, **kwargs)` + + +* **说明** + + 初始化 NoneBot 以及 全局 Driver 对象。 + + NoneBot 将会从 .env 文件中读取环境信息，并使用相应的 env 文件配置。 + + 你也可以传入自定义的 _env_file 来指定 NoneBot 从该文件读取配置。 + + + +* **参数** + + + * `_env_file: Optional[str]`: 配置文件名，默认从 .env.{env_name} 中读取配置 + + + * `**kwargs`: 任意变量，将会存储到 Config 对象里 + + + +* **返回** + + + * `None` + + + +* **用法** + + +```python +nonebot.init(database=Database(...)) +``` + + +## `run(host=None, port=None, *args, **kwargs)` + + +* **说明** + + 启动 NoneBot，即运行全局 Driver 对象。 + + + +* **参数** + + + * `host: Optional[str]`: 主机名／IP，若不传入则使用配置文件中指定的值 + + + * `port: Optional[int]`: 端口，若不传入则使用配置文件中指定的值 + + + * `*args`: 传入 Driver.run 的位置参数 + + + * `**kwargs`: 传入 Driver.run 的命名参数 + + + +* **返回** + + + * `None` + + + +* **用法** + + +```python +nonebot.run(host="127.0.0.1", port=8080) +``` diff --git a/archive/2.0.0a11/api/permission.md b/archive/2.0.0a11/api/permission.md new file mode 100644 index 00000000..1c42b2c8 --- /dev/null +++ b/archive/2.0.0a11/api/permission.md @@ -0,0 +1,63 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.permission 模块 + +## 权限 + +每个 `Matcher` 拥有一个 `Permission` ，其中是 **异步** `PermissionChecker` 的集合，只要有一个 `PermissionChecker` 检查结果为 `True` 时就会继续运行。 + +:::tip 提示 +`PermissionChecker` 既可以是 async function 也可以是 sync function +::: + + +## `MESSAGE` + + +* **说明**: 匹配任意 `message` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 message type 的 Matcher。 + + +## `NOTICE` + + +* **说明**: 匹配任意 `notice` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 notice type 的 Matcher。 + + +## `REQUEST` + + +* **说明**: 匹配任意 `request` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 request type 的 Matcher。 + + +## `METAEVENT` + + +* **说明**: 匹配任意 `meta_event` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 meta_event type 的 Matcher。 + + +## `USER(*user, perm=)` + + +* **说明** + + 在白名单内且满足 perm + + + +* **参数** + + + * `*user: str`: 白名单 + + + * `perm: Permission`: 需要同时满足的权限 + + + +## `SUPERUSER` + + +* **说明**: 匹配任意超级用户消息类型事件 diff --git a/archive/2.0.0a11/api/plugin.md b/archive/2.0.0a11/api/plugin.md new file mode 100644 index 00000000..a924bb6b --- /dev/null +++ b/archive/2.0.0a11/api/plugin.md @@ -0,0 +1,1480 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.plugin 模块 + +## 插件 + +为 NoneBot 插件开发提供便携的定义函数。 + + +## `plugins` + + +* **类型** + + `Dict[str, Plugin]` + + + +* **说明** + + 已加载的插件 + + + +## _class_ `Export` + +基类：`dict` + + +* **说明** + + 插件导出内容以使得其他插件可以获得。 + + + +* **示例** + + +```python +nonebot.export().default = "bar" + +@nonebot.export() +def some_function(): + pass + +# this doesn't work before python 3.9 +# use +# export = nonebot.export(); @export.sub +# instead +# See also PEP-614: https://www.python.org/dev/peps/pep-0614/ +@nonebot.export().sub +def something_else(): + pass +``` + + +## _class_ `Plugin` + +基类：`object` + +存储插件信息 + + +### `name` + + +* **类型**: `str` + + +* **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 + + +### `module` + + +* **类型**: `ModuleType` + + +* **说明**: 插件模块对象 + + +### `matcher` + + +* **类型**: `Set[Type[Matcher]]` + + +* **说明**: 插件内定义的 `Matcher` + + +### `export` + + +* **类型**: `Export` + + +* **说明**: 插件内定义的导出内容 + + +## `on(type='', rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` + + +* **说明** + + 注册一个基础事件响应器，可自定义类型。 + + + +* **参数** + + + * `type: str`: 事件响应器类型 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_metaevent(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` + + +* **说明** + + 注册一个元事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_message(rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=True, state=None, state_factory=None)` + + +* **说明** + + 注册一个消息事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_notice(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` + + +* **说明** + + 注册一个通知事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_request(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` + + +* **说明** + + 注册一个请求事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_startswith(msg, rule=None, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 + + + +* **参数** + + + * `msg: str`: 指定消息开头内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_endswith(msg, rule=None, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 + + + +* **参数** + + + * `msg: str`: 指定消息结尾内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_keyword(keywords, rule=None, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 + + + +* **参数** + + + * `keywords: Set[str]`: 关键词列表 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_command(cmd, rule=None, aliases=None, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 + + 命令匹配规则参考: [命令形式匹配](rule.html#command-command) + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_shell_command(cmd, rule=None, aliases=None, parser=None, **kwargs)` + + +* **说明** + + 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 + + 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 + + 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_regex(pattern, flags=0, rule=None, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 + + 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) + + + +* **参数** + + + * `pattern: str`: 正则表达式 + + + * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## _class_ `CommandGroup` + +基类：`object` + +命令组，用于声明一组有相同名称前缀的命令。 + + +### `__init__(cmd, **kwargs)` + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 + + + * `**kwargs`: 其他传递给 `on_command` 的参数默认值，参考 [on_command](#on-command-cmd-rule-none-aliases-none-kwargs) + + + +### `basecmd` + + +* **类型**: `Tuple[str, ...]` + + +* **说明**: 命令前缀 + + +### `base_kwargs` + + +* **类型**: `Dict[str, Any]` + + +* **说明**: 其他传递给 `on_command` 的参数默认值 + + +### `command(cmd, **kwargs)` + + +* **说明** + + 注册一个新的命令。 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 + + + * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `shell_command(cmd, **kwargs)` + + +* **说明** + + 注册一个新的命令。 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 + + + * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 + + + +* **返回** + + + * `Type[Matcher]` + + + +## _class_ `MatcherGroup` + +基类：`object` + +事件响应器组合，统一管理。为 `Matcher` 创建提供默认属性。 + + +### `__init__(**kwargs)` + + +* **说明** + + 创建一个事件响应器组合，参数为默认值，与 `on` 一致 + + + +### `matchers` + + +* **类型** + + `List[Type[Matcher]]` + + + +* **说明** + + 组内事件响应器列表 + + + +### `base_kwargs` + + +* **类型**: `Dict[str, Any]` + + +* **说明**: 其他传递给 `on` 的参数默认值 + + +### `on(**kwargs)` + + +* **说明** + + 注册一个基础事件响应器，可自定义类型。 + + + +* **参数** + + + * `type: str`: 事件响应器类型 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_metaevent(**kwargs)` + + +* **说明** + + 注册一个元事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_message(**kwargs)` + + +* **说明** + + 注册一个消息事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_notice(**kwargs)` + + +* **说明** + + 注册一个通知事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_request(**kwargs)` + + +* **说明** + + 注册一个请求事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_startswith(msg, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 + + + +* **参数** + + + * `msg: str`: 指定消息开头内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_endswith(msg, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 + + + +* **参数** + + + * `msg: str`: 指定消息结尾内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_keyword(keywords, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 + + + +* **参数** + + + * `keywords: Set[str]`: 关键词列表 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_command(cmd, aliases=None, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 + + 命令匹配规则参考: [命令形式匹配](rule.html#command-command) + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_shell_command(cmd, aliases=None, parser=None, **kwargs)` + + +* **说明** + + 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 + + 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 + + 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_regex(pattern, flags=0, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 + + 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) + + + +* **参数** + + + * `pattern: str`: 正则表达式 + + + * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `load_plugin(module_path)` + + +* **说明** + + 使用 `PluginManager` 加载单个插件，可以是本地插件或是通过 `pip` 安装的插件。 + + + +* **参数** + + + * `module_path: str`: 插件名称 `path.to.your.plugin` + + + +* **返回** + + + * `Optional[Plugin]` + + + +## `load_plugins(*plugin_dir)` + + +* **说明** + + 导入目录下多个插件，以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `*plugin_dir: str`: 插件路径 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_all_plugins(module_path, plugin_dir)` + + +* **说明** + + 导入指定列表中的插件以及指定目录下多个插件，以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `module_path: Set[str]`: 指定插件集合 + + + * `plugin_dir: Set[str]`: 指定插件路径集合 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_from_json(file_path, encoding='utf-8')` + + +* **说明** + + 导入指定 json 文件中的 `plugins` 以及 `plugin_dirs` 下多个插件，以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `file_path: str`: 指定 json 文件路径 + + + * `encoding: str`: 指定 json 文件编码 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_from_toml(file_path, encoding='utf-8')` + + +* **说明** + + 导入指定 toml 文件 `[nonebot.plugins]` 中的 `plugins` 以及 `plugin_dirs` 下多个插件， + 以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `file_path: str`: 指定 toml 文件路径 + + + * `encoding: str`: 指定 toml 文件编码 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_builtin_plugins(name='echo')` + + +* **说明** + + 导入 NoneBot 内置插件 + + + +* **返回** + + + * `Plugin` + + + +## `get_plugin(name)` + + +* **说明** + + 获取当前导入的某个插件。 + + + +* **参数** + + + * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 + + + +* **返回** + + + * `Optional[Plugin]` + + + +## `get_loaded_plugins()` + + +* **说明** + + 获取当前已导入的所有插件。 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `export()` + + +* **说明** + + 获取插件的导出内容对象 + + + +* **返回** + + + * `Export` + + + +## `require(name)` + + +* **说明** + + 获取一个插件的导出内容 + + + +* **参数** + + + * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 + + + +* **返回** + + + * `Optional[Export]` diff --git a/archive/2.0.0a11/api/rule.md b/archive/2.0.0a11/api/rule.md new file mode 100644 index 00000000..5c3dfbed --- /dev/null +++ b/archive/2.0.0a11/api/rule.md @@ -0,0 +1,266 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.rule 模块 + +## 规则 + +每个事件响应器 `Matcher` 拥有一个匹配规则 `Rule` ，其中是 **异步** `RuleChecker` 的集合，只有当所有 `RuleChecker` 检查结果为 `True` 时继续运行。 + +:::tip 提示 +`RuleChecker` 既可以是 async function 也可以是 sync function，但在最终会被 `nonebot.utils.run_sync` 转换为 async function +::: + + +## _class_ `Rule` + +基类：`object` + + +* **说明** + + `Matcher` 规则类，当事件传递时，在 `Matcher` 运行前进行检查。 + + + +* **示例** + + +```python +Rule(async_function) & sync_function +# 等价于 +from nonebot.utils import run_sync +Rule(async_function, run_sync(sync_function)) +``` + + +### `__init__(*checkers)` + + +* **参数** + + + * `*checkers: Callable[[Bot, Event, T_State], Awaitable[bool]]`: **异步** RuleChecker + + + +### `checkers` + + +* **说明** + + 存储 `RuleChecker` + + + +* **类型** + + + * `Set[Callable[[Bot, Event, T_State], Awaitable[bool]]]` + + + +### _async_ `__call__(bot, event, state)` + + +* **说明** + + 检查是否符合所有规则 + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + * `state: T_State`: 当前 State + + + +* **返回** + + + * `bool` + + + +## `startswith(msg)` + + +* **说明** + + 匹配消息开头 + + + +* **参数** + + + * `msg: str`: 消息开头字符串 + + + +## `endswith(msg)` + + +* **说明** + + 匹配消息结尾 + + + +* **参数** + + + * `msg: str`: 消息结尾字符串 + + + +## `keyword(*keywords)` + + +* **说明** + + 匹配消息关键词 + + + +* **参数** + + + * `*keywords: str`: 关键词 + + + +## `command(*cmds)` + + +* **说明** + + 命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 + + 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 + + + +* **参数** + + + * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 + + + +* **示例** + + 使用默认 `command_start`, `command_sep` 配置 + + 命令 `("test",)` 可以匹配：`/test` 开头的消息 + 命令 `("test", "sub")` 可以匹配”`/test.sub` 开头的消息 + + +:::tip 提示 +命令内容与后续消息间无需空格！ +::: + + +## _class_ `ArgumentParser` + +基类：`argparse.ArgumentParser` + + +* **说明** + + `shell_like` 命令参数解析器，解析出错时不会退出程序。 + + + +## `shell_command(*cmds, parser=None)` + + +* **说明** + + 支持 `shell_like` 解析参数的命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 + + 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 + + 可以通过 `state["argv"]` 获取用户输入的原始参数列表 + + 添加 `parser` 参数后, 可以自动处理消息并将结果保存在 `state["args"]` 中。 + + + +* **参数** + + + * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 + + + * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 + + + +* **示例** + + 使用默认 `command_start`, `command_sep` 配置，更多示例参考 `argparse` 标准库文档。 + + +```python +from nonebot.rule import ArgumentParser + +parser = ArgumentParser() +parser.add_argument("-a", action="store_true") + +rule = shell_command("ls", parser=parser) +``` + +:::tip 提示 +命令内容与后续消息间无需空格！ +::: + + +## `regex(regex, flags=0)` + + +* **说明** + + 根据正则表达式进行匹配。 + + 可以通过 `state["_matched"]` `state["_matched_groups"]` `state["_matched_dict"]` + 获取正则表达式匹配成功的文本。 + + + +* **参数** + + + * `regex: str`: 正则表达式 + + + * `flags: Union[int, re.RegexFlag]`: 正则标志 + + +:::tip 提示 +正则表达式匹配使用 search 而非 match，如需从头匹配请使用 `r"^xxx"` 来确保匹配开头 +::: + + +## `to_me()` + + +* **说明** + + 通过 `event.is_tome()` 判断事件是否与机器人有关 + + + +* **参数** + + + * 无 diff --git a/archive/2.0.0a11/api/typing.md b/archive/2.0.0a11/api/typing.md new file mode 100644 index 00000000..c3ec95bf --- /dev/null +++ b/archive/2.0.0a11/api/typing.md @@ -0,0 +1,246 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.typing 模块 + +## 类型 + +下面的文档中，「类型」部分使用 Python 的 Type Hint 语法，见 [PEP 484](https://www.python.org/dev/peps/pep-0484/)、[PEP 526](https://www.python.org/dev/peps/pep-0526/) 和 [typing](https://docs.python.org/3/library/typing.html)。 + +除了 Python 内置的类型，下面还出现了如下 NoneBot 自定类型，实际上它们是 Python 内置类型的别名。 + +以下类型均可从 nonebot.typing 模块导入。 + + +## `T_State` + + +* **类型** + + `Dict[Any, Any]` + + + +* **说明** + + 事件处理状态 State 类型 + + + + +## `T_StateFactory` + + +* **类型** + + `Callable[[Bot, Event], Awaitable[T_State]]` + + + +* **说明** + + 事件处理状态 State 类工厂函数 + + + + +## `T_WebSocketConnectionHook` + + +* **类型** + + `Callable[[Bot], Awaitable[None]]` + + + +* **说明** + + WebSocket 连接建立时执行的函数 + + + + +## `T_WebSocketDisconnectionHook` + + +* **类型** + + `Callable[[Bot], Awaitable[None]]` + + + +* **说明** + + WebSocket 连接断开时执行的函数 + + + + +## `T_EventPreProcessor` + + +* **类型** + + `Callable[[Bot, Event, T_State], Awaitable[None]]` + + + +* **说明** + + 事件预处理函数 EventPreProcessor 类型 + + + + +## `T_EventPostProcessor` + + +* **类型** + + `Callable[[Bot, Event, T_State], Awaitable[None]]` + + + +* **说明** + + 事件预处理函数 EventPostProcessor 类型 + + + + +## `T_RunPreProcessor` + + +* **类型** + + `Callable[[Matcher, Bot, Event, T_State], Awaitable[None]]` + + + +* **说明** + + 事件响应器运行前预处理函数 RunPreProcessor 类型 + + + + +## `T_RunPostProcessor` + + +* **类型** + + `Callable[[Matcher, Optional[Exception], Bot, Event, T_State], Awaitable[None]]` + + + +* **说明** + + 事件响应器运行前预处理函数 RunPostProcessor 类型，第二个参数为运行时产生的错误（如果存在） + + + + +## `T_RuleChecker` + + +* **类型** + + `Callable[[Bot, Event, T_State], Union[bool, Awaitable[bool]]]` + + + +* **说明** + + RuleChecker 即判断是否响应事件的处理函数。 + + + + +## `T_PermissionChecker` + + +* **类型** + + `Callable[[Bot, Event], Union[bool, Awaitable[bool]]]` + + + +* **说明** + + RuleChecker 即判断是否响应消息的处理函数。 + + + + +## `T_Handler` + + +* **类型** + + + * `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` + + + * `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` + + + * `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` + + + * `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` + + + +* **说明** + + Handler 即事件的处理函数。 + + + + +## `T_ArgsParser` + + +* **类型** + + `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` + + + +* **说明** + + ArgsParser 即消息参数解析函数，在 Matcher.got 获取参数时被运行。 + + + + +## `T_TypeUpdater` + + +* **类型** + + `Callable[[Bot, Event, T_State, str], Awaitable[str]]` + + + +* **说明** + + TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 `message`。 + + + + +## `T_PermissionUpdater` + + +* **类型** + + `Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]` + + + +* **说明** + + PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 diff --git a/archive/2.0.0a11/api/utils.md b/archive/2.0.0a11/api/utils.md new file mode 100644 index 00000000..ab3ea0c2 --- /dev/null +++ b/archive/2.0.0a11/api/utils.md @@ -0,0 +1,84 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.utils 模块 + + +## `escape_tag(s)` + + +* **说明** + + 用于记录带颜色日志时转义 `` 类型特殊标签 + + + +* **参数** + + + * `s: str`: 需要转义的字符串 + + + +* **返回** + + + * `str` + + + +## `run_sync(func)` + + +* **说明** + + 一个用于包装 sync function 为 async function 的装饰器 + + + +* **参数** + + + * `func: Callable[..., Any]`: 被装饰的同步函数 + + + +* **返回** + + + * `Callable[..., Awaitable[Any]]` + + + +## `logger_wrapper` + + +* **说明** + + +用于打印 adapter 的日志。 + + +* **Log 参数** + + + +* `level: Literal['WARNING', 'DEBUG', 'INFO']`: 日志等级 + + +* `message: str`: 日志信息 + + +* `exception: Optional[Exception]`: 异常信息 + + +## _class_ `DataclassEncoder` + +基类：`json.encoder.JSONEncoder` + + +* **说明** + + 在JSON序列化 `Message` (List[Dataclass]) 时使用的 `JSONEncoder` diff --git a/archive/2.0.0a11/guide/README.md b/archive/2.0.0a11/guide/README.md new file mode 100644 index 00000000..8aa8d271 --- /dev/null +++ b/archive/2.0.0a11/guide/README.md @@ -0,0 +1,31 @@ +# 概览 + + + +:::tip 提示 +初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./installation.md) 查看安装方法，并进行后续的基础使用教程。 +::: + +NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 + +除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 + +得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 + +需要注意的是，NoneBot 仅支持 **Python 3.7+** + +## 特色 + +NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ + +- 提供使用简易的脚手架 +- 提供丰富的官方插件 +- 提供可添加/替换的驱动以及协议选项 +- 基于异步 I/O +- 同时支持 HTTP 和反向 WebSocket 通信方式 +- 支持多个机器人账号负载均衡 +- 提供直观的交互式会话接口 +- 提供可自定义的权限控制机制 +- 多种方式渲染要发送的消息内容，使对话足够自然 diff --git a/archive/2.0.0a11/guide/basic-configuration.md b/archive/2.0.0a11/guide/basic-configuration.md new file mode 100644 index 00000000..4bb33f4f --- /dev/null +++ b/archive/2.0.0a11/guide/basic-configuration.md @@ -0,0 +1,86 @@ +# 基本配置 + +到目前为止我们还在使用 NoneBot 的默认行为，在开始编写自己的插件之前，我们先尝试在配置文件上动动手脚，让 NoneBot 表现出不同的行为。 + +在上一章节中，我们创建了默认的项目结构，其中 `.env` 和 `.env.*` 均为项目的配置文件，下面将介绍几种 NoneBot 配置方式。 + +:::danger 警告 +请勿将敏感信息写入配置文件并提交至开源仓库！ +::: + +## .env 文件 + +NoneBot 在启动时将会从系统环境变量或者 `.env` 文件中寻找变量 `ENVIRONMENT` (大小写不敏感)，默认值为 `prod`。 +这将引导 NoneBot 从系统环境变量或者 `.env.{ENVIRONMENT}` 文件中进一步加载具体配置。 + +`.env` 文件是基础环境配置文件，该文件中的配置项在不同环境下都会被加载，但会被 `.env.{ENVIRONMENT}` 文件中的配置所覆盖。 + +现在，我们在 `.env` 文件中写入当前环境信息： + +```bash +# .env +ENVIRONMENT=dev +CUSTOM_CONFIG=common config # 这个配置项在任何环境中都会被加载 +``` + +如你所想，之后 NoneBot 就会从 `.env.dev` 文件中加载环境变量。 + +## .env.\* 文件 + +NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 进行配置管理，会从 `.env.{ENVIRONMENT}` 文件中获悉环境配置。 + +可以在 NoneBot 初始化时指定加载某个环境配置文件: `nonebot.init(_env_file=".env.dev")`，这将忽略你在 `.env` 中设置的 `ENVIRONMENT` 。 + +:::warning 提示 +由于 `pydantic` 使用 JSON 解析配置项，请确保配置项值为 JSON 格式的数据。如： + +```bash +list=["123456789", "987654321", 1] +test={"hello": "world"} +``` + +如果配置项值解析失败将作为字符串处理。 +::: + +示例及说明： + +```bash +HOST=0.0.0.0 # 配置 NoneBot 监听的 IP/主机名 +PORT=8080 # 配置 NoneBot 监听的端口 +DEBUG=true # 开启 debug 模式 **请勿在生产环境开启** +SUPERUSERS=["123456789", "987654321"] # 配置 NoneBot 超级用户 +NICKNAME=["awesome", "bot"] # 配置机器人的昵称 +COMMAND_START=["/", ""] # 配置命令起始字符 +COMMAND_SEP=["."] # 配置命令分割字符 + +# Custom Configs +CUSTOM_CONFIG1="config in env file" +CUSTOM_CONFIG2= # 留空则从系统环境变量读取，如不存在则为空字符串 +``` + +详细的配置项参考 [Config Reference](../api/config.md) 。 + +## 系统环境变量 + +如果在系统环境变量中定义了配置，则一样会被读取。 + +## bot.py 文件 + +配置项也可以在 NoneBot 初始化时传入。此处可以传入任意合法 Python 变量。当然也可以在初始化完成后修改或新增。 + +示例： + +```python +# bot.py +import nonebot + +nonebot.init(custom_config3="config on init") + +config = nonebot.get_driver().config +config.custom_config3 = "changed after init" +config.custom_config4 = "new config after init" +``` + +## 优先级 + +`bot.py` 文件( `nonebot.init` ) > 系统环境变量 > `.env` `.env.*` 文件 diff --git a/archive/2.0.0a11/guide/cqhttp-guide.md b/archive/2.0.0a11/guide/cqhttp-guide.md new file mode 100644 index 00000000..356fa6c3 --- /dev/null +++ b/archive/2.0.0a11/guide/cqhttp-guide.md @@ -0,0 +1,101 @@ +# CQHTTP 协议使用指南 + +## 配置 CQHTTP 协议端（以 QQ 为例） + +单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 + +QQ 协议端举例: + +- [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) (基于 [MiraiGo](https://github.com/Mrs4s/MiraiGo)) +- [cqhttp-mirai-embedded](https://github.com/yyuueexxiinngg/cqhttp-mirai/tree/embedded) +- [Mirai](https://github.com/mamoe/mirai) + [cqhttp-mirai](https://github.com/yyuueexxiinngg/cqhttp-mirai) +- [Mirai](https://github.com/mamoe/mirai) + [Mirai Native](https://github.com/iTXTech/mirai-native) + [CQHTTP](https://github.com/richardchien/coolq-http-api) +- [OICQ-http-api](https://github.com/takayama-lily/onebot) (基于 [OICQ](https://github.com/takayama-lily/oicq)) + +这里以 [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) 为例 + +1. 下载 go-cqhttp 对应平台的 release 文件，[点此前往](https://github.com/Mrs4s/go-cqhttp/releases) +2. 运行 exe 文件或者使用 `./go-cqhttp` 启动 +3. 生成默认配置文件并修改默认配置 + +```hjson{2,3,35-36,42} +{ + uin: 机器人QQ号 + password: 机器人密码 + encrypt_password: false + password_encrypted: "" + enable_db: true + access_token: "" + relogin: { + enabled: true + relogin_delay: 3 + max_relogin_times: 0 + } + _rate_limit: { + enabled: false + frequency: 1 + bucket_size: 1 + } + ignore_invalid_cqcode: false + force_fragmented: false + heartbeat_interval: 0 + http_config: { + enabled: false + host: "0.0.0.0" + port: 5700 + timeout: 0 + post_urls: {} + } + ws_config: { + enabled: false + host: "0.0.0.0" + port: 6700 + } + ws_reverse_servers: [ + { + enabled: true + reverse_url: ws://127.0.0.1:8080/cqhttp/ws + reverse_api_url: ws://you_websocket_api.server + reverse_event_url: ws://you_websocket_event.server + reverse_reconnect_interval: 3000 + } + ] + post_message_format: array + use_sso_address: false + debug: false + log_level: "" + web_ui: { + enabled: false + host: 127.0.0.1 + web_ui_port: 9999 + web_input: false + } +} +``` + +其中 `ws://127.0.0.1:8080/cqhttp/ws` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 + +`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 + +## 历史性的第一次对话 + +一旦新的配置文件正确生效之后，NoneBot 所在的控制台（如果正在运行的话）应该会输出类似下面的内容（两条访问日志）： + +```default +09-14 21:31:16 [INFO] uvicorn | ('127.0.0.1', 12345) - "WebSocket /cqhttp/ws" [accepted] +09-14 21:31:16 [INFO] nonebot | WebSocket Connection from CQHTTP Bot 你的QQ号 Accepted! +``` + +这表示 CQHTTP 协议端已经成功地使用 CQHTTP 协议连接上了 NoneBot。 + +现在，尝试向你的机器人账号发送如下内容： + +```default +/echo 你好，世界 +``` + +到这里如果一切 OK，你应该会收到机器人给你回复了 `你好，世界`。这一历史性的对话标志着你已经成功地运行了一个 NoneBot 的最小实例，开始了编写更强大的 QQ 机器人的创意之旅！ + + + + diff --git a/archive/2.0.0a11/guide/creating-a-handler.md b/archive/2.0.0a11/guide/creating-a-handler.md new file mode 100644 index 00000000..723aeeff --- /dev/null +++ b/archive/2.0.0a11/guide/creating-a-handler.md @@ -0,0 +1,197 @@ +# 事件处理 + +在上一章中，我们已经注册了事件响应器，现在我们可以正式编写事件处理逻辑了！ + +## [事件处理函数](../api/typing.md#handler) + +```python{1,2,8,9} +@weather.handle() +async def handle_first_receive(bot: Bot, event: Event, state: T_State): + args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 + if args: + state["city"] = args # 如果用户发送了参数则直接赋值 + + +@weather.got("city", prompt="你想查询哪个城市的天气呢？") +async def handle_city(bot: Bot, event: Event, state: T_State): + city = state["city"] + if city not in ["上海", "北京"]: + await weather.reject("你想查询的城市暂不支持，请重新输入！") + city_weather = await get_weather(city) + await weather.finish(city_weather) +``` + +在之前的样例中，我们定义了两个函数 `handle_first_receive`, `handle_city`，他们被事件响应器的装饰器装饰从而成为事件响应器的事件处理函数。 + +:::tip 提示 +在事件响应器中，事件处理函数是**顺序**执行的！ +::: + +### 添加一个事件处理函数 + +事件响应器提供了三种装饰事件处理函数的装饰器，分别是： + +1. [handle()](../api/matcher.md#classmethod-handle) +2. [receive()](../api/matcher.md#classmethod-receive) +3. [got(key, prompt, args_parser)](../api/matcher.md#classmethod-got-key-prompt-none-args-parser-none) + +#### handle() + +简单的为事件响应器添加一个事件处理函数，这个函数将会在上一个处理函数正常返回执行完毕后立即执行。 + +#### receive() + +指示 NoneBot 接收一条新的用户消息后继续执行该处理函数。此时函数将会接收到新的消息而非前一条消息，之前相关信息可以存储在 state 中。 + +特别的，当装饰的函数前没有其他事件处理函数，那么 `receive()` 不会接收一条新的消息而是直接使用第一条接收到的消息。 + +#### got(key, prompt, args_parser) + +指示 NoneBot 当 `state` 中不存在 `key` 时向用户发送 `prompt` 等待用户回复并赋值给 `state[key]`。 + +`prompt` 可以为 `str`, `Message`, `MessageSegment`，若为空则不会向用户发送，若不为空则会在 format 之后发送，即 `prompt.format(**state)`，注意对 `{}` 进行转义。示例： + +```python +@matcher.receive() +async def handle(bot: Bot, event: Event, state: T_State): + state["key"] = "hello" + + +@matcher.got("key2", prompt="{key}!") +async def handle2(bot: Bot, event: Event, state: T_State): + pass +``` + +`args_parser` 为参数处理函数，在这里传入一个新的函数以覆盖默认的参数处理。详情参照 [args_parser](#参数处理函数-args-parser) + +特别的，这些装饰器都可以套娃使用： + +```python +@matcher.got("key1") +@matcher.got("key2") +async def handle(bot: Bot, event: Event, state: T_State): + pass +``` + +### 事件处理函数参数 + +事件处理函数类型为： + +- `Callable[[Bot, Event, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` +- `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` +- `Callable[[Bot, Event, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` +- `Callable[[Bot, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` +- `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` +- `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` +- `Callable[[Bot, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` +- `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` + +简单说就是：除了 `bot` 参数，其他都是可选的。 + +以下函数都是合法的事件处理函数（仅列举常用的）： + +```python +async def handle(bot: Bot, event: Event, state: T_State): + pass + +async def handle(bot: Bot, event: Event, state: T_State, matcher: Matcher): + pass + +async def handle(bot: Bot, event: Event): + pass + +async def handle(bot: Bot, state: T_State): + pass + +async def handle(bot: Bot): + pass +``` + +:::danger 警告 +函数的参数名固定不能修改！ +::: + +参数分别为： + +1. [nonebot.adapters.Bot](../api/adapters/#class-bot): 即事件上报连接对应的 Bot 对象，为 BaseBot 的子类。特别注意，此处的类型注释可以替换为指定的 Bot 类型，例如：`nonebot.adapters.cqhttp.Bot`，只有在上报事件的 Bot 类型与类型注释相符时才会执行该处理函数！可用于多平台进行不同的处理。 +2. [nonebot.adapters.Event](../api/adapters/#class-event): 即上报事件对象，可以获取到上报的所有信息。 +3. [state](../api/typing.md#t-state): 状态字典，可以存储任意的信息，其中还包含一些特殊的值以获取 NoneBot 内部处理时的一些信息，如： + +- `state["_current_key"]`: 存储当前 `got` 获取的参数名 +- `state["_prefix"]`, `state["_suffix"]`: 存储当前 TRIE 匹配的前缀/后缀，可以通过该值获取用户命令的原始命令 + +:::tip 提示 +NoneBot 会对不同类型的参数进行不同的操作，详情查看 [事件处理函数重载](../advanced/overloaded-handlers.md) +::: + +### 参数处理函数 args_parser + +在使用 `got` 获取用户输入参数时，需要对用户的消息进行处理以转换为我们所需要的信息。在默认情况下，NoneBot 会把用户的消息字符串原封不动的赋值给 `state[key]` 。可以通过以下两种方式修改默认处理逻辑： + +- `@matcher.args_parser` 装饰器：直接装饰一个函数作为参数处理器 +- `got(key, prompt, args_parser)`：直接把函数作为参数传入 + +参数处理函数类型为：`Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`，即： + +```python +async def parser(bot: Bot, event: Event, state: T_State): + state[state["_current_key"]] = str(event.get_message()) +``` + +特别的，`state["_current_key"]` 中存储了当前获取的参数名 + +### 逻辑控制 + +NoneBot 也为事件处理函数提供了一些便捷的逻辑控制函数： + +#### `matcher.send` + +这个函数用于发送一条消息给当前交互的用户。~~其实这并不是一个逻辑控制函数，只是不知道放在哪里……~~ + +#### `matcher.pause` + +这个函数用于结束当前事件处理函数，强制接收一条新的消息再运行**下一个消息处理函数**。 + +#### `matcher.reject` + +这个函数用于结束当前事件处理函数，强制接收一条新的消息再**再次运行当前消息处理函数**。常用于用户输入信息不符合预期。 + +#### `matcher.finish` + +这个函数用于直接结束当前事件处理。 + +以上三个函数都拥有一个参数 `message` / `prompt`，用于向用户发送一条消息。以及 `**kwargs` 直接传递给 `bot.send` 的额外参数。 + +## 常用事件处理结构 + +```python +matcher = on_command("test") + +# 修改默认参数处理 +@matcher.args_parser +async def parse(bot: Bot, event: Event, state: T_State): + print(state["_current_key"], ":", str(event.get_message())) + state[state["_current_key"]] = str(event.get_message()) + +@matcher.handle() +async def first_receive(bot: Bot, event: Event, state: T_State): + # 获取用户原始命令，如：/test + print(state["_prefix"]["raw_command"]) + # 处理用户输入参数，如：/test arg1 arg2 + raw_args = str(event.get_message()).strip() + if raw_args: + arg_list = raw_args.split() + # 将参数存入state以阻止后续再向用户询问参数 + state["arg1"] = arg_list[0] + + +@matcher.got("arg1", prompt="参数？") +async def arg_handle(bot: Bot, event: Event, state: T_State): + # 在这里对参数进行验证 + if state["arg1"] not in ["allow", "list"]: + await matcher.reject("参数不正确！请重新输入") + # 发送一些信息 + await bot.send(event, "message") + await matcher.send("message") + await matcher.finish("message") +``` diff --git a/archive/2.0.0a11/guide/creating-a-matcher.md b/archive/2.0.0a11/guide/creating-a-matcher.md new file mode 100644 index 00000000..61a5143d --- /dev/null +++ b/archive/2.0.0a11/guide/creating-a-matcher.md @@ -0,0 +1,148 @@ +# 注册事件响应器 + +好了，现在插件已经创建完毕，我们可以开始编写实际代码了，下面将以一个简易单文件天气查询插件为例。 + +在插件目录下 `weather.py` 中添加如下代码： + +```python +from nonebot import on_command +from nonebot.rule import to_me +from nonebot.typing import T_State +from nonebot.adapters import Bot, Event + +weather = on_command("天气", rule=to_me(), priority=5) + + +@weather.handle() +async def handle_first_receive(bot: Bot, event: Event, state: T_State): + args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 + if args: + state["city"] = args # 如果用户发送了参数则直接赋值 + + +@weather.got("city", prompt="你想查询哪个城市的天气呢？") +async def handle_city(bot: Bot, event: Event, state: T_State): + city = state["city"] + if city not in ["上海", "北京"]: + await weather.reject("你想查询的城市暂不支持，请重新输入！") + city_weather = await get_weather(city) + await weather.finish(city_weather) + + +async def get_weather(city: str): + return f"{city}的天气是..." +``` + +为了简单起见，我们在这里的例子中没有接入真实的天气数据，但要接入也非常简单，你可以使用中国天气网、和风天气等网站提供的 API。 + +接下来我们来说明这段代码是如何工作的。 + +:::tip 提示 +从这里开始，你需要对 Python 的 asyncio 编程有所了解，因为 NoneBot 是完全基于 asyncio 的，具体可以参考 [廖雪峰的 Python 教程](https://www.liaoxuefeng.com/wiki/1016959663602400/1017959540289152) +::: + +## [事件响应器](../api/matcher.md) + +```python{5} +from nonebot import on_command +from nonebot.rule import to_me +from nonebot.permission import Permission + +weather = on_command("天气", rule=to_me(), permission=Permission(), priority=5) +``` + +在上方代码中，我们注册了一个事件响应器 `Matcher`，它由几个部分组成： + +1. `on_command` 注册一个消息类型的命令处理器 +2. `"天气"` 指定 command 参数 - 命令名 +3. `rule` 补充事件响应器的匹配规则 +4. `priority` 事件响应器优先级 +5. `block` 是否阻止事件传递 + +其他详细配置可以参考 API 文档，下面我们详细说明各个部分： + +### 事件响应器类型 type + +事件响应器类型其实就是对应事件的类型 `Event.get_type()` ，NoneBot 提供了一个基础类型事件响应器 `on()` 以及一些其他内置的事件响应器。 + +以下所有类型的事件响应器都是由 `on(type, rule)` 的形式进行了简化封装。 + +- `on("事件类型")`: 基础事件响应器，第一个参数为事件类型，空字符串表示不限 +- `on_metaevent()` ~ `on("meta_event")`: 元事件响应器 +- `on_message()` ~ `on("message")`: 消息事件响应器 +- `on_request()` ~ `on("request")`: 请求事件响应器 +- `on_notice()` ~ `on("notice")`: 通知事件响应器 +- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../api/rule.md#startswith-msg) +- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../api/rule.md#endswith-msg) +- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../api/rule.md#keyword-keywords) +- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../api/rule.md#command-cmds) +- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../api/rule.md#regex-regex-flags-0) + +### 匹配规则 rule + +事件响应器的匹配规则即 `Rule`，详细内容在下方介绍。[直达](#自定义-rule) + +### 优先级 priority + +事件响应器的优先级代表事件响应器的执行顺序，同一优先级的事件响应器会 **同时执行！**，优先级数字**越小**越先响应！优先级请从 `1` 开始排序！ + +:::tip 提示 +使用 `nonebot-plugin-test` 可以在网页端查看当前所有事件响应器的执行流程，有助理解事件响应流程！ + +```bash +nb plugin install nonebot_plugin_test +``` + +::: + +### 阻断 block + +当有任意事件响应器发出了阻止事件传递信号时，该事件将不再会传递给下一优先级，直接结束处理。 + +NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默认会阻断事件传递，其他则不会。 + +在部分情况中，可以使用 `matcher.stop_propagation()` 方法动态阻止事件传播，该方法需要 `handler` 在参数中获取 `matcher` 实例后调用方法。 + +## 自定义 rule + +rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： + +- [startswith(msg)](../api/rule.md#startswith-msg) +- [endswith(msg)](../api/rule.md#endswith-msg) +- [keyword(\*keywords)](../api/rule.md#keyword-keywords) +- [command(\*cmds)](../api/rule.md#command-cmds) +- [regex(regex, flag)](../api/rule.md#regex-regex-flags-0) + +以上规则都是返回类型为 `Rule` 的函数，`Rule` 由非负个 `RuleChecker` 组成，当所有 `RuleChecker` 返回 `True` 时匹配成功。这些 `Rule`, `RuleChecker` 的形式如下： + +```python +from nonebot.rule import Rule +from nonebot.typing import T_State + +async def async_checker(bot: Bot, event: Event, state: T_State) -> bool: + return True + +def sync_checker(bot: Bot, event: Event, state: T_State) -> bool: + return True + +def check(arg1, arg2): + + async def _checker(bot: Bot, event: Event, state: T_State) -> bool: + return bool(arg1 + arg2) + + return Rule(_checker) +``` + +`Rule` 和 `RuleChecker` 之间可以使用 `与 &` 互相组合： + +```python +from nonebot.rule import Rule + +Rule(async_checker1) & sync_checker & async_checker2 +``` + +**_请勿将事件处理的逻辑写入 `rule` 中，这会使得事件处理返回奇怪的响应。_** + +:::danger 警告 +`Rule(*checkers)` 只接受 async function，或使用 `nonebot.utils.run_sync` 自行包裹 sync function。在使用 `与 &` 时，NoneBot 会自动包裹 sync function +::: diff --git a/archive/2.0.0a11/guide/creating-a-plugin.md b/archive/2.0.0a11/guide/creating-a-plugin.md new file mode 100644 index 00000000..5ce12a28 --- /dev/null +++ b/archive/2.0.0a11/guide/creating-a-plugin.md @@ -0,0 +1,119 @@ +# 创建插件 + +如果之前使用 `nb-cli` 生成了项目结构，那我们已经有了一个空的插件目录 `Awesome-Bot/awesome_bot/plugins`，并且它已在 `bot.py` 中被加载，我们现在可以开始创建插件了！ + +使用 `nb-cli` 创建包形式插件，或自行创建文件(夹) + +```bash +nb plugin new +``` + +插件通常有两种形式，下面分别介绍 + +## 单文件形式 + +在插件目录下创建名为 `foo.py` 的 Python 文件，暂时留空，此时目录结构如下： + + +:::vue +AweSome-Bot +├── awesome_bot +│ └── plugins +│ └── `foo.py` +├── .env +├── .env.dev +├── .env.prod +├── .gitignore +├── bot.py +├── docker-compose.yml +├── Dockerfile +├── pyproject.toml +└── README.md +::: + + +这个时候它已经可以被称为一个插件了，尽管它还什么都没做。 + +## 包形式(推荐) + +在插件目录下创建文件夹 `foo`，并在该文件夹下创建文件 `__init__.py`，此时目录结构如下： + + +:::vue +AweSome-Bot +├── awesome_bot +│ └── plugins +│ └── `foo` +│ └── `__init__.py` +├── .env +├── .env.dev +├── .env.prod +├── .gitignore +├── bot.py +├── docker-compose.yml +├── Dockerfile +├── pyproject.toml +└── README.md +::: + + +这个时候 `foo` 就是一个合法的 Python 包了，同时也是合法的 NoneBot 插件，插件内容可以在 `__init__.py` 中编写。 + +### 推荐结构(仅供参考) + + +:::vue +foo +├── `__init__.py` +├── `config.py` +├── `data_source.py` +└── `model.py` +::: + + +#### \_\_init\_\_.py + +在该文件中编写各类事件响应及处理逻辑。 + +#### config.py + +在该文件中使用 `pydantic` 定义插件所需要的配置项以及类型。 + +示例： + +```python +from pydantic import BaseSettings + + +class Config(BaseSettings): + + # plugin custom config + plugin_setting: str = "default" + + class Config: + extra = "ignore" +``` + +并在 `__init__.py` 文件中添加以下行 + +```python +import nonebot +from .config import Config + +global_config = nonebot.get_driver().config +plugin_config = Config(**global_config.dict()) +``` + +此时就可以通过 `plugin_config.plugin_setting` 获取到插件所需要的配置项了。 + +#### data_source.py + +在该文件中编写数据获取函数。 + +:::warning 警告 +数据获取应尽量使用**异步**处理！例如使用 [httpx](https://www.python-httpx.org/) 而非 [requests](https://requests.readthedocs.io/en/master/) +::: + +#### model.py + +在该文件中编写数据库模型。 diff --git a/archive/2.0.0a11/guide/creating-a-project.md b/archive/2.0.0a11/guide/creating-a-project.md new file mode 100644 index 00000000..6fbf114b --- /dev/null +++ b/archive/2.0.0a11/guide/creating-a-project.md @@ -0,0 +1,57 @@ +# 创建一个完整的项目 + +上一章中我们已经运行了一个简单的 NoneBot 实例，在这一章，我们将从零开始一个完整的项目。 + +## 目录结构 + +可以使用 `nb-cli` 或者自行创建完整的项目目录： + +```bash +nb create +``` + + +:::vue +AweSome-Bot +├── `awesome_bot` _(**或是 src**)_ +│ └── `plugins` +├── `.env` _(**可选的**)_ +├── `.env.dev` _(**可选的**)_ +├── `.env.prod` _(**可选的**)_ +├── .gitignore +├── `bot.py` +├── docker-compose.yml +├── Dockerfile +├── `pyproject.toml` +└── README.md +::: + + +- `awesome_bot/plugins` 或 `src/plugins`: 用于存放编写的 bot 插件 +- `.env`, `.env.dev`, `.env.prod`: 各环境配置文件 +- `bot.py`: bot 入口文件 +- `pyproject.toml`: 项目依赖管理文件，默认使用 [poetry](https://python-poetry.org/) + +## 启动 Bot + +:::warning 提示 +如果您使用如 `VSCode` / `PyCharm` 等 IDE 启动 nonebot，请检查 IDE 当前工作空间目录是否与当前侧边栏打开目录一致。 + +* 在二者不一致的环境下可能导致 nonebot 读取配置文件和插件等不符合预期 +::: + +通过 `nb-cli` + +```bash +nb run [--file=bot.py] [--app=app] +``` + +或 + +```bash +python bot.py +``` + +:::tip 提示 +如果在 bot 入口文件内定义了 asgi server， `nb-cli` 将会为你启动**冷重载模式**（当文件发生变动时自动重启 NoneBot 实例） +::: diff --git a/archive/2.0.0a11/guide/ding-guide.md b/archive/2.0.0a11/guide/ding-guide.md new file mode 100644 index 00000000..ee9449ba --- /dev/null +++ b/archive/2.0.0a11/guide/ding-guide.md @@ -0,0 +1,119 @@ +# 钉钉机器人使用指南 + +基于企业机器人的 outgoing（回调）机制，用户@机器人之后，钉钉会将消息内容 POST 到开发者的消息接收地址。开发者解析出消息内容、发送者身份，根据企业的业务逻辑，组装响应的消息内容返回，钉钉会将响应内容发送到群里。 + +::: warning 只有企业内部机器人支持接收消息 +普通的机器人尚不支持应答机制，该机制指的是群里成员在聊天@机器人的时候，钉钉回调指定的服务地址，即 Outgoing 机器人。 +::: + +首先你需要有钉钉机器人的相关概念，请参阅相关文档： + +- [群机器人概述](https://developers.dingtalk.com/document/app/overview-of-group-robots) +- [开发企业内部机器人](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots) + +## 关于 DingAdapter 的说明 + +你需要显式的注册 ding 这个适配器： + +```python{2,6} +import nonebot +from nonebot.adapters.ding import Bot as DingBot + +nonebot.init() +driver = nonebot.get_driver() +driver.register_adapter("ding", DingBot) +nonebot.load_builtin_plugins() + +if __name__ == "__main__": + nonebot.run() +``` + +注册适配器的目的是将 `/ding` 这个路径挂载到程序上，并且和 DingBot 适配器关联起来。之后钉钉把收到的消息回调到 `http://xx.xxx.xxx.xxx:{port}/ding` 时，Nonebot 才知道要用什么适配器去处理该消息。 + +## 第一个命令 + +因为 Nonebot 可以根据你的命令处理函数的类型注解来选择使用什么 Adapter 进行处理，所以你如果需要使用钉钉相关的功能，你的 handler 中 `bot` 类型的注解需要是 DingBot 及其父类。 + +对于 Event 来说也是如此，Event 也可以根据标注来判断，比如一个 handler 的 event 标注位 `PrivateMessageEvent`，那这个 handler 只会处理私聊消息。 + +举个栗子： + +```python +test = on_command("test", to_me()) + + +@test.handle() +async def test_handler1(bot: DingBot, event: PrivateMessageEvent): + await test.finish("PrivateMessageEvent") + + +@test.handle() +async def test_handler2(bot: DingBot, event: GroupMessageEvent): + await test.finish("GroupMessageEvent") +``` + +这样 Nonebot 就会根据不同的类型注解使用不同的 handler 来处理消息。 + +可以查看 Nonebot 官方的这个例子：，更详细的了解一个 Bot 的结构。 + +## 多种消息格式 + +发送 markdown 消息： + +```python +@markdown.handle() +async def markdown_handler(bot: DingBot): + message = MessageSegment.markdown( + "Hello, This is NoneBot", + "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n" + ) + await markdown.finish(message) +``` + +可以按自己的需要发送原生的格式消息（需要使用 `MessageSegment` 包裹，可以很方便的实现 @ 等操作）： + +```python +@raw.handle() +async def raw_handler(bot: DingBot, event: MessageEvent): + message = MessageSegment.raw({ + "msgtype": "text", + "text": { + "content": f"@{event.senderId}，你好" + }, + }) + message += MessageSegment.atDingtalkIds(event.senderId) + await raw.send(message) +``` + +其他消息格式请查看 [钉钉适配器的 MessageSegment](https://github.com/nonebot/nonebot2/blob/dev/nonebot/adapters/ding/message.py#L8)，里面封装了很多有关消息的方法，比如 `code`、`image`、`feedCard` 等。 + +## 创建机器人并连接 + +在钉钉官方文档 [「开发企业内部机器人 -> 步骤一：创建机器人应用」](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots/title-ufs-4gh-poh) 中有详细介绍，这里就省去创建的步骤，介绍一下如何连接上程序。 + +### 本地开发机器人 + +在本地开发机器人的时候可能没有公网 IP，钉钉官方给我们提供一个 [内网穿透工具](https://developers.dingtalk.com/document/resourcedownload/http-intranet-penetration?pnamespace=app)，方便开发测试。 + +::: tip +究其根源这是一个魔改版的 ngrok，钉钉提供了一个服务器。 + +本工具不保证稳定性，仅适用于开发测试阶段，禁止当作公网域名使用。如线上应用使用本工具造成稳定性问题，后果由自己承担。如使用本工具传播违法不良信息，钉钉将追究法律责任。 +::: + +官方文档里已经讲了如何使用。我们再以 Windows（终端使用 Powershell） 为例，来演示一下。 + +1. 将仓库 clone 到本地，打开 `windows_64` 文件夹。 +2. 执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 8080` 就可以将 8080 端口暴露到公网中。 + 你访问 都会映射到 。 + +假设我们的机器人监听的端口是 `2333`，并且已经注册了钉钉适配器。那我们就执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 2333`，然后在机器人的后台设置 POST 的地址：`http://rcnb.vaiwan.com/ding`。 +这样钉钉接收到消息之后就会 POST 消息到 `http://rcnb.vaiwan.com/ding` 上，然后这个服务会把消息再转发到我们本地的开发服务器上。 + +### 生产模式 + +生产模式你的机器需要有一个公网 IP，然后到机器人的后台设置 POST 的地址就好了。 + +## 示例 + +关于钉钉机器人能做啥，你可以查看 `https://github.com/nonebot/nonebot2/blob/dev/tests/test_plugins/test_ding.py`，里面有一些例子。 diff --git a/archive/2.0.0a11/guide/end-or-start.md b/archive/2.0.0a11/guide/end-or-start.md new file mode 100644 index 00000000..9587c4bb --- /dev/null +++ b/archive/2.0.0a11/guide/end-or-start.md @@ -0,0 +1,9 @@ +# 结语 + +至此，相信你已经能够写出一个基础的插件了。这里给出几个小提示： + +- 请千万注意事件处理器的优先级设定 +- 在匹配规则中请勿使用耗时极长的函数 +- 同一个用户可以**跨群**(**私聊**)继续他的事件处理（除非做出权限限制，将在后续介绍） + +如果「指南」还不能满足你，前往 [进阶](../advanced/README.md) 查看更多的功能信息。 diff --git a/archive/2.0.0a11/guide/getting-started.md b/archive/2.0.0a11/guide/getting-started.md new file mode 100644 index 00000000..f5e61215 --- /dev/null +++ b/archive/2.0.0a11/guide/getting-started.md @@ -0,0 +1,87 @@ +# 开始使用 + +一切都安装成功后，你就已经做好了进行简单配置以运行一个最小的 NoneBot 实例的准备工作。 + +## 最小实例 + +如果你已经按照推荐方式安装了 `nb-cli`，使用它创建一个空项目： + +```bash +nb create +``` + +根据引导进行项目配置，完成后会在当前目录下创建一个项目目录，项目目录内包含 `bot.py`。 + +如果未安装 `nb-cli`，使用你最熟悉的编辑器或 IDE，创建一个名为 `bot.py` 的文件，内容如下（这里以 CQHTTP 适配器为例）： + +```python{4,6,7,10} +import nonebot +from nonebot.adapters.cqhttp import Bot as CQHTTPBot + +nonebot.init() +driver = nonebot.get_driver() +driver.register_adapter("cqhttp", CQHTTPBot) +nonebot.load_builtin_plugins() + +if __name__ == "__main__": + nonebot.run() +``` + +## 解读 + +在上方 `bot.py` 中，这几行高亮代码将依次： + +1. 使用默认配置初始化 NoneBot +2. 加载 NoneBot 内置的 CQHTTP 协议适配组件 + `register_adapter` 的第一个参数我们传入了一个字符串，该字符串将会在后文 [配置 CQHTTP 协议端](#配置-cqhttp-协议端-以-qq-为例) 时使用。 +3. 加载 NoneBot 内置的插件 +4. 在地址 `127.0.0.1:8080` 运行 NoneBot + +在命令行使用如下命令即可运行这个 NoneBot 实例： + +```bash +# nb-cli +nb run +# 其他 +python bot.py +``` + +运行后会产生如下日志： + +```plain +09-14 21:02:00 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" +09-14 21:02:00 [INFO] nonebot | Running NoneBot... +09-14 21:02:00 [INFO] uvicorn | Started server process [1234] +09-14 21:02:00 [INFO] uvicorn | Waiting for application startup. +09-14 21:02:00 [INFO] uvicorn | Application startup complete. +09-14 21:02:00 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:8080 (Press CTRL+C to quit) +``` + +## 配置协议端上报 + +在 `bot.py` 文件中使用 `register_adapter` 注册协议适配之后即可配置协议端来完成与 NoneBot 的通信，详细配置方法参考： + +- [配置 CQHTTP](./cqhttp-guide.md) +- [配置钉钉](./ding-guide.md) +- [配置 mirai-api-http](./mirai-guide.md) + +NoneBot 接受的上报地址与 `Driver` 有关，默认使用的 `FastAPI Driver` 所接受的上报地址有： + +- `/{adapter name}/`: HTTP POST 上报 +- `/{adapter name}/http/`: HTTP POST 上报 +- `/{adapter name}/ws`: WebSocket 上报 +- `/{adapter name}/ws/`: WebSocket 上报 + +:::warning 注意 +如果到这一步你没有在 NoneBot 看到连接成功日志，比较常见的出错点包括： + +- NoneBot 监听 `0.0.0.0`，然后在协议端上报配置中填了 `ws://0.0.0.0:8080/***/ws` +- 在 Docker 容器内运行协议端，并通过 `127.0.0.1` 访问宿主机上的 NoneBot +- 想从公网访问，但没有修改云服务商的安全组策略或系统防火墙 +- NoneBot 所监听的端口存在冲突，已被其它程序占用 +- 弄混了 NoneBot 的 `host`、`port` 参数与协议端上报配置中的 `host`、`port` 参数 +- `ws://` 错填为 `http://` +- 协议端或 NoneBot 启动时遭到外星武器干扰 + +请尝试重启协议端 NoneBot、更换端口、修改防火墙、重启系统、仔细阅读前面的文档及提示、更新协议端 和 NoneBot 到最新版本等方式来解决。 +::: diff --git a/archive/2.0.0a11/guide/images/Handle-Event.png b/archive/2.0.0a11/guide/images/Handle-Event.png new file mode 100644 index 0000000000000000000000000000000000000000..6546632c62c9dfee7d4f8e0ad5d2a7a082929542 GIT binary patch literal 126466 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 z zHuSyaZaZg}!X+LOdpdDN1$Z}?6&M}49`qn#(3rlv@b%lwihqvI-~aemLjCpZ&D+2ZIHJa223EOs;i^^ZDOwjQv#&s+;z1{>NxD6k zelzS3FqMxVGt6j1>>e&U8=;_{^1EZg6rgRJP2*|WT=oG!i0)lX<1aFNy$4p}L0btE zE!Z)A;D;QIOBlfOVkt&%XrZy+D>xqs0n=s(# zGuY~rH$UX$C})DEv~SZte!O+)___Dbn-9};0tf(r$bp9Mp(^fW)ry(+j~8}e^xl(`K$8C~ z8$5d%Xj0gZdL|aY5nTJg5fTODf%T9qX!XY?X8pi_&sELeQwal8VK-o>bwU`8*i*H< zIZ?0wYru!{faU$Hjea%Sq;2~LT9bL&zZ_^Qp`*S2-|P=4p6wq$@%*n`fPc{$|1Apt zEeiiba{uKN{p*ka<0Lq5e;{7ORG8MO7Y{mSBYJfW3$9hu`VOzm=fPVmX3_*wWjsme z{EI!DzKk7W6SaJc2Y)Q=4_Im8bs?1Xx6&Gzf%@a^?Bm^d_!=|9|h|KRKp@Y zFakvPnUqX#&-kQxjR)Vg;FHKJEZGJ&P0`?wRa%$z1unAUi;CU+5_B{O06ZcMSTK5n z$y^F=ll`r?I`Vg4 z9;CnXdK*;6f6BT84tl3Je73eJbiJ3>8sM~w{kym|FXb;LuFDOq@V&EdFNOayU;9vdIb&$v(!(*047j$2w(?gRCQt!}mI= z*L!?!zuWhByM6!t{DtG3^L&i!aXqf^348D3Ba{fDVi?D(zo ze$s&fC=Sa0dGJFWTu^U)&2l}XGhw}-LDln$GJbt)^%=9@Km;K(*>CXlV?bqE+>5^| z&g0iRs^mux?+Djyh73bx{e`b1JEgUW42q|y1@Yk{k6ejX9*YND2E*?X_sg+Jkwmv+ zZL6wXVuqi8Z2ySy!!NvbTiV^8mhL~9*f%{d_n33K%YCtI8j7JVpmM?f+}(DkJ}`wz zqGqVGz(^H2`k(An_}nHGuKc)8w>jo%g9M9R#X{-9)S89Tp$X`!UGN0+4QpE##)mYi^enXd_#;qv zq(+ZIBP$+}U%m@?g!1kVfhvb+`+eT+JDzfPWr^|9U;FtC@n)d-z5Tt7)v8c00OJ@v zHKS!mrGeUy#+L?dcc#iwt?w{{-IwaB+)r`BXrcm&9~g}g3;eTtjCY}^%7em8fXUM6 zAT9>=&RN22;p)lj>G;k{!y8}&86i{-ZmD_49-Iw;Mpc3WJ_fIL;-s$3Y?fmkBlXYTVXzEG1f)4pP>6tif87>@CHT= zr+EvgihK}Udvou7J`RiNWRR%M*j!I;X{8TGj=lD?+dj%4=TOQ6RoiEc`ad=tg}0*dX)1Ry}9%ADqe-%jf%keUFh{%0c%_ z3;Qf4gu2i6z41QT)&Go~a5{f6W&DKaw4P_lH>;oDKiPiUV8ah@|2}qMr0|&INSVVl zjUxN;8e&T|yMD64>#Q;!{apw1y+v9~f;&T@o3kH&2vhEtRhlTk#I|ZU?MOcmPwkjh zVCxm;C31=S;?`4Ryxfbd5ov6}mz+?i*$!6*=BmE=l;8{F!XjUYdmnZi9`qS>8YgTY&iym!GDK5lm% z|Gg|X!T!t-X4LyP173z@8BX`t%;)?5&C+DK0hnWrfP?XWSZiOwOr=deM*Gh8b*k+-6fa#4ozI}!<4^Q_umA*gmjI&a%!e8H{md|lthU+tJ9v% zD031kL~-%0KEe+=9d)JguQRxv$U1>!E^Vku#keQEkMH4 znfrHbWc*+hn@vJ&Pi3ayw>UM<1H>b}FW?~zd;fuVqA*D@*b *}eYX-4FxSv>JU5 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

*N@WS@+EN$Q;{@LQ)Z!7WSW2|_;9z|pPtZ1U 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 VK6&fZIU5*&z|+;wWt~$(698!sxRL+> literal 0 HcmV?d00001 diff --git a/archive/2.0.0a11/guide/installation.md b/archive/2.0.0a11/guide/installation.md new file mode 100644 index 00000000..aaf916ec --- /dev/null +++ b/archive/2.0.0a11/guide/installation.md @@ -0,0 +1,95 @@ +# 安装 + +## NoneBot + +:::warning 注意 +请确保你的 Python 版本 >= 3.7。 +::: + +:::warning 注意 +请在安装 NoneBot v2 之前卸载 NoneBot v1 + +```bash +pip uninstall nonebot +``` + +::: + +### (推荐安装方式)通过脚手架安装 + +1. (推荐)使用你喜欢的 Python 环境管理工具(如 `poetry`)创建新的虚拟环境 +2. 使用 `pip` 或 其他包管理工具 安装 `nb-cli`，`nonebot2` 会作为其依赖被一起安装 + + ```bash + pip install nb-cli + ``` + +3. 点个 star 吧 + + nonebot2: [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) + + nb-cli: [![nb-cli](https://img.shields.io/github/stars/nonebot/nb-cli?style=social)](https://github.com/nonebot/nb-cli) + +4. 如果有疑问，可以加群交流(点击链接直达) + + [![QQ Chat](https://img.shields.io/badge/QQ%E7%BE%A4-768887710-orange?style=social)](https://jq.qq.com/?_wv=1027&k=5OFifDh) + + [![Telegram Chat](https://img.shields.io/badge/telegram-cqhttp-blue?style=social)](https://t.me/cqhttp) + +### (纯净安装)不使用脚手架 + +```bash +pip install nonebot2 +# 也可以通过 poetry 安装 +poetry add nonebot2 +``` + +如果你需要使用最新的（可能**尚未发布**的）特性，可以直接从 GitHub 仓库安装： + +:::warning 注意 +直接从 Github 仓库中安装意味着你将使用最新提交的代码，它们并没有进行充分的稳定性测试 +在任何情况下请不要将其应用于生产环境! +::: + +```bash +# master分支 +poetry add git+https://github.com/nonebot/nonebot2.git#master +# dev分支 +poetry add git+https://github.com/nonebot/nonebot2.git#dev +``` + +或者在克隆 Git 仓库后手动安装： + +```bash +git clone https://github.com/nonebot/nonebot2.git +cd nonebot2 +poetry install --no-dev # 推荐 +pip install . # 不推荐 +``` + +## 安装插件 + +插件可以通过 `nb-cli` 进行安装，也可以自行安装并加载插件。 + +```bash +# 列出所有的插件 +nb plugin list +# 搜索插件 +nb plugin search xxx +# 安装插件 +nb plugin install xxx +``` + +如果急于上线 Bot 或想要使用现成的插件，以下插件可作为参考： + +### 官方插件 + +- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs) 离线文档插件 +- [NoneBot-Plugin-Test](https://github.com/nonebot/plugin-test) 本地机器人测试前端插件 +- [NoneBot-Plugin-APScheduler](https://github.com/nonebot/plugin-apscheduler) 定时任务插件 +- [NoneBot-Plugin-Sentry](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_sentry) Sentry 在线日志分析插件 +- [NoneBot-Plugin-Status](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status) 服务器状态查看插件 + +### 其他插件 + +还有更多的插件在 [这里](/plugin-store.md) 等着你发现～ diff --git a/archive/2.0.0a11/guide/loading-a-plugin.md b/archive/2.0.0a11/guide/loading-a-plugin.md new file mode 100644 index 00000000..e3c7af2f --- /dev/null +++ b/archive/2.0.0a11/guide/loading-a-plugin.md @@ -0,0 +1,125 @@ +# 加载插件 + +在 [创建一个完整的项目](creating-a-project) 一章节中，我们已经创建了插件目录 `awesome_bot/plugins`，现在我们在机器人入口文件中加载它。当然，你也可以单独加载一个插件。 + +## 加载内置插件 + +在 `bot.py` 文件中添加以下行： + +```python{8} +import nonebot +from nonebot.adapters.cqhttp import Bot + +nonebot.init() + +driver = nonebot.get_driver() +driver.register_adapter("cqhttp", Bot) # 注册 CQHTTP 的 Adapter +nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 + +app = nonebot.get_asgi() + +if __name__ == "__main__": + nonebot.run() +``` + +::: warning +目前, 内建插件仅支持 CQHTTP 的 Adapter + +如果您使用的是其他 Adapter, 请移步该 Adapter 相应的文档 +::: + +这将会加载 nonebot 内置的插件，它包含： + +- 命令 `say`：可由**superuser**使用，可以将消息内容由特殊纯文本转为富文本 +- 命令 `echo`：可由任何人使用，将消息原样返回 + +以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../api/rule.md#to-me) + +## 加载插件目录 + +在 `bot.py` 文件中添加以下行： + +```python{5} +import nonebot + +nonebot.init() +# 加载插件目录，该目录下为各插件，以下划线开头的插件将不会被加载 +nonebot.load_plugins("awesome_bot/plugins") + +app = nonebot.get_asgi() + +if __name__ == "__main__": + nonebot.run() +``` + +:::tip 提示 +加载插件目录时，目录下以 `_` 下划线开头的插件将不会被加载！ +::: + +:::warning 提示 +**不能存在相同名称的插件！** +::: + +:::danger 警告 +插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../advanced/export-and-require.md) +::: + +## 加载单个插件 + +在 `bot.py` 文件中添加以下行： + +```python{5,7} +import nonebot + +nonebot.init() +# 加载一个 pip 安装的插件 +nonebot.load_plugin("nonebot_plugin_status") +# 加载本地的单独插件 +nonebot.load_plugin("awesome_bot.plugins.xxx") + +app = nonebot.get_asgi() + +if __name__ == "__main__": + nonebot.run() +``` + +## 子插件(嵌套插件) + +在插件中同样可以加载子插件，例如如下插件目录结构： + + +:::vue +foo_plugin +├── `plugins` +│ ├── `sub_plugin1` +│ │ └── \_\_init\_\_.py +│ └── `sub_plugin2.py` +├── `__init__.py` +└── config.py +::: + + +在插件目录下的 `__init__.py` 中添加如下代码： + +```python +from pathlib import Path + +import nonebot + +# store all subplugins +_sub_plugins = set() +# load sub plugins +_sub_plugins |= nonebot.load_plugins( + str((Path(__file__).parent / "plugins").resolve())) +``` + +插件将会被加载并存储于 `_sub_plugins` 中。 + +## 运行结果 + +尝试运行 `nb run` 或者 `python bot.py`，可以看到日志输出了类似如下内容： + +```plain +09-19 21:51:59 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" +09-19 21:51:59 [INFO] nonebot | Succeeded to import "plugin_in_folder" +``` diff --git a/archive/2.0.0a11/guide/mirai-guide.md b/archive/2.0.0a11/guide/mirai-guide.md new file mode 100644 index 00000000..c22631e0 --- /dev/null +++ b/archive/2.0.0a11/guide/mirai-guide.md @@ -0,0 +1,228 @@ +# Mirai-API-HTTP 协议使用指南 + +::: warning + +Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充分的测试 + +在生产环境中请谨慎使用 + +::: + +::: tip + +为了你的使用之旅更加顺畅, 我们建议您在配置之前具有以下的前置知识 + +- 对服务端/客户端(C/S)模型的基本了解 +- 对 Web 服务配置基础的认知 +- 对`YAML`语法的一点点了解 + +::: + +::: danger + +Mirai-API-HTTP 的适配器以 [AGPLv3 许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 + +这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** + +::: + +**为了便捷起见, 以下内容均以缩写 `MAH` 代替 `mirai-api-http`** + +## 配置 MAH 客户端 + +正如你可能刚刚在[CQHTTP 协议使用指南](./cqhttp-guide.md)中所读到的: + +> 单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 + +这次, 我们将采用在实现上有别于 OneBot（CQHTTP）协议的另外一种无头 QQ API 协议, 即 MAH + +为了配置 MAH 端, 我们现在需要移步到[MAH 的项目地址](https://github.com/project-mirai/mirai-api-http), 来看看它是如何配置的 + +根据[项目提供的 README](https://github.com/project-mirai/mirai-api-http/blob/056beedba31d6ad06426997a1d3fde861a7f8ba3/README.md),配置 MAH 大概需要以下几步 + +1. 下载并安装 Java 运行环境, 你可以有以下几种选择: + + - [由 Oracle 提供的 Java 运行环境](https://java.com/zh-CN/download/manual.jsp) **在没有特殊需求的情况下推荐** + - [由 Zulu 编译的 OpenJRE 环境](https://www.azul.com/downloads/zulu-community/?version=java-8-lts&architecture=x86-64-bit&package=jre) + +2. 下载[Mirai Console Loader](https://github.com/iTXTech/mirai-console-loader) + + - 请按照文档 README 中的步骤下载并安装 + +3. 安装 MAH: + + - 在 Mirai Console Loader 目录下执行该指令 + + - ```shell + ./mcl --update-package net.mamoe:mirai-api-http --channel stable --type plugin + ``` + + 注意: 该指令的前缀`./mcl`可能根据操作系统以及使用 java 环境的不同而变化 + +4. 修改配置文件 + + ::: tip + + 在此之前, 你可能需要了解我们为 MAH 设计的两种通信方式 + + - 正向 Websocket + - NoneBot 作为纯粹的客户端,通过 websocket 监听事件下发 + - 优势 + 1. 网络配置简单, 特别是在使用 Docker 等网络隔离的容器时 + 2. 在初步测试中连接性较好 + - 劣势 + 1. 与 NoneBot 本身的架构不同, 可能稳定性较差 + 2. 需要在注册 adapter 时显式指定 qq, 对于需要开源的程序来讲不利 + - POST 消息上报 + - NoneBot 在接受消息上报时作为服务端, 发送消息时作为客户端 + - 优势 + 1. 与 NoneBot 本身架构相符, 性能和稳定性较强 + 2. 无需在任何地方指定 QQ, 即插即用 + - 劣势 + 1. 由于同时作为客户端和服务端, 配置较为复杂 + 2. 在测试中网络连接性较差 (未确认原因) + + ::: + + - 这是当使用正向 Websocket 时的配置举例 + + - MAH 的`setting.yml`文件 + + - ```yaml + # 省略了部分无需修改的部分 + + host: "0.0.0.0" # 监听地址 + port: 8080 # 监听端口 + authKey: 1234567890 # 访问密钥, 最少八位 + enableWebsocket: true # 必须为true + ``` + + - `.env`文件 + + - ```shell + MIRAI_AUTH_KEY=1234567890 + MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 + MIRAI_PORT=8080 # MAH的监听端口 + ``` + + - `bot.py`文件 + + - ```python + import nonebot + from nonebot.adapters.mirai import WebsocketBot + + nonebot.init() + nonebot.get_driver().register_adapter('mirai-ws', WebsocketBot, qq=12345678) # qq参数需要填在mah中登录的qq + nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 + nonebot.run() + ``` + + - 这是当使用 POST 消息上报时的配置文件 + + - MAH 的`setting.yml`文件 + + - ```yaml + # 省略了部分无需修改的部分 + + host: '0.0.0.0' # 监听地址 + port: 8080 # 监听端口 + authKey: 1234567890 # 访问密钥, 最少八位 + + ## 消息上报 + report: + enable: true # 必须为true + groupMessage: + report: true # 群消息上报 + friendMessage: + report: true # 好友消息上报 + tempMessage: + report: true # 临时会话上报 + eventMessage: + report: true # 事件上报 + destinations: + - 'http://127.0.0.1:2333/mirai/http' #上报地址, 请按照实际情况修改 + # 上报时的额外Header + extraHeaders: {} + ``` + + - `.env`文件 + + - ```shell + HOST=127.0.0.1 # 当MAH运行在本机时 + PORT=2333 + + MIRAI_AUTH_KEY=1234567890 + MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 + MIRAI_PORT=8080 # MAH的监听端口 + ``` + + - `bot.py`文件 + + - ```python + import nonebot + from nonebot.adapters.mirai import Bot + + nonebot.init() + nonebot.get_driver().register_adapter('mirai', Bot) + nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 + nonebot.run() + ``` + +## 历史性的第一次对话 + +现在, 先启动 NoneBot, 再启动 MAH + +如果你的配置文件一切正常, 你将在控制台看到类似于下列的日志 + +```log +02-01 18:25:12 [INFO] nonebot | NoneBot is initializing... +02-01 18:25:12 [INFO] nonebot | Current Env: prod +02-01 18:25:12 [DEBUG] nonebot | Loaded Config: {'driver': 'nonebot.drivers.fastapi', 'host': IPv4Address('127.0.0.1'), 'port': 8080, 'debug': True, 'api_root': {}, 'api_timeout': 30.0, 'access_token': None, 'secret': None, 'superusers': set(), 'nickname': set(), 'command_start': {'/'}, 'command_sep': {'.'}, 'session_expire_timeout': datetime.timedelta(seconds=120), 'mirai_port': 8080, 'environment': 'prod', 'mirai_auth_key': 12345678, 'mirai_host': '127.0.0.1'} +02-01 18:25:12 [DEBUG] nonebot | Succeeded to load adapter "mirai" +02-01 18:25:12 [INFO] nonebot | Succeeded to import "nonebot.plugins.echo" +02-01 18:25:12 [INFO] nonebot | Running NoneBot... +02-01 18:25:12 [DEBUG] nonebot | Loaded adapters: mirai +02-01 18:25:12 [INFO] uvicorn | Started server process [183155] +02-01 18:25:12 [INFO] uvicorn | Waiting for application startup. +02-01 18:25:12 [INFO] uvicorn | Application startup complete. +02-01 18:25:12 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:2333 (Press CTRL+C to quit) +02-01 18:25:14 [INFO] uvicorn | 127.0.0.1:37794 - "POST /mirai/http HTTP/1.1" 204 +02-01 18:25:14 [DEBUG] nonebot | MIRAI | received message {'type': 'BotOnlineEvent', 'qq': 1234567} +02-01 18:25:14 [INFO] nonebot | MIRAI 1234567 | [BotOnlineEvent]: {'self_id': 1234567, 'type': 'BotOnlineEvent', 'qq': 1234567} +02-01 18:25:14 [DEBUG] nonebot | Checking for matchers in priority 1... +``` + +恭喜你, 你的配置已经成功! + +现在, 我们可以写一个简单的插件来测试一下 + +```python +from nonebot.plugin import on_keyword, on_command +from nonebot.rule import to_me +from nonebot.adapters.mirai import Bot, MessageEvent + +message_test = on_keyword({'reply'}, rule=to_me()) + + +@message_test.handle() +async def _message(bot: Bot, event: MessageEvent): + text = event.get_plaintext() + await bot.send(event, text, at_sender=True) + + +command_test = on_command('miecho') + + +@command_test.handle() +async def _echo(bot: Bot, event: MessageEvent): + text = event.get_plaintext() + await bot.send(event, text, at_sender=True) +``` + +它具有两种行为 + +- 在指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称的情况下 (即 [Rule: to_me](../api/rule.md#to-me)), 如果消息内包含 `reply` 字段, 则该消息会被机器人重复一次 + +- 在执行指令`miecho xxx`时, 机器人会发送回参数`xxx` + +至此, 你已经初步掌握了如何使用 Mirai Adapter diff --git a/archive/2.0.0a11/sidebar.config.json b/archive/2.0.0a11/sidebar.config.json new file mode 100644 index 00000000..8b16881e --- /dev/null +++ b/archive/2.0.0a11/sidebar.config.json @@ -0,0 +1,180 @@ +{ + "sidebar": {}, + "locales": { + "/": { + "label": "简体中文", + "selectText": "Languages", + "editLinkText": "在 GitHub 上编辑此页", + "lastUpdated": "上次更新", + "nav": [ + { + "text": "主页", + "link": "/" + }, + { + "text": "指南", + "link": "/guide/" + }, + { + "text": "进阶", + "link": "/advanced/" + }, + { + "text": "API", + "link": "/api/" + }, + { + "text": "商店", + "link": "/store" + }, + { + "text": "更新日志", + "link": "/changelog" + } + ], + "sidebarDepth": 2, + "sidebar": { + "/guide/": [ + { + "title": "开始", + "collapsable": false, + "sidebar": "auto", + "children": [ + "", + "installation", + "getting-started", + "creating-a-project", + "basic-configuration" + ] + }, + { + "title": "编写插件", + "collapsable": false, + "sidebar": "auto", + "children": [ + "loading-a-plugin", + "creating-a-plugin", + "creating-a-matcher", + "creating-a-handler", + "end-or-start" + ] + }, + { + "title": "协议适配", + "collapsable": false, + "sidebar": "auto", + "children": [ + "cqhttp-guide", + "ding-guide", + "mirai-guide" + ] + } + ], + "/advanced/": [ + { + "title": "进阶", + "collapsable": false, + "sidebar": "auto", + "children": [ + "", + "scheduler", + "permission", + "runtime-hook", + "export-and-require", + "overloaded-handlers" + ] + }, + { + "title": "发布", + "collapsable": false, + "sidebar": "auto", + "children": [ + "publish-plugin" + ] + } + ], + "/api/": [ + { + "title": "NoneBot Api Reference", + "path": "", + "collapsable": false, + "children": [ + { + "title": "nonebot 模块", + "path": "nonebot" + }, + { + "title": "nonebot.config 模块", + "path": "config" + }, + { + "title": "nonebot.plugin 模块", + "path": "plugin" + }, + { + "title": "nonebot.message 模块", + "path": "message" + }, + { + "title": "nonebot.matcher 模块", + "path": "matcher" + }, + { + "title": "nonebot.rule 模块", + "path": "rule" + }, + { + "title": "nonebot.permission 模块", + "path": "permission" + }, + { + "title": "nonebot.log 模块", + "path": "log" + }, + { + "title": "nonebot.utils 模块", + "path": "utils" + }, + { + "title": "nonebot.typing 模块", + "path": "typing" + }, + { + "title": "nonebot.exception 模块", + "path": "exception" + }, + { + "title": "nonebot.drivers 模块", + "path": "drivers/" + }, + { + "title": "nonebot.drivers.fastapi 模块", + "path": "drivers/fastapi" + }, + { + "title": "nonebot.drivers.quart 模块", + "path": "drivers/quart" + }, + { + "title": "nonebot.adapters 模块", + "path": "adapters/" + }, + { + "title": "nonebot.adapters.cqhttp 模块", + "path": "adapters/cqhttp" + }, + { + "title": "nonebot.adapters.ding 模块", + "path": "adapters/ding" + }, + { + "title": "nonebot.adapters.mirai 模块", + "path": "adapters/mirai" + } + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/docs/.vuepress/versions.json b/docs/.vuepress/versions.json index 6744a990..a171912c 100644 --- a/docs/.vuepress/versions.json +++ b/docs/.vuepress/versions.json @@ -1,4 +1,5 @@ [ + "2.0.0a11", "2.0.0a10", "2.0.0a8.post2", "2.0.0a7" From 46795ecd4b5864be1c6f2a9bb2194d697040f703 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 5 Mar 2021 20:09:42 +0800 Subject: [PATCH 22/24] :pushpin: update lock file --- packages/nonebot-adapter-cqhttp/poetry.lock | 136 +++++++++++++----- .../nonebot-adapter-cqhttp/pyproject.toml | 4 +- packages/nonebot-adapter-ding/poetry.lock | 136 +++++++++++++----- packages/nonebot-adapter-ding/pyproject.toml | 4 +- packages/nonebot-adapter-mirai/poetry.lock | 136 +++++++++++++----- packages/nonebot-adapter-mirai/pyproject.toml | 4 +- packages/nonebot-plugin-docs/pyproject.toml | 2 +- poetry.lock | 64 ++++----- pyproject.toml | 2 +- 9 files changed, 331 insertions(+), 157 deletions(-) diff --git a/packages/nonebot-adapter-cqhttp/poetry.lock b/packages/nonebot-adapter-cqhttp/poetry.lock index 1bea9aa8..ca160ee8 100644 --- a/packages/nonebot-adapter-cqhttp/poetry.lock +++ b/packages/nonebot-adapter-cqhttp/poetry.lock @@ -62,11 +62,11 @@ reference = "aliyun" [[package]] name = "h11" -version = "0.9.0" +version = "0.12.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [package.source] type = "legacy" @@ -167,7 +167,7 @@ reference = "aliyun" [[package]] name = "nonebot2" -version = "2.0.0a11" +version = "2.0.0-alpha.11" description = "An asynchronous python bot framework." category = "main" optional = false @@ -177,10 +177,10 @@ develop = true [package.dependencies] fastapi = "^0.63.0" loguru = "^0.5.1" -pydantic = {version = "~1.8.0", extras = ["dotenv", "typing_extensions"]} +pydantic = {version = "~1.8.0", extras = ["dotenv"]} pygtrie = "^2.4.1" tomlkit = "^0.7.0" -uvicorn = "^0.11.5" +uvicorn = {version = "^0.13.0", extras = ["standard"]} [package.extras] quart = ["Quart (>=0.14.1,<0.15.0)"] @@ -192,7 +192,7 @@ url = "../.." [[package]] name = "pydantic" -version = "1.8" +version = "1.8.1" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false @@ -240,6 +240,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "pyyaml" +version = "5.4.1" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "rfc3986" version = "1.4.0" @@ -316,7 +329,7 @@ reference = "aliyun" [[package]] name = "uvicorn" -version = "0.11.8" +version = "0.13.4" description = "The lightning-fast ASGI server." category = "main" optional = false @@ -324,13 +337,18 @@ python-versions = "*" [package.dependencies] click = ">=7.0.0,<8.0.0" -h11 = ">=0.8,<0.10" -httptools = {version = ">=0.1.0,<0.2.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -uvloop = {version = ">=0.14.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -websockets = ">=8.0.0,<9.0.0" +colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} +h11 = ">=0.8" +httptools = {version = ">=0.1.0,<0.2.0", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} +PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} +websockets = {version = ">=8.0.0,<9.0.0", optional = true, markers = "extra == \"standard\""} [package.extras] -watchgodreload = ["watchgod (>=0.6,<0.7)"] +standard = ["websockets (>=8.0.0,<9.0.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "httptools (>=0.1.0,<0.2.0)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] [package.source] type = "legacy" @@ -355,6 +373,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "watchgod" +version = "0.7" +description = "Simple, modern file watching and code reload in python." +category = "main" +optional = false +python-versions = ">=3.5" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "websockets" version = "8.1" @@ -387,7 +418,7 @@ reference = "aliyun" [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "ae76a0cd32e545123a695be630a2ca223a84f59e660d858b69940a3281957068" +content-hash = "8110a56337b3ca1557700161e09ff2d74720b5897f0fac09c4ac5038495194d9" [metadata.files] certifi = [ @@ -407,8 +438,8 @@ fastapi = [ {file = "fastapi-0.63.0.tar.gz", hash = "sha256:63c4592f5ef3edf30afa9a44fa7c6b7ccb20e0d3f68cd9eba07b44d552058dcb"}, ] h11 = [ - {file = "h11-0.9.0-py2.py3-none-any.whl", hash = "sha256:4bc6d6a1238b7615b266ada57e0618568066f57dd6fa967d1290ec9309b2f2f1"}, - {file = "h11-0.9.0.tar.gz", hash = "sha256:33d4bca7be0fa039f4e84d50ab00531047e53d6ee8ffbc83501ea602c169cae1"}, + {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, + {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] httpcore = [ {file = "httpcore-0.12.3-py3-none-any.whl", hash = "sha256:93e822cd16c32016b414b789aeff4e855d0ccbfc51df563ee34d4dbadbb3bcdc"}, @@ -442,28 +473,28 @@ loguru = [ ] nonebot2 = [] pydantic = [ - {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, - {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, - {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, - {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, - {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, - {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, - {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, - {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, - {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, - {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, - {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, - {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, + {file = "pydantic-1.8.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:0c40162796fc8d0aa744875b60e4dc36834db9f2a25dbf9ba9664b1915a23850"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:fff29fe54ec419338c522b908154a2efabeee4f483e48990f87e189661f31ce3"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:fbfb608febde1afd4743c6822c19060a8dbdd3eb30f98e36061ba4973308059e"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:eb8ccf12295113ce0de38f80b25f736d62f0a8d87c6b88aca645f168f9c78771"}, + {file = "pydantic-1.8.1-cp36-cp36m-win_amd64.whl", hash = "sha256:20d42f1be7c7acc352b3d09b0cf505a9fab9deb93125061b376fbe1f06a5459f"}, + {file = "pydantic-1.8.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dde4ca368e82791de97c2ec019681ffb437728090c0ff0c3852708cf923e0c7d"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:3bbd023c981cbe26e6e21c8d2ce78485f85c2e77f7bab5ec15b7d2a1f491918f"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:830ef1a148012b640186bf4d9789a206c56071ff38f2460a32ae67ca21880eb8"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:fb77f7a7e111db1832ae3f8f44203691e15b1fa7e5a1cb9691d4e2659aee41c4"}, + {file = "pydantic-1.8.1-cp37-cp37m-win_amd64.whl", hash = "sha256:3bcb9d7e1f9849a6bdbd027aabb3a06414abd6068cb3b21c49427956cce5038a"}, + {file = "pydantic-1.8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2287ebff0018eec3cc69b1d09d4b7cebf277726fa1bd96b45806283c1d808683"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:4bbc47cf7925c86a345d03b07086696ed916c7663cb76aa409edaa54546e53e2"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:6388ef4ef1435364c8cc9a8192238aed030595e873d8462447ccef2e17387125"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:dd4888b300769ecec194ca8f2699415f5f7760365ddbe243d4fd6581485fa5f0"}, + {file = "pydantic-1.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:8fbb677e4e89c8ab3d450df7b1d9caed23f254072e8597c33279460eeae59b99"}, + {file = "pydantic-1.8.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2f2736d9a996b976cfdfe52455ad27462308c9d3d0ae21a2aa8b4cd1a78f47b9"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:3114d74329873af0a0e8004627f5389f3bb27f956b965ddd3e355fe984a1789c"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:258576f2d997ee4573469633592e8b99aa13bda182fcc28e875f866016c8e07e"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:c17a0b35c854049e67c68b48d55e026c84f35593c66d69b278b8b49e2484346f"}, + {file = "pydantic-1.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:e8bc082afef97c5fd3903d05c6f7bb3a6af9fc18631b4cc9fedeb4720efb0c58"}, + {file = "pydantic-1.8.1-py3-none-any.whl", hash = "sha256:e3f8790c47ac42549dc8b045a67b0ca371c7f66e73040d0197ce6172b385e520"}, + {file = "pydantic-1.8.1.tar.gz", hash = "sha256:26cf3cb2e68ec6c0cfcb6293e69fb3450c5fd1ace87f46b64f678b0d29eac4c3"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -472,6 +503,29 @@ python-dotenv = [ {file = "python-dotenv-0.15.0.tar.gz", hash = "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"}, {file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"}, ] +pyyaml = [ + {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, + {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, + {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, + {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, + {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, + {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, + {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, + {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, + {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, + {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, + {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, +] rfc3986 = [ {file = "rfc3986-1.4.0-py2.py3-none-any.whl", hash = "sha256:af9147e9aceda37c91a05f4deb128d4b4b49d6b199775fd2d2927768abdc8f50"}, {file = "rfc3986-1.4.0.tar.gz", hash = "sha256:112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d"}, @@ -494,8 +548,8 @@ typing-extensions = [ {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, ] uvicorn = [ - {file = "uvicorn-0.11.8-py3-none-any.whl", hash = "sha256:4b70ddb4c1946e39db9f3082d53e323dfd50634b95fd83625d778729ef1730ef"}, - {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, + {file = "uvicorn-0.13.4-py3-none-any.whl", hash = "sha256:7587f7b08bd1efd2b9bad809a3d333e972f1d11af8a5e52a9371ee3a5de71524"}, + {file = "uvicorn-0.13.4.tar.gz", hash = "sha256:3292251b3c7978e8e4a7868f4baf7f7f7bb7e40c759ecc125c37e99cdea34202"}, ] uvloop = [ {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, @@ -509,6 +563,10 @@ uvloop = [ {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] +watchgod = [ + {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, + {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, +] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, {file = "websockets-8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:3db87421956f1b0779a7564915875ba774295cc86e81bc671631379371af1170"}, diff --git a/packages/nonebot-adapter-cqhttp/pyproject.toml b/packages/nonebot-adapter-cqhttp/pyproject.toml index 18e77b28..3101ec67 100644 --- a/packages/nonebot-adapter-cqhttp/pyproject.toml +++ b/packages/nonebot-adapter-cqhttp/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-adapter-cqhttp" -version = "2.0.0a10" +version = "2.0.0-alpha.11" description = "OneBot(CQHTTP) adapter for nonebot2" authors = ["yanyongyu "] license = "MIT" @@ -24,7 +24,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.7.3" httpx = "^0.17.0" -nonebot2 = "^2.0.0-alpha.10" +nonebot2 = "^2.0.0-alpha.11" [tool.poetry.dev-dependencies] nonebot2 = { path = "../../", develop = true } diff --git a/packages/nonebot-adapter-ding/poetry.lock b/packages/nonebot-adapter-ding/poetry.lock index 1bea9aa8..ca160ee8 100644 --- a/packages/nonebot-adapter-ding/poetry.lock +++ b/packages/nonebot-adapter-ding/poetry.lock @@ -62,11 +62,11 @@ reference = "aliyun" [[package]] name = "h11" -version = "0.9.0" +version = "0.12.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [package.source] type = "legacy" @@ -167,7 +167,7 @@ reference = "aliyun" [[package]] name = "nonebot2" -version = "2.0.0a11" +version = "2.0.0-alpha.11" description = "An asynchronous python bot framework." category = "main" optional = false @@ -177,10 +177,10 @@ develop = true [package.dependencies] fastapi = "^0.63.0" loguru = "^0.5.1" -pydantic = {version = "~1.8.0", extras = ["dotenv", "typing_extensions"]} +pydantic = {version = "~1.8.0", extras = ["dotenv"]} pygtrie = "^2.4.1" tomlkit = "^0.7.0" -uvicorn = "^0.11.5" +uvicorn = {version = "^0.13.0", extras = ["standard"]} [package.extras] quart = ["Quart (>=0.14.1,<0.15.0)"] @@ -192,7 +192,7 @@ url = "../.." [[package]] name = "pydantic" -version = "1.8" +version = "1.8.1" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false @@ -240,6 +240,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "pyyaml" +version = "5.4.1" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "rfc3986" version = "1.4.0" @@ -316,7 +329,7 @@ reference = "aliyun" [[package]] name = "uvicorn" -version = "0.11.8" +version = "0.13.4" description = "The lightning-fast ASGI server." category = "main" optional = false @@ -324,13 +337,18 @@ python-versions = "*" [package.dependencies] click = ">=7.0.0,<8.0.0" -h11 = ">=0.8,<0.10" -httptools = {version = ">=0.1.0,<0.2.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -uvloop = {version = ">=0.14.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -websockets = ">=8.0.0,<9.0.0" +colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} +h11 = ">=0.8" +httptools = {version = ">=0.1.0,<0.2.0", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} +PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} +websockets = {version = ">=8.0.0,<9.0.0", optional = true, markers = "extra == \"standard\""} [package.extras] -watchgodreload = ["watchgod (>=0.6,<0.7)"] +standard = ["websockets (>=8.0.0,<9.0.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "httptools (>=0.1.0,<0.2.0)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] [package.source] type = "legacy" @@ -355,6 +373,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "watchgod" +version = "0.7" +description = "Simple, modern file watching and code reload in python." +category = "main" +optional = false +python-versions = ">=3.5" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "websockets" version = "8.1" @@ -387,7 +418,7 @@ reference = "aliyun" [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "ae76a0cd32e545123a695be630a2ca223a84f59e660d858b69940a3281957068" +content-hash = "8110a56337b3ca1557700161e09ff2d74720b5897f0fac09c4ac5038495194d9" [metadata.files] certifi = [ @@ -407,8 +438,8 @@ fastapi = [ {file = "fastapi-0.63.0.tar.gz", hash = "sha256:63c4592f5ef3edf30afa9a44fa7c6b7ccb20e0d3f68cd9eba07b44d552058dcb"}, ] h11 = [ - {file = "h11-0.9.0-py2.py3-none-any.whl", hash = "sha256:4bc6d6a1238b7615b266ada57e0618568066f57dd6fa967d1290ec9309b2f2f1"}, - {file = "h11-0.9.0.tar.gz", hash = "sha256:33d4bca7be0fa039f4e84d50ab00531047e53d6ee8ffbc83501ea602c169cae1"}, + {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, + {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] httpcore = [ {file = "httpcore-0.12.3-py3-none-any.whl", hash = "sha256:93e822cd16c32016b414b789aeff4e855d0ccbfc51df563ee34d4dbadbb3bcdc"}, @@ -442,28 +473,28 @@ loguru = [ ] nonebot2 = [] pydantic = [ - {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, - {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, - {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, - {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, - {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, - {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, - {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, - {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, - {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, - {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, - {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, - {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, + {file = "pydantic-1.8.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:0c40162796fc8d0aa744875b60e4dc36834db9f2a25dbf9ba9664b1915a23850"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:fff29fe54ec419338c522b908154a2efabeee4f483e48990f87e189661f31ce3"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:fbfb608febde1afd4743c6822c19060a8dbdd3eb30f98e36061ba4973308059e"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:eb8ccf12295113ce0de38f80b25f736d62f0a8d87c6b88aca645f168f9c78771"}, + {file = "pydantic-1.8.1-cp36-cp36m-win_amd64.whl", hash = "sha256:20d42f1be7c7acc352b3d09b0cf505a9fab9deb93125061b376fbe1f06a5459f"}, + {file = "pydantic-1.8.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dde4ca368e82791de97c2ec019681ffb437728090c0ff0c3852708cf923e0c7d"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:3bbd023c981cbe26e6e21c8d2ce78485f85c2e77f7bab5ec15b7d2a1f491918f"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:830ef1a148012b640186bf4d9789a206c56071ff38f2460a32ae67ca21880eb8"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:fb77f7a7e111db1832ae3f8f44203691e15b1fa7e5a1cb9691d4e2659aee41c4"}, + {file = "pydantic-1.8.1-cp37-cp37m-win_amd64.whl", hash = "sha256:3bcb9d7e1f9849a6bdbd027aabb3a06414abd6068cb3b21c49427956cce5038a"}, + {file = "pydantic-1.8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2287ebff0018eec3cc69b1d09d4b7cebf277726fa1bd96b45806283c1d808683"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:4bbc47cf7925c86a345d03b07086696ed916c7663cb76aa409edaa54546e53e2"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:6388ef4ef1435364c8cc9a8192238aed030595e873d8462447ccef2e17387125"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:dd4888b300769ecec194ca8f2699415f5f7760365ddbe243d4fd6581485fa5f0"}, + {file = "pydantic-1.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:8fbb677e4e89c8ab3d450df7b1d9caed23f254072e8597c33279460eeae59b99"}, + {file = "pydantic-1.8.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2f2736d9a996b976cfdfe52455ad27462308c9d3d0ae21a2aa8b4cd1a78f47b9"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:3114d74329873af0a0e8004627f5389f3bb27f956b965ddd3e355fe984a1789c"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:258576f2d997ee4573469633592e8b99aa13bda182fcc28e875f866016c8e07e"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:c17a0b35c854049e67c68b48d55e026c84f35593c66d69b278b8b49e2484346f"}, + {file = "pydantic-1.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:e8bc082afef97c5fd3903d05c6f7bb3a6af9fc18631b4cc9fedeb4720efb0c58"}, + {file = "pydantic-1.8.1-py3-none-any.whl", hash = "sha256:e3f8790c47ac42549dc8b045a67b0ca371c7f66e73040d0197ce6172b385e520"}, + {file = "pydantic-1.8.1.tar.gz", hash = "sha256:26cf3cb2e68ec6c0cfcb6293e69fb3450c5fd1ace87f46b64f678b0d29eac4c3"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -472,6 +503,29 @@ python-dotenv = [ {file = "python-dotenv-0.15.0.tar.gz", hash = "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"}, {file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"}, ] +pyyaml = [ + {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, + {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, + {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, + {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, + {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, + {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, + {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, + {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, + {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, + {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, + {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, +] rfc3986 = [ {file = "rfc3986-1.4.0-py2.py3-none-any.whl", hash = "sha256:af9147e9aceda37c91a05f4deb128d4b4b49d6b199775fd2d2927768abdc8f50"}, {file = "rfc3986-1.4.0.tar.gz", hash = "sha256:112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d"}, @@ -494,8 +548,8 @@ typing-extensions = [ {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, ] uvicorn = [ - {file = "uvicorn-0.11.8-py3-none-any.whl", hash = "sha256:4b70ddb4c1946e39db9f3082d53e323dfd50634b95fd83625d778729ef1730ef"}, - {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, + {file = "uvicorn-0.13.4-py3-none-any.whl", hash = "sha256:7587f7b08bd1efd2b9bad809a3d333e972f1d11af8a5e52a9371ee3a5de71524"}, + {file = "uvicorn-0.13.4.tar.gz", hash = "sha256:3292251b3c7978e8e4a7868f4baf7f7f7bb7e40c759ecc125c37e99cdea34202"}, ] uvloop = [ {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, @@ -509,6 +563,10 @@ uvloop = [ {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] +watchgod = [ + {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, + {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, +] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, {file = "websockets-8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:3db87421956f1b0779a7564915875ba774295cc86e81bc671631379371af1170"}, diff --git a/packages/nonebot-adapter-ding/pyproject.toml b/packages/nonebot-adapter-ding/pyproject.toml index 0bfd589d..69e9d4b3 100644 --- a/packages/nonebot-adapter-ding/pyproject.toml +++ b/packages/nonebot-adapter-ding/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-adapter-ding" -version = "2.0.0a10" +version = "2.0.0-alpha.11" description = "Ding adapter for nonebot2" authors = ["Artin ", "yanyongyu "] license = "MIT" @@ -24,7 +24,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.7.3" httpx = "^0.17.0" -nonebot2 = "^2.0.0-alpha.10" +nonebot2 = "^2.0.0-alpha.11" [tool.poetry.dev-dependencies] nonebot2 = { path = "../../", develop = true } diff --git a/packages/nonebot-adapter-mirai/poetry.lock b/packages/nonebot-adapter-mirai/poetry.lock index 1f2d7be3..8178a3bf 100644 --- a/packages/nonebot-adapter-mirai/poetry.lock +++ b/packages/nonebot-adapter-mirai/poetry.lock @@ -62,11 +62,11 @@ reference = "aliyun" [[package]] name = "h11" -version = "0.9.0" +version = "0.12.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [package.source] type = "legacy" @@ -167,7 +167,7 @@ reference = "aliyun" [[package]] name = "nonebot2" -version = "2.0.0a11" +version = "2.0.0-alpha.11" description = "An asynchronous python bot framework." category = "main" optional = false @@ -177,10 +177,10 @@ develop = true [package.dependencies] fastapi = "^0.63.0" loguru = "^0.5.1" -pydantic = {version = "~1.8.0", extras = ["dotenv", "typing_extensions"]} +pydantic = {version = "~1.8.0", extras = ["dotenv"]} pygtrie = "^2.4.1" tomlkit = "^0.7.0" -uvicorn = "^0.11.5" +uvicorn = {version = "^0.13.0", extras = ["standard"]} [package.extras] quart = ["Quart (>=0.14.1,<0.15.0)"] @@ -192,7 +192,7 @@ url = "../.." [[package]] name = "pydantic" -version = "1.8" +version = "1.8.1" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false @@ -240,6 +240,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "pyyaml" +version = "5.4.1" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "rfc3986" version = "1.4.0" @@ -316,7 +329,7 @@ reference = "aliyun" [[package]] name = "uvicorn" -version = "0.11.8" +version = "0.13.4" description = "The lightning-fast ASGI server." category = "main" optional = false @@ -324,13 +337,18 @@ python-versions = "*" [package.dependencies] click = ">=7.0.0,<8.0.0" -h11 = ">=0.8,<0.10" -httptools = {version = ">=0.1.0,<0.2.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -uvloop = {version = ">=0.14.0", markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\""} -websockets = ">=8.0.0,<9.0.0" +colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} +h11 = ">=0.8" +httptools = {version = ">=0.1.0,<0.2.0", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} +PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} +websockets = {version = ">=8.0.0,<9.0.0", optional = true, markers = "extra == \"standard\""} [package.extras] -watchgodreload = ["watchgod (>=0.6,<0.7)"] +standard = ["websockets (>=8.0.0,<9.0.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "httptools (>=0.1.0,<0.2.0)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] [package.source] type = "legacy" @@ -355,6 +373,19 @@ type = "legacy" url = "https://mirrors.aliyun.com/pypi/simple" reference = "aliyun" +[[package]] +name = "watchgod" +version = "0.7" +description = "Simple, modern file watching and code reload in python." +category = "main" +optional = false +python-versions = ">=3.5" + +[package.source] +type = "legacy" +url = "https://mirrors.aliyun.com/pypi/simple" +reference = "aliyun" + [[package]] name = "websockets" version = "8.1" @@ -387,7 +418,7 @@ reference = "aliyun" [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "8851125fb5acd0c4f12b72f5d99b2565335923baf1d574970f1d551600157f96" +content-hash = "9eb7c46cddf1245508a34c00f5709d21415d02d7f8c356733cc20ad187f431f9" [metadata.files] certifi = [ @@ -407,8 +438,8 @@ fastapi = [ {file = "fastapi-0.63.0.tar.gz", hash = "sha256:63c4592f5ef3edf30afa9a44fa7c6b7ccb20e0d3f68cd9eba07b44d552058dcb"}, ] h11 = [ - {file = "h11-0.9.0-py2.py3-none-any.whl", hash = "sha256:4bc6d6a1238b7615b266ada57e0618568066f57dd6fa967d1290ec9309b2f2f1"}, - {file = "h11-0.9.0.tar.gz", hash = "sha256:33d4bca7be0fa039f4e84d50ab00531047e53d6ee8ffbc83501ea602c169cae1"}, + {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, + {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] httpcore = [ {file = "httpcore-0.12.3-py3-none-any.whl", hash = "sha256:93e822cd16c32016b414b789aeff4e855d0ccbfc51df563ee34d4dbadbb3bcdc"}, @@ -442,28 +473,28 @@ loguru = [ ] nonebot2 = [] pydantic = [ - {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, - {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, - {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, - {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, - {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, - {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, - {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, - {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, - {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, - {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, - {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, - {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, + {file = "pydantic-1.8.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:0c40162796fc8d0aa744875b60e4dc36834db9f2a25dbf9ba9664b1915a23850"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:fff29fe54ec419338c522b908154a2efabeee4f483e48990f87e189661f31ce3"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:fbfb608febde1afd4743c6822c19060a8dbdd3eb30f98e36061ba4973308059e"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:eb8ccf12295113ce0de38f80b25f736d62f0a8d87c6b88aca645f168f9c78771"}, + {file = "pydantic-1.8.1-cp36-cp36m-win_amd64.whl", hash = "sha256:20d42f1be7c7acc352b3d09b0cf505a9fab9deb93125061b376fbe1f06a5459f"}, + {file = "pydantic-1.8.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dde4ca368e82791de97c2ec019681ffb437728090c0ff0c3852708cf923e0c7d"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:3bbd023c981cbe26e6e21c8d2ce78485f85c2e77f7bab5ec15b7d2a1f491918f"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:830ef1a148012b640186bf4d9789a206c56071ff38f2460a32ae67ca21880eb8"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:fb77f7a7e111db1832ae3f8f44203691e15b1fa7e5a1cb9691d4e2659aee41c4"}, + {file = "pydantic-1.8.1-cp37-cp37m-win_amd64.whl", hash = "sha256:3bcb9d7e1f9849a6bdbd027aabb3a06414abd6068cb3b21c49427956cce5038a"}, + {file = "pydantic-1.8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2287ebff0018eec3cc69b1d09d4b7cebf277726fa1bd96b45806283c1d808683"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:4bbc47cf7925c86a345d03b07086696ed916c7663cb76aa409edaa54546e53e2"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:6388ef4ef1435364c8cc9a8192238aed030595e873d8462447ccef2e17387125"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:dd4888b300769ecec194ca8f2699415f5f7760365ddbe243d4fd6581485fa5f0"}, + {file = "pydantic-1.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:8fbb677e4e89c8ab3d450df7b1d9caed23f254072e8597c33279460eeae59b99"}, + {file = "pydantic-1.8.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2f2736d9a996b976cfdfe52455ad27462308c9d3d0ae21a2aa8b4cd1a78f47b9"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:3114d74329873af0a0e8004627f5389f3bb27f956b965ddd3e355fe984a1789c"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:258576f2d997ee4573469633592e8b99aa13bda182fcc28e875f866016c8e07e"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:c17a0b35c854049e67c68b48d55e026c84f35593c66d69b278b8b49e2484346f"}, + {file = "pydantic-1.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:e8bc082afef97c5fd3903d05c6f7bb3a6af9fc18631b4cc9fedeb4720efb0c58"}, + {file = "pydantic-1.8.1-py3-none-any.whl", hash = "sha256:e3f8790c47ac42549dc8b045a67b0ca371c7f66e73040d0197ce6172b385e520"}, + {file = "pydantic-1.8.1.tar.gz", hash = "sha256:26cf3cb2e68ec6c0cfcb6293e69fb3450c5fd1ace87f46b64f678b0d29eac4c3"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -472,6 +503,29 @@ python-dotenv = [ {file = "python-dotenv-0.15.0.tar.gz", hash = "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"}, {file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"}, ] +pyyaml = [ + {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, + {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, + {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, + {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, + {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, + {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, + {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, + {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, + {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, + {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, + {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, + {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, + {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, + {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, + {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, + {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, + {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, + {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, +] rfc3986 = [ {file = "rfc3986-1.4.0-py2.py3-none-any.whl", hash = "sha256:af9147e9aceda37c91a05f4deb128d4b4b49d6b199775fd2d2927768abdc8f50"}, {file = "rfc3986-1.4.0.tar.gz", hash = "sha256:112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d"}, @@ -494,8 +548,8 @@ typing-extensions = [ {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, ] uvicorn = [ - {file = "uvicorn-0.11.8-py3-none-any.whl", hash = "sha256:4b70ddb4c1946e39db9f3082d53e323dfd50634b95fd83625d778729ef1730ef"}, - {file = "uvicorn-0.11.8.tar.gz", hash = "sha256:46a83e371f37ea7ff29577d00015f02c942410288fb57def6440f2653fff1d26"}, + {file = "uvicorn-0.13.4-py3-none-any.whl", hash = "sha256:7587f7b08bd1efd2b9bad809a3d333e972f1d11af8a5e52a9371ee3a5de71524"}, + {file = "uvicorn-0.13.4.tar.gz", hash = "sha256:3292251b3c7978e8e4a7868f4baf7f7f7bb7e40c759ecc125c37e99cdea34202"}, ] uvloop = [ {file = "uvloop-0.15.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:19fa1d56c91341318ac5d417e7b61c56e9a41183946cc70c411341173de02c69"}, @@ -509,6 +563,10 @@ uvloop = [ {file = "uvloop-0.15.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:6de130d0cb78985a5d080e323b86c5ecaf3af82f4890492c05981707852f983c"}, {file = "uvloop-0.15.2.tar.gz", hash = "sha256:2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"}, ] +watchgod = [ + {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, + {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, +] websockets = [ {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"}, {file = "websockets-8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:3db87421956f1b0779a7564915875ba774295cc86e81bc671631379371af1170"}, diff --git a/packages/nonebot-adapter-mirai/pyproject.toml b/packages/nonebot-adapter-mirai/pyproject.toml index b3afe6fa..67c918fa 100644 --- a/packages/nonebot-adapter-mirai/pyproject.toml +++ b/packages/nonebot-adapter-mirai/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-adapter-mirai" -version = "2.0.0a10" +version = "2.0.0-alpha.11" description = "Mirai Api HTTP adapter for nonebot2" authors = ["Mix ", "yanyongyu "] license = "AGPL-3.0-or-later" @@ -25,7 +25,7 @@ packages = [ python = "^3.7.3" httpx = "^0.17.0" websockets = "^8.1" -nonebot2 = "^2.0.0-alpha.10" +nonebot2 = "^2.0.0-alpha.11" [tool.poetry.dev-dependencies] nonebot2 = { path = "../../", develop = true } diff --git a/packages/nonebot-plugin-docs/pyproject.toml b/packages/nonebot-plugin-docs/pyproject.toml index 67899cc6..50390337 100644 --- a/packages/nonebot-plugin-docs/pyproject.toml +++ b/packages/nonebot-plugin-docs/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-plugin-docs" -version = "2.0.0a6.post1" +version = "2.0.0-alpha.11" description = "View NoneBot2 Docs Locally" authors = ["yanyongyu "] license = "MIT" diff --git a/poetry.lock b/poetry.lock index 2a143855..73598b33 100644 --- a/poetry.lock +++ b/poetry.lock @@ -389,7 +389,7 @@ reference = "aliyun" [[package]] name = "nonebot-adapter-cqhttp" -version = "2.0.0a10" +version = "2.0.0-alpha.11" description = "OneBot(CQHTTP) adapter for nonebot2" category = "dev" optional = false @@ -398,7 +398,7 @@ develop = true [package.dependencies] httpx = "^0.17.0" -nonebot2 = "^2.0.0-alpha.10" +nonebot2 = "^2.0.0-alpha.11" [package.source] type = "directory" @@ -406,7 +406,7 @@ url = "packages/nonebot-adapter-cqhttp" [[package]] name = "nonebot-adapter-ding" -version = "2.0.0a10" +version = "2.0.0-alpha.11" description = "Ding adapter for nonebot2" category = "dev" optional = false @@ -415,7 +415,7 @@ develop = true [package.dependencies] httpx = "^0.17.0" -nonebot2 = "^2.0.0-alpha.10" +nonebot2 = "^2.0.0-alpha.11" [package.source] type = "directory" @@ -423,7 +423,7 @@ url = "packages/nonebot-adapter-ding" [[package]] name = "nonebot-adapter-mirai" -version = "2.0.0a10" +version = "2.0.0-alpha.11" description = "Mirai Api HTTP adapter for nonebot2" category = "dev" optional = false @@ -432,7 +432,7 @@ develop = true [package.dependencies] httpx = "^0.17.0" -nonebot2 = "^2.0.0-alpha.10" +nonebot2 = "^2.0.0-alpha.11" websockets = "^8.1" [package.source] @@ -470,7 +470,7 @@ reference = "aliyun" [[package]] name = "pydantic" -version = "1.8" +version = "1.8.1" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false @@ -491,7 +491,7 @@ reference = "aliyun" [[package]] name = "pydash" -version = "4.9.2" +version = "4.9.3" description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library." category = "dev" optional = false @@ -1257,32 +1257,32 @@ priority = [ {file = "priority-1.3.0.tar.gz", hash = "sha256:6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe"}, ] pydantic = [ - {file = "pydantic-1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:22fe5756c6c57279234e4c4027a3549507aca29e9ee832d6aa39c367cb43c99f"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:c26d380af3e9a8eb9abe3b6337cea28f057b5425330817c918cf74d0a0a2303d"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a0ff36e3f929d76b91d1624c6673dbdc1407358700d117bb7f29d5696c52d288"}, - {file = "pydantic-1.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:d5aeab86837f8799df0d84bec1190e6cc0062d5c5374636b5599234f2b39fe0a"}, - {file = "pydantic-1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:999cc108933425752e45d1bf2f57d3cf091f2a5e8b9b8afab5b8872d2cc7645f"}, - {file = "pydantic-1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a989924324513215ad2b2cfd187426e6372f76f507b17361142c0b792294960c"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2bc9e9f5d91a29dec53346efc5c719d82297885d89c8a62b971492fba222c68d"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:12ed0b175bba65e29dfc5859cd539d3512f58bb776bf620a3d3338501fd0f389"}, - {file = "pydantic-1.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:26821f61623b01d618bd8b3243f790ac8bd7ae31b388c0e41aa586002cf350eb"}, - {file = "pydantic-1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d361d181a3fb53ebfdc2fb1e3ca55a6b2ad717578a5e119c99641afd11b31a47"}, - {file = "pydantic-1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:91baec8ed771d4c53d71ef549d8e36b0f92a31c32296062d562d1d7074dd1d6e"}, - {file = "pydantic-1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b4e03c84f4e96e3880c9d34508cccbd0f0df6e7dc14b17f960ea8c71448823a3"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c8a3600435b83a4f28f5379f3bb574576521180f691828268268e9f172f1b1eb"}, - {file = "pydantic-1.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:ccc2ab0a240d01847f3d5f0f9e1582d450a2fc3389db33a7af8e7447b205a935"}, - {file = "pydantic-1.8-cp38-cp38-win_amd64.whl", hash = "sha256:ad2fae68e185cfae5b6d83e7915352ff0b6e5fa84d84bc6a94c3e2de58327114"}, - {file = "pydantic-1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5759a4b276bda5ac2360f00e9b1e711aaac51fabd155b422d27f3339710f4264"}, - {file = "pydantic-1.8-cp39-cp39-manylinux1_i686.whl", hash = "sha256:865410a6df71fb60294887770d19c67d499689f7ce64245182653952cdbd4183"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:edf37d30ea60179ef067add9772cf42299ea6cd490b3c94335a68f1021944ac4"}, - {file = "pydantic-1.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:4a83d24bcf9ce8e6fa55c379bba1359461eedb85721bfb3151e240871e2b13a8"}, - {file = "pydantic-1.8-cp39-cp39-win_amd64.whl", hash = "sha256:77e04800d19acc2a8fbb95fe3d47ff397ce137aa5a2b32cc23a87bac70dda343"}, - {file = "pydantic-1.8-py3-none-any.whl", hash = "sha256:42b8fb1e4e4783c4aa31df44b64714f96aa4deeacbacf3713a8a238ee7df3b2b"}, - {file = "pydantic-1.8.tar.gz", hash = "sha256:0b71ca069c16470cb00be0acaf0657eb74cbc4ff5f11b42e79647f170956cda3"}, + {file = "pydantic-1.8.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:0c40162796fc8d0aa744875b60e4dc36834db9f2a25dbf9ba9664b1915a23850"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:fff29fe54ec419338c522b908154a2efabeee4f483e48990f87e189661f31ce3"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:fbfb608febde1afd4743c6822c19060a8dbdd3eb30f98e36061ba4973308059e"}, + {file = "pydantic-1.8.1-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:eb8ccf12295113ce0de38f80b25f736d62f0a8d87c6b88aca645f168f9c78771"}, + {file = "pydantic-1.8.1-cp36-cp36m-win_amd64.whl", hash = "sha256:20d42f1be7c7acc352b3d09b0cf505a9fab9deb93125061b376fbe1f06a5459f"}, + {file = "pydantic-1.8.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dde4ca368e82791de97c2ec019681ffb437728090c0ff0c3852708cf923e0c7d"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:3bbd023c981cbe26e6e21c8d2ce78485f85c2e77f7bab5ec15b7d2a1f491918f"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:830ef1a148012b640186bf4d9789a206c56071ff38f2460a32ae67ca21880eb8"}, + {file = "pydantic-1.8.1-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:fb77f7a7e111db1832ae3f8f44203691e15b1fa7e5a1cb9691d4e2659aee41c4"}, + {file = "pydantic-1.8.1-cp37-cp37m-win_amd64.whl", hash = "sha256:3bcb9d7e1f9849a6bdbd027aabb3a06414abd6068cb3b21c49427956cce5038a"}, + {file = "pydantic-1.8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2287ebff0018eec3cc69b1d09d4b7cebf277726fa1bd96b45806283c1d808683"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:4bbc47cf7925c86a345d03b07086696ed916c7663cb76aa409edaa54546e53e2"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:6388ef4ef1435364c8cc9a8192238aed030595e873d8462447ccef2e17387125"}, + {file = "pydantic-1.8.1-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:dd4888b300769ecec194ca8f2699415f5f7760365ddbe243d4fd6581485fa5f0"}, + {file = "pydantic-1.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:8fbb677e4e89c8ab3d450df7b1d9caed23f254072e8597c33279460eeae59b99"}, + {file = "pydantic-1.8.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2f2736d9a996b976cfdfe52455ad27462308c9d3d0ae21a2aa8b4cd1a78f47b9"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:3114d74329873af0a0e8004627f5389f3bb27f956b965ddd3e355fe984a1789c"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:258576f2d997ee4573469633592e8b99aa13bda182fcc28e875f866016c8e07e"}, + {file = "pydantic-1.8.1-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:c17a0b35c854049e67c68b48d55e026c84f35593c66d69b278b8b49e2484346f"}, + {file = "pydantic-1.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:e8bc082afef97c5fd3903d05c6f7bb3a6af9fc18631b4cc9fedeb4720efb0c58"}, + {file = "pydantic-1.8.1-py3-none-any.whl", hash = "sha256:e3f8790c47ac42549dc8b045a67b0ca371c7f66e73040d0197ce6172b385e520"}, + {file = "pydantic-1.8.1.tar.gz", hash = "sha256:26cf3cb2e68ec6c0cfcb6293e69fb3450c5fd1ace87f46b64f678b0d29eac4c3"}, ] pydash = [ - {file = "pydash-4.9.2-py2.py3-none-any.whl", hash = "sha256:dab98145502528369bd05034f6fb2b520297d49f942cfd51dc9cdc2cd47ec368"}, - {file = "pydash-4.9.2.tar.gz", hash = "sha256:11d8f3c92d92a004e042fdb226b10dba28f4e311546b0de89d983e91539d5e55"}, + {file = "pydash-4.9.3-py2.py3-none-any.whl", hash = "sha256:7851a2d749e70c02585ae4803b01c5e0f47b7ec9df9b84ccb16aac38cad2fdd2"}, + {file = "pydash-4.9.3.tar.gz", hash = "sha256:d709e57b537b1aaf118f188da3ec6242a665090ecd7839b66f857ee3dc2bb006"}, ] pygments = [ {file = "Pygments-2.8.0-py3-none-any.whl", hash = "sha256:b21b072d0ccdf29297a82a2363359d99623597b8a265b8081760e4d0f7153c88"}, diff --git a/pyproject.toml b/pyproject.toml index 196e0b9c..7e64c234 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot2" -version = "2.0.0a11" +version = "2.0.0-alpha.11" description = "An asynchronous python bot framework." authors = ["yanyongyu "] license = "MIT" From d568a316848fbde72f8d5a211633b05eccc664e1 Mon Sep 17 00:00:00 2001 From: nonebot Date: Fri, 5 Mar 2021 12:17:22 +0000 Subject: [PATCH 23/24] :memo: update api docs --- docs/api/nonebot.md | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/api/nonebot.md b/docs/api/nonebot.md index b726f5bd..6ecd5e9d 100644 --- a/docs/api/nonebot.md +++ b/docs/api/nonebot.md @@ -76,6 +76,37 @@ sidebarDepth: 0 * `require` => `nonebot.plugin.require` +## `get_driver()` + + +* **说明** + + 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 + + + +* **返回** + + + * `Driver`: 全局 Driver 对象 + + + +* **异常** + + + * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) + + + +* **用法** + + +```python +driver = nonebot.get_driver() +``` + + ## `get_app()` @@ -169,37 +200,6 @@ bots = nonebot.get_bots() ``` -## `get_driver()` - - -* **说明** - - 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 - - - -* **返回** - - - * `Driver`: 全局 Driver 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -driver = nonebot.get_driver() -``` - - ## `init(*, _env_file=None, **kwargs)` From f7dd8983790825a5bbb4634317ccfe57ce9d72fd Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 5 Mar 2021 20:29:47 +0800 Subject: [PATCH 24/24] :memo: update api doc --- archive/2.0.0a11/api/nonebot.md | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/archive/2.0.0a11/api/nonebot.md b/archive/2.0.0a11/api/nonebot.md index b726f5bd..6ecd5e9d 100644 --- a/archive/2.0.0a11/api/nonebot.md +++ b/archive/2.0.0a11/api/nonebot.md @@ -76,6 +76,37 @@ sidebarDepth: 0 * `require` => `nonebot.plugin.require` +## `get_driver()` + + +* **说明** + + 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 + + + +* **返回** + + + * `Driver`: 全局 Driver 对象 + + + +* **异常** + + + * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) + + + +* **用法** + + +```python +driver = nonebot.get_driver() +``` + + ## `get_app()` @@ -169,37 +200,6 @@ bots = nonebot.get_bots() ``` -## `get_driver()` - - -* **说明** - - 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 - - - -* **返回** - - - * `Driver`: 全局 Driver 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -driver = nonebot.get_driver() -``` - - ## `init(*, _env_file=None, **kwargs)`