diff --git a/nonebot_plugin_marshoai/handler.py b/nonebot_plugin_marshoai/handler.py index f04285e..afa1704 100644 --- a/nonebot_plugin_marshoai/handler.py +++ b/nonebot_plugin_marshoai/handler.py @@ -35,7 +35,7 @@ from .util import ( make_chat_openai, parse_richtext, ) -from .utils.request import process_chat_stream +from .utils.processor import process_chat_stream class MarshoHandler: @@ -50,7 +50,7 @@ class MarshoHandler: self.event: Event = current_event.get() # self.state: T_State = current_handler.get().state self.matcher: Matcher = current_matcher.get() - self.message_id: str = get_message_id(self.event) + self.message_id: str = UniMessage.get_message_id(self.event) self.target = get_target(self.event) async def process_user_input( diff --git a/nonebot_plugin_marshoai/marsho.py b/nonebot_plugin_marshoai/marsho.py index 8ef3ffd..e3556aa 100644 --- a/nonebot_plugin_marshoai/marsho.py +++ b/nonebot_plugin_marshoai/marsho.py @@ -32,7 +32,7 @@ from .instances import client, context, model_name, target_list, tools from .metadata import metadata from .plugin.func_call.caller import get_function_calls from .util import * -from .utils.request import process_chat_stream +from .utils.processor import process_chat_stream async def at_enable(): diff --git a/nonebot_plugin_marshoai/models.py b/nonebot_plugin_marshoai/models.py index 701f76a..59398c6 100755 --- a/nonebot_plugin_marshoai/models.py +++ b/nonebot_plugin_marshoai/models.py @@ -7,6 +7,7 @@ import sys import traceback from nonebot import logger +from typing_extensions import deprecated from .config import config @@ -73,6 +74,7 @@ class MarshoContext: return self._get_target_dict(is_private).setdefault(target_id, []) +@deprecated("小棉工具已弃用,无法正常调用") class MarshoTools: """ Marsho 的工具类 diff --git a/nonebot_plugin_marshoai/utils/request.py b/nonebot_plugin_marshoai/utils/processor.py similarity index 100% rename from nonebot_plugin_marshoai/utils/request.py rename to nonebot_plugin_marshoai/utils/processor.py