适配Amrita1.x

Author: JohnRichard4096

=0.7.3

@@ -1,6 +1,7 @@
 import typing
 
-from amrita.plugins.chat.API import (
+from amrita.plugins.chat.runtime import AmritaChatObject
+from amrita_core import (
     ToolContext,
     on_tools,
 )
@@ -36,13 +37,14 @@ def format_omikuji(data: OmikujiData, user_name: str | None = ""):
 @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())
+    obj: AmritaChatObject = typing.cast(AmritaChatObject, ctx.event.chat_object)
+    nb_event: MessageEvent = obj.event
     is_group = hasattr(nb_event, "group_id")
-    bot = get_bot(str(ctx.event._nbevent.self_id))
+    bot = get_bot(str(nb_event.self_id))
 
     if (data := await get_cached_omikuji(nb_event)) is None:
         await bot.send(
-            ctx.event._nbevent,
+            nb_event,
             "轻轻摇动古老的签筒，竹签哗啦作响... 心中默念所求之事... 一支签缓缓落下。",
         )
         data = await generate_omikuji(ctx.data["theme"], is_group)

amrita_plugin_omikuji/llm_tool.py

@@ -3,7 +3,7 @@
 import random
 from typing import Literal
 
-from amrita.plugins.chat.API import (
+from amrita_core import (
     FunctionDefinitionSchema,
     FunctionParametersSchema,
     FunctionPropertySchema,

amrita_plugin_omikuji/models.py

@@ -3,11 +3,11 @@
 from copy import deepcopy
 from datetime import datetime, timedelta
 
-from amrita.plugins.chat.API import (
+from amrita.plugins.chat.config import (
     config_manager,
-    tools_caller,
 )
-from amrita.plugins.chat.utils.models import Message
+from amrita_core.libchat import tools_caller
+from amrita_core.types import Message
 from nonebot import logger
 
 from .cache import OmikujiCacheData

amrita_plugin_omikuji/utils.py

@@ -1,6 +1,6 @@
 [project]
 name = "amrita-plugin-omikuji"
-version = "0.1.2.post1"
+version = "0.1.3"
 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.7.3",
+    "amrita[full]>=1.0.1",
     "zipp>=3.23.0",
 ]
 license = "GPL-3.0-or-later"