amrita_plugin_memory 0.2.5__tar.gz → 0.2.7__tar.gz

{amrita_plugin_memory-0.2.5 → amrita_plugin_memory-0.2.7}/PKG-INFO

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

amrita_plugin_memory-0.2.7/amrita_plugin_memory/rethinking/__init__.py

@@ -0,0 +1,13 @@
+"""潜意识推理循环（rethinking"""
+
+from . import _state, backend, hooks, nodes, schemas, tools, workflow
+
+__all__ = [
+    "_state",
+    "backend",
+    "hooks",
+    "nodes",
+    "schemas",
+    "tools",
+    "workflow",
+]

{amrita_plugin_memory-0.2.5 → amrita_plugin_memory-0.2.7}/amrita_plugin_memory/rethinking/_state.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
+from amrita.plugins.chat.config import config_manager
+from amrita_core import ModelPreset
 from amrita_core.tools.manager import MultiToolsManager
 
 if TYPE_CHECKING:
@@ -15,6 +17,12 @@ _pending_messages: list[dict[str, Any]] = []
 _SUBCONSCIOUS_TOOLS = MultiToolsManager()
 
 
+async def get_preset() -> ModelPreset:
+    return await config_manager.get_preset(
+        (await config_manager.safe_get_config()).preset
+    )
+
+
 def get_runner() -> SubconsciousRunner | None:
     return _runner
 

{amrita_plugin_memory-0.2.5 → amrita_plugin_memory-0.2.7}/amrita_plugin_memory/rethinking/runner.py

@@ -12,15 +12,15 @@ 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
 from amrita_core.config import get_config
-from amrita_core.preset import PresetManager
+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
@@ -40,6 +40,9 @@ from .workflow import build_workflow
 _REPO_UID = "user_00000000"
 
 
+async def _ign_cb(*_, **__): ...
+
+
 class SubconsciousRunner:
     """常驻推理循环运行器。
 
@@ -123,21 +126,18 @@ class SubconsciousRunner:
         self._is_running = True
         self._iter_stop_result = {}
 
-        preset = PresetManager().get_default_preset()
+        preset = await _state.get_preset()
         prompt_text = await self._load_prompt()
         user_msg_text = (
             f"现在是第 {self._total_runs + 1} 次潜意识推理循环。"
             f"请检查用户 (ID: {self._config.target_user_id}) 的记忆库，执行必要的整理操作。"
             f"完成后务必调用 subconscious_iter_stop。"
         )
-        if self._is_native_thinking():
-            user_msg_text += (
-                " （注意：你的模型启用了内置思考模式，请务必调用 think_and_reason。）"
-            )
-
         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,
@@ -146,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
 
@@ -157,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:
@@ -181,8 +180,7 @@ class SubconsciousRunner:
         await self._post_process(chat_obj)
 
     @staticmethod
-    def _is_native_thinking() -> bool:
-        preset = PresetManager().get_default_preset()
+    def _is_native_thinking(preset: ModelPreset) -> bool:
         return (
             preset.thinking_config is not None
             and preset.thinking_config.thinking_type == "enabled"

{amrita_plugin_memory-0.2.5 → amrita_plugin_memory-0.2.7}/amrita_plugin_memory/rethinking/tools.py

@@ -8,7 +8,6 @@ from typing import Any
 
 from amrita_core import on_tools
 from amrita_core.libchat import call_completion, get_last_response
-from amrita_core.preset import PresetManager
 from amrita_core.types import CONTENT_LIST_TYPE, Message
 from chromadb import GetResult
 from jinja2 import Template
@@ -308,7 +307,7 @@ async def _generate_send_content(intent: str, memory_context: str) -> str:
         current_time=datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC"),
         character_prompt=character_prompt,
     )
-    preset = PresetManager().get_default_preset()
+    preset = await _state.get_preset()
     messages: CONTENT_LIST_TYPE = [
         Message(role="system", content=system_content),
         Message(

{amrita_plugin_memory-0.2.5 → amrita_plugin_memory-0.2.7}/amrita_plugin_memory.egg-info/PKG-INFO

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

{amrita_plugin_memory-0.2.5 → amrita_plugin_memory-0.2.7}/pyproject.toml

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

amrita_plugin_memory-0.2.5/amrita_plugin_memory/rethinking/__init__.py

@@ -1,20 +0,0 @@
-"""潜意识推理循环（rethinking 子包）。
-
-导入此包时触发工具注册和 hook 注册。
-注意：避免模块级导入 tools/runner 等会触发循环导入的子模块。
-这些模块的副作用（@on_tools 注册、hook 注册）通过 hooks 和 tools 内部的延迟导入自动生效。
-"""
-
-from . import _state, backend, hooks, nodes, schemas, workflow
-
-__all__ = [
-    "_state",
-    "backend",
-    "consts",
-    "hooks",
-    "nodes",
-    "runner",
-    "schemas",
-    "tools",
-    "workflow",
-]