amrita_plugin_memory 0.2.6__tar.gz → 0.2.8__tar.gz

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amrita_plugin_memory
-Version: 0.2.6
+Version: 0.2.8
 Summary: Amrita长期记忆插件
 Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
@@ -10,6 +10,7 @@ Requires-Dist: aiologic>=0.16.0
 Requires-Dist: amrita-core>=0.8.5
 Requires-Dist: amrita>=1.3
 Requires-Dist: chromadb>=1.5.8
+Requires-Dist: nonebot-plugin-amrita>=0.2.2
 Requires-Dist: nonebot-plugin-apscheduler>=0.5.0
 Requires-Dist: nonebot-plugin-localstore>=0.7.4
 Dynamic: license-file

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/amrita_plugin_memory/__init__.py

@@ -2,6 +2,7 @@ from nonebot import require
 
 require("nonebot_plugin_localstore")
 require("nonebot_plugin_apscheduler")
+require("nonebot_plugin_amrita")
 require("amrita.plugins.chat")
 require("amrita.plugins.menu")
 from . import config, embed, matchers, rethinking, tools, vector

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/amrita_plugin_memory/rethinking/__init__.py

@@ -1,4 +1,4 @@
-"""潜意识推理循环（rethinking"""
+"""潜意识推理循环（rethinking）"""
 
 from . import _state, backend, hooks, nodes, schemas, tools, workflow
 

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/amrita_plugin_memory/rethinking/runner.py

@@ -9,9 +9,8 @@ import random
 from datetime import datetime, timedelta, timezone
 from typing import Any
 
-from amrita.plugins.chat.utils.app import CachedUserDataRepository
 from amrita.plugins.chat.utils.libchat import add_usage
-from amrita.plugins.chat.utils.sql import InsightsModel
+from amrita_core import SuspendObjectStream
 from amrita_core.base.backend import BackendSlots
 from amrita_core.builtins.agent import ReActAgentStrategy
 from amrita_core.chatmanager import ChatObject
@@ -20,10 +19,11 @@ from amrita_core.preset import ModelPreset
 from amrita_core.types import Message, UniResponseUsage
 from amrita_core.utils import gather_usage
 from amrita_sense import WorkflowInterpreter
-from amrita_sense.exceptions import InterruptKeepContext
 from amrita_sense.runtime.types import InterpreterContext
 from jinja2 import Template
 from nonebot import logger
+from nonebot_plugin_amrita.database import InsightsModel
+from nonebot_plugin_amrita.memory import CachedUserDataRepository
 from nonebot_plugin_apscheduler import scheduler
 
 from ..config import DATA_PATH, SubconsciousConfig
@@ -40,12 +40,15 @@ from .workflow import build_workflow
 _REPO_UID = "user_00000000"
 
 
+async def _ign_cb(*_, **__): ...
+
+
 class SubconsciousRunner:
     """常驻推理循环运行器。
 
     使用 ChatObject 作为数据容器 + 标准 Agent 框架（ReActAgentStrategy）。
     LIMITING_MEMORY 节点在 Agent Loop 之前运行 MemoryLimiter 压缩会话消息。
-    持久化使用 CachedUserDataRepository（uid=user_00000000）。
+    持久化使用 CachedUserDataRepository（user_00000000）。
     """
 
     def __init__(self, config: SubconsciousConfig) -> None:
@@ -133,6 +136,8 @@ class SubconsciousRunner:
         train = Message(role="system", content=prompt_text)
         user_input = user_msg_text
 
+        io_stream = SuspendObjectStream(callback=_ign_cb)
+
         chat_obj = ChatObject(
             train=train,
             user_input=user_input,
@@ -141,7 +146,7 @@ class SubconsciousRunner:
             backend=BackendSlots(self._backend, self._backend),
             config=get_config(),
             agent_strategy=ReActAgentStrategy,
-            exception_ignored=(InterruptKeepContext,),
+            io_stream=io_stream,
         )
         self._chat_obj = chat_obj
 
@@ -152,7 +157,6 @@ class SubconsciousRunner:
             chat_obj.io_stream,
             extra_args=chat_obj._interpreter._ava_args[1:],
             extra_kwargs=chat_obj._interpreter._ava_kwargs,
-            exception_ignored=chat_obj._interpreter._exc_ignored,
         )
 
         if self._saved_dump is not None:
@@ -264,7 +268,7 @@ class SubconsciousRunner:
         """从 CachedUserDataRepository 恢复状态。"""
         try:
             repo = CachedUserDataRepository()
-            mem = await repo.get_memory(0, False, uid=_REPO_UID)
+            mem = await repo.get_memory(_REPO_UID)
             # extra_prompt 存 JSON 元状态
             if mem.extra_prompt:
                 data = json.loads(mem.extra_prompt)
@@ -297,7 +301,7 @@ class SubconsciousRunner:
         """保存状态到 CachedUserDataRepository。"""
         try:
             repo = CachedUserDataRepository()
-            mem = await repo.get_memory(0, False, uid=_REPO_UID)
+            mem = await repo.get_memory(_REPO_UID)
             latest_abstract = self._last_abstracts[-1] if self._last_abstracts else ""
             mem.memory_json.abstract = latest_abstract
             mem.extra_prompt = json.dumps(
@@ -318,7 +322,7 @@ class SubconsciousRunner:
         """持久化待发送消息到 CachedUserDataRepository 的 extra_prompt 中。"""
         try:
             repo = CachedUserDataRepository()
-            mem = await repo.get_memory(0, False, uid=_REPO_UID)
+            mem = await repo.get_memory(_REPO_UID)
             existing: dict[str, Any] = {}
             if mem.extra_prompt:
                 try:

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/amrita_plugin_memory/rethinking/tools.py

@@ -268,10 +268,10 @@ async def subconscious_read_chat_context(data: dict[str, Any]) -> str:
         return _tools_err(f"invalid target_user_id: {uid_str}")
     limit = int(data.get("limit", 10))
     try:
-        from amrita.plugins.chat.utils.app import CachedUserDataRepository
+        from nonebot_plugin_amrita.memory import CachedUserDataRepository
 
         repo = CachedUserDataRepository()
-        mem = await repo.get_memory(user_id, is_group=False)
+        mem = await repo.get_memory(f"user_{user_id}")
         messages = mem.memory_json.messages
         recent = messages[-limit:] if len(messages) > limit else messages
         return json.dumps(

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/amrita_plugin_memory/tools.py

@@ -23,6 +23,7 @@ Scope = Literal["group", "user"]  # type alias
 
 def _get_event(ctx: ToolContext) -> OB11Event:
     """从 ToolContext 中提取 OneBot V11 原始事件"""
+    assert ctx.ctx.chat_object
     amrictx: AmritaBotContext = ctx.ctx.chat_object._hook_kwargs["amrita"]
     return amrictx["event"]
 

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/amrita_plugin_memory.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amrita_plugin_memory
-Version: 0.2.6
+Version: 0.2.8
 Summary: Amrita长期记忆插件
 Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
@@ -10,6 +10,7 @@ Requires-Dist: aiologic>=0.16.0
 Requires-Dist: amrita-core>=0.8.5
 Requires-Dist: amrita>=1.3
 Requires-Dist: chromadb>=1.5.8
+Requires-Dist: nonebot-plugin-amrita>=0.2.2
 Requires-Dist: nonebot-plugin-apscheduler>=0.5.0
 Requires-Dist: nonebot-plugin-localstore>=0.7.4
 Dynamic: license-file

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/amrita_plugin_memory.egg-info/requires.txt

@@ -3,5 +3,6 @@ aiologic>=0.16.0
 amrita-core>=0.8.5
 amrita>=1.3
 chromadb>=1.5.8
+nonebot-plugin-amrita>=0.2.2
 nonebot-plugin-apscheduler>=0.5.0
 nonebot-plugin-localstore>=0.7.4

{amrita_plugin_memory-0.2.6 → amrita_plugin_memory-0.2.8}/pyproject.toml

@@ -1,13 +1,14 @@
 [project]
 name = "amrita_plugin_memory"
 description = "Amrita长期记忆插件"
-version = "0.2.6"
+version = "0.2.8"
 dependencies = [
     "aiohttp>=3.13.3",
     "aiologic>=0.16.0",
     "amrita-core>=0.8.5",
     "amrita>=1.3",
     "chromadb>=1.5.8",
+    "nonebot-plugin-amrita>=0.2.2",
     "nonebot-plugin-apscheduler>=0.5.0",
     "nonebot-plugin-localstore>=0.7.4",
 ]