使用SuggarChat新写法重构

Author: JohnRichard4096

README.md

@@ -48,10 +48,10 @@
 - SuggarChat 框架
 - 支持的LLM服务（如OpenAI、Anthropic等）
 
-### 使用pip安装（推荐）
+### 使用nb-cli安装（推荐）
 
 ```bash
-pip install nonebot-plugin-omikuji
+nb plugin install nonebot-plugin-omikuji
 ```
 
 ### 使用uv安装

nonebot_plugin_omikuji/llm_tool.py

@@ -3,18 +3,14 @@
 from nonebot import get_bot, logger
 from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot_plugin_suggarchat.API import (
-    FunctionDefinitionSchema,
-    FunctionParametersSchema,
-    FunctionPropertySchema,
     ToolContext,
     ToolData,
-    ToolFunctionSchema,
 )
 
 from nonebot_plugin_omikuji.cache import cache_omikuji, get_cached_omikuji
 
 from .config import get_config
-from .models import OMIKUJI_THEMES, OmikujiData
+from .models import FUNC_META, OmikujiData
 from .utils import generate_omikuji
 
 LEVEL = ["大吉", "吉", "中吉", "小吉", "末吉", "凶", "大凶"]
@@ -58,23 +54,4 @@ async def omikuji(ctx: ToolContext):
     ctx.matcher.cancel_nonebot_process()
 
 
-FUNC_META = ToolFunctionSchema(
-    strict=True,
-    function=FunctionDefinitionSchema(
-        name="御神签(omikuji)",
-        description="抽取一个御神签",
-        parameters=FunctionParametersSchema(
-            type="object",
-            properties={
-                "theme": FunctionPropertySchema(
-                    type="string",
-                    description="御神签主题（如果包含不良内容则随机选择）",
-                    enum=OMIKUJI_THEMES,
-                )
-            },
-            required=["theme"],
-        ),
-    ),
-)
-
 TOOL_DATA = ToolData(data=FUNC_META, func=omikuji, custom_run=True)

nonebot_plugin_omikuji/models.py

@@ -125,9 +125,9 @@ class OmikujiData(BaseModel):
 )
 
 FUNC_META = ToolFunctionSchema(
-    strict=False,
+    strict=True,
     function=FunctionDefinitionSchema(
-        name="御神签(omikuji)",
+        name="omikuji",
         description="抽取一个御神签",
         parameters=FunctionParametersSchema(
             type="object",

nonebot_plugin_omikuji/utils.py

@@ -8,6 +8,7 @@
     config_manager,
     tools_caller,
 )
+from nonebot_plugin_suggarchat.utils.models import Message
 
 from .cache import OmikujiCacheData
 from .config import get_config
@@ -66,14 +67,17 @@ async def generate_omikuji(
         if cache := await _hit_cache_omikuji(theme, level):
             return cache
     logger.debug(f"theme: {theme}, level: {level} Cache miss")
-    system_prompt = deepcopy(
-        config_manager.group_train if is_group else config_manager.private_train
+    system_prompt = Message.model_validate(
+        deepcopy(
+            config_manager.group_train if is_group else config_manager.private_train
+        )
+    )
+    assert isinstance(system_prompt.content, str)
+    system_prompt.content += "\n你现在需要结合你的角色设定生成御神签。"
+    user_prompt = Message(
+        role="user",
+        content=f"御神签的运势是：'{level}'\n现在生成一张主题为：'{theme}'的御神签",
     )
-    system_prompt["content"] += "\n你现在需要结合你的角色设定生成御神签。"
-    user_prompt = {
-        "role": "user",
-        "content": f"御神签的运势是：'{level}'\n现在生成一张主题为：'{theme}'的御神签",
-    }
     msg_input = [system_prompt, user_prompt]
     data = await tools_caller(
         messages=msg_input, tools=[OMIKUJI_SCHEMA_META], tool_choice="required"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-omikuji"
-version = "0.1.0.post1"
+version = "0.1.1"
 description = "Nonebot2的御神签插件"
 readme = "README.md"
 requires-python = ">=3.10, <4.0"
@@ -11,6 +11,7 @@ dependencies = [
     "nonebot-plugin-localstore>=0.7.4",
     "aiofiles>=24.1.0",
     "nonebot-plugin-orm>=0.8.2",
+    "zipp>=3.23.0",
 ]
 license = "GPL-3.0-or-later"
 keywords = ['chat", "suggar", "nonebot']