fix: 修复工具调用枚举

Author: JohnRichard4096

=0.7.3

@@ -9,12 +9,9 @@
 require("amrita.plugins.chat")
 require("amrita.plugins.menu")
 
-from amrita.plugins.chat.API import ToolsManager
-
 from . import commands, llm_tool, sql_models
 from .cache import OmikujiCache
-from .config import get_cache_dir, get_config
-from .llm_tool import TOOL_DATA
+from .config import get_cache_dir
 
 __plugin_meta__ = PluginMetadata(
     name="御神签",
@@ -33,10 +30,6 @@ async def init():
         version = metadata.version("amrita_plugin_omikuji")
         if "dev" in version:
             logger.warning("当前版本为开发版本，可能存在不稳定情况！")
-    logger.info(f"Loading OMIKUJI V{version}......")
-    conf = get_config()
-    if conf.enable_omikuji:
-        ToolsManager().register_tool(TOOL_DATA)
     logger.info("正在初始化缓存数据......")
     os.makedirs(get_cache_dir(), exist_ok=True)
     for cache in get_cache_dir().glob("*.json"):

amrita_plugin_omikuji/__init__.py

@@ -42,9 +42,13 @@ def check(self) -> Config:
         return self
 
 
+PLUGIN_CONFIG = get_plugin_config(Config)
+CACHE_DIR = get_plugin_cache_dir()
+
+
 def get_config() -> Config:
-    return get_plugin_config(Config)
+    return PLUGIN_CONFIG
 
 
 def get_cache_dir() -> Path:
-    return get_plugin_cache_dir()
+    return CACHE_DIR

amrita_plugin_omikuji/config.py

@@ -2,15 +2,14 @@
 
 from amrita.plugins.chat.API import (
     ToolContext,
-    ToolData,
+    on_tools,
 )
 from nonebot import get_bot, logger
 from nonebot.adapters.onebot.v11 import MessageEvent
 
-from amrita_plugin_omikuji.cache import cache_omikuji, get_cached_omikuji
-
+from .cache import cache_omikuji, get_cached_omikuji
 from .config import get_config
-from .models import FUNC_META, OmikujiData
+from .models import FUNC_DEFINTION, OmikujiData
 from .utils import generate_omikuji
 
 LEVEL = ["大吉", "吉", "中吉", "小吉", "末吉", "凶", "大凶"]
@@ -34,7 +33,8 @@ def format_omikuji(data: OmikujiData, user_name: str | None = ""):
     return msg
 
 
-async def omikuji(ctx: ToolContext):
+@on_tools(FUNC_DEFINTION, custom_run=True, strict=True)
+async def omikuji(ctx: ToolContext) -> str:
     logger.info("获取御神签")
     nb_event: MessageEvent = typing.cast(MessageEvent, ctx.event.get_nonebot_event())
     is_group = hasattr(nb_event, "group_id")
@@ -51,7 +51,4 @@ async def omikuji(ctx: ToolContext):
         return data.model_dump_json()
     msg = format_omikuji(data)
     await bot.send(nb_event, msg)
-    ctx.matcher.cancel_nonebot_process()
-
-
-TOOL_DATA = ToolData(data=FUNC_META, func=omikuji, custom_run=True)
+    return "Generated a omikuji for user."

amrita_plugin_omikuji/llm_tool.py

@@ -124,20 +124,20 @@ class OmikujiData(BaseModel):
     ),
 )
 
-FUNC_META = ToolFunctionSchema(
-    strict=True,
-    function=FunctionDefinitionSchema(
-        name="omikuji",
-        description="抽取一个御神签",
-        parameters=FunctionParametersSchema(
-            type="object",
-            properties={
-                "theme": FunctionPropertySchema(
-                    type="string",
-                    description="御神签主题（如果包含不良内容则随机选择）",
-                )
-            },
-            required=["theme"],
-        ),
+FUNC_DEFINTION = FunctionDefinitionSchema(
+    name="omikuji",
+    description="抽取一个御神签",
+    parameters=FunctionParametersSchema(
+        type="object",
+        properties={
+            "theme": FunctionPropertySchema(
+                type="string",
+                description="御神签主题（如果包含不良内容则随机选择）",
+                enum=OMIKUJI_THEMES,
+            )
+        },
+        required=["theme"],
     ),
 )
+
+FUNC_META = ToolFunctionSchema(strict=True, function=FUNC_DEFINTION)

amrita_plugin_omikuji/models.py

@@ -59,7 +59,7 @@ async def _hit_cache_omikuji(
 async def generate_omikuji(
     theme: THEME_TYPE,
     is_group: bool = False,
-    level: str = "",
+    level: str | None = None,
 ) -> OmikujiData:
     config = get_config()
     level = level or random_level()

amrita_plugin_omikuji/utils.py

@@ -1,6 +1,6 @@
 [project]
 name = "amrita-plugin-omikuji"
-version = "0.1.1.1"
+version = "0.1.2"
 description = "AmritaBot的御神签插件"
 readme = "README.md"
 requires-python = ">=3.10, <4.0"
@@ -10,7 +10,7 @@ dependencies = [
     "nonebot-plugin-localstore>=0.7.4",
     "aiofiles>=24.1.0",
     "nonebot-plugin-orm>=0.8.2",
-    "amrita[full]>=0.4.4",
+    "amrita[full]==0.7.3",
     "zipp>=3.23.0",
 ]
 license = "GPL-3.0-or-later"