From 5944df41b5c4d8de456fff649c3d9cf296d7dc7f Mon Sep 17 00:00:00 2001 From: hermes Date: Sun, 27 Sep 2026 00:58:03 +0800 Subject: [PATCH] =?UTF-8?q?chore(plugin):=20=E9=83=A8=E7=BD=B2=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E5=A4=B4=E9=83=A8=E6=B3=A8=E9=87=8A=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=88=E6=9D=83=E5=A8=81=E5=89=AF=E6=9C=AC=20=3D=20hermes-ag?= =?UTF-8?q?ent/plugins/memory/zhiyi/=5F=5Finit=5F=5F.py=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 三副本收敛后的头部说明改写:明确"改内容请改权威副本再同步本文件"(t_4171e2ad 教训:改错副本白重启两次)。 --- plugins/hermes-zhiyi/__init__.py | 37 ++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/plugins/hermes-zhiyi/__init__.py b/plugins/hermes-zhiyi/__init__.py index 01669a4..221e4e1 100644 --- a/plugins/hermes-zhiyi/__init__.py +++ b/plugins/hermes-zhiyi/__init__.py @@ -1,9 +1,5 @@ -# ⚠️ 影子副本 — 不是生效文件!改这里不会生效。 -# 生效文件(memory provider 发现是 bundled-first,内置目录优先): -# ~/.hermes/hermes-agent/plugins/memory/zhiyi/__init__.py -# 验证生效路径: -# python3 -c "import sys;sys.path.insert(0,'/home/muc/.hermes/hermes-agent');import plugins.memory as pm;print(pm.find_provider_dir('zhiyi'))" -# 同步方式:以生效文件为准 cp 过来,再 commit(t_4171e2ad 教训:改错副本让人白重启两次) +# ⚠️ 部署副本 — 权威副本 = ~/.hermes/hermes-agent/plugins/memory/zhiyi/__init__.py(bundled-first 生效) +# 改内容请改权威副本后再同步本文件(2026-09-26 三副本收敛) """hermes-zhiyi — Bridge plugin: Hermes Agent → ZhiYi MemoryWeave REST API. Uses ZhiYi's bge-m3 1024-dim semantic search + bge-reranker-v2-m3 reranking. @@ -33,7 +29,14 @@ from pathlib import Path from typing import Any, Dict, List, Optional import requests -import websocket + +try: # 可选依赖:仅用于 WS 推送监听(prefetch.push)。缺失不得拖垮整个 provider + import websocket +except ImportError: # pragma: no cover - 环境未装 websocket-client + websocket = None + logging.getLogger(__name__).warning( + "[ZhiYi] websocket-client 未安装 → WS 推送监听停用(记忆读写/检索不受影响)" + ) from agent.memory_provider import MemoryProvider from tools.registry import tool_error @@ -373,6 +376,9 @@ class HermesZhiYiMemoryProvider(MemoryProvider): def _start_ws_listener(self) -> None: """启动 WebSocket 事件监听线程(连接织忆事件推送)。""" + if websocket is None: + logger.info("[ZhiYi] websocket-client 缺失 → 跳过 WS 推送监听(不影响记忆读写)") + return if self._ws_running: return self._ws_running = True @@ -536,11 +542,17 @@ class HermesZhiYiMemoryProvider(MemoryProvider): content = r.get("content", "") or r.get("text", "") or r.get("snippet", "") cat = r.get("category", "") mid = r.get("id") or r.get("memory_id") or "" + # 2026-09-26:记忆出处(笔记路径)—— 服务端 recall 现已返回 source, + # 蒸馏记忆形如 "wiki:";渲染出来便于回溯「这条记忆来自哪篇笔记」。 + src = (r.get("source") or "").strip() + prov = "" + if src: + prov = f"[出处:{src[5:]}]" if src.startswith("wiki:") else f"[源:{src}]" if content: if mid: - blocks.append(f" [id={mid}][{score:.2f}][{cat}] {content[:500]}") + blocks.append(f" [id={mid}][{score:.2f}][{cat}]{prov} {content[:500]}") else: - blocks.append(f" [{score:.2f}][{cat}] {content[:500]}") + blocks.append(f" [{score:.2f}][{cat}]{prov} {content[:500]}") # 图谱导航 + Obsidian 笔记(如果缓存没有命中) if notes is None: @@ -617,8 +629,11 @@ class HermesZhiYiMemoryProvider(MemoryProvider): if not query or len(query) < 2: return try: - wiki_dir = Path.home() / "mc" / "小唯" / "07-Wiki" - data_struct = wiki_dir / "data_structure.md" + wiki_dir = Path.home() / "mc" / "小怡" + data_struct = wiki_dir / "04-OBSIDIAN工具" / "04-01-定义规范" / "data_structure.md" + # 2026-09-26 修:原路径 ~/mc/小唯/07-Wiki 为改名前的旧名(小唯→小怡),且 07-Wiki 已按 + # P2 迁移映射表重组到 04-OBSIDIAN工具/(旧 07-Wiki/data_structure.md → 04-01-定义规范/)。 + # 旧路径不存在 → data_struct.exists() 恒 False → 本段静默失效(deep 模式无本地证据)。 if not data_struct.exists(): return