amrita 1.0.0.dev1__tar.gz → 1.0.0.dev2__tar.gz

{amrita-1.0.0.dev1/amrita.egg-info → amrita-1.0.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amrita
-Version: 1.0.0.dev1
+Version: 1.0.0.dev2
 Summary: A powerful AI bot framework powered by NoneBot2
 License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/LiteSuggarDEV/Amrita
@@ -29,7 +29,7 @@ Requires-Dist: nonebot-plugin-orm>=0.8.3
 Requires-Dist: nb-cli==1.6.0
 Requires-Dist: watchfiles>=1.1.1
 Provides-Extra: full
-Requires-Dist: amrita-core==0.4.2.1; extra == "full"
+Requires-Dist: amrita-core==0.4.3.2; extra == "full"
 Requires-Dist: nonebot-plugin-uniconf>=0.1.3; extra == "full"
 Requires-Dist: aiomysql>=0.3.2; extra == "full"
 Requires-Dist: aiopg>=1.4.0; extra == "full"

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/builtin_hook.py

@@ -7,7 +7,6 @@ from amrita_core import (
     ChatObject,
     PreCompletionEvent,
     ToolContext,
-    get_config,
     on_precompletion,
     on_tools,
 )
@@ -47,7 +46,7 @@ agent.BUILTIN_TOOLS_NAME.add(REPORT_TOOL_MEDIUM.function.name)
 @on_tools(
     data=PROCESS_MESSAGE_TOOL,
     custom_run=True,
-    enable_if=lambda: get_config().function_config.agent_middle_message,
+    enable_if=lambda: config_manager.config.llm.tools.agent_middle_message,
 )
 async def _(ctx: ToolContext) -> str | None:
     msg: str = ctx.data["content"]

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/check_rule.py

@@ -53,7 +53,7 @@ async def is_bot_enabled(event: Event) -> bool:
         bots = set(nonebot.get_bots().keys())
         if event.get_user_id() in bots:  # 多实例下防止冲突
             return False
-    if group_id := getattr(event, "group_id", None) is not None:
+    if (group_id := getattr(event, "group_id", None)) is not None:
         data = await CachedUserDataRepository().get_group_config(
             group_id,
         )
@@ -219,7 +219,10 @@ async def should_respond_with_usage_check(event: MessageEvent, bot: Bot) -> bool
         ):
             if event.is_tome():
                 with contextlib.suppress(Exception):
-                    await bot.send(event, "今天的聊天额度已经用完了～")
+                    await bot.send(
+                        event,
+                        random.choice(config_manager.config.usage_limit.limit_msg),
+                    )
                     return False
             return False
         return True

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/config.py

@@ -11,6 +11,7 @@ import nonebot_plugin_localstore as store
 import tomli
 import tomli_w
 from amrita_core import ModelPreset as CoreModelPreset
+from amrita_core import PresetManager, set_config
 from amrita_core.config import (
     AmritaConfig as AmritaCoreConfig,
 )
@@ -27,6 +28,7 @@ from nonebot import get_driver, logger
 from nonebot_plugin_uniconf import EnvfulConfigManager
 from nonebot_plugin_uniconf.manager import replace_env_vars
 from pydantic import BaseModel, Field
+from typing_extensions import final, override
 
 from amrita.config_manager import UniConfigManager
 
@@ -262,10 +264,14 @@ class UsageLimitConfig(BaseModel):
     total_daily_limit: int = Field(default=1500, description="总使用次数限制")
     total_daily_token_limit: int = Field(default=1000000, description="总使用token限制")
     global_insights_expire_days: int = Field(default=7, description="全局统计过期天数")
+    limit_msg: list[str] = Field(
+        default=["今日额度已达上限，请明天再试。"],
+        description="达到使用限制时返回的消息",
+    )
 
 
 class LLM_Config(BaseModel):
-    tools: ToolsConfig = Field(default=ToolsConfig(), description="工具调用配置")
+    tools: ToolsConfig = Field(default=ToolsConfig(), description="工具调用子系统")
     stream: bool = Field(default=False, description="是否启用流式响应（逐字输出）")
     memory_length_limit: int = Field(default=50, description="记忆上下文的最大消息数量")
     max_tokens: int = Field(default=100, description="单次回复生成的最大token数")
@@ -294,14 +300,6 @@ class LLM_Config(BaseModel):
         default=["你好，这个问题我暂时无法处理，请稍后再试。"],
         description="触发安全熔断时随机返回的提示消息",
     )
-    # 添加limit相关配置
-    limit: UsageLimitConfig = Field(
-        default=UsageLimitConfig(), description="使用限制配置"
-    )
-    limit_msg: list[str] = Field(
-        default=["使用次数已达上限，请明天再试。"],
-        description="达到使用限制时返回的消息",
-    )
 
 
 class Config(BaseModel):
@@ -318,17 +316,11 @@ class Config(BaseModel):
     autoreply: AutoReplyConfig = Field(
         default=AutoReplyConfig(), description="自动回复设置"
     )
-    # 添加与Core配置对应的function_config
-    function_config: ToolsConfig = Field(
-        default=ToolsConfig(), description="功能配置，对应Core的function_config"
-    )
     function: FunctionConfig = Field(
         default=FunctionConfig(), description="功能开关配置"
     )
     extended: ExtendConfig = Field(default=ExtendConfig(), description="扩展行为设置")
-    llm: LLM_Config = Field(
-        default=LLM_Config(), description="大语言模型配置，对应Core的llm"
-    )
+    llm: LLM_Config = Field(default=LLM_Config(), description="LLM核心功能配置")
     extra: dict[str, Any] = Field(default={}, description="扩展预留区")
     usage_limit: UsageLimitConfig = Field(
         default=UsageLimitConfig(), description="使用限额配置"
@@ -337,9 +329,6 @@ class Config(BaseModel):
     parse_segments: bool = Field(
         default=True, description="是否解析特殊消息段（如@提及/合并转发等）"
     )
-    matcher_function: bool = Field(
-        default=True, description="是否启用 SuggarMatcher 高级匹配功能"
-    )
     preset: str = Field(default="default", description="默认使用的模型预设配置名称")
     group_prompt_character: str = Field(
         default="default", description="群聊场景使用的提示词模板名称"
@@ -386,15 +375,15 @@ class Config(BaseModel):
     def to_core_config(self) -> AmritaCoreConfig:
         return AmritaCoreConfig(
             function_config=CoreFunctionConfig(
-                use_minimal_context=self.function_config.use_minimal_context,
-                tool_calling_mode=self.function_config.tool_calling_mode,
-                agent_tool_call_limit=self.function_config.agent_tool_call_limit,
-                agent_tool_call_notice=self.function_config.agent_tool_call_notice,
-                agent_thought_mode=self.function_config.agent_thought_mode,
-                agent_reasoning_hide=self.function_config.agent_reasoning_hide,
-                agent_middle_message=self.function_config.agent_middle_message,
-                agent_mcp_client_enable=self.function_config.agent_mcp_client_enable,
-                agent_mcp_server_scripts=self.function_config.agent_mcp_server_scripts,
+                use_minimal_context=self.llm.tools.use_minimal_context,
+                tool_calling_mode=self.llm.tools.tool_calling_mode,
+                agent_tool_call_limit=self.llm.tools.agent_tool_call_limit,
+                agent_tool_call_notice=self.llm.tools.agent_tool_call_notice,
+                agent_thought_mode=self.llm.tools.agent_thought_mode,
+                agent_reasoning_hide=self.llm.tools.agent_reasoning_hide,
+                agent_middle_message=self.llm.tools.agent_middle_message,
+                agent_mcp_client_enable=self.llm.tools.agent_mcp_client_enable,
+                agent_mcp_server_scripts=self.llm.tools.agent_mcp_server_scripts,
             ),
             llm=CoreLLMConfig(
                 require_tools=self.llm.tools.require_tools,
@@ -447,6 +436,7 @@ class Prompts:
                 f.write(prompt.text)
 
 
+@final
 class ConfigManager(EnvfulConfigManager[Config]):
     config_dir: Path = CONFIG_DIR
     private_prompts: Path = config_dir / "private_prompts"
@@ -461,8 +451,13 @@ class ConfigManager(EnvfulConfigManager[Config]):
     _owner_name = store._try_get_caller_plugin().name
     __lateinit__ = True
 
+    @override
+    def _update_cache(self, value: Config | None = None):
+        super()._update_cache(value)
+        set_config(self.config.to_core_config())
+
     async def __apost_init__(self):
-        return await self.load()
+        await self.load()
 
     async def load(self):
         """_初始化配置目录_"""
@@ -524,7 +519,7 @@ class ConfigManager(EnvfulConfigManager[Config]):
         if cache and self.models:
             return [model for model, _ in self.models]
         self.models.clear()  # 清空模型列表
-
+        PresetManager()._presets.clear()
         for file in self.custom_models_dir.glob("*.json"):
             model_data = ModelPreset.load(file).model_dump()
             preset_data = replace_env_vars(model_data)
@@ -533,6 +528,7 @@ class ConfigManager(EnvfulConfigManager[Config]):
             model_preset = ModelPreset.model_validate(preset_data)
             self._model_name2file[model_preset.name] = file
             self.models.append((model_preset, file.stem))
+            PresetManager().add_preset(model_preset)
 
         return [model for model, _ in self.models]
 

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/handlers/chat.py

@@ -5,8 +5,10 @@ import random
 from datetime import datetime
 
 from amrita_core import (
+    MemoryModel,
     PresetManager,
     SessionsManager,
+    TextContent,
     UniResponse,
     UniResponseUsage,
     debug_log,
@@ -18,12 +20,17 @@ from amrita_core.protocol import (
     MessageWithMetadata,
     StringMessageContent,
 )
+from amrita_core.types import ImageContent, ImageUrl
 from nonebot import get_driver
 from nonebot.adapters.onebot.v11 import (
     Bot,
     MessageSegment,
 )
-from nonebot.adapters.onebot.v11.event import GroupMessageEvent, MessageEvent
+from nonebot.adapters.onebot.v11.event import (
+    GroupMessageEvent,
+    MessageEvent,
+    Reply,
+)
 from nonebot.exception import MatcherException, NoneBotException, ProcessException
 from nonebot.matcher import Matcher
 from pytz import utc
@@ -31,9 +38,13 @@ from pytz import utc
 from amrita.plugins.chat.config import ConfigManager, config_manager
 from amrita.plugins.chat.matcher import ChatException
 from amrita.plugins.chat.utils.app import CachedUserDataRepository, UserMetadataSchema
-from amrita.plugins.chat.utils.functions import split_message_into_chats
+from amrita.plugins.chat.utils.functions import (
+    get_friend_name,
+    split_message_into_chats,
+    synthesize_message,
+)
 from amrita.plugins.chat.utils.lock import get_group_lock, get_private_lock
-from amrita.plugins.chat.utils.sql import InsightsModel, get_any_id
+from amrita.plugins.chat.utils.sql import InsightsModel, get_any_id, get_uni_user_id
 from amrita.utils.admin import send_to_admin
 
 from ..runtime import AmritaChatObject
@@ -59,6 +70,72 @@ def add_usage(
         ins.total_called_count += 1
 
 
+async def handle_reply(
+    reply: Reply, bot: Bot, group_id: int | None, content: str
+) -> str:
+    """处理引用消息：
+    - 提取引用消息的内容和时间信息。
+    - 格式化为可读的引用内容。
+
+    Args:
+        reply: 回复消息
+        bot: Bot实例
+        group_id: 群组ID（私聊为None）
+        content: 原始内容
+
+    Returns:
+        格式化后的内容
+    """
+    if not reply.sender.user_id:
+        return content
+    dt_object = datetime.fromtimestamp(reply.time)
+    weekday = dt_object.strftime("%A")
+    formatted_time = dt_object.strftime("%Y-%m-%d %I:%M:%S %p")
+    role = await get_user_role(bot, group_id, reply.sender.user_id) if group_id else ""
+
+    reply_content = await synthesize_message(reply.message, bot)
+    result = f"{content}\n<MESSAGE_REFERED>\n{formatted_time} {weekday} [{role}]{reply.sender.nickname}（QQ:{reply.sender.user_id}）说：{reply_content}\n</MESSAGE_REFERED>"
+    debug_log(f"处理引用消息完成: {result[:50]}..")
+    return result
+
+
+def get_reply_pics(event: MessageEvent) -> list[ImageContent]:
+    """获取引用消息中的图片内容
+
+    Returns:
+        图片内容列表
+    """
+    if reply := event.reply:
+        msg = reply.message
+        images = [
+            ImageContent(image_url=ImageUrl(url=url))
+            for seg in msg
+            if seg.type == "image" and (url := seg.data.get("url")) is not None
+        ]
+        debug_log(f"获取引用图片完成，共 {len(images)} 张")
+        return images
+    return []
+
+
+async def get_user_role(bot: Bot, group_id: int, user_id: int) -> str:
+    """获取用户在群聊中的身份（群主、管理员或普通成员）。
+
+    Args:
+        group_id: 群组ID
+        user_id: 用户ID
+
+    Returns:
+        用户角色字符串
+    """
+    role_data = await bot.get_group_member_info(group_id=group_id, user_id=user_id)
+    role = role_data["role"]
+    role_str = {"admin": "群管理员", "owner": "群主", "member": "普通成员"}.get(
+        role, "[获取身份失败]"
+    )
+    debug_log(f"获取用户角色完成: {role_str}")
+    return role_str
+
+
 async def send_response(chat: AmritaChatObject, response: str):
     """发送聊天模型的回复，根据配置选择不同的发送方式。
 
@@ -79,6 +156,58 @@ async def send_response(chat: AmritaChatObject, response: str):
             )
 
 
+async def synthesize_message_to_msg(
+    event: MessageEvent,
+    role: str,
+    user_name: str,
+    user_id: str,
+    content: str,
+):
+    """将消息转换为Message
+
+    根据配置和多模态支持情况，将事件消息转换为适当的格式，
+    支持文本和图片内容的组合。
+
+    Args:
+        event: 消息事件
+        role: 用户角色
+        date: 时间戳
+        user_name: 用户名
+        user_id: 用户ID
+        content: 消息内容
+
+    Returns:
+        转换后的消息内容
+    """
+    is_multimodal: bool = (
+        any(
+            [
+                (await config_manager.get_preset(preset=preset)).multimodal
+                for preset in [
+                    config_manager.config.preset,
+                    *config_manager.config.preset_extension.backup_preset_list,
+                ]
+            ]
+        )
+        or len(config_manager.config.preset_extension.multi_modal_preset_list) > 0
+    )
+
+    if config_manager.config.parse_segments:
+        text = (
+            [TextContent(text=f"[{role}][{user_name}（{user_id}）]说:{content}")]
+            + [
+                ImageContent(image_url=ImageUrl(url=seg.data["url"]))
+                for seg in event.message
+                if seg.type == "image" and seg.data.get("url")
+            ]
+            if is_multimodal
+            else f"[{role}][{user_name}（{user_id}）]说:{content}"
+        )
+    else:
+        text = event.message.extract_plain_text()
+    return text
+
+
 async def entry(event: MessageEvent, matcher: Matcher, bot: Bot):
     """聊天处理器入口函数
 
@@ -98,11 +227,7 @@ async def entry(event: MessageEvent, matcher: Matcher, bot: Bot):
         if prefix.strip()
     ):
         matcher.skip()
-    session_id = (
-        f"{event.group_id}_{event.user_id}"
-        if isinstance(event, GroupMessageEvent)
-        else f"private_{event.user_id}"
-    )
+    session_id = get_uni_user_id(event)
     train = (
         config_manager.group_train
         if isinstance(event, GroupMessageEvent)
@@ -114,7 +239,9 @@ async def entry(event: MessageEvent, matcher: Matcher, bot: Bot):
 
     async def filter(message: COMPLETION_RETURNING):
         nonlocal can_send_message
-        if isinstance(message, MessageWithMetadata):
+        if isinstance(message, str):
+            return
+        elif isinstance(message, MessageWithMetadata):
             match message.metadata.get("type", ""):
                 case "system":
                     if (
@@ -156,15 +283,56 @@ async def entry(event: MessageEvent, matcher: Matcher, bot: Bot):
             msg = MessageSegment.image(await message.get_image())
             await matcher.send(msg)
 
+    content = await synthesize_message(event.get_message(), bot)
+    debug_log(f"合成消息完成: {content}")
+
+    if content.strip() == "":
+        content = ""
+    if event.reply:
+        group_id = event.group_id if isinstance(event, GroupMessageEvent) else None
+        debug_log("处理引用消息..")
+        content = await handle_reply(event.reply, bot, group_id, content)
+
+    reply_pics = get_reply_pics(event)
+    debug_log(f"获取引用图片完成，共 {len(reply_pics)} 张")
+    if isinstance(event, GroupMessageEvent):
+        # 群聊消息处理
+        debug_log("处理群聊消息")
+        group_id = event.group_id
+
+        user_name = (
+            (await bot.get_group_member_info(group_id=group_id, user_id=event.user_id))[
+                "nickname"
+            ]
+            if not config.function.use_user_nickname
+            else event.sender.nickname
+        )
+    else:
+        debug_log("处理私聊消息")
+        user_name = (
+            await get_friend_name(event.user_id, bot=bot)
+            if not isinstance(event, GroupMessageEvent)
+            else event.sender.nickname
+        )
+    role = (
+        await get_user_role(bot, event.group_id, event.user_id)
+        if isinstance(event, GroupMessageEvent)
+        else ""
+    )
+    content = await synthesize_message_to_msg(
+        event, role, str(user_name), str(event.user_id), content
+    )
+    if isinstance(content, list):
+        content.extend(reply_pics)
     chat: AmritaChatObject = AmritaChatObject(
         event=event,
         matcher=matcher,
         bot=bot,
         session_id=session_id,
         train=train,
-        auto_create_session=True,
-        context=None,
-        config=config.to_core_config(),
+        auto_create_session=False,
+        user_input=content,
+        context=MemoryModel(),
         preset=PresetManager().get_preset(config.preset),
         hook_args=(event, matcher, bot),
         exception_ignored=(ProcessException, MatcherException),
@@ -225,7 +393,6 @@ async def entry(event: MessageEvent, matcher: Matcher, bot: Bot):
             ):
                 d.called_count  # 增加使用次数
                 add_usage(d, response.usage)
-                debug_log(f"更新记忆数据，使用次数: {d.usage}")
                 await cudr.update_metadata(d)
         SessionsManager().drop_session(session_id)
         chat._pending = False

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/handlers/debug_switchs.py

@@ -1,8 +1,7 @@
+from amrita_core import logging
 from nonebot.adapters.onebot.v11.event import MessageEvent
 from nonebot.matcher import Matcher
 
-from ..utils import logging
-
 
 async def debug_switchs(event: MessageEvent, matcher: Matcher):
     """根据用户权限切换调试模式"""

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/handlers/insights.py

@@ -27,14 +27,14 @@ async def insights(event: MessageEvent, matcher: Matcher, args: Message = Comman
         is_admin = await is_bot_admin(event)
 
         msg = (
-            f"您今日的使用次数为：{data.usage}/{user_limit if (user_limit != -1 and enable_limit and not is_admin) else '♾'}次"
+            f"您今日的使用次数为：{data.called_count}/{user_limit if (user_limit != -1 and enable_limit and not is_admin) else '♾'}次"
             + f"\n您今日的token使用量为：{data.tokens_input + data.tokens_output}/{user_token_limit if (user_token_limit != -1 and enable_limit and not is_admin) else '♾'}tokens"
             + f"(输入：{data.tokens_input},输出：{data.tokens_output})"
         )
         if isinstance(event, GroupMessageEvent):
             data = await CachedUserDataRepository().get_metadata(*get_any_id(event))
             msg = (
-                f"群组使用次数为：{data.usage}/{group_limit if (group_limit != -1 and enable_limit) else '♾'}次"
+                f"群组使用次数为：{data.called_count}/{group_limit if (group_limit != -1 and enable_limit) else '♾'}次"
                 + f"\n群组使用token为：{data.tokens_input + data.tokens_output}/{group_token_limit if (group_token_limit != -1 and enable_limit) else '♾'}tokens"
                 + f"（输入：{data.tokens_input},输出：{data.tokens_output}）"
                 + f"\n\n{msg}"

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/handlers/mcp.py

@@ -72,15 +72,15 @@ async def mcp_status(bot: Bot, matcher: Matcher, event: MessageEvent, arg: list[
 async def add_mcp_server(
     matcher: Matcher, bot: Bot, event: MessageEvent, mcp_server: str
 ):
-    if not config_manager.config.llm.tools.agent_mcp_client_enable:
+    config = config_manager.config
+    if not config.llm.tools.agent_mcp_client_enable:
         return
-    config = config_manager.ins_config
     if not mcp_server:
         await matcher.finish("请输入MCP Server脚本路径")
     if mcp_server in config.llm.tools.agent_mcp_server_scripts:
         await matcher.finish("MCP Server脚本已存在")
     try:
-        await ClientManager().initialize_this(mcp_server)
+        await ClientManager().initialize_this(mcp_server, True)
         config.llm.tools.agent_mcp_server_scripts.append(mcp_server)
         await config_manager.save_config()
         await matcher.send("添加成功")

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/page.py

@@ -447,7 +447,7 @@ async def add_mcp_server(request: Request):
 
         # 尝试初始化MCP服务器
         client_manager = ClientManager()
-        await client_manager.initialize_this(server_script)
+        await client_manager.initialize_this(server_script, True)
 
         # 保存到配置
         config.llm.tools.agent_mcp_server_scripts.append(server_script)
@@ -500,7 +500,7 @@ async def update_mcp_server(request: Request, server_script: str | None = None):
         await client_manager.unregister_client(old_server_script)
 
         # 尝试初始化新MCP服务器
-        await client_manager.initialize_this(new_server_script)
+        await client_manager.initialize_this(new_server_script, True)
 
         # 添加新服务器到配置
         config.llm.tools.agent_mcp_server_scripts.append(new_server_script)

{amrita-1.0.0.dev1 → amrita-1.0.0.dev2}/amrita/plugins/chat/preprocess.py

@@ -11,6 +11,7 @@ driver = get_driver()
 async def onEnable():
     logger.debug("加载配置文件...")
     config = await config_manager.safe_get_config()
+
     await run_hooks()
     logger.debug("正在加载AmritaCore...")
     core_config = config.to_core_config()