Compare commits
35
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db6fd1b8e3 | ||
|
|
5176683937 | ||
|
|
6150ceb9cc | ||
|
|
6054f9921a | ||
|
|
ba70b84b00 | ||
|
|
fb71eafa35 | ||
|
|
cdd549fdd1 | ||
|
|
0df84c086c | ||
|
|
dc0ba49fbe | ||
|
|
ce705e9e4a | ||
|
|
334b14472b | ||
|
|
38baa9eebf | ||
|
|
0083a355a5 | ||
|
|
c049facb70 | ||
|
|
c681fdcf24 | ||
|
|
d0a52c9863 | ||
|
|
01259d01f5 | ||
|
|
0e436e9b70 | ||
|
|
ec99618e1f | ||
|
|
c53c874c21 | ||
|
|
80f21d29a7 | ||
|
|
2cc2f02450 | ||
|
|
5be27fd87f | ||
|
|
7aaf0f8557 | ||
|
|
887583b858 | ||
|
|
fcdb2307e2 | ||
|
|
9ed744b455 | ||
|
|
1b90f04a50 | ||
|
|
0822e7137e | ||
|
|
bcc0751060 | ||
|
|
183b61e736 | ||
|
|
e038006c7f | ||
|
|
16953ed49e | ||
|
|
4ff948c7e1 | ||
|
|
346f2653f2 |
No files matched your search
@@ -14,13 +14,6 @@ Hy Memory and MemHub are versioned and released independently.
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
- Serialized each SDK SQLite store's shared connection lifecycle so concurrent
|
|
||||||
history/cache operations cannot race with `close()` and crash the process.
|
|
||||||
- Clarified that `add(metadata=...)` carries legacy SDK processing options,
|
|
||||||
while persistent caller business context belongs in `meta`.
|
|
||||||
- Added an opt-in `get(..., include_raw=True)` path for reading `L1_RAW`
|
|
||||||
memories, including memories written in lite mode. The default remains
|
|
||||||
hidden for backward compatibility.
|
|
||||||
- Removed MemHub's task-scoped HyPermission store wrappers and global
|
- Removed MemHub's task-scoped HyPermission store wrappers and global
|
||||||
model-content consent switch. The trusted embedded Hy Memory SDK now uses
|
model-content consent switch. The trusted embedded Hy Memory SDK now uses
|
||||||
its native local stores directly.
|
its native local stores directly.
|
||||||
|
|||||||
@@ -32,8 +32,7 @@ English | [中文](README.zh.md)
|
|||||||
|
|
||||||
## Latest News
|
## Latest News
|
||||||
|
|
||||||
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 📦 **Released [MemHub v1.0.4](https://github.com/Tencent-Hunyuan/Hy-Memory/releases/tag/v1.0.4)** and **[memhub-cli 1.0.5](https://www.npmjs.com/package/memhub-cli/v/1.0.5)**, with a signed macOS desktop app and verified macOS/Linux Runtimes!
|
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **Released** **Hy Memory 2.0 (`hy-memory==2.0.3`)** on [PyPI](https://pypi.org/project/hy-memory/2.0.3/) and open-sourced the **Hy-Memory** monorepo together with **[MemHub](memhub/README.md)**!
|
||||||
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **Released** **Hy Memory 2.0 (`hy-memory==2.0.4`)** on [PyPI](https://pypi.org/project/hy-memory/2.0.4/) and open-sourced the **Hy-Memory** monorepo together with **[MemHub](memhub/README.md)**!
|
|
||||||
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **Open-sourced** **[Hy-Memory-30B-A3B](https://huggingface.co/tencent/Hy-Memory-30B-A3B)** on Hugging Face along with its [technical report](https://arxiv.org/abs/2610.22196) on attributed reinforcement learning for long-term memory writing!
|
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **Open-sourced** **[Hy-Memory-30B-A3B](https://huggingface.co/tencent/Hy-Memory-30B-A3B)** on Hugging Face along with its [technical report](https://arxiv.org/abs/2610.22196) on attributed reinforcement learning for long-term memory writing!
|
||||||
* *<mark>[new]</mark>* 🔥🔥 **[2026-09]**: 📊 **Released** **[CMB: A Coding Memory Benchmark for Long-Horizon and Interleaved Coding Agents](docs/papers/CMB_A_Coding_Memory_Benchmark_for_Long_Horizon_and_Interleaved_Coding_Agents.pdf)** (submitted to **ICLR 2027**).
|
* *<mark>[new]</mark>* 🔥🔥 **[2026-09]**: 📊 **Released** **[CMB: A Coding Memory Benchmark for Long-Horizon and Interleaved Coding Agents](docs/papers/CMB_A_Coding_Memory_Benchmark_for_Long_Horizon_and_Interleaved_Coding_Agents.pdf)** (submitted to **ICLR 2027**).
|
||||||
* *<mark>[new]</mark>* 🔥🔥 **[2026-08]**: 🎉 **Accepted** at **EMNLP 2026**: **[Memory Beyond Recall: A Dual-Process Cognitive Memory System for Self-Evolving LLM Agents](https://arxiv.org/abs/2606.09483)**!
|
* *<mark>[new]</mark>* 🔥🔥 **[2026-08]**: 🎉 **Accepted** at **EMNLP 2026**: **[Memory Beyond Recall: A Dual-Process Cognitive Memory System for Self-Evolving LLM Agents](https://arxiv.org/abs/2606.09483)**!
|
||||||
|
|||||||
+1
-2
@@ -32,8 +32,7 @@
|
|||||||
|
|
||||||
## 最新动态
|
## 最新动态
|
||||||
|
|
||||||
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 📦 **正式发布 [MemHub v1.0.4](https://github.com/Tencent-Hunyuan/Hy-Memory/releases/tag/v1.0.4)** 与 **[memhub-cli 1.0.5](https://www.npmjs.com/package/memhub-cli/v/1.0.5)**,提供已签名的 macOS 桌面应用及经过验证的 macOS/Linux Runtime!
|
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **正式发布** **Hy Memory 2.0 (`hy-memory==2.0.3`)**(已上线 [PyPI](https://pypi.org/project/hy-memory/2.0.3/)),并开源 **Hy-Memory** monorepo 与 **[MemHub](memhub/README.md)**!
|
||||||
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **正式发布** **Hy Memory 2.0 (`hy-memory==2.0.4`)**(已上线 [PyPI](https://pypi.org/project/hy-memory/2.0.4/)),并开源 **Hy-Memory** monorepo 与 **[MemHub](memhub/README.md)**!
|
|
||||||
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **模型开源** 在 Hugging Face 发布 **[Hy-Memory-30B-A3B](https://huggingface.co/tencent/Hy-Memory-30B-A3B)** 长期记忆写入模型及[技术报告](https://arxiv.org/abs/2610.22196)!
|
* *<mark>[new]</mark>* 🔥🔥🔥 **[2026-10]**: 🚀 **模型开源** 在 Hugging Face 发布 **[Hy-Memory-30B-A3B](https://huggingface.co/tencent/Hy-Memory-30B-A3B)** 长期记忆写入模型及[技术报告](https://arxiv.org/abs/2610.22196)!
|
||||||
* *<mark>[new]</mark>* 🔥🔥 **[2026-09]**: 📊 **基准与方法发布** 推出长周期与交错式编程记忆评测基准 **[CMB: A Coding Memory Benchmark for Long-Horizon and Interleaved Coding Agents](docs/papers/CMB_A_Coding_Memory_Benchmark_for_Long_Horizon_and_Interleaved_Coding_Agents.pdf)**(已投稿 **ICLR 2027**)。
|
* *<mark>[new]</mark>* 🔥🔥 **[2026-09]**: 📊 **基准与方法发布** 推出长周期与交错式编程记忆评测基准 **[CMB: A Coding Memory Benchmark for Long-Horizon and Interleaved Coding Agents](docs/papers/CMB_A_Coding_Memory_Benchmark_for_Long_Horizon_and_Interleaved_Coding_Agents.pdf)**(已投稿 **ICLR 2027**)。
|
||||||
* *<mark>[new]</mark>* 🔥🔥 **[2026-08]**: 🎉 **论文录用** 双系统认知记忆架构论文 **[Memory Beyond Recall: A Dual-Process Cognitive Memory System for Self-Evolving LLM Agents](https://arxiv.org/abs/2606.09483)** 被 **EMNLP 2026** 接收!
|
* *<mark>[new]</mark>* 🔥🔥 **[2026-08]**: 🎉 **论文录用** 双系统认知记忆架构论文 **[Memory Beyond Recall: A Dual-Process Cognitive Memory System for Self-Evolving LLM Agents](https://arxiv.org/abs/2606.09483)** 被 **EMNLP 2026** 接收!
|
||||||
|
|||||||
@@ -106,15 +106,6 @@ result = client.add(
|
|||||||
)
|
)
|
||||||
```
|
```
|
||||||
|
|
||||||
`metadata` 与 `meta` 不是同一字段:
|
|
||||||
|
|
||||||
- `metadata` 是兼容旧调用方保留的 SDK 处理选项,会进入内部
|
|
||||||
`WriteRequest.extra`,不保证持久化或随查询结果返回。
|
|
||||||
- `meta` 是调用方的业务上下文,会持久化并在 `search()`、`get()` 等结果中返回。
|
|
||||||
同一记忆被多次合并时,各次 `meta` 会按写入顺序保存在列表中。
|
|
||||||
|
|
||||||
需要以后读回的数据必须放在 `meta`,不要放在 `metadata`。
|
|
||||||
|
|
||||||
`scene` 的公开取值:
|
`scene` 的公开取值:
|
||||||
|
|
||||||
- `None`:普通文本直接走 chat;messages 含 tool 时执行快速场景判断。
|
- `None`:普通文本直接走 chat;messages 含 tool 时执行快速场景判断。
|
||||||
@@ -272,8 +263,6 @@ catalog 也可以在没有基础 L0 时形成只读的合成画像。
|
|||||||
|
|
||||||
```python
|
```python
|
||||||
memory = client.get("memory_id")
|
memory = client.get("memory_id")
|
||||||
# lite 模式写入的是 L1_RAW;按 ID 读取时必须显式选择返回原文。
|
|
||||||
raw_memory = client.get("memory_id", include_raw=True)
|
|
||||||
result = client.update("memory_id", "更新后的内容")
|
result = client.update("memory_id", "更新后的内容")
|
||||||
result = client.delete("memory_id")
|
result = client.delete("memory_id")
|
||||||
result = client.delete_all(user_id="user_001")
|
result = client.delete_all(user_id="user_001")
|
||||||
@@ -293,10 +282,6 @@ result = client.clone_user("user_001", "user_002", agent_id=None)
|
|||||||
对应异步方法为 `async_get()`、`async_update()`、`async_delete()`、
|
对应异步方法为 `async_get()`、`async_update()`、`async_delete()`、
|
||||||
`async_delete_all()`、`async_list_memories()`、`async_clone_user()`。
|
`async_delete_all()`、`async_list_memories()`、`async_clone_user()`。
|
||||||
|
|
||||||
`get()` / `async_get()` 默认继续隐藏 `L1_RAW`,因此不会改变现有调用方的原文访问
|
|
||||||
边界。只有显式传入 `include_raw=True` 才返回该层;这也是 lite 模式按 ID 读取
|
|
||||||
写入内容及其 `meta` 的方式。MemHub 的 HTTP 读取接口不开放此参数。
|
|
||||||
|
|
||||||
普通 `list_memories()` 返回 `vdb` 桶,并在 Graph 有结果时附带 `graph`;传入
|
普通 `list_memories()` 返回 `vdb` 桶,并在 Graph 有结果时附带 `graph`;传入
|
||||||
`workspace_id` 时返回生产力记忆的 `scene="productivity"` 和 `experiences`。
|
`workspace_id` 时返回生产力记忆的 `scene="productivity"` 和 `experiences`。
|
||||||
|
|
||||||
|
|||||||
+12
-39
@@ -1597,9 +1597,7 @@ class HyMemoryClient:
|
|||||||
session_id: Session ID(三级隔离 key)
|
session_id: Session ID(三级隔离 key)
|
||||||
source: 调用来源,例如 openclaw / cursor / codex;与 agent_id 正交。
|
source: 调用来源,例如 openclaw / cursor / codex;与 agent_id 正交。
|
||||||
写入前执行 strip().lower(),默认 "default"。
|
写入前执行 strip().lower(),默认 "default"。
|
||||||
metadata: 旧版 SDK 处理选项,会并入内部 WriteRequest.extra。
|
metadata: 自定义元数据
|
||||||
不保证持久化或随查询返回;调用方需要保存并读回的业务字段
|
|
||||||
请使用 meta。
|
|
||||||
memory_at: 记忆时间戳(不传则用当前时间),用于导入历史记忆
|
memory_at: 记忆时间戳(不传则用当前时间),用于导入历史记忆
|
||||||
scene: 显式指定写入路由,跳过 LLM 自动判定。
|
scene: 显式指定写入路由,跳过 LLM 自动判定。
|
||||||
- None(默认):含 tool 时 LLM 判 chat/working/coding;
|
- None(默认):含 tool 时 LLM 判 chat/working/coding;
|
||||||
@@ -1625,8 +1623,8 @@ class HyMemoryClient:
|
|||||||
branch: Coding memory 路径专用。分支名。同 workspace_id。chat 路径忽略。
|
branch: Coding memory 路径专用。分支名。同 workspace_id。chat 路径忽略。
|
||||||
meta: 调用方自定义业务 meta,随本次产出的记忆存储、查询时原样返回。
|
meta: 调用方自定义业务 meta,随本次产出的记忆存储、查询时原样返回。
|
||||||
不 embed、不参与召回、不作过滤条件。
|
不 embed、不参与召回、不作过滤条件。
|
||||||
与 metadata 不同:metadata 是旧版内部处理选项,
|
与 metadata 不同:metadata 会并入 extra(含 SDK 内部控制键),
|
||||||
meta 独立持久化,只做业务透传。
|
meta 独立存放,只做透传。
|
||||||
语义为「该次 write 时刻的上下文」,故存为 list——同一节点被
|
语义为「该次 write 时刻的上下文」,故存为 list——同一节点被
|
||||||
多次写入合并时会追加而非覆盖,详见 get() 返回的 meta 字段。
|
多次写入合并时会追加而非覆盖,详见 get() 返回的 meta 字段。
|
||||||
|
|
||||||
@@ -1793,26 +1791,17 @@ class HyMemoryClient:
|
|||||||
query_embedding=query_embedding,
|
query_embedding=query_embedding,
|
||||||
))
|
))
|
||||||
|
|
||||||
def get(
|
def get(self, memory_id: str) -> Optional[Dict[str, Any]]:
|
||||||
self,
|
|
||||||
memory_id: str,
|
|
||||||
*,
|
|
||||||
include_raw: bool = False,
|
|
||||||
) -> Optional[Dict[str, Any]]:
|
|
||||||
"""
|
"""
|
||||||
获取单条记忆。
|
获取单条记忆。
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
memory_id: 记忆 ID
|
memory_id: 记忆 ID
|
||||||
include_raw: 是否允许返回 L1_RAW 原始记忆。默认 False,保持原有隐藏行为;
|
|
||||||
lite 模式的记忆均为 L1_RAW,需显式设为 True 才能按 ID 读取。
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
{"memory_id", "content", "layer", "request_id", "elapsed_ms"} 或 None(不存在时)
|
{"memory_id", "content", "layer", "request_id", "elapsed_ms"} 或 None(不存在时)
|
||||||
"""
|
"""
|
||||||
return self._loop_thread.run(
|
return self._loop_thread.run(self.async_get(memory_id))
|
||||||
self.async_get(memory_id, include_raw=include_raw)
|
|
||||||
)
|
|
||||||
|
|
||||||
def update(
|
def update(
|
||||||
self,
|
self,
|
||||||
@@ -3661,21 +3650,12 @@ class HyMemoryClient:
|
|||||||
# ================================================================
|
# ================================================================
|
||||||
|
|
||||||
@_ensure_internal_loop
|
@_ensure_internal_loop
|
||||||
async def async_get(
|
async def async_get(self, memory_id: str) -> Optional[Dict[str, Any]]:
|
||||||
self,
|
|
||||||
memory_id: str,
|
|
||||||
*,
|
|
||||||
include_raw: bool = False,
|
|
||||||
) -> Optional[Dict[str, Any]]:
|
|
||||||
"""
|
"""
|
||||||
获取单条记忆(异步)。
|
获取单条记忆(异步)。
|
||||||
|
|
||||||
VDB + Graph 双路并行查询,哪个有结果返回哪个。
|
VDB + Graph 双路并行查询,哪个有结果返回哪个。
|
||||||
|
|
||||||
Args:
|
|
||||||
memory_id: 记忆 ID
|
|
||||||
include_raw: 是否允许返回 L1_RAW 原始记忆,默认 False。
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
{"memory_id", "content", "layer", "source", "request_id", "elapsed_ms"} 或 None
|
{"memory_id", "content", "layer", "source", "request_id", "elapsed_ms"} 或 None
|
||||||
"""
|
"""
|
||||||
@@ -3703,24 +3683,17 @@ class HyMemoryClient:
|
|||||||
|
|
||||||
vdb_node, graph_node = await _asyncio_get.gather(_get_vdb(), _get_graph())
|
vdb_node, graph_node = await _asyncio_get.gather(_get_vdb(), _get_graph())
|
||||||
|
|
||||||
# L1_RAW 默认不对外可见:按 ID 直取走主键查询、绕过向量库的 layer
|
# L1_RAW 不对外可见:按 ID 直取走主键查询、绕过向量库的 layer filter,
|
||||||
# filter,故在此统一挡掉。SDK 调用方可通过 include_raw=True 显式读取;
|
# 故在此统一挡掉。async_get 是 GET /v1/memories/{id} 与
|
||||||
# HTTP 接口不传该参数,继续保持隐藏。内部写链路不经过此方法。
|
# /v1/memories/batch 两个对外接口的共同必经处,而内部写链路不经过它
|
||||||
|
# (writer 写后校验直接调 vector_store.get_by_id),挡在此处不影响内部。
|
||||||
#
|
#
|
||||||
# 置于 gather 之后、埋点之前:命中 raw 仍照常落 GET 埋点(保留可观测性,
|
# 置于 gather 之后、埋点之前:命中 raw 仍照常落 GET 埋点(保留可观测性,
|
||||||
# 便于发现有调用方拿 raw id 试探),只是不把内容返回给调用方。
|
# 便于发现有调用方拿 raw id 试探),只是不把内容返回给调用方。
|
||||||
# 对调用方的表现与"该 id 不存在"完全一致,不额外暴露"存在但被挡"的信息。
|
# 对调用方的表现与"该 id 不存在"完全一致,不额外暴露"存在但被挡"的信息。
|
||||||
if (
|
if vdb_node is not None and vdb_node.layer == MemoryLayer.L1_RAW:
|
||||||
not include_raw
|
|
||||||
and vdb_node is not None
|
|
||||||
and vdb_node.layer == MemoryLayer.L1_RAW
|
|
||||||
):
|
|
||||||
vdb_node = None
|
vdb_node = None
|
||||||
if (
|
if graph_node is not None and getattr(graph_node, "layer", None) == MemoryLayer.L1_RAW:
|
||||||
not include_raw
|
|
||||||
and graph_node is not None
|
|
||||||
and getattr(graph_node, "layer", None) == MemoryLayer.L1_RAW
|
|
||||||
):
|
|
||||||
graph_node = None
|
graph_node = None
|
||||||
|
|
||||||
elapsed = round((time.perf_counter() - t0) * 1000, 2)
|
elapsed = round((time.perf_counter() - t0) * 1000, 2)
|
||||||
|
|||||||
+125
-136
@@ -7,7 +7,7 @@ Agent Memory V2 - SqliteCache
|
|||||||
设计模式跟随 history_store.py:
|
设计模式跟随 history_store.py:
|
||||||
- 标准库 sqlite3 + _run_in_sqlite_pool()
|
- 标准库 sqlite3 + _run_in_sqlite_pool()
|
||||||
- WAL 模式 + check_same_thread=False
|
- WAL 模式 + check_same_thread=False
|
||||||
- 每实例 threading.RLock 保护共享连接的全部操作与关闭
|
- threading.Lock 保护写操作
|
||||||
|
|
||||||
三张表:
|
三张表:
|
||||||
- memory_operations / pipeline_logs / system_metrics: 审计与观测
|
- memory_operations / pipeline_logs / system_metrics: 审计与观测
|
||||||
@@ -122,10 +122,7 @@ class SqliteCache(CacheBase):
|
|||||||
def __init__(self, config: MemoryConfig):
|
def __init__(self, config: MemoryConfig):
|
||||||
self.config = config
|
self.config = config
|
||||||
self._conn: Optional[sqlite3.Connection] = None
|
self._conn: Optional[sqlite3.Connection] = None
|
||||||
# One connection is shared by the executor workers. Use the same lock
|
self._lock = threading.Lock()
|
||||||
# for reads, writes, initialization and close so close() cannot free
|
|
||||||
# the connection while another worker is inside sqlite3.
|
|
||||||
self._lock = threading.RLock()
|
|
||||||
|
|
||||||
# 读取 db_path
|
# 读取 db_path
|
||||||
cache_cfg = getattr(config, "cache", None)
|
cache_cfg = getattr(config, "cache", None)
|
||||||
@@ -147,37 +144,35 @@ class SqliteCache(CacheBase):
|
|||||||
logger.debug(f"SqliteCache initialized: {self._db_path}")
|
logger.debug(f"SqliteCache initialized: {self._db_path}")
|
||||||
|
|
||||||
def _init_sync(self) -> None:
|
def _init_sync(self) -> None:
|
||||||
with self._lock:
|
db_dir = os.path.dirname(self._db_path)
|
||||||
db_dir = os.path.dirname(self._db_path)
|
if db_dir:
|
||||||
if db_dir:
|
os.makedirs(db_dir, exist_ok=True)
|
||||||
os.makedirs(db_dir, exist_ok=True)
|
self._conn = sqlite3.connect(self._db_path, check_same_thread=False)
|
||||||
self._conn = sqlite3.connect(self._db_path, check_same_thread=False)
|
self._conn.row_factory = sqlite3.Row
|
||||||
self._conn.row_factory = sqlite3.Row
|
self._conn.execute("PRAGMA journal_mode=WAL;")
|
||||||
self._conn.execute("PRAGMA journal_mode=WAL;")
|
self._conn.executescript(_CREATE_TABLES_SQL)
|
||||||
self._conn.executescript(_CREATE_TABLES_SQL)
|
self._migrate_pipeline_logs_columns()
|
||||||
self._migrate_pipeline_logs_columns()
|
self._conn.commit()
|
||||||
self._conn.commit()
|
|
||||||
|
|
||||||
def _migrate_pipeline_logs_columns(self) -> None:
|
def _migrate_pipeline_logs_columns(self) -> None:
|
||||||
"""给旧库的 pipeline_logs_v2 补 namespace/session/event time 列。"""
|
"""给旧库的 pipeline_logs_v2 补 namespace/session/event time 列。"""
|
||||||
with self._lock:
|
try:
|
||||||
try:
|
cols = {
|
||||||
cols = {
|
row["name"]
|
||||||
row["name"]
|
for row in self._conn.execute("PRAGMA table_info(pipeline_logs_v2)")
|
||||||
for row in self._conn.execute("PRAGMA table_info(pipeline_logs_v2)")
|
}
|
||||||
}
|
_text_cols = ("namespace", "session_id")
|
||||||
_text_cols = ("namespace", "session_id")
|
for col in _text_cols:
|
||||||
for col in _text_cols:
|
if col not in cols:
|
||||||
if col not in cols:
|
|
||||||
self._conn.execute(
|
|
||||||
f"ALTER TABLE pipeline_logs_v2 ADD COLUMN {col} TEXT NOT NULL DEFAULT ''"
|
|
||||||
)
|
|
||||||
if "event_at_ms" not in cols:
|
|
||||||
self._conn.execute(
|
self._conn.execute(
|
||||||
"ALTER TABLE pipeline_logs_v2 ADD COLUMN event_at_ms INTEGER NOT NULL DEFAULT 0"
|
f"ALTER TABLE pipeline_logs_v2 ADD COLUMN {col} TEXT NOT NULL DEFAULT ''"
|
||||||
)
|
)
|
||||||
except Exception as e:
|
if "event_at_ms" not in cols:
|
||||||
logger.debug(f"[sqlite] pipeline_logs_v2 column migration skipped: {e}")
|
self._conn.execute(
|
||||||
|
"ALTER TABLE pipeline_logs_v2 ADD COLUMN event_at_ms INTEGER NOT NULL DEFAULT 0"
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.debug(f"[sqlite] pipeline_logs_v2 column migration skipped: {e}")
|
||||||
|
|
||||||
async def close(self) -> None:
|
async def close(self) -> None:
|
||||||
if self._conn is not None:
|
if self._conn is not None:
|
||||||
@@ -185,10 +180,9 @@ class SqliteCache(CacheBase):
|
|||||||
logger.info("SqliteCache closed")
|
logger.info("SqliteCache closed")
|
||||||
|
|
||||||
def _close_sync(self) -> None:
|
def _close_sync(self) -> None:
|
||||||
with self._lock:
|
if self._conn:
|
||||||
if self._conn:
|
self._conn.close()
|
||||||
self._conn.close()
|
self._conn = None
|
||||||
self._conn = None
|
|
||||||
|
|
||||||
# ================================================================
|
# ================================================================
|
||||||
# 统计
|
# 统计
|
||||||
@@ -261,40 +255,39 @@ class SqliteCache(CacheBase):
|
|||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
def _query():
|
def _query():
|
||||||
with self._lock:
|
conditions = []
|
||||||
conditions = []
|
params = []
|
||||||
params = []
|
if request_id:
|
||||||
if request_id:
|
conditions.append("request_id = ?")
|
||||||
conditions.append("request_id = ?")
|
params.append(request_id)
|
||||||
params.append(request_id)
|
if memory_id:
|
||||||
if memory_id:
|
conditions.append("memory_id = ?")
|
||||||
conditions.append("memory_id = ?")
|
params.append(memory_id)
|
||||||
params.append(memory_id)
|
if user_id:
|
||||||
if user_id:
|
conditions.append("user_id = ?")
|
||||||
conditions.append("user_id = ?")
|
params.append(user_id)
|
||||||
params.append(user_id)
|
|
||||||
|
|
||||||
if not conditions:
|
if not conditions:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
where = " AND ".join(conditions)
|
where = " AND ".join(conditions)
|
||||||
rows = self._conn.execute(
|
rows = self._conn.execute(
|
||||||
f"SELECT * FROM memory_operations_v2 WHERE {where} "
|
f"SELECT * FROM memory_operations_v2 WHERE {where} "
|
||||||
f"ORDER BY id DESC LIMIT ?",
|
f"ORDER BY id DESC LIMIT ?",
|
||||||
params + [limit],
|
params + [limit],
|
||||||
).fetchall()
|
).fetchall()
|
||||||
result = []
|
result = []
|
||||||
for r in rows:
|
for r in rows:
|
||||||
row = dict(r)
|
row = dict(r)
|
||||||
# 反序列化 supersedes JSON 字符串 → list
|
# 反序列化 supersedes JSON 字符串 → list
|
||||||
import json as _json
|
import json as _json
|
||||||
raw_sup = row.get("supersedes", "")
|
raw_sup = row.get("supersedes", "")
|
||||||
try:
|
try:
|
||||||
row["supersedes"] = _json.loads(raw_sup) if raw_sup else []
|
row["supersedes"] = _json.loads(raw_sup) if raw_sup else []
|
||||||
except Exception:
|
except Exception:
|
||||||
row["supersedes"] = []
|
row["supersedes"] = []
|
||||||
result.append(row)
|
result.append(row)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
return await _run_in_sqlite_pool(_query)
|
return await _run_in_sqlite_pool(_query)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -376,38 +369,37 @@ class SqliteCache(CacheBase):
|
|||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
def _query():
|
def _query():
|
||||||
with self._lock:
|
conditions = []
|
||||||
conditions = []
|
params = []
|
||||||
params = []
|
if request_id:
|
||||||
if request_id:
|
conditions.append("request_id = ?")
|
||||||
conditions.append("request_id = ?")
|
params.append(request_id)
|
||||||
params.append(request_id)
|
if user_id:
|
||||||
if user_id:
|
conditions.append("user_id = ?")
|
||||||
conditions.append("user_id = ?")
|
params.append(user_id)
|
||||||
params.append(user_id)
|
if step:
|
||||||
if step:
|
conditions.append("step = ?")
|
||||||
conditions.append("step = ?")
|
params.append(step)
|
||||||
params.append(step)
|
|
||||||
|
|
||||||
if not conditions:
|
if not conditions:
|
||||||
return []
|
return []
|
||||||
|
|
||||||
where = " AND ".join(conditions)
|
where = " AND ".join(conditions)
|
||||||
rows = self._conn.execute(
|
rows = self._conn.execute(
|
||||||
f"SELECT * FROM pipeline_logs_v2 WHERE {where} "
|
f"SELECT * FROM pipeline_logs_v2 WHERE {where} "
|
||||||
f"ORDER BY id ASC LIMIT ?",
|
f"ORDER BY id ASC LIMIT ?",
|
||||||
params + [limit],
|
params + [limit],
|
||||||
).fetchall()
|
).fetchall()
|
||||||
out = [dict(r) for r in rows]
|
out = [dict(r) for r in rows]
|
||||||
# 派生可读的 event_at(ISO ms)供查询接口直接用;event_at_ms 为 0 时留空
|
# 派生可读的 event_at(ISO ms)供查询接口直接用;event_at_ms 为 0 时留空
|
||||||
from datetime import datetime as _dt
|
from datetime import datetime as _dt
|
||||||
for _r in out:
|
for _r in out:
|
||||||
_ms = _r.get("event_at_ms") or 0
|
_ms = _r.get("event_at_ms") or 0
|
||||||
_r["event_at"] = (
|
_r["event_at"] = (
|
||||||
_dt.fromtimestamp(_ms / 1000.0).isoformat(timespec="milliseconds")
|
_dt.fromtimestamp(_ms / 1000.0).isoformat(timespec="milliseconds")
|
||||||
if _ms else ""
|
if _ms else ""
|
||||||
)
|
)
|
||||||
return out
|
return out
|
||||||
|
|
||||||
return await _run_in_sqlite_pool(_query)
|
return await _run_in_sqlite_pool(_query)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -422,27 +414,26 @@ class SqliteCache(CacheBase):
|
|||||||
"""存储一个分钟桶的增量指标数据(UPSERT: 同一分钟多次写入会合并)"""
|
"""存储一个分钟桶的增量指标数据(UPSERT: 同一分钟多次写入会合并)"""
|
||||||
try:
|
try:
|
||||||
def _store():
|
def _store():
|
||||||
with self._lock:
|
now = datetime.now().isoformat()
|
||||||
now = datetime.now().isoformat()
|
# UPSERT: 如果同一分钟已存在,合并数据
|
||||||
# UPSERT: 如果同一分钟已存在,合并数据
|
existing = self._conn.execute(
|
||||||
existing = self._conn.execute(
|
"SELECT data FROM system_metrics WHERE minute_ts = ?",
|
||||||
"SELECT data FROM system_metrics WHERE minute_ts = ?",
|
(minute_ts,),
|
||||||
(minute_ts,),
|
).fetchone()
|
||||||
).fetchone()
|
if existing:
|
||||||
if existing:
|
import json as _json
|
||||||
import json as _json
|
old_data = _json.loads(existing["data"])
|
||||||
old_data = _json.loads(existing["data"])
|
merged = self._merge_metric_buckets(old_data, data)
|
||||||
merged = self._merge_metric_buckets(old_data, data)
|
self._conn.execute(
|
||||||
self._conn.execute(
|
"UPDATE system_metrics SET data = ?, created_at = ? WHERE minute_ts = ?",
|
||||||
"UPDATE system_metrics SET data = ?, created_at = ? WHERE minute_ts = ?",
|
(_json.dumps(merged, default=str), now, minute_ts),
|
||||||
(_json.dumps(merged, default=str), now, minute_ts),
|
)
|
||||||
)
|
else:
|
||||||
else:
|
self._conn.execute(
|
||||||
self._conn.execute(
|
"INSERT INTO system_metrics (minute_ts, data, created_at) VALUES (?, ?, ?)",
|
||||||
"INSERT INTO system_metrics (minute_ts, data, created_at) VALUES (?, ?, ?)",
|
(minute_ts, json.dumps(data, default=str), now),
|
||||||
(minute_ts, json.dumps(data, default=str), now),
|
)
|
||||||
)
|
self._conn.commit()
|
||||||
self._conn.commit()
|
|
||||||
await _run_in_sqlite_pool(_store)
|
await _run_in_sqlite_pool(_store)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"store_metrics_minute failed: {e}")
|
logger.warning(f"store_metrics_minute failed: {e}")
|
||||||
@@ -451,18 +442,17 @@ class SqliteCache(CacheBase):
|
|||||||
"""读取指定时间范围内的分钟指标数据"""
|
"""读取指定时间范围内的分钟指标数据"""
|
||||||
try:
|
try:
|
||||||
def _load():
|
def _load():
|
||||||
with self._lock:
|
rows = self._conn.execute(
|
||||||
rows = self._conn.execute(
|
"SELECT data FROM system_metrics WHERE minute_ts >= ? AND minute_ts <= ? ORDER BY minute_ts",
|
||||||
"SELECT data FROM system_metrics WHERE minute_ts >= ? AND minute_ts <= ? ORDER BY minute_ts",
|
(start_ts, end_ts),
|
||||||
(start_ts, end_ts),
|
).fetchall()
|
||||||
).fetchall()
|
results = []
|
||||||
results = []
|
for row in rows:
|
||||||
for row in rows:
|
try:
|
||||||
try:
|
results.append(json.loads(row["data"]))
|
||||||
results.append(json.loads(row["data"]))
|
except (json.JSONDecodeError, TypeError):
|
||||||
except (json.JSONDecodeError, TypeError):
|
pass
|
||||||
pass
|
return results
|
||||||
return results
|
|
||||||
return await _run_in_sqlite_pool(_load)
|
return await _run_in_sqlite_pool(_load)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"load_metrics_range failed: {e}")
|
logger.warning(f"load_metrics_range failed: {e}")
|
||||||
@@ -472,12 +462,11 @@ class SqliteCache(CacheBase):
|
|||||||
"""删除指定时间之前的 metrics 数据"""
|
"""删除指定时间之前的 metrics 数据"""
|
||||||
try:
|
try:
|
||||||
def _cleanup():
|
def _cleanup():
|
||||||
with self._lock:
|
self._conn.execute(
|
||||||
self._conn.execute(
|
"DELETE FROM system_metrics WHERE minute_ts < ?",
|
||||||
"DELETE FROM system_metrics WHERE minute_ts < ?",
|
(before_ts,),
|
||||||
(before_ts,),
|
)
|
||||||
)
|
self._conn.commit()
|
||||||
self._conn.commit()
|
|
||||||
await _run_in_sqlite_pool(_cleanup)
|
await _run_in_sqlite_pool(_cleanup)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.warning(f"cleanup_old_metrics failed: {e}")
|
logger.warning(f"cleanup_old_metrics failed: {e}")
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import json
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import threading
|
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone
|
||||||
from typing import Dict, List, Any, Optional
|
from typing import Dict, List, Any, Optional
|
||||||
|
|
||||||
@@ -90,10 +89,6 @@ class HistoryStore:
|
|||||||
"""
|
"""
|
||||||
self._db_path = config.history.db_path
|
self._db_path = config.history.db_path
|
||||||
self._conn: Optional[sqlite3.Connection] = None
|
self._conn: Optional[sqlite3.Connection] = None
|
||||||
# sqlite3.Connection.close() must never race with an execute() on the
|
|
||||||
# same connection. The lock also serializes operations on this shared
|
|
||||||
# connection; separate HistoryStore instances remain independent.
|
|
||||||
self._conn_lock = threading.RLock()
|
|
||||||
|
|
||||||
async def initialize(self) -> None:
|
async def initialize(self) -> None:
|
||||||
"""创建表和索引(如果不存在)"""
|
"""创建表和索引(如果不存在)"""
|
||||||
@@ -102,21 +97,20 @@ class HistoryStore:
|
|||||||
|
|
||||||
def _init_sync(self) -> None:
|
def _init_sync(self) -> None:
|
||||||
"""同步初始化:创建目录、连接数据库、建表建索引"""
|
"""同步初始化:创建目录、连接数据库、建表建索引"""
|
||||||
with self._conn_lock:
|
# 确保目录存在
|
||||||
# 确保目录存在
|
db_dir = os.path.dirname(self._db_path)
|
||||||
db_dir = os.path.dirname(self._db_path)
|
if db_dir:
|
||||||
if db_dir:
|
os.makedirs(db_dir, exist_ok=True)
|
||||||
os.makedirs(db_dir, exist_ok=True)
|
|
||||||
|
|
||||||
self._conn = sqlite3.connect(self._db_path, check_same_thread=False)
|
self._conn = sqlite3.connect(self._db_path, check_same_thread=False)
|
||||||
self._conn.row_factory = sqlite3.Row
|
self._conn.row_factory = sqlite3.Row
|
||||||
# 开启 WAL 模式,提高并发读写性能
|
# 开启 WAL 模式,提高并发读写性能
|
||||||
self._conn.execute("PRAGMA journal_mode=WAL;")
|
self._conn.execute("PRAGMA journal_mode=WAL;")
|
||||||
|
|
||||||
self._conn.execute(_CREATE_TABLE_SQL)
|
self._conn.execute(_CREATE_TABLE_SQL)
|
||||||
for idx_sql in _CREATE_INDEXES_SQL:
|
for idx_sql in _CREATE_INDEXES_SQL:
|
||||||
self._conn.execute(idx_sql)
|
self._conn.execute(idx_sql)
|
||||||
self._conn.commit()
|
self._conn.commit()
|
||||||
|
|
||||||
# ================================================================
|
# ================================================================
|
||||||
# 记录操作
|
# 记录操作
|
||||||
@@ -224,14 +218,13 @@ class HistoryStore:
|
|||||||
return await _run_in_sqlite_pool(self._get_history_sync, memory_id)
|
return await _run_in_sqlite_pool(self._get_history_sync, memory_id)
|
||||||
|
|
||||||
def _get_history_sync(self, memory_id: str) -> List[Dict[str, Any]]:
|
def _get_history_sync(self, memory_id: str) -> List[Dict[str, Any]]:
|
||||||
with self._conn_lock:
|
if self._conn is None:
|
||||||
if self._conn is None:
|
return []
|
||||||
return []
|
cursor = self._conn.execute(
|
||||||
cursor = self._conn.execute(
|
"SELECT * FROM memory_history WHERE memory_id = ? ORDER BY created_at ASC",
|
||||||
"SELECT * FROM memory_history WHERE memory_id = ? ORDER BY created_at ASC",
|
(memory_id,),
|
||||||
(memory_id,),
|
)
|
||||||
)
|
return [dict(row) for row in cursor.fetchall()]
|
||||||
return [dict(row) for row in cursor.fetchall()]
|
|
||||||
|
|
||||||
async def get_recent(
|
async def get_recent(
|
||||||
self,
|
self,
|
||||||
@@ -251,15 +244,14 @@ class HistoryStore:
|
|||||||
return await _run_in_sqlite_pool(self._get_recent_sync, isolation_key, limit)
|
return await _run_in_sqlite_pool(self._get_recent_sync, isolation_key, limit)
|
||||||
|
|
||||||
def _get_recent_sync(self, isolation_key: str, limit: int) -> List[Dict[str, Any]]:
|
def _get_recent_sync(self, isolation_key: str, limit: int) -> List[Dict[str, Any]]:
|
||||||
with self._conn_lock:
|
if self._conn is None:
|
||||||
if self._conn is None:
|
return []
|
||||||
return []
|
cursor = self._conn.execute(
|
||||||
cursor = self._conn.execute(
|
"SELECT * FROM memory_history WHERE isolation_key = ? "
|
||||||
"SELECT * FROM memory_history WHERE isolation_key = ? "
|
"ORDER BY created_at DESC LIMIT ?",
|
||||||
"ORDER BY created_at DESC LIMIT ?",
|
(isolation_key, limit),
|
||||||
(isolation_key, limit),
|
)
|
||||||
)
|
return [dict(row) for row in cursor.fetchall()]
|
||||||
return [dict(row) for row in cursor.fetchall()]
|
|
||||||
|
|
||||||
async def count(self, isolation_key: str = "") -> int:
|
async def count(self, isolation_key: str = "") -> int:
|
||||||
"""
|
"""
|
||||||
@@ -274,17 +266,16 @@ class HistoryStore:
|
|||||||
return await _run_in_sqlite_pool(self._count_sync, isolation_key)
|
return await _run_in_sqlite_pool(self._count_sync, isolation_key)
|
||||||
|
|
||||||
def _count_sync(self, isolation_key: str) -> int:
|
def _count_sync(self, isolation_key: str) -> int:
|
||||||
with self._conn_lock:
|
if self._conn is None:
|
||||||
if self._conn is None:
|
return 0
|
||||||
return 0
|
if isolation_key:
|
||||||
if isolation_key:
|
cursor = self._conn.execute(
|
||||||
cursor = self._conn.execute(
|
"SELECT COUNT(*) FROM memory_history WHERE isolation_key = ?",
|
||||||
"SELECT COUNT(*) FROM memory_history WHERE isolation_key = ?",
|
(isolation_key,),
|
||||||
(isolation_key,),
|
)
|
||||||
)
|
else:
|
||||||
else:
|
cursor = self._conn.execute("SELECT COUNT(*) FROM memory_history")
|
||||||
cursor = self._conn.execute("SELECT COUNT(*) FROM memory_history")
|
return cursor.fetchone()[0]
|
||||||
return cursor.fetchone()[0]
|
|
||||||
|
|
||||||
async def close(self) -> None:
|
async def close(self) -> None:
|
||||||
"""关闭数据库连接"""
|
"""关闭数据库连接"""
|
||||||
@@ -293,10 +284,9 @@ class HistoryStore:
|
|||||||
logger.info("[HistoryStore] closed")
|
logger.info("[HistoryStore] closed")
|
||||||
|
|
||||||
def _close_sync(self) -> None:
|
def _close_sync(self) -> None:
|
||||||
with self._conn_lock:
|
if self._conn:
|
||||||
if self._conn:
|
self._conn.close()
|
||||||
self._conn.close()
|
self._conn = None
|
||||||
self._conn = None
|
|
||||||
|
|
||||||
# ================================================================
|
# ================================================================
|
||||||
# 内部
|
# 内部
|
||||||
@@ -349,34 +339,33 @@ class HistoryStore:
|
|||||||
role: str = "",
|
role: str = "",
|
||||||
extra: Optional[Dict[str, Any]] = None,
|
extra: Optional[Dict[str, Any]] = None,
|
||||||
) -> int:
|
) -> int:
|
||||||
with self._conn_lock:
|
if self._conn is None:
|
||||||
if self._conn is None:
|
return -1
|
||||||
return -1
|
now = _now_iso()
|
||||||
now = _now_iso()
|
extra_json = json.dumps(extra or {}, ensure_ascii=False)
|
||||||
extra_json = json.dumps(extra or {}, ensure_ascii=False)
|
cursor = self._conn.execute(
|
||||||
cursor = self._conn.execute(
|
"""INSERT INTO memory_history
|
||||||
"""INSERT INTO memory_history
|
(memory_id, isolation_key, event,
|
||||||
(memory_id, isolation_key, event,
|
old_memory, new_memory, old_status, new_status,
|
||||||
old_memory, new_memory, old_status, new_status,
|
change_reason, layer, actor_id, role, extra,
|
||||||
change_reason, layer, actor_id, role, extra,
|
created_at, updated_at)
|
||||||
created_at, updated_at)
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
|
(
|
||||||
(
|
memory_id,
|
||||||
memory_id,
|
isolation_key,
|
||||||
isolation_key,
|
event,
|
||||||
event,
|
old_memory,
|
||||||
old_memory,
|
new_memory,
|
||||||
new_memory,
|
old_status,
|
||||||
old_status,
|
new_status,
|
||||||
new_status,
|
change_reason,
|
||||||
change_reason,
|
layer,
|
||||||
layer,
|
actor_id,
|
||||||
actor_id,
|
role,
|
||||||
role,
|
extra_json,
|
||||||
extra_json,
|
now,
|
||||||
now,
|
now,
|
||||||
now,
|
),
|
||||||
),
|
)
|
||||||
)
|
self._conn.commit()
|
||||||
self._conn.commit()
|
return cursor.lastrowid
|
||||||
return cursor.lastrowid
|
|
||||||
@@ -12,6 +12,7 @@
|
|||||||
* It is generated rather than hand-written so the two cannot drift: this reads
|
* It is generated rather than hand-written so the two cannot drift: this reads
|
||||||
* the real package.json and only strips what is provably not needed at runtime.
|
* the real package.json and only strips what is provably not needed at runtime.
|
||||||
*/
|
*/
|
||||||
|
import { execFileSync } from "node:child_process";
|
||||||
import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
||||||
import { createRequire } from "node:module";
|
import { createRequire } from "node:module";
|
||||||
import { dirname, resolve } from "node:path";
|
import { dirname, resolve } from "node:path";
|
||||||
@@ -19,14 +20,12 @@ import { fileURLToPath } from "node:url";
|
|||||||
|
|
||||||
const here = dirname(fileURLToPath(import.meta.url));
|
const here = dirname(fileURLToPath(import.meta.url));
|
||||||
const root = resolve(here, "..");
|
const root = resolve(here, "..");
|
||||||
|
const repositoryRoot = resolve(root, "../..");
|
||||||
const require = createRequire(import.meta.url);
|
const require = createRequire(import.meta.url);
|
||||||
const { assertSemver } = require("../../../scripts/release-version.cjs");
|
const { resolveBuildVersion } = require("../../../scripts/release-version.cjs");
|
||||||
|
const releaseVersion = resolveBuildVersion(process.env, repositoryRoot);
|
||||||
const pkgPath = resolve(root, "package.json");
|
const pkgPath = resolve(root, "package.json");
|
||||||
const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
|
const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
|
||||||
const publishVersion = assertSemver(
|
|
||||||
process.env.MEMHUB_NPM_VERSION?.trim() || pkg.version,
|
|
||||||
"MEMHUB_NPM_VERSION",
|
|
||||||
);
|
|
||||||
const publishName = process.env.MEMHUB_NPM_PACKAGE?.trim();
|
const publishName = process.env.MEMHUB_NPM_PACKAGE?.trim();
|
||||||
if (!publishName || !/^(?:@[a-z0-9._-]+\/)?[a-z0-9._-]+$/.test(publishName)) {
|
if (!publishName || !/^(?:@[a-z0-9._-]+\/)?[a-z0-9._-]+$/.test(publishName)) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
@@ -54,7 +53,7 @@ mkdirSync(outDir, { recursive: true });
|
|||||||
|
|
||||||
const published = { ...pkg };
|
const published = { ...pkg };
|
||||||
published.name = publishName;
|
published.name = publishName;
|
||||||
published.version = publishVersion;
|
published.version = releaseVersion;
|
||||||
for (const section of ["dependencies", "devDependencies", "peerDependencies"]) {
|
for (const section of ["dependencies", "devDependencies", "peerDependencies"]) {
|
||||||
if (!published[section]) continue;
|
if (!published[section]) continue;
|
||||||
published[section] = Object.fromEntries(
|
published[section] = Object.fromEntries(
|
||||||
|
|||||||
@@ -331,7 +331,7 @@ import {
|
|||||||
renderVersion,
|
renderVersion,
|
||||||
renderVersionDocument,
|
renderVersionDocument,
|
||||||
} from "./usage.js";
|
} from "./usage.js";
|
||||||
import { CLI_VERSION, PRODUCT, RUNTIME_RELEASE_VERSION } from "./version.js";
|
import { CLI_VERSION, PRODUCT } from "./version.js";
|
||||||
import { runWatchLoop, type WatchEvent, type WatchRead } from "./watch-loop.js";
|
import { runWatchLoop, type WatchEvent, type WatchRead } from "./watch-loop.js";
|
||||||
|
|
||||||
export interface RunControls {
|
export interface RunControls {
|
||||||
@@ -417,8 +417,7 @@ async function selectInstallSource(
|
|||||||
throw new Error("release_manifest_url_unavailable");
|
throw new Error("release_manifest_url_unavailable");
|
||||||
}
|
}
|
||||||
const manifestUrl =
|
const manifestUrl =
|
||||||
explicitManifestUrl ??
|
explicitManifestUrl ?? template.replaceAll("{version}", CLI_VERSION);
|
||||||
template.replaceAll("{version}", RUNTIME_RELEASE_VERSION);
|
|
||||||
const allowedHosts = parseAllowedReleaseHosts(
|
const allowedHosts = parseAllowedReleaseHosts(
|
||||||
environment.MEMHUB_RELEASE_ALLOWED_HOSTS,
|
environment.MEMHUB_RELEASE_ALLOWED_HOSTS,
|
||||||
);
|
);
|
||||||
@@ -463,7 +462,7 @@ async function resolveRemoteInstallPreview(
|
|||||||
): Promise<ResolvedRuntimeRelease> {
|
): Promise<ResolvedRuntimeRelease> {
|
||||||
return (controls.resolveRuntimeRelease ?? resolveRuntimeRelease)({
|
return (controls.resolveRuntimeRelease ?? resolveRuntimeRelease)({
|
||||||
manifestUrl: selection.manifestUrl,
|
manifestUrl: selection.manifestUrl,
|
||||||
expectedVersion: RUNTIME_RELEASE_VERSION,
|
expectedVersion: CLI_VERSION,
|
||||||
channel: selection.channel,
|
channel: selection.channel,
|
||||||
platform: process.platform,
|
platform: process.platform,
|
||||||
arch: process.arch,
|
arch: process.arch,
|
||||||
@@ -477,7 +476,7 @@ async function acquireRemoteInstallSource(
|
|||||||
): Promise<AcquiredRuntimeDistribution> {
|
): Promise<AcquiredRuntimeDistribution> {
|
||||||
return (controls.acquireRuntimeDistribution ?? acquireRuntimeDistribution)({
|
return (controls.acquireRuntimeDistribution ?? acquireRuntimeDistribution)({
|
||||||
manifestUrl: selection.manifestUrl,
|
manifestUrl: selection.manifestUrl,
|
||||||
expectedVersion: RUNTIME_RELEASE_VERSION,
|
expectedVersion: CLI_VERSION,
|
||||||
channel: selection.channel,
|
channel: selection.channel,
|
||||||
platform: process.platform,
|
platform: process.platform,
|
||||||
arch: process.arch,
|
arch: process.arch,
|
||||||
@@ -6521,7 +6520,7 @@ function parseInstallOptions(
|
|||||||
...(releaseManifestUrl ? { releaseManifestUrl } : {}),
|
...(releaseManifestUrl ? { releaseManifestUrl } : {}),
|
||||||
releaseChannel:
|
releaseChannel:
|
||||||
releaseChannel ??
|
releaseChannel ??
|
||||||
(RUNTIME_RELEASE_VERSION.includes("-") ? "prerelease" : "stable"),
|
(CLI_VERSION.includes("-") ? "prerelease" : "stable"),
|
||||||
installRoot: resolvedInstallRoot,
|
installRoot: resolvedInstallRoot,
|
||||||
home: resolvedHome,
|
home: resolvedHome,
|
||||||
uid: uid ?? process.getuid?.(),
|
uid: uid ?? process.getuid?.(),
|
||||||
|
|||||||
@@ -48,11 +48,7 @@ describe("publish manifest is production-safe", () => {
|
|||||||
execFileSync("node", ["scripts/prepare-publish-manifest.mjs"], {
|
execFileSync("node", ["scripts/prepare-publish-manifest.mjs"], {
|
||||||
cwd: root,
|
cwd: root,
|
||||||
stdio: "pipe",
|
stdio: "pipe",
|
||||||
env: {
|
env: { ...process.env, MEMHUB_NPM_PACKAGE: "@example/memhub-cli" },
|
||||||
...process.env,
|
|
||||||
MEMHUB_NPM_PACKAGE: "@example/memhub-cli",
|
|
||||||
MEMHUB_NPM_VERSION: "1.0.5",
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
const published = JSON.parse(
|
const published = JSON.parse(
|
||||||
readFileSync(path.join(root, "dist-publish", "package.json"), "utf8"),
|
readFileSync(path.join(root, "dist-publish", "package.json"), "utf8"),
|
||||||
@@ -60,7 +56,6 @@ describe("publish manifest is production-safe", () => {
|
|||||||
expect(published.dependencies).toBeUndefined();
|
expect(published.dependencies).toBeUndefined();
|
||||||
expect(published.private).toBe(false);
|
expect(published.private).toBe(false);
|
||||||
expect(published.name).toBe("@example/memhub-cli");
|
expect(published.name).toBe("@example/memhub-cli");
|
||||||
expect(published.version).toBe("1.0.5");
|
|
||||||
expect(published.bin).toMatchObject({
|
expect(published.bin).toMatchObject({
|
||||||
memhub: "dist/one-memory.cjs",
|
memhub: "dist/one-memory.cjs",
|
||||||
"memhub-cli": "dist/one-memory.cjs",
|
"memhub-cli": "dist/one-memory.cjs",
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
declare const __ONE_MEMORY_VERSION__: string;
|
declare const __ONE_MEMORY_VERSION__: string;
|
||||||
declare const __ONE_MEMORY_BUILD_NUMBER__: string;
|
declare const __ONE_MEMORY_BUILD_NUMBER__: string;
|
||||||
declare const __MEMHUB_DEFAULT_RUNTIME_VERSION__: string;
|
|
||||||
|
|
||||||
const SEMVER =
|
|
||||||
/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
|
|
||||||
|
|
||||||
const embeddedVersion =
|
const embeddedVersion =
|
||||||
typeof __ONE_MEMORY_VERSION__ === "string"
|
typeof __ONE_MEMORY_VERSION__ === "string"
|
||||||
@@ -13,18 +9,13 @@ const embeddedBuildNumber =
|
|||||||
typeof __ONE_MEMORY_BUILD_NUMBER__ === "string"
|
typeof __ONE_MEMORY_BUILD_NUMBER__ === "string"
|
||||||
? __ONE_MEMORY_BUILD_NUMBER__.trim()
|
? __ONE_MEMORY_BUILD_NUMBER__.trim()
|
||||||
: "";
|
: "";
|
||||||
const embeddedRuntimeVersion =
|
|
||||||
typeof __MEMHUB_DEFAULT_RUNTIME_VERSION__ === "string"
|
|
||||||
? __MEMHUB_DEFAULT_RUNTIME_VERSION__.trim()
|
|
||||||
: "";
|
|
||||||
|
|
||||||
export const CLI_VERSION = SEMVER.test(embeddedVersion)
|
export const CLI_VERSION =
|
||||||
? embeddedVersion
|
/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/.test(
|
||||||
: "development";
|
embeddedVersion,
|
||||||
|
)
|
||||||
export const RUNTIME_RELEASE_VERSION = SEMVER.test(embeddedRuntimeVersion)
|
? embeddedVersion
|
||||||
? embeddedRuntimeVersion
|
: "development";
|
||||||
: CLI_VERSION;
|
|
||||||
|
|
||||||
export const CLI_BUILD_NUMBER = /^\d+$/.test(embeddedBuildNumber)
|
export const CLI_BUILD_NUMBER = /^\d+$/.test(embeddedBuildNumber)
|
||||||
? Number(embeddedBuildNumber)
|
? Number(embeddedBuildNumber)
|
||||||
|
|||||||
@@ -2,22 +2,11 @@ import { createRequire } from "node:module";
|
|||||||
import { defineConfig } from "tsup";
|
import { defineConfig } from "tsup";
|
||||||
|
|
||||||
const require = createRequire(import.meta.url);
|
const require = createRequire(import.meta.url);
|
||||||
const { assertSemver, resolveBuildVersion } =
|
const { resolveBuildVersion } =
|
||||||
require("../../scripts/release-version.cjs") as {
|
require("../../scripts/release-version.cjs") as {
|
||||||
assertSemver(value: string, label?: string): string;
|
|
||||||
resolveBuildVersion(environment?: NodeJS.ProcessEnv, root?: string): string;
|
resolveBuildVersion(environment?: NodeJS.ProcessEnv, root?: string): string;
|
||||||
};
|
};
|
||||||
const releaseVersion = resolveBuildVersion(process.env);
|
const releaseVersion = resolveBuildVersion(process.env);
|
||||||
const packageVersion = (require("./package.json") as { version: string })
|
|
||||||
.version;
|
|
||||||
const cliVersion = assertSemver(
|
|
||||||
process.env.MEMHUB_NPM_VERSION?.trim() || packageVersion,
|
|
||||||
"MEMHUB_NPM_VERSION",
|
|
||||||
);
|
|
||||||
const runtimeReleaseVersion = assertSemver(
|
|
||||||
process.env.MEMHUB_DEFAULT_RUNTIME_VERSION?.trim() || releaseVersion,
|
|
||||||
"MEMHUB_DEFAULT_RUNTIME_VERSION",
|
|
||||||
);
|
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
entry: { "one-memory": "src/entry.ts" },
|
entry: { "one-memory": "src/entry.ts" },
|
||||||
@@ -26,7 +15,7 @@ export default defineConfig({
|
|||||||
outDir: "dist",
|
outDir: "dist",
|
||||||
clean: true,
|
clean: true,
|
||||||
define: {
|
define: {
|
||||||
__ONE_MEMORY_VERSION__: JSON.stringify(cliVersion),
|
__ONE_MEMORY_VERSION__: JSON.stringify(releaseVersion),
|
||||||
__ONE_MEMORY_BUILD_NUMBER__: JSON.stringify(
|
__ONE_MEMORY_BUILD_NUMBER__: JSON.stringify(
|
||||||
process.env.ONE_MEMORY_BUILD_NUMBER ?? "unknown",
|
process.env.ONE_MEMORY_BUILD_NUMBER ?? "unknown",
|
||||||
),
|
),
|
||||||
@@ -36,7 +25,6 @@ export default defineConfig({
|
|||||||
__MEMHUB_DEFAULT_RELEASE_MANIFEST_URL_TEMPLATE__: JSON.stringify(
|
__MEMHUB_DEFAULT_RELEASE_MANIFEST_URL_TEMPLATE__: JSON.stringify(
|
||||||
process.env.MEMHUB_DEFAULT_RELEASE_MANIFEST_URL_TEMPLATE ?? "",
|
process.env.MEMHUB_DEFAULT_RELEASE_MANIFEST_URL_TEMPLATE ?? "",
|
||||||
),
|
),
|
||||||
__MEMHUB_DEFAULT_RUNTIME_VERSION__: JSON.stringify(runtimeReleaseVersion),
|
|
||||||
},
|
},
|
||||||
// The shared operations package ships TypeScript sources, so it must be
|
// The shared operations package ships TypeScript sources, so it must be
|
||||||
// inlined into the CJS bundle the same way runtime-control is; otherwise the
|
// inlined into the CJS bundle the same way runtime-control is; otherwise the
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ export default defineConfig({
|
|||||||
__ONE_MEMORY_BUILD_NUMBER__: JSON.stringify("unknown"),
|
__ONE_MEMORY_BUILD_NUMBER__: JSON.stringify("unknown"),
|
||||||
__ONE_MEMORY_COMMIT__: JSON.stringify("unknown"),
|
__ONE_MEMORY_COMMIT__: JSON.stringify("unknown"),
|
||||||
__MEMHUB_DEFAULT_RELEASE_MANIFEST_URL_TEMPLATE__: JSON.stringify(""),
|
__MEMHUB_DEFAULT_RELEASE_MANIFEST_URL_TEMPLATE__: JSON.stringify(""),
|
||||||
__MEMHUB_DEFAULT_RUNTIME_VERSION__: JSON.stringify(version),
|
|
||||||
},
|
},
|
||||||
test: {
|
test: {
|
||||||
testTimeout: 120_000,
|
testTimeout: 120_000,
|
||||||
|
|||||||
@@ -2793,12 +2793,6 @@ def create_app(
|
|||||||
# D75: work queued for the previous model continues with this one.
|
# D75: work queued for the previous model continues with this one.
|
||||||
# Only tasks that never reached the model are re-bound.
|
# Only tasks that never reached the model are re-bound.
|
||||||
await asyncio.to_thread(app.state.memory_task_store.rebind_unstarted_profile, profile)
|
await asyncio.to_thread(app.state.memory_task_store.rebind_unstarted_profile, profile)
|
||||||
# A missing profile is an event-driven wait, not a provider outage.
|
|
||||||
# Release those durable rows only now that activation has changed the
|
|
||||||
# condition; the ordinary drain poll will claim them without a restart.
|
|
||||||
await asyncio.to_thread(
|
|
||||||
app.state.memory_write_queue.readmit_model_profile_waiters
|
|
||||||
)
|
|
||||||
# Not awaited: the catch-up reads every conversation ever imported, and
|
# Not awaited: the catch-up reads every conversation ever imported, and
|
||||||
# the answer to "which profile is active" does not depend on it.
|
# the answer to "which profile is active" does not depend on it.
|
||||||
_start_backfill(app)
|
_start_backfill(app)
|
||||||
@@ -5068,11 +5062,10 @@ def _source_writes_on(app: FastAPI, source_id: str) -> bool:
|
|||||||
|
|
||||||
|
|
||||||
def _sedimentation_claim_enabled(app: FastAPI, source_id: str) -> bool:
|
def _sedimentation_claim_enabled(app: FastAPI, source_id: str) -> bool:
|
||||||
"""Claim queued model work only when policy, source and model all admit it."""
|
"""Claim queued model work only while both global and source gates allow it."""
|
||||||
|
|
||||||
return (
|
return (
|
||||||
_config_store(app).sedimentation_enabled()
|
_config_store(app).sedimentation_enabled()
|
||||||
and _model_profile_store(app).active_identity() is not None
|
|
||||||
and _history_import_gate_released(app)
|
and _history_import_gate_released(app)
|
||||||
and _source_writes_on(app, source_id)
|
and _source_writes_on(app, source_id)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -282,24 +282,11 @@ class PollingLiveSyncSupervisor:
|
|||||||
and job.status
|
and job.status
|
||||||
in {ImportStatus.PENDING, ImportStatus.RUNNING, ImportStatus.INTERRUPTED}
|
in {ImportStatus.PENDING, ImportStatus.RUNNING, ImportStatus.INTERRUPTED}
|
||||||
]
|
]
|
||||||
bounded_history_incomplete = any(
|
|
||||||
job.source_id == source_id
|
|
||||||
and job.operation == "history"
|
|
||||||
and job.history_after is not None
|
|
||||||
and job.status is not ImportStatus.COMPLETED
|
|
||||||
for job in source_jobs
|
|
||||||
)
|
|
||||||
# Establish the realtime EOF independently even while history owns
|
# Establish the realtime EOF independently even while history owns
|
||||||
# this source. Otherwise the P1 job starts from the P2 checkpoint
|
# this source. Otherwise the P1 job starts from the P2 checkpoint
|
||||||
# (or from zero) and becomes a second full-history scan.
|
# (or from zero) and becomes a second full-history scan.
|
||||||
adapter = self.import_supervisor.adapters[source_id]
|
adapter = self.import_supervisor.adapters[source_id]
|
||||||
live_cursors = await self._live_cursors(source_id, adapter)
|
await self._live_cursors(source_id, adapter)
|
||||||
# A bounded onboarding history is the authority for everything up
|
|
||||||
# to its EOF. An adapter without a native live baseline has no safe
|
|
||||||
# realtime cursor until that history finishes; starting a sync from
|
|
||||||
# zero here would bypass `history_after` and import the old corpus.
|
|
||||||
if bounded_history_incomplete and not live_cursors:
|
|
||||||
return None
|
|
||||||
# Only one scan of a source may be in flight: they share the
|
# Only one scan of a source may be in flight: they share the
|
||||||
# cursor, and two readers means every file read twice. With a
|
# cursor, and two readers means every file read twice. With a
|
||||||
# catch-up still holding the source there is no free moment to ask
|
# catch-up still holding the source there is no free moment to ask
|
||||||
|
|||||||
@@ -1404,12 +1404,11 @@ class DurableWriteQueue:
|
|||||||
) -> int:
|
) -> int:
|
||||||
"""Re-admit `waiting_for_model` jobs whose wait has elapsed.
|
"""Re-admit `waiting_for_model` jobs whose wait has elapsed.
|
||||||
|
|
||||||
A model outage clears on its own, so transient waiters retry on a timer
|
A model outage clears on its own, so this state is retried on a timer
|
||||||
rather than waiting for a grant event like `waiting_for_permission`.
|
rather than waiting for a grant event like `waiting_for_permission`.
|
||||||
`model_profile_not_active` is excluded: only explicit activation can
|
Keyed on `updated_at` so repeated calls while a job is still parked do
|
||||||
change that condition. Keyed on `updated_at` so repeated calls while a
|
not reset its own clock; the attempt consumed by the parking claim is
|
||||||
job is still parked do not reset its own clock; the attempt consumed by
|
returned, the same way `readmit_parked` does.
|
||||||
the parking claim is returned, the same way `readmit_parked` does.
|
|
||||||
"""
|
"""
|
||||||
now = now or datetime.now(UTC)
|
now = now or datetime.now(UTC)
|
||||||
threshold = (now - after).isoformat()
|
threshold = (now - after).isoformat()
|
||||||
@@ -1418,33 +1417,8 @@ class DurableWriteQueue:
|
|||||||
"UPDATE memory_write_jobs SET state=?, lease_owner=NULL, "
|
"UPDATE memory_write_jobs SET state=?, lease_owner=NULL, "
|
||||||
"lease_expires_at=NULL, attempts=CASE WHEN attempts>0 "
|
"lease_expires_at=NULL, attempts=CASE WHEN attempts>0 "
|
||||||
"THEN attempts-1 ELSE 0 END, last_error=NULL, updated_at=? "
|
"THEN attempts-1 ELSE 0 END, last_error=NULL, updated_at=? "
|
||||||
"WHERE state=? AND updated_at <= ? AND hy_invoked=0 "
|
"WHERE state=? AND updated_at <= ? AND hy_invoked=0",
|
||||||
"AND (last_error IS NULL OR last_error<>?)",
|
(PENDING, now.isoformat(), WAITING_FOR_MODEL, threshold),
|
||||||
(
|
|
||||||
PENDING,
|
|
||||||
now.isoformat(),
|
|
||||||
WAITING_FOR_MODEL,
|
|
||||||
threshold,
|
|
||||||
"model_profile_not_active",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
return changed.rowcount
|
|
||||||
|
|
||||||
def readmit_model_profile_waiters(self) -> int:
|
|
||||||
"""Re-admit no-profile work only after model activation changes the condition."""
|
|
||||||
now = datetime.now(UTC).isoformat()
|
|
||||||
with main_database(self.database_path).write() as connection, connection:
|
|
||||||
changed = connection.execute(
|
|
||||||
"UPDATE memory_write_jobs SET state=?, lease_owner=NULL, "
|
|
||||||
"lease_expires_at=NULL, attempts=CASE WHEN attempts>0 "
|
|
||||||
"THEN attempts-1 ELSE 0 END, last_error=NULL, updated_at=? "
|
|
||||||
"WHERE state=? AND last_error=? AND hy_invoked=0",
|
|
||||||
(
|
|
||||||
PENDING,
|
|
||||||
now,
|
|
||||||
WAITING_FOR_MODEL,
|
|
||||||
"model_profile_not_active",
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
return changed.rowcount
|
return changed.rowcount
|
||||||
|
|
||||||
@@ -2097,12 +2071,7 @@ async def execute_job(
|
|||||||
# Never `logger.exception` here: it prints the exception's message,
|
# Never `logger.exception` here: it prints the exception's message,
|
||||||
# which may be a provider response or the user's own text. Log the
|
# which may be a provider response or the user's own text. Log the
|
||||||
# already-sanitised code instead, matching `hy-failure-classification`.
|
# already-sanitised code instead, matching `hy-failure-classification`.
|
||||||
if code == "model_profile_not_active":
|
logger.error("durable_write_job_failed job_id=%s error_code=%s", job_id, code)
|
||||||
logger.debug("durable_write_job_parked job_id=%s error_code=%s", job_id, code)
|
|
||||||
elif state in PARKED_STATES:
|
|
||||||
logger.info("durable_write_job_parked job_id=%s error_code=%s", job_id, code)
|
|
||||||
else:
|
|
||||||
logger.error("durable_write_job_failed job_id=%s error_code=%s", job_id, code)
|
|
||||||
return
|
return
|
||||||
await in_the_background(queue.settle, job_id, state=COMPLETED, owner=owner)
|
await in_the_background(queue.settle, job_id, state=COMPLETED, owner=owner)
|
||||||
|
|
||||||
|
|||||||
@@ -94,67 +94,6 @@ class SettledFixtureAdapter(IncrementalFixtureAdapter):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class BoundedOnboardingAdapter:
|
|
||||||
"""No native baseline: bounded history must establish the live cursor."""
|
|
||||||
|
|
||||||
descriptor = IncrementalFixtureAdapter.descriptor
|
|
||||||
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.include_new = False
|
|
||||||
|
|
||||||
async def detect(self) -> bool:
|
|
||||||
return True
|
|
||||||
|
|
||||||
async def scan(self, options: ScanOptions):
|
|
||||||
current = options.cursors.get("e" * 64)
|
|
||||||
checkpoint = current.checkpoint if current is not None else None
|
|
||||||
if checkpoint not in {"byte:10", "byte:20"}:
|
|
||||||
yield ScannedEvidence(
|
|
||||||
evidence=EvidenceInput(
|
|
||||||
source_id="fixture",
|
|
||||||
conversation_id="old-conversation",
|
|
||||||
message_id="old-message",
|
|
||||||
role="user",
|
|
||||||
written_by=WrittenBy.PERSON,
|
|
||||||
created_at=datetime(2020, 1, 1, tzinfo=UTC),
|
|
||||||
verbatim="old history",
|
|
||||||
origin_meta={EvidenceOrigin.FILE: OriginMetadata()},
|
|
||||||
),
|
|
||||||
cursor=SourceCursor(
|
|
||||||
file_key="e" * 64,
|
|
||||||
file_identity="bounded",
|
|
||||||
checkpoint="byte:10",
|
|
||||||
checkpoint_anchor="f" * 64,
|
|
||||||
observed_size=20,
|
|
||||||
observed_modified_ns=1,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
checkpoint = "byte:10"
|
|
||||||
if self.include_new and checkpoint != "byte:20":
|
|
||||||
yield ScannedEvidence(
|
|
||||||
evidence=EvidenceInput(
|
|
||||||
source_id="fixture",
|
|
||||||
conversation_id="new-conversation",
|
|
||||||
message_id="new-message",
|
|
||||||
role="user",
|
|
||||||
written_by=WrittenBy.PERSON,
|
|
||||||
created_at=datetime(2026, 10, 18, tzinfo=UTC),
|
|
||||||
verbatim="new append",
|
|
||||||
origin_meta={EvidenceOrigin.FILE: OriginMetadata()},
|
|
||||||
),
|
|
||||||
cursor=SourceCursor(
|
|
||||||
file_key="e" * 64,
|
|
||||||
file_identity="bounded",
|
|
||||||
checkpoint="byte:20",
|
|
||||||
checkpoint_anchor="1" * 64,
|
|
||||||
observed_size=20,
|
|
||||||
observed_modified_ns=2,
|
|
||||||
read_to_end=True,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
yield ScanProgressEvent(phase=ScanPhase.DONE)
|
|
||||||
|
|
||||||
|
|
||||||
class HoldingHistoryAdapter:
|
class HoldingHistoryAdapter:
|
||||||
"""First scan blocks until cancelled; later scans yield one new record."""
|
"""First scan blocks until cancelled; later scans yield one new record."""
|
||||||
|
|
||||||
@@ -389,56 +328,6 @@ def test_live_sync_does_not_resume_a_history_import_the_user_paused(tmp_path) ->
|
|||||||
asyncio.run(scenario())
|
asyncio.run(scenario())
|
||||||
|
|
||||||
|
|
||||||
def test_bounded_onboarding_history_establishes_cursor_before_first_sync(tmp_path) -> None:
|
|
||||||
async def scenario() -> None:
|
|
||||||
database = tmp_path / "one-memory.sqlite3"
|
|
||||||
evidence = EvidenceStore(database)
|
|
||||||
jobs = ImportJobStore(database)
|
|
||||||
adapter = BoundedOnboardingAdapter()
|
|
||||||
imports = ImportSupervisor(
|
|
||||||
adapters={"fixture": adapter},
|
|
||||||
evidence_store=evidence,
|
|
||||||
job_store=jobs,
|
|
||||||
)
|
|
||||||
live_sync = PollingLiveSyncSupervisor(
|
|
||||||
source_ids=("fixture",),
|
|
||||||
import_supervisor=imports,
|
|
||||||
job_store=jobs,
|
|
||||||
)
|
|
||||||
history = imports.create_job("fixture", operation="history")
|
|
||||||
with sqlite3.connect(database) as connection, connection:
|
|
||||||
connection.execute(
|
|
||||||
"UPDATE import_jobs SET history_after=? WHERE job_id=?",
|
|
||||||
(datetime(2026, 10, 15, tzinfo=UTC).isoformat(), history.job_id),
|
|
||||||
)
|
|
||||||
|
|
||||||
# With no native baseline, sync must wait instead of scanning from zero
|
|
||||||
# and bypassing the onboarding history window.
|
|
||||||
assert await live_sync.trigger("fixture") is None
|
|
||||||
assert not [job for job in jobs.list_jobs() if job.operation == "sync"]
|
|
||||||
|
|
||||||
imports.enqueue(history.job_id)
|
|
||||||
completed = await imports.wait(history.job_id)
|
|
||||||
assert completed.status is ImportStatus.COMPLETED
|
|
||||||
assert completed.stored == 0
|
|
||||||
assert completed.skipped == 1
|
|
||||||
assert evidence.count() == 0
|
|
||||||
|
|
||||||
# Once bounded history has advanced the cursor to EOF, normal realtime
|
|
||||||
# appends are admitted without retaining the three-day cutoff forever.
|
|
||||||
adapter.include_new = True
|
|
||||||
synced = await live_sync.trigger("fixture")
|
|
||||||
assert synced is not None
|
|
||||||
assert synced.status is ImportStatus.COMPLETED
|
|
||||||
assert synced.stored == 1
|
|
||||||
records = evidence.list_extractable()
|
|
||||||
assert [record.verbatim for record in records] == ["new append"]
|
|
||||||
await live_sync.shutdown()
|
|
||||||
await imports.shutdown()
|
|
||||||
|
|
||||||
asyncio.run(scenario())
|
|
||||||
|
|
||||||
|
|
||||||
def test_a_sync_left_running_after_its_worker_died_is_started_again(tmp_path) -> None:
|
def test_a_sync_left_running_after_its_worker_died_is_started_again(tmp_path) -> None:
|
||||||
"""A running row with no live worker used to be returned as 'already syncing'.
|
"""A running row with no live worker used to be returned as 'already syncing'.
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ from __future__ import annotations
|
|||||||
import asyncio
|
import asyncio
|
||||||
import contextlib
|
import contextlib
|
||||||
import json
|
import json
|
||||||
import logging
|
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
@@ -1370,30 +1369,24 @@ def test_a_machine_error_code_is_preserved(tmp_path) -> None:
|
|||||||
assert safe_error_code(ValueError("some sentence with spaces")) == "ValueError"
|
assert safe_error_code(ValueError("some sentence with spaces")) == "ValueError"
|
||||||
|
|
||||||
|
|
||||||
def test_an_inactive_profile_parks_without_error_logging(tmp_path, caplog) -> None:
|
def test_an_inactive_profile_parks_for_model_before_any_send(tmp_path) -> None:
|
||||||
"""A pre-bridge model-not-ready code parks and keeps the intent."""
|
"""A pre-bridge model-not-ready code parks and keeps the intent."""
|
||||||
path = tmp_path / "one-memory.sqlite3"
|
path = tmp_path / "one-memory.sqlite3"
|
||||||
queue = DurableWriteQueue(path)
|
queue = DurableWriteQueue(path)
|
||||||
record = queue.submit(_request())
|
record = queue.submit(_request())
|
||||||
_claim_through_drain(queue, record.job_id)
|
_claim_through_drain(queue, record.job_id)
|
||||||
|
|
||||||
with caplog.at_level(
|
asyncio.run(
|
||||||
logging.DEBUG,
|
execute_job(
|
||||||
logger="one_memory.memory_server.durable_queue",
|
record.job_id,
|
||||||
):
|
queue=queue,
|
||||||
asyncio.run(
|
supervisor=_Recorder(error=RuntimeError("model_profile_not_active")),
|
||||||
execute_job(
|
evidence=_EvidenceStore({"e1"}),
|
||||||
record.job_id,
|
|
||||||
queue=queue,
|
|
||||||
supervisor=_Recorder(error=RuntimeError("model_profile_not_active")),
|
|
||||||
evidence=_EvidenceStore({"e1"}),
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
)
|
||||||
|
|
||||||
assert _state(path, record.job_id) == WAITING_FOR_MODEL
|
assert _state(path, record.job_id) == WAITING_FOR_MODEL
|
||||||
assert _rows(path)[0]["hy_invoked"] == 0
|
assert _rows(path)[0]["hy_invoked"] == 0
|
||||||
assert "durable_write_job_failed" not in caplog.text
|
|
||||||
assert "durable_write_job_parked" in caplog.text
|
|
||||||
|
|
||||||
|
|
||||||
def test_an_authorization_stop_cancels_instead_of_failing(tmp_path) -> None:
|
def test_an_authorization_stop_cancels_instead_of_failing(tmp_path) -> None:
|
||||||
@@ -1553,7 +1546,7 @@ def test_parking_does_not_burn_the_retry_budget(tmp_path) -> None:
|
|||||||
assert queue.get("idem-1").state == PENDING
|
assert queue.get("idem-1").state == PENDING
|
||||||
|
|
||||||
|
|
||||||
def test_a_transient_model_waiter_is_readmitted_once_its_wait_elapses(tmp_path) -> None:
|
def test_a_model_waiter_is_readmitted_once_its_wait_elapses(tmp_path) -> None:
|
||||||
"""A model outage clears on its own; nothing re-admits it otherwise.
|
"""A model outage clears on its own; nothing re-admits it otherwise.
|
||||||
|
|
||||||
`waiting_for_permission` needs a grant event, but `waiting_for_model` is
|
`waiting_for_permission` needs a grant event, but `waiting_for_model` is
|
||||||
@@ -1571,7 +1564,7 @@ def test_a_transient_model_waiter_is_readmitted_once_its_wait_elapses(tmp_path)
|
|||||||
queue.settle(
|
queue.settle(
|
||||||
record.job_id,
|
record.job_id,
|
||||||
state=WAITING_FOR_MODEL,
|
state=WAITING_FOR_MODEL,
|
||||||
error_code="model_secret_unavailable",
|
error_code="model_profile_not_active",
|
||||||
hy_invoked=False,
|
hy_invoked=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1588,8 +1581,8 @@ def test_a_transient_model_waiter_is_readmitted_once_its_wait_elapses(tmp_path)
|
|||||||
assert _rows(path)[0]["attempts"] == 0
|
assert _rows(path)[0]["attempts"] == 0
|
||||||
|
|
||||||
|
|
||||||
def test_no_profile_waiter_is_readmitted_only_after_activation(tmp_path) -> None:
|
def test_readmitting_a_model_waiter_clears_its_stale_detail(tmp_path) -> None:
|
||||||
"""No timer can create a model profile; activation owns this transition."""
|
"""The timer readmission path must clear the old blocking reason too."""
|
||||||
path = tmp_path / "one-memory.sqlite3"
|
path = tmp_path / "one-memory.sqlite3"
|
||||||
queue = DurableWriteQueue(path)
|
queue = DurableWriteQueue(path)
|
||||||
record = queue.submit(_request())
|
record = queue.submit(_request())
|
||||||
@@ -1601,50 +1594,13 @@ def test_no_profile_waiter_is_readmitted_only_after_activation(tmp_path) -> None
|
|||||||
)
|
)
|
||||||
now = datetime.now(UTC)
|
now = datetime.now(UTC)
|
||||||
|
|
||||||
assert queue.readmit_model_waiters(now=now + timedelta(minutes=2)) == 0
|
assert queue.readmit_model_waiters(now=now + timedelta(minutes=2)) == 1
|
||||||
parked = queue.get("idem-1")
|
|
||||||
assert parked.state == WAITING_FOR_MODEL
|
|
||||||
assert parked.detail == "model_profile_not_active"
|
|
||||||
|
|
||||||
assert queue.readmit_model_profile_waiters() == 1
|
|
||||||
readmitted = queue.get("idem-1")
|
readmitted = queue.get("idem-1")
|
||||||
assert readmitted.state == PENDING
|
assert readmitted.state == PENDING
|
||||||
assert readmitted.detail == ""
|
assert readmitted.detail == ""
|
||||||
|
|
||||||
|
|
||||||
def test_no_profile_backlog_stays_parked_across_maintenance_cycles(tmp_path) -> None:
|
|
||||||
path = tmp_path / "one-memory.sqlite3"
|
|
||||||
queue = DurableWriteQueue(path)
|
|
||||||
for index in range(100):
|
|
||||||
record = queue.submit(_request(key=f"no-profile-{index}"))
|
|
||||||
queue.settle(
|
|
||||||
record.job_id,
|
|
||||||
state=WAITING_FOR_MODEL,
|
|
||||||
error_code="model_profile_not_active",
|
|
||||||
hy_invoked=False,
|
|
||||||
)
|
|
||||||
with sqlite3.connect(path) as connection, connection:
|
|
||||||
connection.execute(
|
|
||||||
"UPDATE memory_write_jobs SET attempts=1,"
|
|
||||||
"updated_at='2000-01-01T00:00:00+00:00'"
|
|
||||||
)
|
|
||||||
|
|
||||||
first = datetime.now(UTC)
|
|
||||||
assert queue.readmit_model_waiters(now=first, after=timedelta(0)) == 0
|
|
||||||
assert (
|
|
||||||
queue.readmit_model_waiters(
|
|
||||||
now=first + timedelta(minutes=2),
|
|
||||||
after=timedelta(0),
|
|
||||||
)
|
|
||||||
== 0
|
|
||||||
)
|
|
||||||
with sqlite3.connect(path) as connection:
|
|
||||||
assert connection.execute(
|
|
||||||
"SELECT state,attempts,COUNT(*) FROM memory_write_jobs "
|
|
||||||
"GROUP BY state,attempts"
|
|
||||||
).fetchall() == [(WAITING_FOR_MODEL, 1, 100)]
|
|
||||||
|
|
||||||
|
|
||||||
def test_readmit_parked_cannot_resurrect_a_terminal_row(tmp_path) -> None:
|
def test_readmit_parked_cannot_resurrect_a_terminal_row(tmp_path) -> None:
|
||||||
"""Only parked states may be re-admitted, never a finished write.
|
"""Only parked states may be re-admitted, never a finished write.
|
||||||
|
|
||||||
|
|||||||
@@ -259,17 +259,12 @@ def test_activation_survives_a_corpus_already_imported(tmp_path) -> None:
|
|||||||
),
|
),
|
||||||
secrets=secrets,
|
secrets=secrets,
|
||||||
)
|
)
|
||||||
readmissions: list[bool] = []
|
|
||||||
app.state.memory_write_queue.readmit_model_profile_waiters = (
|
|
||||||
lambda: readmissions.append(True) or 0
|
|
||||||
)
|
|
||||||
|
|
||||||
activated = await client.post(f"/api/v1/model-profiles/{profile_id}/activate")
|
activated = await client.post(f"/api/v1/model-profiles/{profile_id}/activate")
|
||||||
|
|
||||||
assert activated.status_code == 200
|
assert activated.status_code == 200
|
||||||
assert activated.json()["is_active"] is True
|
assert activated.json()["is_active"] is True
|
||||||
assert API_KEY not in activated.text
|
assert API_KEY not in activated.text
|
||||||
assert readmissions == [True]
|
|
||||||
# Started, not waited for: the walk reads every conversation.
|
# Started, not waited for: the walk reads every conversation.
|
||||||
assert not app.state.memory_backfill.done()
|
assert not app.state.memory_backfill.done()
|
||||||
|
|
||||||
|
|||||||
@@ -111,9 +111,6 @@ def test_the_manual_source_is_admitted_by_grant_without_a_toggle(tmp_path) -> No
|
|||||||
app = SimpleNamespace(
|
app = SimpleNamespace(
|
||||||
state=SimpleNamespace(
|
state=SimpleNamespace(
|
||||||
config_store=config,
|
config_store=config,
|
||||||
model_profile_store=SimpleNamespace(
|
|
||||||
active_identity=lambda: ("profile", 1)
|
|
||||||
),
|
|
||||||
source_grant_store=SimpleNamespace(
|
source_grant_store=SimpleNamespace(
|
||||||
receipt=lambda **_kwargs: SimpleNamespace(revoked_at=None)
|
receipt=lambda **_kwargs: SimpleNamespace(revoked_at=None)
|
||||||
),
|
),
|
||||||
@@ -128,21 +125,6 @@ def test_the_manual_source_is_admitted_by_grant_without_a_toggle(tmp_path) -> No
|
|||||||
assert _sedimentation_claim_enabled(app, "one-memory-manual") is False
|
assert _sedimentation_claim_enabled(app, "one-memory-manual") is False
|
||||||
|
|
||||||
|
|
||||||
def test_claim_gate_waits_without_polling_when_no_model_is_active(tmp_path) -> None:
|
|
||||||
config = ConfigStore(tmp_path)
|
|
||||||
app = SimpleNamespace(
|
|
||||||
state=SimpleNamespace(
|
|
||||||
config_store=config,
|
|
||||||
model_profile_store=SimpleNamespace(active_identity=lambda: None),
|
|
||||||
source_grant_store=SimpleNamespace(
|
|
||||||
receipt=lambda **_kwargs: SimpleNamespace(revoked_at=None)
|
|
||||||
),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
assert _sedimentation_claim_enabled(app, "one-memory-manual") is False
|
|
||||||
|
|
||||||
|
|
||||||
def test_first_import_gate_waits_for_every_selected_history_job() -> None:
|
def test_first_import_gate_waits_for_every_selected_history_job() -> None:
|
||||||
state = SimpleNamespace(
|
state = SimpleNamespace(
|
||||||
status="importing",
|
status="importing",
|
||||||
|
|||||||
@@ -174,20 +174,20 @@ it("continues to step3 while sample GET is pending without calling completion AP
|
|||||||
expect(screen.queryByText(/^已生成.*记忆/)).toBeNull();
|
expect(screen.queryByText(/^已生成.*记忆/)).toBeNull();
|
||||||
});
|
});
|
||||||
it.each([
|
it.each([
|
||||||
["pending", "已扫描 100 条,正在筛选"],
|
"pending",
|
||||||
["paused", "已扫描 100 条,尚未保存"],
|
"paused",
|
||||||
["interrupted", "已扫描 100 条,尚未保存"],
|
"interrupted",
|
||||||
["failed", "已扫描 100 条,尚未保存"],
|
"failed",
|
||||||
["cancelled", "已扫描 100 条,尚未保存"],
|
"cancelled",
|
||||||
["completed", "已扫描 100 条,本次没有可保存的对话"],
|
"completed",
|
||||||
] as const)(
|
] as const)(
|
||||||
"shows %s without mutating jobs or fetching missing content",
|
"shows %s without mutating jobs or fetching missing content",
|
||||||
(status, expected) => {
|
(status) => {
|
||||||
setup({
|
setup({
|
||||||
jobs: [{ ...job, status, stored: 0 }],
|
jobs: [{ ...job, status, stored: 0 }],
|
||||||
sources: [{ ...source, imported_messages: 0 }],
|
sources: [{ ...source, imported_messages: 0 }],
|
||||||
});
|
});
|
||||||
expect(screen.getByText(expected)).toBeTruthy();
|
expect(screen.getByText("已扫描 100 条,正在保存")).toBeTruthy();
|
||||||
expect(api.receipt).not.toHaveBeenCalled();
|
expect(api.receipt).not.toHaveBeenCalled();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -38,71 +38,6 @@ it("uses the selected job's message count, never the source total or fake percen
|
|||||||
expect(container.textContent).not.toContain("%");
|
expect(container.textContent).not.toContain("%");
|
||||||
expect(container.textContent).not.toContain("持续导入中");
|
expect(container.textContent).not.toContain("持续导入中");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("does not describe scanned-but-skipped history as saved", () => {
|
|
||||||
const { container } = render(
|
|
||||||
<R6ImportProgress
|
|
||||||
sourceIds={["cursor"]}
|
|
||||||
sources={[source]}
|
|
||||||
jobs={[
|
|
||||||
{
|
|
||||||
...job,
|
|
||||||
status: "completed",
|
|
||||||
discovered: 12_375,
|
|
||||||
stored: 0,
|
|
||||||
skipped: 12_375,
|
|
||||||
history_after: "2026-10-15T00:00:00Z",
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
/>,
|
|
||||||
);
|
|
||||||
expect(
|
|
||||||
screen.getByText("已扫描 12,375 条,本次没有符合时间范围的对话"),
|
|
||||||
).toBeTruthy();
|
|
||||||
expect(screen.getByText("导入完成")).toBeTruthy();
|
|
||||||
expect(container.textContent).not.toContain("正在保存");
|
|
||||||
expect(container.textContent).not.toContain("已保存 12,375");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("calls an active bounded scan filtering rather than saving", () => {
|
|
||||||
render(
|
|
||||||
<R6ImportProgress
|
|
||||||
sourceIds={["cursor"]}
|
|
||||||
sources={[source]}
|
|
||||||
jobs={[
|
|
||||||
{
|
|
||||||
...job,
|
|
||||||
discovered: 3_522,
|
|
||||||
stored: 0,
|
|
||||||
history_after: "2026-10-15T00:00:00Z",
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
/>,
|
|
||||||
);
|
|
||||||
expect(screen.getByText("已扫描 3,522 条,正在筛选最近 3 天")).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("reports only stored rows as saved after a completed partial import", () => {
|
|
||||||
const { container } = render(
|
|
||||||
<R6ImportProgress
|
|
||||||
sourceIds={["cursor"]}
|
|
||||||
sources={[source]}
|
|
||||||
jobs={[
|
|
||||||
{
|
|
||||||
...job,
|
|
||||||
status: "completed",
|
|
||||||
discovered: 25_177,
|
|
||||||
stored: 20_826,
|
|
||||||
skipped: 4_351,
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
/>,
|
|
||||||
);
|
|
||||||
expect(screen.getByText("已保存 20,826 条消息")).toBeTruthy();
|
|
||||||
expect(screen.getByText("导入完成")).toBeTruthy();
|
|
||||||
expect(container.textContent).not.toContain("25,177");
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each(["paused", "interrupted", "failed", "completed", "cancelled"] as const)(
|
it.each(["paused", "interrupted", "failed", "completed", "cancelled"] as const)(
|
||||||
"does not animate %s as active work",
|
"does not animate %s as active work",
|
||||||
(status) => {
|
(status) => {
|
||||||
|
|||||||
@@ -3,21 +3,6 @@ import { useEffect, useLayoutEffect, useRef } from "react";
|
|||||||
import { AppMark } from "./app-mark";
|
import { AppMark } from "./app-mark";
|
||||||
import "./r6-import-progress.css";
|
import "./r6-import-progress.css";
|
||||||
|
|
||||||
function progressText(job: ImportJob): string | null {
|
|
||||||
if (job.stored > 0) return `已保存 ${job.stored.toLocaleString()} 条消息`;
|
|
||||||
if (job.discovered <= 0) return null;
|
|
||||||
const scanned = `已扫描 ${job.discovered.toLocaleString()} 条`;
|
|
||||||
if (job.status === "completed")
|
|
||||||
return job.history_after
|
|
||||||
? `${scanned},本次没有符合时间范围的对话`
|
|
||||||
: `${scanned},本次没有可保存的对话`;
|
|
||||||
if (job.status === "pending" || job.status === "running")
|
|
||||||
return job.history_after
|
|
||||||
? `${scanned},正在筛选最近 3 天`
|
|
||||||
: `${scanned},正在筛选`;
|
|
||||||
return `${scanned},尚未保存`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function R6ImportProgress({
|
export function R6ImportProgress({
|
||||||
sourceIds,
|
sourceIds,
|
||||||
sources,
|
sources,
|
||||||
@@ -101,9 +86,8 @@ export function R6ImportProgress({
|
|||||||
interrupted: "已中断",
|
interrupted: "已中断",
|
||||||
failed: "导入遇到问题",
|
failed: "导入遇到问题",
|
||||||
cancelled: "已取消",
|
cancelled: "已取消",
|
||||||
completed: "导入完成",
|
completed: "已保存",
|
||||||
};
|
};
|
||||||
const progress = job ? progressText(job) : null;
|
|
||||||
return (
|
return (
|
||||||
<article
|
<article
|
||||||
className="r6-import-progress-card"
|
className="r6-import-progress-card"
|
||||||
@@ -118,8 +102,10 @@ export function R6ImportProgress({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<h2>{source?.display_name ?? id}</h2>
|
<h2>{source?.display_name ?? id}</h2>
|
||||||
{progress ? (
|
{job && job.stored > 0 ? (
|
||||||
<p>{progress}</p>
|
<p>{`已保存 ${job.stored.toLocaleString()} 条消息`}</p>
|
||||||
|
) : job && job.discovered > 0 ? (
|
||||||
|
<p>{`已扫描 ${job.discovered.toLocaleString()} 条,正在保存`}</p>
|
||||||
) : noImportedHistory ? (
|
) : noImportedHistory ? (
|
||||||
<p>没有可保存的历史对话</p>
|
<p>没有可保存的历史对话</p>
|
||||||
) : null}
|
) : null}
|
||||||
|
|||||||
@@ -312,48 +312,6 @@ describe("remote Runtime acquisition", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("allows the exact GitHub Release asset redirect hosts by default", async () => {
|
|
||||||
const value = await fixture();
|
|
||||||
const manifestUrl =
|
|
||||||
"https://github.com/example/project/releases/download/v1.2.3/release-manifest.json";
|
|
||||||
const artifactUrl =
|
|
||||||
"https://github.com/example/project/releases/download/v1.2.3/runtime.tar.gz";
|
|
||||||
const manifestAssetUrl =
|
|
||||||
"https://release-assets.githubusercontent.com/manifest-download";
|
|
||||||
const runtimeAssetUrl =
|
|
||||||
"https://release-assets.githubusercontent.com/runtime-download";
|
|
||||||
const release = {
|
|
||||||
...value.release,
|
|
||||||
artifacts: [{ ...value.artifact, url: artifactUrl }],
|
|
||||||
};
|
|
||||||
const temporaryParent = await mkdtemp(
|
|
||||||
path.join(os.tmpdir(), "memhub-github-release-parent-"),
|
|
||||||
);
|
|
||||||
roots.push(temporaryParent);
|
|
||||||
|
|
||||||
const acquired = await acquireRuntimeDistribution({
|
|
||||||
manifestUrl,
|
|
||||||
expectedVersion: "1.2.3",
|
|
||||||
channel: "stable",
|
|
||||||
platform: "linux",
|
|
||||||
arch: "x64",
|
|
||||||
temporaryParent,
|
|
||||||
httpGet: httpFixture({
|
|
||||||
[manifestUrl]: response(new Uint8Array(), 302, {
|
|
||||||
location: manifestAssetUrl,
|
|
||||||
}),
|
|
||||||
[manifestAssetUrl]: response(Buffer.from(JSON.stringify(release))),
|
|
||||||
[artifactUrl]: response(new Uint8Array(), 302, {
|
|
||||||
location: runtimeAssetUrl,
|
|
||||||
}),
|
|
||||||
[runtimeAssetUrl]: response(value.archiveBytes),
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(acquired.release.version).toBe("1.2.3");
|
|
||||||
await acquired.cleanup();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rejects an archive whose internal commit drifts from the Release", async () => {
|
it("rejects an archive whose internal commit drifts from the Release", async () => {
|
||||||
const value = await fixture();
|
const value = await fixture();
|
||||||
const release = { ...value.release, git_commit: "b".repeat(40) };
|
const release = { ...value.release, git_commit: "b".repeat(40) };
|
||||||
@@ -410,6 +368,7 @@ describe("remote Runtime acquisition", () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
it("rejects a redirect to an untrusted host", async () => {
|
it("rejects a redirect to an untrusted host", async () => {
|
||||||
|
const value = await fixture();
|
||||||
await expect(
|
await expect(
|
||||||
acquireRuntimeDistribution({
|
acquireRuntimeDistribution({
|
||||||
manifestUrl: "https://downloads.example.test/release-manifest.json",
|
manifestUrl: "https://downloads.example.test/release-manifest.json",
|
||||||
|
|||||||
@@ -38,10 +38,6 @@ const SHA256 = /^[a-f0-9]{64}$/;
|
|||||||
const COMMIT = /^[0-9a-f]{40}$/;
|
const COMMIT = /^[0-9a-f]{40}$/;
|
||||||
const SAFE_FILE_NAME = /^[0-9A-Za-z][0-9A-Za-z._-]{0,255}$/;
|
const SAFE_FILE_NAME = /^[0-9A-Za-z][0-9A-Za-z._-]{0,255}$/;
|
||||||
const REDIRECTS = new Set([301, 302, 303, 307, 308]);
|
const REDIRECTS = new Set([301, 302, 303, 307, 308]);
|
||||||
const GITHUB_RELEASE_REDIRECT_HOSTS = [
|
|
||||||
"release-assets.githubusercontent.com",
|
|
||||||
"objects.githubusercontent.com",
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export type ReleaseChannel = "stable" | "prerelease";
|
export type ReleaseChannel = "stable" | "prerelease";
|
||||||
export type RuntimeReleasePlatform = "darwin" | "linux";
|
export type RuntimeReleasePlatform = "darwin" | "linux";
|
||||||
@@ -334,12 +330,8 @@ export async function resolveRuntimeRelease(options: {
|
|||||||
maxRedirects?: number;
|
maxRedirects?: number;
|
||||||
}): Promise<ResolvedRuntimeRelease> {
|
}): Promise<ResolvedRuntimeRelease> {
|
||||||
const manifestUrl = trustedUrl(options.manifestUrl);
|
const manifestUrl = trustedUrl(options.manifestUrl);
|
||||||
const defaultHosts =
|
|
||||||
normalizedHost(manifestUrl.hostname) === "github.com"
|
|
||||||
? [manifestUrl.hostname, ...GITHUB_RELEASE_REDIRECT_HOSTS]
|
|
||||||
: [manifestUrl.hostname];
|
|
||||||
const allowedHosts = new Set(
|
const allowedHosts = new Set(
|
||||||
(options.allowedHosts ?? defaultHosts).map(normalizedHost),
|
(options.allowedHosts ?? [manifestUrl.hostname]).map(normalizedHost),
|
||||||
);
|
);
|
||||||
if (!allowedHosts.has(normalizedHost(manifestUrl.hostname))) {
|
if (!allowedHosts.has(normalizedHost(manifestUrl.hostname))) {
|
||||||
throw new Error("release_url_untrusted");
|
throw new Error("release_url_untrusted");
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import {
|
|||||||
mkdir,
|
mkdir,
|
||||||
readdir,
|
readdir,
|
||||||
readFile,
|
readFile,
|
||||||
readlink,
|
|
||||||
realpath,
|
realpath,
|
||||||
rm,
|
rm,
|
||||||
stat,
|
stat,
|
||||||
@@ -321,12 +320,6 @@ async function distributionBytes(source) {
|
|||||||
|
|
||||||
async function sha256File(file) {
|
async function sha256File(file) {
|
||||||
const digest = createHash("sha256");
|
const digest = createHash("sha256");
|
||||||
const info = await lstat(file);
|
|
||||||
if (info.isSymbolicLink()) {
|
|
||||||
digest.update("symlink\0");
|
|
||||||
digest.update(await readlink(file));
|
|
||||||
return digest.digest("hex");
|
|
||||||
}
|
|
||||||
for await (const chunk of createReadStream(file)) digest.update(chunk);
|
for await (const chunk of createReadStream(file)) digest.update(chunk);
|
||||||
return digest.digest("hex");
|
return digest.digest("hex");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import {
|
|||||||
readdir,
|
readdir,
|
||||||
readFile,
|
readFile,
|
||||||
rm,
|
rm,
|
||||||
symlink,
|
|
||||||
writeFile,
|
writeFile,
|
||||||
} from "node:fs/promises";
|
} from "node:fs/promises";
|
||||||
import os from "node:os";
|
import os from "node:os";
|
||||||
@@ -122,35 +121,6 @@ test("builds versioned Runtime archives, checksums and a downloader-compatible m
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
test("verifies Runtime symlinks with the same identity rule as the installer", async (t) => {
|
|
||||||
const root = await mkdtemp(path.join(os.tmpdir(), "memhub-release-assets-"));
|
|
||||||
t.after(() => rm(root, { recursive: true, force: true }));
|
|
||||||
const source = await distribution(root, "linux", "x64");
|
|
||||||
const link = "memhub";
|
|
||||||
await symlink(link, path.join(source, "bin", "node"));
|
|
||||||
const manifestPath = path.join(source, "manifest.json");
|
|
||||||
const manifest = JSON.parse(await readFile(manifestPath, "utf8"));
|
|
||||||
manifest.files["bin/node"] = sha256(`symlink\0${link}`);
|
|
||||||
await writeFile(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
|
|
||||||
|
|
||||||
const release = await buildReleaseAssets({
|
|
||||||
output: path.join(root, "release"),
|
|
||||||
version: "0.1.0-internal.1",
|
|
||||||
channel: "prerelease",
|
|
||||||
assetBaseUrl: "https://git.example.test/release/downloads/",
|
|
||||||
distributions: [source],
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.ok(
|
|
||||||
release.artifacts.some(
|
|
||||||
(artifact) =>
|
|
||||||
artifact.kind === "runtime" &&
|
|
||||||
artifact.platform === "linux" &&
|
|
||||||
artifact.arch === "x64",
|
|
||||||
),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("refuses version, build and duplicate target drift", async (t) => {
|
test("refuses version, build and duplicate target drift", async (t) => {
|
||||||
const root = await mkdtemp(path.join(os.tmpdir(), "memhub-release-assets-"));
|
const root = await mkdtemp(path.join(os.tmpdir(), "memhub-release-assets-"));
|
||||||
t.after(() => rm(root, { recursive: true, force: true }));
|
t.after(() => rm(root, { recursive: true, force: true }));
|
||||||
|
|||||||
@@ -23,8 +23,7 @@ export async function publishCliAfterRelease(options, dependencies = {}) {
|
|||||||
const statImpl = dependencies.statImpl ?? stat;
|
const statImpl = dependencies.statImpl ?? stat;
|
||||||
const buildEnvironment = {
|
const buildEnvironment = {
|
||||||
...environment,
|
...environment,
|
||||||
MEMHUB_NPM_VERSION: options.version,
|
ONE_MEMORY_VERSION: options.version,
|
||||||
MEMHUB_DEFAULT_RUNTIME_VERSION: options.runtimeVersion,
|
|
||||||
ONE_MEMORY_BUILD_NUMBER: String(options.buildNumber),
|
ONE_MEMORY_BUILD_NUMBER: String(options.buildNumber),
|
||||||
ONE_MEMORY_COMMIT: options.gitCommit,
|
ONE_MEMORY_COMMIT: options.gitCommit,
|
||||||
};
|
};
|
||||||
@@ -32,7 +31,7 @@ export async function publishCliAfterRelease(options, dependencies = {}) {
|
|||||||
const versionReceipt = await verifyVersion(
|
const versionReceipt = await verifyVersion(
|
||||||
[
|
[
|
||||||
"--version",
|
"--version",
|
||||||
options.runtimeVersion,
|
options.version,
|
||||||
"--channel",
|
"--channel",
|
||||||
options.channel,
|
options.channel,
|
||||||
"--tag",
|
"--tag",
|
||||||
@@ -44,7 +43,7 @@ export async function publishCliAfterRelease(options, dependencies = {}) {
|
|||||||
);
|
);
|
||||||
const releaseReceipt = await verifyRelease({
|
const releaseReceipt = await verifyRelease({
|
||||||
manifestUrl: options.manifestUrl,
|
manifestUrl: options.manifestUrl,
|
||||||
version: options.runtimeVersion,
|
version: options.version,
|
||||||
gitCommit: options.gitCommit,
|
gitCommit: options.gitCommit,
|
||||||
channel: options.channel,
|
channel: options.channel,
|
||||||
platform: options.platform,
|
platform: options.platform,
|
||||||
@@ -107,8 +106,7 @@ export async function publishCliAfterRelease(options, dependencies = {}) {
|
|||||||
return {
|
return {
|
||||||
schema_version: 1,
|
schema_version: 1,
|
||||||
product: "memhub-cli-publication",
|
product: "memhub-cli-publication",
|
||||||
version: options.version,
|
version: versionReceipt.version,
|
||||||
runtime_version: releaseReceipt.version,
|
|
||||||
build_number: versionReceipt.build_number,
|
build_number: versionReceipt.build_number,
|
||||||
tag: versionReceipt.tag,
|
tag: versionReceipt.tag,
|
||||||
release: releaseReceipt,
|
release: releaseReceipt,
|
||||||
@@ -198,11 +196,6 @@ function parseArgs(arguments_) {
|
|||||||
options.manifestUrl = value;
|
options.manifestUrl = value;
|
||||||
else if (flag === "--version" && options.version === undefined)
|
else if (flag === "--version" && options.version === undefined)
|
||||||
options.version = value;
|
options.version = value;
|
||||||
else if (
|
|
||||||
flag === "--runtime-version" &&
|
|
||||||
options.runtimeVersion === undefined
|
|
||||||
)
|
|
||||||
options.runtimeVersion = value;
|
|
||||||
else if (flag === "--git-commit" && options.gitCommit === undefined)
|
else if (flag === "--git-commit" && options.gitCommit === undefined)
|
||||||
options.gitCommit = value;
|
options.gitCommit = value;
|
||||||
else if (flag === "--channel" && options.channel === undefined)
|
else if (flag === "--channel" && options.channel === undefined)
|
||||||
@@ -226,7 +219,6 @@ function parseArgs(arguments_) {
|
|||||||
if (
|
if (
|
||||||
!options.manifestUrl ||
|
!options.manifestUrl ||
|
||||||
!options.version ||
|
!options.version ||
|
||||||
!options.runtimeVersion ||
|
|
||||||
!options.gitCommit ||
|
!options.gitCommit ||
|
||||||
!options.channel ||
|
!options.channel ||
|
||||||
!options.tag ||
|
!options.tag ||
|
||||||
@@ -238,7 +230,7 @@ function parseArgs(arguments_) {
|
|||||||
!options.npmTag
|
!options.npmTag
|
||||||
) {
|
) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
"usage: publish-cli-after-release.mjs --manifest-url <https-url> --version <CLI SemVer> --runtime-version <Runtime SemVer> --git-commit <sha> --channel <stable|prerelease> --tag <vSemVer> --build-number <integer> --platform <darwin|linux> --arch <x64|arm64> --registry <https-url> --npm-tag <tag> [--access <public|restricted>] [--provenance] [--allowed-host <hostname>] [--dry-run]",
|
"usage: publish-cli-after-release.mjs --manifest-url <https-url> --version <SemVer> --git-commit <sha> --channel <stable|prerelease> --tag <vSemVer> --build-number <integer> --platform <darwin|linux> --arch <x64|arm64> --registry <https-url> --npm-tag <tag> [--access <public|restricted>] [--provenance] [--allowed-host <hostname>] [--dry-run]",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return options;
|
return options;
|
||||||
|
|||||||
@@ -6,9 +6,6 @@ import test from "node:test";
|
|||||||
|
|
||||||
import { publishCliAfterRelease } from "./publish-cli-after-release.mjs";
|
import { publishCliAfterRelease } from "./publish-cli-after-release.mjs";
|
||||||
|
|
||||||
const CLI_VERSION = "0.1.1";
|
|
||||||
const RUNTIME_VERSION = "0.1.0-internal.1";
|
|
||||||
|
|
||||||
async function fixture(t) {
|
async function fixture(t) {
|
||||||
const root = await mkdtemp(path.join(os.tmpdir(), "memhub-publish-gate-"));
|
const root = await mkdtemp(path.join(os.tmpdir(), "memhub-publish-gate-"));
|
||||||
t.after(() => rm(root, { recursive: true, force: true }));
|
t.after(() => rm(root, { recursive: true, force: true }));
|
||||||
@@ -18,10 +15,10 @@ async function fixture(t) {
|
|||||||
await mkdir(output, { recursive: true });
|
await mkdir(output, { recursive: true });
|
||||||
await writeFile(
|
await writeFile(
|
||||||
path.join(publish, "package.json"),
|
path.join(publish, "package.json"),
|
||||||
`${JSON.stringify({ name: "@example/memhub-cli", version: CLI_VERSION, private: false })}\n`,
|
`${JSON.stringify({ name: "@example/memhub-cli", version: "0.1.0-internal.1", private: false })}\n`,
|
||||||
);
|
);
|
||||||
await writeFile(
|
await writeFile(
|
||||||
path.join(output, `example-memhub-cli-${CLI_VERSION}.tgz`),
|
path.join(output, "example-memhub-cli-0.1.0-internal.1.tgz"),
|
||||||
"tarball",
|
"tarball",
|
||||||
);
|
);
|
||||||
return root;
|
return root;
|
||||||
@@ -29,11 +26,10 @@ async function fixture(t) {
|
|||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
manifestUrl: "https://releases.example.test/release-manifest.json",
|
manifestUrl: "https://releases.example.test/release-manifest.json",
|
||||||
version: CLI_VERSION,
|
version: "0.1.0-internal.1",
|
||||||
runtimeVersion: RUNTIME_VERSION,
|
|
||||||
gitCommit: "a".repeat(40),
|
gitCommit: "a".repeat(40),
|
||||||
channel: "prerelease",
|
channel: "prerelease",
|
||||||
tag: `v${RUNTIME_VERSION}`,
|
tag: "v0.1.0-internal.1",
|
||||||
buildNumber: 1,
|
buildNumber: 1,
|
||||||
platform: "linux",
|
platform: "linux",
|
||||||
arch: "x64",
|
arch: "x64",
|
||||||
@@ -53,24 +49,15 @@ test("verifies the Runtime before building and publishing the CLI", async (t) =>
|
|||||||
{
|
{
|
||||||
verifyVersion: async () => {
|
verifyVersion: async () => {
|
||||||
events.push("version");
|
events.push("version");
|
||||||
return {
|
return { version: options.version, build_number: 1, tag: options.tag };
|
||||||
version: options.runtimeVersion,
|
|
||||||
build_number: 1,
|
|
||||||
tag: options.tag,
|
|
||||||
};
|
|
||||||
},
|
},
|
||||||
verifyRelease: async (verifyOptions) => {
|
verifyRelease: async (verifyOptions) => {
|
||||||
events.push("release");
|
events.push("release");
|
||||||
assert.equal(verifyOptions.gitCommit, options.gitCommit);
|
assert.equal(verifyOptions.gitCommit, options.gitCommit);
|
||||||
assert.equal(verifyOptions.version, options.runtimeVersion);
|
return { version: options.version, sha256: "a".repeat(64) };
|
||||||
return { version: options.runtimeVersion, sha256: "a".repeat(64) };
|
|
||||||
},
|
},
|
||||||
runCommand: (command, arguments_, commandOptions) => {
|
runCommand: (command, arguments_, commandOptions) => {
|
||||||
assert.equal(commandOptions.env.MEMHUB_NPM_VERSION, options.version);
|
assert.equal(commandOptions.env.ONE_MEMORY_VERSION, options.version);
|
||||||
assert.equal(
|
|
||||||
commandOptions.env.MEMHUB_DEFAULT_RUNTIME_VERSION,
|
|
||||||
options.runtimeVersion,
|
|
||||||
);
|
|
||||||
assert.equal(
|
assert.equal(
|
||||||
commandOptions.env.ONE_MEMORY_BUILD_NUMBER,
|
commandOptions.env.ONE_MEMORY_BUILD_NUMBER,
|
||||||
String(options.buildNumber),
|
String(options.buildNumber),
|
||||||
@@ -87,8 +74,6 @@ test("verifies the Runtime before building and publishing the CLI", async (t) =>
|
|||||||
assert.match(events[3], /--access public/);
|
assert.match(events[3], /--access public/);
|
||||||
assert.match(events[3], /--provenance/);
|
assert.match(events[3], /--provenance/);
|
||||||
assert.equal(receipt.npm_package, "@example/memhub-cli");
|
assert.equal(receipt.npm_package, "@example/memhub-cli");
|
||||||
assert.equal(receipt.version, CLI_VERSION);
|
|
||||||
assert.equal(receipt.runtime_version, RUNTIME_VERSION);
|
|
||||||
assert.equal(receipt.dry_run, true);
|
assert.equal(receipt.dry_run, true);
|
||||||
assert.equal(receipt.npm_access, "public");
|
assert.equal(receipt.npm_access, "public");
|
||||||
assert.equal(receipt.provenance, true);
|
assert.equal(receipt.provenance, true);
|
||||||
@@ -102,7 +87,7 @@ test("never builds or invokes npm when the Runtime release is unavailable", asyn
|
|||||||
{ ...options, root },
|
{ ...options, root },
|
||||||
{
|
{
|
||||||
verifyVersion: async () => ({
|
verifyVersion: async () => ({
|
||||||
version: options.runtimeVersion,
|
version: options.version,
|
||||||
build_number: 1,
|
build_number: 1,
|
||||||
tag: options.tag,
|
tag: options.tag,
|
||||||
}),
|
}),
|
||||||
@@ -130,11 +115,11 @@ test("rejects a package identity that differs from the configured publish name",
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
verifyVersion: async () => ({
|
verifyVersion: async () => ({
|
||||||
version: options.runtimeVersion,
|
version: options.version,
|
||||||
build_number: 1,
|
build_number: 1,
|
||||||
tag: options.tag,
|
tag: options.tag,
|
||||||
}),
|
}),
|
||||||
verifyRelease: async () => ({ version: options.runtimeVersion }),
|
verifyRelease: async () => ({ version: options.version }),
|
||||||
runCommand: () => undefined,
|
runCommand: () => undefined,
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -12,9 +12,8 @@ L1_RAW 对外读路径不可见:闸门焊在向量库唯一查询入口。
|
|||||||
hybrid_search_native / list_by_user 四个查询方法的共同必经处,
|
hybrid_search_native / list_by_user 四个查询方法的共同必经处,
|
||||||
上层无法绕开,新增接口自动受保护。
|
上层无法绕开,新增接口自动受保护。
|
||||||
|
|
||||||
按 ID 直取走主键查询、不经过 filter,故在 `client.async_get` 处默认挡住。
|
按 ID 直取走主键查询、不经过 filter,故在 `client.async_get` 处单独挡
|
||||||
Python SDK 调用方可显式传 `include_raw=True` 读取;HTTP 接口不传该参数,
|
(GET /v1/memories/{id} 与 /v1/memories/batch 的共同必经处)。
|
||||||
继续保持原有隐藏行为。
|
|
||||||
|
|
||||||
内部管线需读原始对话时显式 allow_raw_layer=True 放行:
|
内部管线需读原始对话时显式 allow_raw_layer=True 放行:
|
||||||
- `writer._get_recent_dialogue_history`:提取前拼多轮对话历史喂 LLM
|
- `writer._get_recent_dialogue_history`:提取前拼多轮对话历史喂 LLM
|
||||||
@@ -125,63 +124,28 @@ class TestListNoLongerFiltersInProcess:
|
|||||||
"list 又出现进程内过滤 raw 的写法,应交由 vdb 侧 filter 完成"
|
"list 又出现进程内过滤 raw 的写法,应交由 vdb 侧 filter 完成"
|
||||||
|
|
||||||
|
|
||||||
class TestGetByIdRawOptIn:
|
class TestGetByIdPathBlocksRaw:
|
||||||
"""按 ID 直取默认隐藏 raw,只有 SDK 显式选择时才返回。"""
|
"""按 ID 直取:走主键查询不经 filter,须在 async_get 处挡住。"""
|
||||||
|
|
||||||
@staticmethod
|
def test_async_get_drops_raw_node(self):
|
||||||
def _client(node):
|
|
||||||
from hy_memory.client import HyMemoryClient
|
|
||||||
|
|
||||||
class Store:
|
|
||||||
async def get_by_id(self, memory_id):
|
|
||||||
return node if memory_id == node.node_id else None
|
|
||||||
|
|
||||||
async def no_op_log(**kwargs):
|
|
||||||
return None
|
|
||||||
|
|
||||||
client = HyMemoryClient.__new__(HyMemoryClient)
|
|
||||||
client._vector_store = Store()
|
|
||||||
client._graph_store = None
|
|
||||||
client._backend_identity = lambda: {}
|
|
||||||
client._maybe_store_op_log = no_op_log
|
|
||||||
return client
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _raw_node():
|
|
||||||
return MemoryNode(
|
|
||||||
node_id="raw-1",
|
|
||||||
user_id="u1",
|
|
||||||
agent_id="a1",
|
|
||||||
session_id="s1",
|
|
||||||
content="原始对话",
|
|
||||||
layer=MemoryLayer.L1_RAW,
|
|
||||||
status=MemoryStatus.ACTIVE,
|
|
||||||
custom={"meta": [{"source": "test"}]},
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_default_still_hides_raw(self):
|
|
||||||
from hy_memory.client import HyMemoryClient
|
|
||||||
|
|
||||||
client = self._client(self._raw_node())
|
|
||||||
raw_get = HyMemoryClient.async_get.__wrapped__
|
|
||||||
assert run(raw_get(client, "raw-1")) is None
|
|
||||||
|
|
||||||
def test_explicit_include_raw_returns_lite_memory(self):
|
|
||||||
from hy_memory.client import HyMemoryClient
|
|
||||||
|
|
||||||
client = self._client(self._raw_node())
|
|
||||||
raw_get = HyMemoryClient.async_get.__wrapped__
|
|
||||||
result = run(raw_get(client, "raw-1", include_raw=True))
|
|
||||||
|
|
||||||
assert result["memory_id"] == "raw-1"
|
|
||||||
assert result["content"] == "原始对话"
|
|
||||||
assert result["layer"] == MemoryLayer.L1_RAW.value
|
|
||||||
assert result["meta"] == [{"source": "test"}]
|
|
||||||
|
|
||||||
def test_public_get_exposes_keyword_only_opt_in(self):
|
|
||||||
import inspect
|
import inspect
|
||||||
from hy_memory.client import HyMemoryClient
|
from hy_memory.client import HyMemoryClient
|
||||||
|
src = inspect.getsource(HyMemoryClient.async_get)
|
||||||
|
assert "MemoryLayer.L1_RAW" in src, \
|
||||||
|
"async_get 未挡 raw,batch 与按 ID 单取会漏出原始对话"
|
||||||
|
|
||||||
param = inspect.signature(HyMemoryClient.get).parameters["include_raw"]
|
def test_block_happens_before_return(self):
|
||||||
assert param.default is False
|
"""挡的位置必须在两处 return 之前,否则等于没挡。"""
|
||||||
assert param.kind is inspect.Parameter.KEYWORD_ONLY
|
import inspect
|
||||||
|
from hy_memory.client import HyMemoryClient
|
||||||
|
lines = inspect.getsource(HyMemoryClient.async_get).splitlines()
|
||||||
|
block_at = next(
|
||||||
|
i for i, l in enumerate(lines)
|
||||||
|
if "MemoryLayer.L1_RAW" in l and "vdb_node" in l
|
||||||
|
)
|
||||||
|
first_return_at = next(
|
||||||
|
i for i, l in enumerate(lines)
|
||||||
|
if l.strip().startswith("return {")
|
||||||
|
)
|
||||||
|
assert block_at < first_return_at, \
|
||||||
|
f"挡 raw 在第 {block_at} 行、首个 return 在第 {first_return_at} 行,顺序错了"
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
import asyncio
|
|
||||||
import threading
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
from hy_memory.config import MemoryConfig
|
|
||||||
from hy_memory.data.cache_sqlite import SqliteCache
|
|
||||||
from hy_memory.data.history_store import HistoryStore
|
|
||||||
|
|
||||||
|
|
||||||
class _BlockingCursor:
|
|
||||||
def fetchone(self):
|
|
||||||
return (1,)
|
|
||||||
|
|
||||||
def fetchall(self):
|
|
||||||
return []
|
|
||||||
|
|
||||||
|
|
||||||
class _BlockingConnection:
|
|
||||||
"""Hold execute() open so a concurrent close() can be observed."""
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
self.entered = threading.Event()
|
|
||||||
self.release = threading.Event()
|
|
||||||
self.closed = threading.Event()
|
|
||||||
|
|
||||||
def execute(self, *_args, **_kwargs):
|
|
||||||
self.entered.set()
|
|
||||||
if not self.release.wait(timeout=2):
|
|
||||||
raise TimeoutError("test did not release the blocking query")
|
|
||||||
if self.closed.is_set():
|
|
||||||
raise AssertionError("connection was closed while execute() was active")
|
|
||||||
return _BlockingCursor()
|
|
||||||
|
|
||||||
def close(self):
|
|
||||||
self.closed.set()
|
|
||||||
|
|
||||||
|
|
||||||
def _config(tmp_path) -> MemoryConfig:
|
|
||||||
config = MemoryConfig()
|
|
||||||
config.history.db_path = str(tmp_path / "history.db")
|
|
||||||
config.cache.db_path = str(tmp_path / "cache.db")
|
|
||||||
return config
|
|
||||||
|
|
||||||
|
|
||||||
async def _wait_for(event: threading.Event) -> None:
|
|
||||||
assert await asyncio.wait_for(asyncio.to_thread(event.wait, 1), timeout=2)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_history_close_waits_for_active_query(tmp_path):
|
|
||||||
store = HistoryStore(_config(tmp_path))
|
|
||||||
connection = _BlockingConnection()
|
|
||||||
store._conn = connection
|
|
||||||
|
|
||||||
query = asyncio.create_task(store.count())
|
|
||||||
await _wait_for(connection.entered)
|
|
||||||
closing = asyncio.create_task(store.close())
|
|
||||||
await asyncio.sleep(0.05)
|
|
||||||
|
|
||||||
assert not connection.closed.is_set()
|
|
||||||
connection.release.set()
|
|
||||||
assert await query == 1
|
|
||||||
await closing
|
|
||||||
assert connection.closed.is_set()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_cache_close_waits_for_active_query(tmp_path):
|
|
||||||
store = SqliteCache(_config(tmp_path))
|
|
||||||
connection = _BlockingConnection()
|
|
||||||
store._conn = connection
|
|
||||||
|
|
||||||
query = asyncio.create_task(store.load_metrics_range("0", "9"))
|
|
||||||
await _wait_for(connection.entered)
|
|
||||||
closing = asyncio.create_task(store.close())
|
|
||||||
await asyncio.sleep(0.05)
|
|
||||||
|
|
||||||
assert not connection.closed.is_set()
|
|
||||||
connection.release.set()
|
|
||||||
assert await query == []
|
|
||||||
await closing
|
|
||||||
assert connection.closed.is_set()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_history_concurrent_reads_and_writes_are_serialized(tmp_path):
|
|
||||||
store = HistoryStore(_config(tmp_path))
|
|
||||||
await store.initialize()
|
|
||||||
try:
|
|
||||||
inserted = await asyncio.gather(
|
|
||||||
*(
|
|
||||||
store.record_add(
|
|
||||||
memory_id=f"memory-{index}",
|
|
||||||
content="content",
|
|
||||||
layer="l2_fact",
|
|
||||||
isolation_key="user",
|
|
||||||
)
|
|
||||||
for index in range(200)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
assert all(row_id > 0 for row_id in inserted)
|
|
||||||
assert len(set(inserted)) == 200
|
|
||||||
|
|
||||||
counts = await asyncio.gather(*(store.count() for _ in range(100)))
|
|
||||||
assert counts == [200] * 100
|
|
||||||
finally:
|
|
||||||
await store.close()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_cache_concurrent_pipeline_log_reads_and_writes_are_serialized(tmp_path):
|
|
||||||
store = SqliteCache(_config(tmp_path))
|
|
||||||
await store.initialize()
|
|
||||||
try:
|
|
||||||
written = await asyncio.gather(
|
|
||||||
*(
|
|
||||||
store.store_pipeline_log(
|
|
||||||
request_id="request",
|
|
||||||
user_id="user",
|
|
||||||
agent_id="agent",
|
|
||||||
step="EXTRACT",
|
|
||||||
prompt=f"prompt-{index}",
|
|
||||||
response="response",
|
|
||||||
)
|
|
||||||
for index in range(200)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
assert written == [True] * 200
|
|
||||||
|
|
||||||
pages = await asyncio.gather(
|
|
||||||
*(store.get_pipeline_logs(request_id="request", limit=200) for _ in range(50))
|
|
||||||
)
|
|
||||||
assert all(len(page) == 200 for page in pages)
|
|
||||||
finally:
|
|
||||||
await store.close()
|
|
||||||
Reference in new issue
Block a user