diff --git a/arclet/entari/command/__init__.py b/arclet/entari/command/__init__.py index c534a7e..7add084 100644 --- a/arclet/entari/command/__init__.py +++ b/arclet/entari/command/__init__.py @@ -9,9 +9,8 @@ from arclet.alconna import Alconna, Arg, Args, Arparma, CommandMeta, command_manager from arclet.alconna.tools.construct import AlconnaString, alconna_from_format from arclet.alconna.typing import TAValue -from arclet.letoderea import EVENT, RESULT, Contexts, ExitState, Scope, Subscriber, make_event +from arclet.letoderea import EVENT, RESULT, Contexts, ExitState, Result, Scope, Subscriber, make_event from arclet.letoderea.provider import TProviders, get_providers -from arclet.letoderea.typing import Result from nepattern import DirectPattern from tarina import LRU from tarina.trie import CharTrie diff --git a/arclet/entari/command/provider.py b/arclet/entari/command/provider.py index 4f7cd0f..f8c8871 100644 --- a/arclet/entari/command/provider.py +++ b/arclet/entari/command/provider.py @@ -18,7 +18,7 @@ from ..config import EntariConfig from ..const import ITEM_MESSAGE_CONTENT from ..event.base import Reply -from ..event.command import CommandExecute, CommandOutput, CommandParse, CommandReceive +from ..event.command import CommandOutput, CommandParse, CommandReceive from ..filter.parse import parse_filter from ..message import MessageChain from ..session import Session diff --git a/arclet/entari/plugin/__init__.py b/arclet/entari/plugin/__init__.py index 1f10a08..fa2ba9a 100644 --- a/arclet/entari/plugin/__init__.py +++ b/arclet/entari/plugin/__init__.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Literal, TypeVar, overload from arclet.letoderea import Subscriber, on, publish -from arclet.letoderea.typing import Resultable +from arclet.letoderea.utils import Resultable from tarina import init_spec from tarina.tools import nest_obj_update diff --git a/arclet/entari/plugin/model.pyi b/arclet/entari/plugin/model.pyi index 0dcf6e0..d56b9be 100644 --- a/arclet/entari/plugin/model.pyi +++ b/arclet/entari/plugin/model.pyi @@ -11,7 +11,7 @@ from arclet.letoderea.decorate import Check from arclet.letoderea.provider import TProviders from arclet.letoderea.publisher import Publisher from arclet.letoderea.scope import RegisterWrapper -from arclet.letoderea.typing import Resultable, TCallable +from arclet.letoderea.utils import Resultable, TCallable from launart import Service from tarina import ContextModel diff --git a/pdm.lock b/pdm.lock index 9a742be..8a5cb83 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "cli", "cron", "dev", "dotenv", "full", "msgspec", "pydantic", "reload", "rich", "toml", "yaml"] strategy = ["inherit_metadata"] lock_version = "4.5.0" -content_hash = "sha256:580636d478539eb1f64f470edef9341ab98cefb6d500e5bbcfded775431f8fc9" +content_hash = "sha256:c79283b35abcd9d7a887b5f7099c3f0c361529ebbf88ebef58529338d81fb3c2" [[metadata.targets]] requires_python = ">=3.10" @@ -221,7 +221,7 @@ files = [ [[package]] name = "arclet-letoderea" -version = "0.21.0rc2" +version = "0.21.0" requires_python = "<4.0,>=3.10" summary = "A high-performance, simple-structured event system, relies on asyncio" groups = ["default"] @@ -230,8 +230,8 @@ dependencies = [ "typing-extensions>=4.12.0", ] files = [ - {file = "arclet_letoderea-0.21.0rc2-py3-none-any.whl", hash = "sha256:0d4074e93e99c9ef19705d50944ef354689595959737302f638f61dff8fea169"}, - {file = "arclet_letoderea-0.21.0rc2.tar.gz", hash = "sha256:4afd4aa1a140c651d3a6c593a5d3ef2322877af356a2edc3c5b01c533c40ed3d"}, + {file = "arclet_letoderea-0.21.0-py3-none-any.whl", hash = "sha256:fb5f9e01b1914c133ff37db0d2895143c9cbfbd47eef053148077edfcb04ac77"}, + {file = "arclet_letoderea-0.21.0.tar.gz", hash = "sha256:09bc30878f3f2b2aa460bdd08d28d000712d404d801a4e9384ff99d9633ce3c8"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index 490a5ac..96c10eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = [ {name = "RF-Tar-Railt",email = "rf_tar_railt@qq.com"}, ] dependencies = [ - "arclet-letoderea<0.22.0,>=0.21.0rc2", + "arclet-letoderea<0.22.0,>=0.21.0", "arclet-alconna<2.0.0,>=1.8.44", "satori-python-core<1.4.0,>=1.3.2", "satori-python-client<1.4.0,>=1.3.2",