amrita_plugin_memory 0.1.3__tar.gz → 0.1.5__tar.gz

{amrita_plugin_memory-0.1.3 → amrita_plugin_memory-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amrita_plugin_memory
-Version: 0.1.3
+Version: 0.1.5
 Summary: Amrita长期记忆插件
 Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown

amrita_plugin_memory-0.1.5/amrita_plugin_memory/__init__.py

@@ -0,0 +1,8 @@
+from nonebot import require
+
+require("nonebot_plugin_localstore")
+require("amrita.plugins.chat")
+require("amrita.plugins.menu")
+from . import config, embed, matchers, tools, vector
+
+__all__ = ["config", "embed", "matchers", "tools", "vector"]

amrita_plugin_memory-0.1.5/amrita_plugin_memory/matchers.py

@@ -0,0 +1,189 @@
+"""NoneBot2 命令：/memory"""
+
+from amrita.plugins.menu.models import MatcherData
+from nonebot import on_command
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message, MessageEvent
+from nonebot.matcher import Matcher
+from nonebot.params import CommandArg
+
+from .vector import AsyncUserMemory, get_db_conn
+
+memory_cmd = on_command(
+    "memory",
+    aliases={"记忆"},
+    state=MatcherData(
+        name="记忆管理",
+        description="查看/搜索/删除长期记忆",
+        usage="/memory (list|search|delete) [参数]",
+    ).model_dump(),
+)
+
+
+def _label(scope: str) -> str:
+    return "👥群共享" if scope == "group" else "👤个人"
+
+
+@memory_cmd.handle()
+async def _(
+    matcher: Matcher,
+    event: MessageEvent,
+    args: Message = CommandArg(),
+):
+    args_list = args.extract_plain_text().strip().split(maxsplit=1)
+    sub = args_list[0].lower() if args_list else ""
+    rest = args_list[1] if len(args_list) > 1 else ""
+
+    ope = AsyncUserMemory(get_db_conn())
+    await ope.init()
+
+    if isinstance(event, GroupMessageEvent):
+        available_scopes = {"group", "user"}
+        partitions = {
+            "group": f"group_{event.group_id}",
+            "user": f"user_{event.user_id}",
+        }
+        role = event.sender.role if event.sender else "member"
+    else:
+        available_scopes = {"user"}
+        partitions = {"user": f"user_{event.user_id}"}
+        role = None
+
+    # 解析子命令: /memory [scope] [action] [args...]
+    if sub in available_scopes:
+        scope = sub
+        action = rest.split(maxsplit=1)[0] if rest else ""
+        action_args = rest.split(maxsplit=1)[1] if rest and " " in rest else ""
+    elif sub in ("list", "search", "delete"):
+        # 老格式兼容 /memory list 等 → 默认以个人范围执行
+        scope = "user"
+        action = sub
+        action_args = rest
+    else:
+        scope = None
+        action = ""
+        action_args = ""
+
+    pid = partitions.get(scope) if scope else None
+
+    if scope and pid and action in ("", "list"):
+        await _handle_list(matcher, ope, pid, scope)
+    elif scope and pid and action == "search":
+        await _handle_search(matcher, ope, pid, scope, action_args)
+    elif scope and pid and action == "delete":
+        await _handle_delete(matcher, ope, pid, scope, role, action_args)
+    else:
+        hint = (
+            "用法:\n"
+            "/memory user list           — 列出个人记忆\n"
+            "/memory user search <关键词> — 搜索个人记忆\n"
+            "/memory user delete <ID>    — 删除个人记忆"
+        )
+        if "group" in available_scopes:
+            hint += (
+                "\n"
+                "/memory group list          — 列出群共享记忆\n"
+                "/memory group search <关键词> — 搜索群共享记忆\n"
+                "/memory group delete <ID>    — 删除群共享记忆(仅管理/群主)"
+            )
+        await matcher.finish(hint)
+
+
+async def _handle_list(
+    matcher: Matcher,
+    ope: AsyncUserMemory,
+    partition_id: str,
+    scope: str,
+):
+    try:
+        result = await ope.get_all_notes(
+            partition_id, include=["metadatas", "documents"]
+        )
+        if not result or not result.get("ids"):
+            await matcher.finish(f"{_label(scope)} 暂无记忆")
+
+        ids = result["ids"]
+        documents = result.get("documents") or [""] * len(ids)
+        metadatas = result.get("metadatas") or [{}] * len(ids)
+
+        lines = [f"📋 {_label(scope)} 记忆列表（共 {len(ids)} 条）:"]
+        for i, doc_id in enumerate(ids):
+            meta = metadatas[i] if i < len(metadatas) else {}
+            doc = documents[i] if i < len(documents) else ""
+            preview = doc[:50] + "..." if len(doc) > 50 else doc
+            lines.append(
+                f"[{meta.get('importance', '-')}] {doc_id[:8]}… "
+                f"{preview} | tag: {meta.get('tags', '-')}"
+            )
+
+        await matcher.finish("\n".join(lines))
+    except Exception as e:
+        await matcher.finish(f"列出记忆失败: {e}")
+
+
+async def _handle_search(
+    matcher: Matcher,
+    ope: AsyncUserMemory,
+    partition_id: str,
+    scope: str,
+    query: str,
+):
+    if not query:
+        await matcher.finish("请提供搜索关键词，例如: /memory user search 喜欢什么")
+
+    try:
+        res = await ope.query_notes(partition_id, query, top_k=10)
+        if not res or not res.get("ids") or not res["ids"]:
+            await matcher.finish(f"{_label(scope)} 未找到与「{query}」相关的记忆")
+
+        flat_ids = res["ids"][0]
+        if not flat_ids:
+            await matcher.finish(f"{_label(scope)} 未找到与「{query}」相关的记忆")
+
+        raw_docs = res.get("documents")
+        flat_docs = raw_docs[0] if raw_docs else []
+        raw_metas = res.get("metadatas")
+        flat_metas = raw_metas[0] if raw_metas else []
+        raw_dist = res.get("distances")
+        distances: list[float] = raw_dist[0] if raw_dist else []  # type: ignore[assignment]
+
+        lines = [f"🔍 {_label(scope)} 搜索「{query}」结果:"]
+        for i, doc_id in enumerate(flat_ids):
+            meta = flat_metas[i] if i < len(flat_metas) else {}
+            doc = flat_docs[i] if i < len(flat_docs) else ""
+            dist = distances[i] if i < len(distances) else 0.0
+            preview = doc[:50] + "..." if len(doc) > 50 else doc
+            lines.append(
+                f"[{meta.get('importance', '-')}] {doc_id[:8]}… "
+                f"{preview} | tag: {meta.get('tags', '-')} | score: {dist:.3f}"
+            )
+
+        await matcher.finish("\n".join(lines))
+    except Exception as e:
+        await matcher.finish(f"搜索记忆失败: {e}")
+
+
+async def _handle_delete(
+    matcher: Matcher,
+    ope: AsyncUserMemory,
+    partition_id: str,
+    scope: str,
+    role: str | None,
+    doc_id: str,
+):
+    if not doc_id:
+        await matcher.finish("请提供要删除的记忆 ID")
+
+    try:
+        result = await ope.get_all_notes(partition_id, include=["metadatas"])
+        if doc_id not in (result.get("ids") or []):
+            await matcher.finish(f"{_label(scope)} 未找到记忆: {doc_id}")
+
+        if scope == "group" and role == "member":
+            await matcher.finish(
+                f"❌ 无权删除{_label(scope)}记忆，仅管理员和群主可删除"
+            )
+
+        await ope.delete_note(partition_id, doc_id)
+        await matcher.finish(f"✅ 已删除 {_label(scope)} 记忆: {doc_id[:8]}…")
+    except Exception as e:
+        await matcher.finish(f"删除记忆失败: {e}")

{amrita_plugin_memory-0.1.3 → amrita_plugin_memory-0.1.5}/amrita_plugin_memory/tools.py

@@ -13,6 +13,7 @@ from amrita_core import (
 from chromadb import QueryResult
 from nonebot import logger
 from nonebot.adapters.onebot.v11 import Event as OB11Event
+from nonebot.adapters.onebot.v11 import GroupMessageEvent
 
 from .config import DataManager
 from .vector import AsyncUserMemory, MemoryMetadata, get_db_conn
@@ -30,16 +31,15 @@ def _resolve_scope_id(ctx: ToolContext, scope: str) -> str:
     """根据 scope 返回对应的分区 key
 
     - scope="group": 群共享记忆，返回 f"group_{group_id}"
-    - scope="user":  用户专属记忆，返回 event.get_session_id()
+    - scope="user":  用户专属记忆，返回 f"user_{user_id}"（群聊私聊互通）
     """
-    event = _get_event(ctx)
+    event: OB11Event = _get_event(ctx)
     if scope == "group":
-        group_id: int | None = getattr(event, "group_id", None)
-        if group_id is None:
+        if not isinstance(event, GroupMessageEvent):
             raise ValueError("当前不在群聊中，无法使用群共享记忆")
-        return f"group_{group_id}"
+        return f"group_{event.group_id}"
     elif scope == "user":
-        return event.get_session_id()
+        return f"user_{event.user_id}"  # type: ignore
     else:
         raise ValueError(f"无效的 scope: {scope}")
 
@@ -61,6 +61,14 @@ def _err(message: str) -> str:
     )
 
 
+def _check_required(ctx: ToolContext, tool_name: str, *params: str) -> str | None:
+    """校验必填参数，缺失时返回错误消息；全部通过返回 None"""
+    for p in params:
+        if p not in ctx.data or ctx.data[p] is None:
+            return _err(f"调用 {tool_name} 工具必须带有 {p} 参数")
+    return None
+
+
 #  公共参数：scope
 _SCOPE_PROP = FunctionPropertySchema(
     type="string",
@@ -183,7 +191,11 @@ LIST_MEMORY_FUN = FunctionDefinitionSchema(
 
 @on_tools(WRITE_MEMORY_FUN, custom_run=True, strict=True)
 async def w(ctx: ToolContext) -> str:
-    scope: str = ctx.data.get("scope", "user")
+    if err := _check_required(
+        ctx, "write_memory", "content", "tags", "importance", "scope"
+    ):
+        return err
+    scope: str = ctx.data["scope"]
     try:
         partition_id = _resolve_scope_id(ctx, scope)
     except ValueError as e:
@@ -205,14 +217,16 @@ async def w(ctx: ToolContext) -> str:
         scope=cast(Scope, scope),
     )
     await ope.add_note(partition_id, ctx.data["content"], metadata=meta)
-    dmp = meta.model_dump()
+    dmp = meta.model_dump(mode="json")
     dmp["status"] = "success"
     return json.dumps(dmp, ensure_ascii=False, indent=4)
 
 
 @on_tools(READ_MEMORY_FUN, custom_run=True, strict=True)
 async def r(ctx: ToolContext) -> str:
-    scope: str = ctx.data.get("scope", "user")
+    if err := _check_required(ctx, "read_memory", "query", "scope"):
+        return err
+    scope: str = ctx.data["scope"]
     try:
         partition_id = _resolve_scope_id(ctx, scope)
     except ValueError as e:
@@ -226,7 +240,7 @@ async def r(ctx: ToolContext) -> str:
         res: QueryResult = await ope.query_notes(
             partition_id,
             ctx.data["query"],
-            top_k=ctx.data["top_k"],
+            top_k=ctx.data.get("top_k", 5),
             importance=ctx.data.get("importance"),
         )
         return json.dumps(res, ensure_ascii=False, indent=4)
@@ -237,7 +251,9 @@ async def r(ctx: ToolContext) -> str:
 
 @on_tools(UPDATE_FUN, custom_run=True, strict=True)
 async def update_memory(ctx: ToolContext) -> str:
-    scope: str = ctx.data.get("scope", "user")
+    if err := _check_required(ctx, "update_memory", "id", "scope"):
+        return err
+    scope: str = ctx.data["scope"]
     try:
         partition_id = _resolve_scope_id(ctx, scope)
     except ValueError as e:
@@ -307,7 +323,9 @@ async def update_memory(ctx: ToolContext) -> str:
 
 @on_tools(DELETE_FUN, custom_run=True, strict=True)
 async def delete_memory(ctx: ToolContext) -> str:
-    scope: str = ctx.data.get("scope", "user")
+    if err := _check_required(ctx, "delete_memory", "id", "scope"):
+        return err
+    scope: str = ctx.data["scope"]
     try:
         partition_id = _resolve_scope_id(ctx, scope)
     except ValueError as e:
@@ -337,7 +355,9 @@ async def delete_memory(ctx: ToolContext) -> str:
 
 @on_tools(LIST_MEMORY_FUN, custom_run=True, strict=True)
 async def list_memory(ctx: ToolContext) -> str:
-    scope: str = ctx.data.get("scope", "user")
+    if err := _check_required(ctx, "list_memory", "scope"):
+        return err
+    scope: str = ctx.data["scope"]
     try:
         partition_id = _resolve_scope_id(ctx, scope)
     except ValueError as e:

{amrita_plugin_memory-0.1.3 → amrita_plugin_memory-0.1.5}/amrita_plugin_memory.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amrita_plugin_memory
-Version: 0.1.3
+Version: 0.1.5
 Summary: Amrita长期记忆插件
 Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown

{amrita_plugin_memory-0.1.3 → amrita_plugin_memory-0.1.5}/amrita_plugin_memory.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 amrita_plugin_memory/__init__.py
 amrita_plugin_memory/config.py
 amrita_plugin_memory/embed.py
+amrita_plugin_memory/matchers.py
 amrita_plugin_memory/tools.py
 amrita_plugin_memory/vector.py
 amrita_plugin_memory.egg-info/PKG-INFO

{amrita_plugin_memory-0.1.3 → amrita_plugin_memory-0.1.5}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "amrita_plugin_memory"
 description = "Amrita长期记忆插件"
-version = "0.1.3"
+version = "0.1.5"
 dependencies = [
     "aiohttp>=3.13.3",
     "aiologic>=0.16.0",

amrita_plugin_memory-0.1.3/amrita_plugin_memory/__init__.py

@@ -1,7 +0,0 @@
-from nonebot import require
-
-require("nonebot_plugin_localstore")
-require("amrita.plugins.chat")
-from . import config, embed, tools, vector
-
-__all__ = ["config", "embed", "tools", "vector"]