amrita_plugin_memory 0.2.4__tar.gz → 0.2.6__tar.gz

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

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

amrita_plugin_memory-0.2.6/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.4 → amrita_plugin_memory-0.2.6}/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.4 → amrita_plugin_memory-0.2.6}/amrita_plugin_memory/rethinking/runner.py

@@ -16,7 +16,7 @@ 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
@@ -123,18 +123,13 @@ 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
 
@@ -170,7 +165,9 @@ class SubconsciousRunner:
             chat_obj.begin()
             await chat_obj
         except Exception as e:
-            logger.error(f"[EXP Subconscious] Error: {e}", exc_info=True)
+            logger.opt(exception=e, colors=True, raw=True).exception(
+                f"[EXP Subconscious] Error: {e}"
+            )
         finally:
             self._chat_obj = None
             self._is_running = False
@@ -179,8 +176,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"
@@ -314,7 +310,9 @@ class SubconsciousRunner:
             )
             await repo.update_memory_data(mem)
         except Exception as e:
-            logger.error(f"[EXP Subconscious] Save to repo failed: {e}")
+            logger.opt(exception=e, colors=True, raw=True).exception(
+                f"[EXP Subconscious] Save to repo failed: {e}"
+            )
 
     async def _save_pending_to_repo(self) -> None:
         """持久化待发送消息到 CachedUserDataRepository 的 extra_prompt 中。"""
@@ -331,7 +329,9 @@ class SubconsciousRunner:
             mem.extra_prompt = json.dumps(existing, ensure_ascii=False)
             await repo.update_memory_data(mem)
         except Exception as e:
-            logger.error(f"[EXP Subconscious] Save pending failed: {e}")
+            logger.opt(exception=e, colors=True, raw=True).exception(
+                f"[EXP Subconscious] Save pending failed: {e}"
+            )
 
     #  Prompt 加载
 

{amrita_plugin_memory-0.2.4 → amrita_plugin_memory-0.2.6}/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
@@ -81,7 +80,9 @@ async def subconscious_read_memory(data: dict[str, Any]) -> str:
         )
         return json.dumps(result, ensure_ascii=False, indent=2, default=str)
     except Exception as e:
-        logger.error(f"subconscious_read_memory error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_read_memory error: {e}"
+        )
         return _tools_err(str(e))
 
 
@@ -99,7 +100,9 @@ async def subconscious_write_memory(data: dict[str, Any]) -> str:
         await ope.add_note(pid, str(data["content"]), metadata=meta)
         return _tools_ok(id=meta.memory_id)
     except Exception as e:
-        logger.error(f"subconscious_write_memory error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_write_memory error: {e}"
+        )
         return _tools_err(str(e))
 
 
@@ -146,7 +149,9 @@ async def subconscious_update_memory(data: dict[str, Any]) -> str:
         await ope.update_note(pid, new_content, metadata=meta)
         return _tools_ok(message="记忆更新成功", id=mem_id)
     except Exception as e:
-        logger.error(f"subconscious_update_memory error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_update_memory error: {e}"
+        )
         return _tools_err(str(e))
 
 
@@ -166,7 +171,9 @@ async def subconscious_delete_memory(data: dict[str, Any]) -> str:
         await ope.delete_note(pid, mem_id)
         return _tools_ok(message="记忆删除成功", id=mem_id)
     except Exception as e:
-        logger.error(f"subconscious_delete_memory error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_delete_memory error: {e}"
+        )
         return _tools_err(str(e))
 
 
@@ -203,7 +210,9 @@ async def subconscious_list_memory(data: dict[str, Any]) -> str:
             )
         return _tools_ok(memories=memories, total=len(ids))
     except Exception as e:
-        logger.error(f"subconscious_list_memory error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_list_memory error: {e}"
+        )
         return _tools_err(str(e))
 
 
@@ -236,7 +245,9 @@ async def subconscious_send_to_user(data: dict[str, Any]) -> str:
     try:
         content = await _generate_send_content(intent, memory_context)
     except Exception as e:
-        logger.error(f"[EXP Subconscious] Generate send content failed: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"[EXP Subconscious] Generate send content failed: {e}"
+        )
         return _tools_err(str(e))
     ts = datetime.now(timezone.utc).isoformat()
     pending = _state.get_pending()
@@ -272,7 +283,9 @@ async def subconscious_read_chat_context(data: dict[str, Any]) -> str:
             indent=2,
         )
     except Exception as e:
-        logger.error(f"subconscious_read_chat_context error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_read_chat_context error: {e}"
+        )
         return _tools_err(str(e))
 
 
@@ -294,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(
@@ -386,7 +399,9 @@ async def subconscious_duplicate_helper(data: dict[str, Any]) -> str:
             memories=items,
         )
     except Exception as e:
-        logger.error(f"subconscious_duplicate_helper error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_duplicate_helper error: {e}"
+        )
         return _tools_err(str(e))
 
 
@@ -444,5 +459,7 @@ async def subconscious_get_memory_stats(data: dict[str, Any]) -> str:
             avg_length=total_length // len(ids) if ids else 0,
         )
     except Exception as e:
-        logger.error(f"subconscious_get_memory_stats error: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"subconscious_get_memory_stats error: {e}"
+        )
         return _tools_err(str(e))

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

@@ -245,7 +245,9 @@ async def r(ctx: ToolContext) -> str:
         )
         return json.dumps(res, ensure_ascii=False, indent=4)
     except Exception as e:
-        logger.error(f"检索记忆时发生错误: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"检索记忆时发生错误: {e}"
+        )
         return _err(f"检索记忆失败: {e!s}")
 
 
@@ -317,7 +319,9 @@ async def update_memory(ctx: ToolContext) -> str:
 
         return _ok(message="记忆更新成功", id=ctx.data["id"])
     except Exception as e:
-        logger.error(f"更新记忆时发生错误: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"更新记忆时发生错误: {e}"
+        )
         return _err(f"更新记忆失败: {e!s}")
 
 
@@ -349,7 +353,9 @@ async def delete_memory(ctx: ToolContext) -> str:
         await ope.delete_note(partition_id, ctx.data["id"])
         return _ok(message="记忆删除成功", id=ctx.data["id"])
     except Exception as e:
-        logger.error(f"删除记忆时发生错误: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"删除记忆时发生错误: {e}"
+        )
         return _err(f"删除记忆失败: {e!s}")
 
 
@@ -400,5 +406,7 @@ async def list_memory(ctx: ToolContext) -> str:
 
         return _ok(memories=memories, total=len(ids))
     except Exception as e:
-        logger.error(f"列出记忆时发生错误: {e}")
+        logger.opt(exception=e, colors=True, raw=True).exception(
+            f"列出记忆时发生错误: {e}"
+        )
         return _err(f"列出记忆失败: {e!s}")

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

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

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

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

amrita_plugin_memory-0.2.4/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",
-]