Merge branch 'main' into feat/prompt-update

README.md

@@ -10,7 +10,7 @@
 
 _✨ 使用 OpenAI 标准格式 API 的聊天机器人插件 ✨_  
 
-[![QQ群](https://img.shields.io/badge/QQ群-1029557452-blue.svg?logo=QQ&style=flat-square)](https://qm.qq.com/q/a13iwP5kAw)
+[![QQ群](https://img.shields.io/badge/QQ群-1029557452-blue.svg?logo=QQ)](https://qm.qq.com/q/a13iwP5kAw)
 [![NoneBot Registry](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin%2Fnonebot-plugin-marshoai&style=flat-square)](https://registry.nonebot.dev/plugin/nonebot-plugin-marshoai:nonebot_plugin_marshoai)
 <a href="https://registry.nonebot.dev/plugin/nonebot-plugin-marshoai:nonebot_plugin_marshoai">
   <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin-adapters%2Fnonebot-plugin-marshoai&style=flat-square" alt="Supported Adapters">
@@ -22,21 +22,20 @@ _✨ 使用 OpenAI 标准格式 API 的聊天机器人插件 ✨_
   <img src="https://img.shields.io/badge/Code%20Style-Black-121110.svg?style=flat-square" alt="codestyle">
 </div>  
 
-<img width="100%" src="https://starify.komoridevs.icu/api/starify?owner=LiteyukiStudio&repo=nonebot-plugin-marshoai" alt="starify" />
 
 ## 📖 介绍
 
-通过调用 OpenAI 标准格式 API（例如 GitHub Models API），来实现聊天的插件。  
-插件内置了猫娘小棉（Marsho，マルショ）的人物设定，可以进行可爱的聊天！  
+通过调用 OpenAI 标准格式 API(例如 GitHub Models API) 来实现聊天的插件。  
+插件内置了猫娘小棉(Marsho)的人物设定，可以进行可爱的聊天！  
 _谁不喜欢回复消息快又可爱的猫娘呢？_  
-**对 OneBot 以外的适配器与非 GitHub Models API 的支持未完全经过验证。**  
+**对 OneBot 以外的适配器与非 GitHub Models API 的支持未经过完全验证。**  
 [Melobot 实现](https://github.com/LiteyukiStudio/marshoai-melo)
 
 ## 🐱 设定
 
 #### 基本信息
 
--   名字：小棉（Marsho，マルショ）
+-   名字：小棉(Marsho)
 -   生日：9 月 6 日
 
 #### 喜好
@@ -59,7 +58,7 @@ _谁不喜欢回复消息快又可爱的猫娘呢？_
 -   [nonebot-plugin-latex](https://github.com/EillesWan/nonebot-plugin-latex)
 -   [nonebot-plugin-deepseek](https://github.com/KomoriDev/nonebot-plugin-deepseek)
 
-"Marsho" logo 由 [@Asankilp](https://github.com/Asankilp) 绘制，基于 [CC BY-NC-SA 4.0](http://creativecommons.org/licenses/by-nc-sa/4.0/) 许可下提供。  
+"Marsho" logo 由 [@Asankilp](https://github.com/Asankilp)绘制，基于 [CC BY-NC-SA 4.0](http://creativecommons.org/licenses/by-nc-sa/4.0/) 许可下提供。  
 "nonebot-plugin-marshoai" 基于 [MIT](./LICENSE-MIT) 许可下提供。  
 部分指定的代码基于 [Mulan PSL v2](./LICENSE-MULAN) 许可下提供。
 

nonebot_plugin_marshoai/cache/decos.py

@@ -1,39 +0,0 @@
-from ..models import Cache
-
-cache = Cache()
-
-
-def from_cache(key):
-    """
-    当缓存中有数据时，直接返回缓存中的数据，否则执行函数并将结果存入缓存
-    """
-
-    def decorator(func):
-        async def wrapper(*args, **kwargs):
-            cached = cache.get(key)
-            if cached:
-                return cached
-            else:
-                result = await func(*args, **kwargs)
-                cache.set(key, result)
-                return result
-
-        return wrapper
-
-    return decorator
-
-
-def update_to_cache(key):
-    """
-    执行函数并将结果存入缓存
-    """
-
-    def decorator(func):
-        async def wrapper(*args, **kwargs):
-            result = await func(*args, **kwargs)
-            cache.set(key, result)
-            return result
-
-        return wrapper
-
-    return decorator

nonebot_plugin_marshoai/config.py

@@ -1,3 +1,4 @@
+import shutil
 from io import StringIO
 from pathlib import Path
 
@@ -80,15 +81,15 @@ destination_folder = Path("config/marshoai/")
 destination_file = destination_folder / "config.yaml"
 
 
-def dump_config_to_yaml(cfg: ConfigModel):
-    return yaml_.dump(cfg.model_dump(), allow_unicode=True, default_flow_style=False)
+def dump_config_to_yaml(config: ConfigModel):
+    return yaml_.dump(config.model_dump(), allow_unicode=True, default_flow_style=False)
 
 
-def write_default_config(dest_file):
+def write_default_config(destination_file):
     """
     写入默认配置
     """
-    with open(dest_file, "w", encoding="utf-8") as f:
+    with open(destination_file, "w", encoding="utf-8") as f:
         with StringIO(dump_config_to_yaml(ConfigModel())) as f2:
             f.write(f2.read())
 
@@ -109,17 +110,17 @@ def check_yaml_is_changed():
         return True
 
 
-def merge_configs(existing_cfg, new_cfg):
+def merge_configs(old_config, new_config):
     """
     合并配置文件
     """
-    for key, value in new_cfg.items():
-        if key in existing_cfg:
+    for key, value in new_config.items():
+        if key in old_config:
             continue
         else:
             logger.info(f"新增配置项: {key} = {value}")
-            existing_cfg[key] = value
-    return existing_cfg
+            old_config[key] = value
+    return old_config
 
 
 config: ConfigModel = get_plugin_config(ConfigModel)

nonebot_plugin_marshoai/handler.py

@@ -1,242 +0,0 @@
-import json
-from typing import Optional, Tuple, Union
-
-from azure.ai.inference.models import (
-    CompletionsFinishReason,
-    ImageContentItem,
-    ImageUrl,
-    TextContentItem,
-    ToolMessage,
-    UserMessage,
-)
-from nonebot.adapters import Bot, Event
-from nonebot.log import logger
-from nonebot.matcher import (
-    Matcher,
-    current_bot,
-    current_event,
-    current_matcher,
-)
-from nonebot_plugin_alconna.uniseg import UniMessage, UniMsg
-from openai import AsyncOpenAI
-from openai.types.chat import ChatCompletion, ChatCompletionMessage
-
-from .config import config
-from .constants import SUPPORT_IMAGE_MODELS
-from .instances import target_list
-from .models import MarshoContext
-from .plugin.func_call.caller import get_function_calls
-from .plugin.func_call.models import SessionContext
-from .util import (
-    extract_content_and_think,
-    get_image_b64,
-    get_nickname_by_user_id,
-    get_prompt,
-    make_chat_openai,
-    parse_richtext,
-)
-
-
-class MarshoHandler:
-    def __init__(
-        self,
-        client: AsyncOpenAI,
-        context: MarshoContext,
-    ):
-        self.client = client
-        self.context = context
-        self.bot: Bot = current_bot.get()
-        self.event: Event = current_event.get()
-        # self.state: T_State = current_handler.get().state
-        self.matcher: Matcher = current_matcher.get()
-        self.message_id: str = UniMessage.get_message_id(self.event)
-        self.target = UniMessage.get_target(self.event)
-
-    async def process_user_input(
-        self, user_input: UniMsg, model_name: str
-    ) -> Union[str, list]:
-        """
-        处理用户输入为可输入 API 的格式，并添加昵称提示
-        """
-        is_support_image_model = (
-            model_name.lower()
-            in SUPPORT_IMAGE_MODELS + config.marshoai_additional_image_models
-        )
-        usermsg = [] if is_support_image_model else ""
-        user_nickname = await get_nickname_by_user_id(self.event.get_user_id())
-        if user_nickname:
-            nickname_prompt = f"\n此消息的说话者为: {user_nickname}"
-        else:
-            nickname_prompt = ""
-        for i in user_input:  # type: ignore
-            if i.type == "text":
-                if is_support_image_model:
-                    usermsg += [TextContentItem(text=i.data["text"] + nickname_prompt).as_dict()]  # type: ignore
-                else:
-                    usermsg += str(i.data["text"] + nickname_prompt)  # type: ignore
-            elif i.type == "image":
-                if is_support_image_model:
-                    usermsg.append(  # type: ignore
-                        ImageContentItem(
-                            image_url=ImageUrl(  # type: ignore
-                                url=str(await get_image_b64(i.data["url"]))  # type: ignore
-                            )  # type: ignore
-                        ).as_dict()  # type: ignore
-                    )  # type: ignore
-                    logger.info(f"输入图片 {i.data['url']}")
-                elif config.marshoai_enable_support_image_tip:
-                    await UniMessage(
-                        "*此模型不支持图片处理或管理员未启用此模型的图片支持。图片将被忽略。"
-                    ).send()
-        return usermsg  # type: ignore
-
-    async def handle_single_chat(
-        self,
-        user_message: Union[str, list],
-        model_name: str,
-        tools_list: list,
-        tool_message: Optional[list] = None,
-    ) -> ChatCompletion:
-        """
-        处理单条聊天
-        """
-
-        context_msg = get_prompt(model_name) + (
-            self.context.build(self.target.id, self.target.private)
-        )
-        response = await make_chat_openai(
-            client=self.client,
-            msg=context_msg + [UserMessage(content=user_message).as_dict()] + (tool_message if tool_message else []),  # type: ignore
-            model_name=model_name,
-            tools=tools_list if tools_list else None,
-        )
-        return response
-
-    async def handle_function_call(
-        self,
-        completion: ChatCompletion,
-        user_message: Union[str, list],
-        model_name: str,
-        tools_list: list,
-    ):
-        # function call
-        # 需要获取额外信息，调用函数工具
-        tool_msg = []
-        choice = completion.choices[0]
-        # await UniMessage(str(response)).send()
-        tool_calls = choice.message.tool_calls
-        # try:
-        #     if tool_calls[0]["function"]["name"].startswith("$"):
-        #         choice.message.tool_calls[0][
-        #             "type"
-        #         ] = "builtin_function"  # 兼容 moonshot AI 内置函数的临时方案
-        # except:
-        #     pass
-        tool_msg.append(choice.message)
-        for tool_call in tool_calls:  # type: ignore
-            try:
-                function_args = json.loads(tool_call.function.arguments)
-            except json.JSONDecodeError:
-                function_args = json.loads(
-                    tool_call.function.arguments.replace("'", '"')
-                )
-            # 删除args的placeholder参数
-            if "placeholder" in function_args:
-                del function_args["placeholder"]
-            logger.info(
-                f"调用函数 {tool_call.function.name.replace('-', '.')}\n参数:"
-                + "\n".join([f"{k}={v}" for k, v in function_args.items()])
-            )
-            await UniMessage(
-                f"调用函数 {tool_call.function.name.replace('-', '.')}\n参数:"
-                + "\n".join([f"{k}={v}" for k, v in function_args.items()])
-            ).send()
-            if caller := get_function_calls().get(tool_call.function.name):
-                logger.debug(f"调用插件函数 {caller.full_name}")
-                # 权限检查，规则检查 TODO
-                # 实现依赖注入，检查函数参数及参数注解类型，对Event类型的参数进行注入
-                func_return = await caller.with_ctx(
-                    SessionContext(
-                        bot=self.bot,
-                        event=self.event,
-                        matcher=self.matcher,
-                        state=None,
-                    )
-                ).call(**function_args)
-            else:
-                logger.error(f"未找到函数 {tool_call.function.name.replace('-', '.')}")
-                func_return = f"未找到函数 {tool_call.function.name.replace('-', '.')}"
-            tool_msg.append(
-                ToolMessage(tool_call_id=tool_call.id, content=func_return).as_dict()  # type: ignore
-            )
-            #  tool_msg[0]["tool_calls"][0]["type"] = "builtin_function"
-            # await UniMessage(str(tool_msg)).send()
-        return await self.handle_common_chat(
-            user_message=user_message,
-            model_name=model_name,
-            tools_list=tools_list,
-            tool_message=tool_msg,
-        )
-
-    async def handle_common_chat(
-        self,
-        user_message: Union[str, list],
-        model_name: str,
-        tools_list: list,
-        stream: bool = False,
-        tool_message: Optional[list] = None,
-    ) -> Optional[Tuple[UserMessage, ChatCompletionMessage]]:
-        """
-        处理一般聊天
-        """
-        global target_list
-        if stream:
-            raise NotImplementedError
-        response = await self.handle_single_chat(
-            user_message=user_message,
-            model_name=model_name,
-            tools_list=tools_list,
-            tool_message=tool_message,
-        )
-        choice = response.choices[0]
-        # Sprint(choice)
-        # 当tool_calls非空时，将finish_reason设置为TOOL_CALLS
-        if choice.message.tool_calls is not None and config.marshoai_fix_toolcalls:
-            choice.finish_reason = "tool_calls"
-        logger.info(f"完成原因：{choice.finish_reason}")
-        if choice.finish_reason == CompletionsFinishReason.STOPPED:
-
-            ##### DeepSeek-R1 兼容部分 #####
-            choice_msg_content, choice_msg_thinking, choice_msg_after = (
-                extract_content_and_think(choice.message)
-            )
-            if choice_msg_thinking and config.marshoai_send_thinking:
-                await UniMessage("思维链：\n" + choice_msg_thinking).send()
-            ##### 兼容部分结束 #####
-
-            if [self.target.id, self.target.private] not in target_list:
-                target_list.append([self.target.id, self.target.private])
-
-            # 对话成功发送消息
-            if config.marshoai_enable_richtext_parse:
-                await (await parse_richtext(str(choice_msg_content))).send(
-                    reply_to=True
-                )
-            else:
-                await UniMessage(str(choice_msg_content)).send(reply_to=True)
-            return UserMessage(content=user_message), choice_msg_after
-        elif choice.finish_reason == CompletionsFinishReason.CONTENT_FILTERED:
-
-            # 对话失败，消息过滤
-
-            await UniMessage("*已被内容过滤器过滤。请调整聊天内容后重试。").send(
-                reply_to=True
-            )
-            return None
-        elif choice.finish_reason == CompletionsFinishReason.TOOL_CALLS:
-            return await self.handle_function_call(
-                response, user_message, model_name, tools_list
-            )
-        else:
-            await UniMessage(f"意外的完成原因:{choice.finish_reason}").send()
-            return None

nonebot_plugin_marshoai/hooks.py

@@ -6,7 +6,7 @@ import nonebot_plugin_localstore as store
 from nonebot import logger
 
 from .config import config
-from .instances import context, driver, target_list, tools
+from .instances import *
 from .plugin import load_plugin, load_plugins
 from .util import get_backup_context, save_context_to_json
 

nonebot_plugin_marshoai/instances.py

@@ -1,4 +1,6 @@
 # Marsho 的类实例以及全局变量
+from azure.ai.inference.aio import ChatCompletionsClient
+from azure.core.credentials import AzureKeyCredential
 from nonebot import get_driver
 from openai import AsyncOpenAI
 

nonebot_plugin_marshoai/marsho.py

@@ -2,10 +2,15 @@ import contextlib
 import traceback
 from typing import Optional
 
+import openai
 from arclet.alconna import Alconna, AllParam, Args
 from azure.ai.inference.models import (
     AssistantMessage,
     CompletionsFinishReason,
+    ImageContentItem,
+    ImageUrl,
+    TextContentItem,
+    ToolMessage,
     UserMessage,
 )
 from nonebot import logger, on_command, on_message
@@ -13,17 +18,15 @@ from nonebot.adapters import Bot, Event, Message
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
-from nonebot.rule import to_me
+from nonebot.rule import Rule, to_me
 from nonebot.typing import T_State
 from nonebot_plugin_alconna import MsgTarget, UniMessage, UniMsg, on_alconna
 
-from .config import config
-from .constants import INTRODUCTION, SUPPORT_IMAGE_MODELS
-from .handler import MarshoHandler
 from .hooks import *
-from .instances import client, context, model_name, target_list, tools
+from .instances import *
 from .metadata import metadata
 from .plugin.func_call.caller import get_function_calls
+from .plugin.func_call.models import SessionContext
 from .util import *
 
 
@@ -227,16 +230,16 @@ async def marsho(
         # 发送说明
         # await UniMessage(metadata.usage + "\n当前使用的模型：" + model_name).send()
         await marsho_cmd.finish(INTRODUCTION)
-        backup_context = await get_backup_context(target.id, target.private)
-        if backup_context:
-            context.set_context(
-                backup_context, target.id, target.private
-            )  # 加载历史记录
-            logger.info(f"已恢复会话 {target.id} 的上下文备份~")
-    handler = MarshoHandler(client, context)
     try:
-        user_nickname = await get_nickname_by_user_id(event.get_user_id())
-        if not user_nickname:
+        user_id = event.get_user_id()
+        nicknames = await get_nicknames()
+        user_nickname = nicknames.get(user_id, "")
+        if user_nickname != "":
+            nickname_prompt = (
+                f"\n*此消息的说话者id为:{user_id}，名字为:{user_nickname}*"
+            )
+        else:
+            nickname_prompt = ""
             # 用户名无法获取，暂时注释
             # user_nickname = event.sender.nickname  # 未设置昵称时获取用户名
             # nickname_prompt = f"\n*此消息的说话者:{user_nickname}"
@@ -250,21 +253,189 @@ async def marsho(
                     "※你未设置自己的昵称。推荐使用「nickname [昵称]」命令设置昵称来获得个性化(可能）回答。"
                 ).send()
 
-        usermsg = await handler.process_user_input(text, model_name)
+        is_support_image_model = (
+            model_name.lower()
+            in SUPPORT_IMAGE_MODELS + config.marshoai_additional_image_models
+        )
+        is_openai_new_model = model_name.lower() in OPENAI_NEW_MODELS
+        usermsg = [] if is_support_image_model else ""
+        for i in text:  # type: ignore
+            if i.type == "text":
+                if is_support_image_model:
+                    usermsg += [TextContentItem(text=i.data["text"] + nickname_prompt).as_dict()]  # type: ignore
+                else:
+                    usermsg += str(i.data["text"] + nickname_prompt)  # type: ignore
+            elif i.type == "image":
+                if is_support_image_model:
+                    usermsg.append(  # type: ignore
+                        ImageContentItem(
+                            image_url=ImageUrl(  # type: ignore
+                                url=str(await get_image_b64(i.data["url"]))  # type: ignore
+                            )  # type: ignore
+                        ).as_dict()  # type: ignore
+                    )  # type: ignore
+                    logger.info(f"输入图片 {i.data['url']}")
+                elif config.marshoai_enable_support_image_tip:
+                    await UniMessage(
+                        "*此模型不支持图片处理或管理员未启用此模型的图片支持。图片将被忽略。"
+                    ).send()
+        backup_context = await get_backup_context(target.id, target.private)
+        if backup_context:
+            context.set_context(
+                backup_context, target.id, target.private
+            )  # 加载历史记录
+            logger.info(f"已恢复会话 {target.id} 的上下文备份~")
+        context_msg = get_prompt(model_name) + context.build(target.id, target.private)
 
         tools_lists = tools.tools_list + list(
             map(lambda v: v.data(), get_function_calls().values())
         )
         logger.info(f"正在获取回答，模型：{model_name}")
         # logger.info(f"上下文：{context_msg}")
-        response = await handler.handle_common_chat(usermsg, model_name, tools_lists)
+        response = await make_chat_openai(
+            client=client,
+            model_name=model_name,
+            msg=context_msg + [UserMessage(content=usermsg).as_dict()],  # type: ignore
+            tools=tools_lists if tools_lists else None,  # TODO 临时追加函数，后期优化
+        )
         # await UniMessage(str(response)).send()
-        if response is not None:
-            context_user, context_assistant = response
-            context.append(context_user.as_dict(), target.id, target.private)
-            context.append(context_assistant.to_dict(), target.id, target.private)
-        else:
+        choice = response.choices[0]
+        # Sprint(choice)
+        # 当tool_calls非空时，将finish_reason设置为TOOL_CALLS
+        if choice.message.tool_calls != None and config.marshoai_fix_toolcalls:
+            choice.finish_reason = "tool_calls"
+        logger.info(f"完成原因：{choice.finish_reason}")
+        if choice.finish_reason == CompletionsFinishReason.STOPPED:
+            # 当对话成功时，将dict的上下文添加到上下文类中
+            context.append(
+                UserMessage(content=usermsg).as_dict(), target.id, target.private  # type: ignore
+            )
+
+            ##### DeepSeek-R1 兼容部分 #####
+            choice_msg_content, choice_msg_thinking, choice_msg_after = (
+                extract_content_and_think(choice.message)
+            )
+            if choice_msg_thinking and config.marshoai_send_thinking:
+                await UniMessage("思维链：\n" + choice_msg_thinking).send()
+            ##### 兼容部分结束 #####
+
+            context.append(choice_msg_after.to_dict(), target.id, target.private)
+            if [target.id, target.private] not in target_list:
+                target_list.append([target.id, target.private])
+
+            # 对话成功发送消息
+            if config.marshoai_enable_richtext_parse:
+                await (await parse_richtext(str(choice_msg_content))).send(
+                    reply_to=True
+                )
+            else:
+                await UniMessage(str(choice_msg_content)).send(reply_to=True)
+        elif choice.finish_reason == CompletionsFinishReason.CONTENT_FILTERED:
+
+            # 对话失败，消息过滤
+
+            await UniMessage("*已被内容过滤器过滤。请调整聊天内容后重试。").send(
+                reply_to=True
+            )
             return
+        elif choice.finish_reason == CompletionsFinishReason.TOOL_CALLS:
+            # function call
+            # 需要获取额外信息，调用函数工具
+            tool_msg = []
+            while choice.message.tool_calls != None:
+                # await UniMessage(str(response)).send()
+                tool_calls = choice.message.tool_calls
+                # try:
+                #     if tool_calls[0]["function"]["name"].startswith("$"):
+                #         choice.message.tool_calls[0][
+                #             "type"
+                #         ] = "builtin_function"  # 兼容 moonshot AI 内置函数的临时方案
+                # except:
+                #     pass
+                tool_msg.append(choice.message)
+                for tool_call in tool_calls:
+                    try:
+                        function_args = json.loads(tool_call.function.arguments)
+                    except json.JSONDecodeError:
+                        function_args = json.loads(
+                            tool_call.function.arguments.replace("'", '"')
+                        )
+                    # 删除args的placeholder参数
+                    if "placeholder" in function_args:
+                        del function_args["placeholder"]
+                    logger.info(
+                        f"调用函数 {tool_call.function.name.replace('-', '.')}\n参数:"
+                        + "\n".join([f"{k}={v}" for k, v in function_args.items()])
+                    )
+                    await UniMessage(
+                        f"调用函数 {tool_call.function.name.replace('-', '.')}\n参数:"
+                        + "\n".join([f"{k}={v}" for k, v in function_args.items()])
+                    ).send()
+                    # TODO 临时追加插件函数，若工具中没有则调用插件函数
+                    if tools.has_function(tool_call.function.name):
+                        logger.debug(f"调用工具函数 {tool_call.function.name}")
+                        func_return = await tools.call(
+                            tool_call.function.name, function_args
+                        )  # 获取返回值
+                    else:
+                        if caller := get_function_calls().get(tool_call.function.name):
+                            logger.debug(f"调用插件函数 {caller.full_name}")
+                            # 权限检查，规则检查 TODO
+                            # 实现依赖注入，检查函数参数及参数注解类型，对Event类型的参数进行注入
+                            func_return = await caller.with_ctx(
+                                SessionContext(
+                                    bot=bot,
+                                    event=event,
+                                    state=state,
+                                    matcher=matcher,
+                                )
+                            ).call(**function_args)
+                        else:
+                            logger.error(
+                                f"未找到函数 {tool_call.function.name.replace('-', '.')}"
+                            )
+                            func_return = f"未找到函数 {tool_call.function.name.replace('-', '.')}"
+                    tool_msg.append(
+                        ToolMessage(tool_call_id=tool_call.id, content=func_return).as_dict()  # type: ignore
+                    )
+                    #  tool_msg[0]["tool_calls"][0]["type"] = "builtin_function"
+                    # await UniMessage(str(tool_msg)).send()
+                request_msg = context_msg + [UserMessage(content=usermsg).as_dict()] + tool_msg  # type: ignore
+                response = await make_chat_openai(
+                    client=client,
+                    model_name=model_name,
+                    msg=request_msg,  # type: ignore
+                    tools=(
+                        tools_lists if tools_lists else None
+                    ),  # TODO 临时追加函数，后期优化
+                )
+                choice = response.choices[0]
+                # 当tool_calls非空时，将finish_reason设置为TOOL_CALLS
+                if choice.message.tool_calls != None:
+                    choice.finish_reason = CompletionsFinishReason.TOOL_CALLS
+            if choice.finish_reason == CompletionsFinishReason.STOPPED:
+
+                # 对话成功 添加上下文
+                context.append(
+                    UserMessage(content=usermsg).as_dict(), target.id, target.private  # type: ignore
+                )
+                # context.append(tool_msg, target.id, target.private)
+                choice_msg_dict = choice.message.to_dict()
+                if "reasoning_content" in choice_msg_dict:
+                    del choice_msg_dict["reasoning_content"]
+                context.append(choice_msg_dict, target.id, target.private)
+
+                # 发送消息
+                if config.marshoai_enable_richtext_parse:
+                    await (await parse_richtext(str(choice.message.content))).send(
+                        reply_to=True
+                    )
+                else:
+                    await UniMessage(str(choice.message.content)).send(reply_to=True)
+            else:
+                await marsho_cmd.finish(f"意外的完成原因:{choice.finish_reason}")
+        else:
+            await marsho_cmd.finish(f"意外的完成原因:{choice.finish_reason}")
     except Exception as e:
         await UniMessage(str(e) + suggest_solution(str(e))).send()
         traceback.print_exc()
@@ -279,10 +450,12 @@ with contextlib.suppress(ImportError):  # 优化先不做（）
     @poke_notify.handle()
     async def poke(event: Event):
 
-        user_nickname = await get_nickname_by_user_id(event.get_user_id())
+        user_id = event.get_user_id()
+        nicknames = await get_nicknames()
+        user_nickname = nicknames.get(user_id, "")
         try:
             if config.marshoai_poke_suffix != "":
-                logger.info(f"收到戳一戳，用户昵称：{user_nickname}")
+                logger.info(f"收到戳一戳，用户昵称：{user_nickname}，用户ID：{user_id}")
                 response = await make_chat_openai(
                     client=client,
                     model_name=model_name,

nonebot_plugin_marshoai/models.py

@@ -9,25 +9,7 @@ import traceback
 from nonebot import logger
 
 from .config import config
-
-
-class Cache:
-    """
-    缓存类
-    """
-
-    def __init__(self):
-        self.cache = {}
-
-    def get(self, key):
-        if key in self.cache:
-            return self.cache[key]
-        else:
-            self.cache[key] = None
-            return None
-
-    def set(self, key, value):
-        self.cache[key] = value
+from .util import *
 
 
 class MarshoContext:

nonebot_plugin_marshoai/plugin/func_call/caller.py

@@ -70,8 +70,8 @@ class Caller:
         ):
             return False, "告诉用户 Permission Denied 权限不足"
 
-        # if self.ctx.state is None:
-        #     return False, "State is None"
+        if self.ctx.state is None:
+            return False, "State is None"
         if self._rule and not await self._rule(
             self.ctx.bot, self.ctx.event, self.ctx.state
         ):
@@ -115,10 +115,6 @@ class Caller:
         # 检查函数签名，确定依赖注入参数
         sig = inspect.signature(func)
         for name, param in sig.parameters.items():
-            # if param.annotation == T_State:
-            #     self.di.state = name
-            #     continue  # 防止后续判断T_State子类时报错
-
             if issubclass(param.annotation, Event) or isinstance(
                 param.annotation, Event
             ):
@@ -137,6 +133,9 @@ class Caller:
             ):
                 self.di.matcher = name
 
+            if param.annotation == T_State:
+                self.di.state = name
+
         # 检查默认值情况
         for name, param in sig.parameters.items():
             if param.default is not inspect.Parameter.empty:

nonebot_plugin_marshoai/plugin/func_call/models.py

@@ -19,7 +19,7 @@ class SessionContext(BaseModel):
     bot: Bot
     event: Event
     matcher: Matcher
-    state: T_State | None
+    state: T_State
     caller: Any = None
 
     class Config:
@@ -30,5 +30,5 @@ class SessionContextDepends(BaseModel):
     bot: str | None = None
     event: str | None = None
     matcher: str | None = None
-    # state: str | None = None
+    state: str | None = None
     caller: str | None = None

nonebot_plugin_marshoai/util.py

@@ -20,14 +20,13 @@ from openai.types.chat import ChatCompletion, ChatCompletionMessage
 from zhDateTime import DateTime
 
 from ._types import DeveloperMessage
-from .cache.decos import *
 from .config import config
-from .constants import CODE_BLOCK_PATTERN, IMG_LATEX_PATTERN, OPENAI_NEW_MODELS
+from .constants import *
 from .deal_latex import ConvertLatex
 
-# nickname_json = None  # 记录昵称
-# praises_json = None  # 记录夸赞名单
-loaded_target_list: List[str] = []  # 记录已恢复备份的上下文的列表
+nickname_json = None  # 记录昵称
+praises_json = None  # 记录夸赞名单
+loaded_target_list = []  # 记录已恢复备份的上下文的列表
 
 NOT_GIVEN = NotGiven()
 
@@ -156,29 +155,30 @@ async def make_chat_openai(
     )
 
 
-@from_cache("praises")
 def get_praises():
-    praises_file = store.get_plugin_data_file(
-        "praises.json"
-    )  # 夸赞名单文件使用localstore存储
-    if not praises_file.exists():
-        with open(praises_file, "w", encoding="utf-8") as f:
-            json.dump(_praises_init_data, f, ensure_ascii=False, indent=4)
-    with open(praises_file, "r", encoding="utf-8") as f:
-        data = json.load(f)
-    praises_json = data
+    global praises_json
+    if praises_json is None:
+        praises_file = store.get_plugin_data_file(
+            "praises.json"
+        )  # 夸赞名单文件使用localstore存储
+        if not praises_file.exists():
+            with open(praises_file, "w", encoding="utf-8") as f:
+                json.dump(_praises_init_data, f, ensure_ascii=False, indent=4)
+        with open(praises_file, "r", encoding="utf-8") as f:
+            data = json.load(f)
+        praises_json = data
     return praises_json
 
 
-@update_to_cache("praises")
 async def refresh_praises_json():
+    global praises_json
     praises_file = store.get_plugin_data_file("praises.json")
     if not praises_file.exists():
         with open(praises_file, "w", encoding="utf-8") as f:
             json.dump(_praises_init_data, f, ensure_ascii=False, indent=4)  # 异步？
     async with aiofiles.open(praises_file, "r", encoding="utf-8") as f:
         data = json.loads(await f.read())
-    return data
+    praises_json = data
 
 
 def build_praises() -> str:
@@ -210,21 +210,22 @@ async def load_context_from_json(name: str, path: str) -> list:
         return []
 
 
-@from_cache("nickname")
 async def get_nicknames():
-    """获取nickname_json, 优先来源于缓存"""
-    filename = store.get_plugin_data_file("nickname.json")
-    # noinspection PyBroadException
-    try:
-        async with aiofiles.open(filename, "r", encoding="utf-8") as f:
-            nickname_json = json.loads(await f.read())
-    except (json.JSONDecodeError, FileNotFoundError):
-        nickname_json = {}
+    """获取nickname_json, 优先来源于全局变量"""
+    global nickname_json
+    if nickname_json is None:
+        filename = store.get_plugin_data_file("nickname.json")
+        # noinspection PyBroadException
+        try:
+            async with aiofiles.open(filename, "r", encoding="utf-8") as f:
+                nickname_json = json.loads(await f.read())
+        except Exception:
+            nickname_json = {}
     return nickname_json
 
 
-@update_to_cache("nickname")
 async def set_nickname(user_id: str, name: str):
+    global nickname_json
     filename = store.get_plugin_data_file("nickname.json")
     if not filename.exists():
         data = {}
@@ -236,25 +237,19 @@ async def set_nickname(user_id: str, name: str):
         del data[user_id]
     with open(filename, "w", encoding="utf-8") as f:
         json.dump(data, f, ensure_ascii=False, indent=4)
-    return data
+    nickname_json = data
 
 
-async def get_nickname_by_user_id(user_id: str):
-    nickname_json = await get_nicknames()
-    return nickname_json.get(user_id, "")
-
-
-@update_to_cache("nickname")
 async def refresh_nickname_json():
-    """强制刷新nickname_json"""
+    """强制刷新nickname_json, 刷新全局变量"""
+    global nickname_json
     # noinspection PyBroadException
     try:
         async with aiofiles.open(
             store.get_plugin_data_file("nickname.json"), "r", encoding="utf-8"
         ) as f:
             nickname_json = json.loads(await f.read())
-        return nickname_json
-    except (json.JSONDecodeError, FileNotFoundError):
+    except Exception:
         logger.error("刷新 nickname_json 表错误：无法载入 nickname.json 文件")
 
 

pyproject.toml

@@ -81,4 +81,4 @@ test = [
 ]
 
 [tool.ruff.lint]
-ignore = ["E402", "F405"]
+ignore = ["E402"]