Compare commits
28
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba6248b90b | ||
|
|
6cad02bc82 | ||
|
|
fdc57822b5 | ||
|
|
b20331aa39 | ||
|
|
104fbcce09 | ||
|
|
302fd30af1 | ||
|
|
cdb44658cf | ||
|
|
2ab04291a9 | ||
|
|
3772a69c6b | ||
|
|
80d3b55723 | ||
|
|
b5ec0861f0 | ||
|
|
47e938da1b | ||
|
|
f5ea0af75d | ||
|
|
1c2f48579f | ||
|
|
d29615abeb | ||
|
|
0965519e16 | ||
|
|
7e9f0d98d8 | ||
|
|
0ff4538f36 | ||
|
|
a9709788d8 | ||
|
|
c1e5916b51 | ||
|
|
97de5480bd | ||
|
|
97d9309ca8 | ||
|
|
b1b3e0a291 | ||
|
|
53507c7abe | ||
|
|
5a1d252787 | ||
|
|
8895fea775 | ||
|
|
78882f3300 | ||
|
|
988667cd87 |
No files matched your search
@@ -40,6 +40,7 @@ MEMORY_EMBEDDING_DIMS=1024
|
||||
# MEMORY_EMBEDDER_TIMEOUT=15
|
||||
# MEMORY_EMBEDDER_MAX_RETRIES=2
|
||||
# MEMORY_EMBEDDER_RETRY_DELAY=0.3
|
||||
# MEMORY_EMBEDDER_BATCH_SIZE=64
|
||||
# MEMORY_EMBEDDER_EXTRA_HEADERS={}
|
||||
# MEMORY_EMBEDDER_EXTRA_BODY={}
|
||||
|
||||
|
||||
@@ -4,6 +4,73 @@ Hy Memory and MemHub are versioned and released independently.
|
||||
|
||||
## Unreleased
|
||||
|
||||
## Hy Memory 2.0.10 — 2026-11-01
|
||||
|
||||
- New `hy_memory.reembed` module for switching the embedding
|
||||
model. Writers must be paused for the whole run. Nothing is derived from
|
||||
the provider or endpoint: source and target are named explicitly, and the
|
||||
identity of a space is the model name plus the width (`space_identity`).
|
||||
Only Chroma and Kuzu are supported.
|
||||
- `vector_space_names(config, base_name=None)` returns every physical
|
||||
collection a client opens for the six vector roles: memory, entities,
|
||||
coding keys and working facts, each in the working and coding variants.
|
||||
- `reembed_vector_space(source, target, embedding=...)` pages every raw
|
||||
source collection, covering all users and all layers including L1_RAW. It
|
||||
embeds the text the write path embedded (`reembed_text`: the canonical
|
||||
state's `state_retrieval_text`, a schema's `retrieval_text`, otherwise the
|
||||
document). It then writes each record into the target with the same id,
|
||||
document and metadata. Each batch's widths are checked before anything is
|
||||
written. A cancel stops at a batch boundary (`ReembedCancelled`). A rerun
|
||||
skips the ids the target already holds, so it resumes, and a merge never
|
||||
overwrites the target. The source is never written.
|
||||
- `plan_reembed`, `verify_reembed` and `drop_vector_space` complete the
|
||||
vector side. `verify_reembed` checks ids, metadata, per-user counts and
|
||||
the width, and runs a self-recall sample. `drop_vector_space` refuses
|
||||
collections that a live client in this process holds open.
|
||||
- `scan_vector_spaces(persist_directory)` is read-only. It lists every
|
||||
space on disk with its roles, counts, stored width, per-user counts and
|
||||
the models recorded in metadata. `diff_spaces(source, target)` returns the
|
||||
ids that the source holds and the target lacks, whatever their status.
|
||||
- `reembed_graph(source_path, target_path, embedding=..., target_dims=...)`
|
||||
builds a new Kuzu graph at the new width. It copies every node and edge
|
||||
and recomputes `Memory.embedding`, `Memory.beh_embedding`, and the Topic
|
||||
and HierarchyTopic embeddings, then rebuilds the HNSW index. The source
|
||||
graph is opened read-only and kept for rollback. A run that fails or is
|
||||
cancelled leaves no target behind, and a rerun starts over.
|
||||
`verify_graph_reembed` and `drop_graph` complete the graph side.
|
||||
- `EmbedService.embed_batch` now splits large batches into
|
||||
requests of `embedder.batch_size` texts each (`MEMORY_EMBEDDER_BATCH_SIZE`,
|
||||
default 64); before, it sent them all in one request. On a 429 it waits for
|
||||
the `Retry-After` time plus jitter, capped at 60 s. It takes a per-call
|
||||
`max_retries`. A returned vector whose width differs from the configured
|
||||
`embedding_dims` now raises `EmbeddingDimensionMismatchError` and is not
|
||||
retried.
|
||||
- Raw conversations are stored already trimmed. MemHub now keeps every raw
|
||||
forever and lite mode stores nothing else, so tool output and long pasted
|
||||
logs no longer stay in full. One rule (`hy_memory/utils/raw_trim.py`) is
|
||||
applied to each message when the raw is written:
|
||||
- `user` and `system` turns are kept in full;
|
||||
- `assistant` turns and other speakers (`[John]:`) longer than 500
|
||||
characters, after stripping, are cut to the first 500 plus `...`. This is
|
||||
the limit history injection used before;
|
||||
- `tool` turns keep their head and tail, and the middle becomes
|
||||
`[...N bytes omitted by truncate...]`, with the coding limit
|
||||
`coding.tool_result_max_bytes` (`MEMORY_CODING_TOOL_RESULT_MAX_BYTES`,
|
||||
default 2048).
|
||||
|
||||
The rule is idempotent. It covers chat `L1_RAW` in lite, pro and ultra (lite
|
||||
keeps tool turns, because it has no coding route) and the `memory_history`
|
||||
ADD record. The coding/working `coding_trace` was already trimmed when it
|
||||
was written. Its tool and assistant truncations are now idempotent, so
|
||||
reading the history back no longer rewrites the omitted-count markers. The
|
||||
text embedded for `L1_RAW` is the trimmed text. New raws carry
|
||||
`custom.raw_trimmed=true`.
|
||||
- Extractor history ("last k messages") now joins the stored raws directly
|
||||
and does not trim them again. Raws written before this change have no
|
||||
`raw_trimmed` flag, so they are still trimmed with the same rule when they
|
||||
are read. The extractor still receives the current batch in full (tool
|
||||
turns are still removed on the chat route).
|
||||
|
||||
## MemHub 1.0.5 — 2026-10-28
|
||||
|
||||
Build 36, on `hy-memory==2.0.8`. Linux x64/arm64 Runtime and macOS arm64
|
||||
@@ -94,6 +161,29 @@ authority on first launch.
|
||||
`hy_node_permissions` proof table. Evidence, governed memories, model
|
||||
profiles, SDK stores, and source/host grants are preserved.
|
||||
|
||||
## Hy Memory 2.0.9 — 2026-11-01
|
||||
|
||||
- Published
|
||||
[`hy-memory==2.0.9`](https://pypi.org/project/hy-memory/2.0.9/).
|
||||
- Placeholder values no longer overwrite the user's basic profile (L0). A
|
||||
small extraction model filled `basic_info` with `{"name": "用户"}`,
|
||||
`The user` or `N/A` when the user had said nothing about themselves, and
|
||||
each placeholder superseded the real value, so the L0 chain read
|
||||
费天翔 → Fei → 用户 → The user. Two defences:
|
||||
- `upsert_basic_profile` drops placeholder values: empty, `用户`,
|
||||
`the user`, `user`, `n/a`, `na`, `none`, `null`, `unknown`, `未提供`,
|
||||
`未知`, `不详`, `-`, `?` and the field's own name, compared
|
||||
case-insensitively with whitespace and punctuation stripped. When nothing
|
||||
is left it writes no new version and no new L0 head. Placeholders already
|
||||
stored in the chain no longer override earlier real values when the
|
||||
profile is assembled, so `get_user_profile` of an affected user shows the
|
||||
last real value again without any migration. This also stops an
|
||||
assistant quoting an old memory ("The user's name is 用户.") from being
|
||||
written back.
|
||||
- The extraction prompts (zh and en) state the rule: only what the user
|
||||
said in a `user` turn, never the field name or a placeholder, `{}`
|
||||
otherwise, with a small-talk counter-example.
|
||||
|
||||
## Hy Memory 2.0.8 — 2026-10-28
|
||||
|
||||
- Published
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
| `MEMORY_EMBEDDER_TIMEOUT` | `15` | 单次超时,秒 |
|
||||
| `MEMORY_EMBEDDER_MAX_RETRIES` | `2` | 最大重试次数 |
|
||||
| `MEMORY_EMBEDDER_RETRY_DELAY` | `0.3` | 重试间隔,秒 |
|
||||
| `MEMORY_EMBEDDER_BATCH_SIZE` | `64` | `embed_batch` 单次请求最多发送的文本条数,超出按此切块 |
|
||||
| `MEMORY_EMBEDDER_EXTRA_HEADERS` | — | JSON object,附加 HTTP headers |
|
||||
| `MEMORY_EMBEDDER_EXTRA_BODY` | — | JSON object,附加请求 body |
|
||||
|
||||
|
||||
@@ -55,6 +55,33 @@ except Exception:
|
||||
from .client import HyMemoryClient
|
||||
from .inspector import MemoryInspector
|
||||
from .runtime import SharedRuntime
|
||||
from .reembed import (
|
||||
EmbeddingSpaceIdentity,
|
||||
GraphReembedPlan,
|
||||
GraphReembedProgress,
|
||||
GraphReembedReport,
|
||||
GraphVerification,
|
||||
ReembedCancelled,
|
||||
ReembedPlan,
|
||||
ReembedProgress,
|
||||
ReembedReport,
|
||||
ReembedVerification,
|
||||
ScannedSpace,
|
||||
SpaceDiff,
|
||||
VectorSpace,
|
||||
diff_spaces,
|
||||
drop_graph,
|
||||
drop_vector_space,
|
||||
plan_reembed,
|
||||
reembed_graph,
|
||||
reembed_text,
|
||||
reembed_vector_space,
|
||||
scan_vector_spaces,
|
||||
space_identity,
|
||||
vector_space_names,
|
||||
verify_graph_reembed,
|
||||
verify_reembed,
|
||||
)
|
||||
from .snapshot import (
|
||||
DataPlaneRestore,
|
||||
DataPlaneSnapshot,
|
||||
@@ -129,6 +156,32 @@ __all__ = [
|
||||
"DataPlaneSnapshotRejected",
|
||||
"restore_local_data_plane",
|
||||
"snapshot_local_data_plane",
|
||||
# 换 embedding 模型:把向量库和图重新 embed 进新的 embedding 空间
|
||||
"EmbeddingSpaceIdentity",
|
||||
"GraphReembedPlan",
|
||||
"GraphReembedProgress",
|
||||
"GraphReembedReport",
|
||||
"GraphVerification",
|
||||
"ReembedCancelled",
|
||||
"ReembedPlan",
|
||||
"ReembedProgress",
|
||||
"ReembedReport",
|
||||
"ReembedVerification",
|
||||
"ScannedSpace",
|
||||
"SpaceDiff",
|
||||
"VectorSpace",
|
||||
"diff_spaces",
|
||||
"drop_graph",
|
||||
"drop_vector_space",
|
||||
"plan_reembed",
|
||||
"reembed_graph",
|
||||
"reembed_text",
|
||||
"reembed_vector_space",
|
||||
"scan_vector_spaces",
|
||||
"space_identity",
|
||||
"vector_space_names",
|
||||
"verify_graph_reembed",
|
||||
"verify_reembed",
|
||||
# 配置
|
||||
"MemoryConfig",
|
||||
# 公共扩展协议 / 精确读取类型
|
||||
|
||||
@@ -682,6 +682,23 @@ Output:
|
||||
```
|
||||
John's occupation and location are HIS attributes, so they go into `memory` with "John" as the subject. They must NEVER land in `basic_info.occupation` / `basic_info.location` — `basic_info` is exclusively the user's own profile. Only `name` (Tim, from the user message's `name` field) belongs there.
|
||||
|
||||
## Example 11 — Counter-example: small talk has no basic_info
|
||||
|
||||
New Messages:
|
||||
[{"role": "user", "content": "Hi"},
|
||||
{"role": "assistant", "content": "Hello! The user's name is The user. How can I help?"}]
|
||||
Memory Date: 2025-09-03
|
||||
|
||||
Output:
|
||||
```json
|
||||
{
|
||||
"memory": [],
|
||||
"intentions": [],
|
||||
"basic_info": {}
|
||||
}
|
||||
```
|
||||
The user stated nothing about themselves. The assistant's line is not a user turn, and "The user" is a placeholder, not a name. Output `{}` — never `{"name": "The user"}` or `{"name": "user"}`.
|
||||
|
||||
---
|
||||
"""
|
||||
|
||||
@@ -749,6 +766,14 @@ Rules:
|
||||
fields (e.g. name, age, location, occupation, employer) **explicitly stated**
|
||||
in the NEW user messages. Never infer, never invent. If no field is explicitly
|
||||
stated, output `{{}}`.
|
||||
* HARD RULE: fill a field ONLY if the user stated it in a `user` turn.
|
||||
Anything said only by the assistant (including the assistant quoting an
|
||||
earlier memory such as "The user's name is X") does NOT count. If nothing
|
||||
qualifies, output `"basic_info": {{}}`.
|
||||
* NEVER write the field name itself or a placeholder as a value ("user",
|
||||
"The user", "用户", "name", "N/A", "unknown", "none", "-"). Omit the field.
|
||||
* Negative example: small talk such as `[user]: Hi` / `[assistant]: How can
|
||||
I help?`, or `[user]: Reply with exactly: PONG` → `"basic_info": {{}}`.
|
||||
* Exception for `name`: the `name` field on the user's own message, or a leading
|
||||
line "The user's name is X" / "用户名叫X", is an authoritative source for
|
||||
`name` — even though the user never said it out loud.
|
||||
@@ -817,6 +842,14 @@ Rules:
|
||||
fields (e.g. name, age, location, occupation, employer) **explicitly stated**
|
||||
in the NEW user messages. Never infer, never invent. If no field is explicitly
|
||||
stated, output `{{}}`.
|
||||
* HARD RULE: fill a field ONLY if the user stated it in a `user` turn.
|
||||
Anything said only by the assistant (including the assistant quoting an
|
||||
earlier memory such as "The user's name is X") does NOT count. If nothing
|
||||
qualifies, output `"basic_info": {{}}`.
|
||||
* NEVER write the field name itself or a placeholder as a value ("user",
|
||||
"The user", "用户", "name", "N/A", "unknown", "none", "-"). Omit the field.
|
||||
* Negative example: small talk such as `[user]: Hi` / `[assistant]: How can
|
||||
I help?`, or `[user]: Reply with exactly: PONG` → `"basic_info": {{}}`.
|
||||
* Exception for `name`: the `name` field on the user's own message, or a leading
|
||||
line "The user's name is X" / "用户名叫X", is an authoritative source for
|
||||
`name` — even though the user never said it out loud.
|
||||
|
||||
@@ -365,6 +365,13 @@ EXTRACT_PROMPT_ZH = """## 最近 k 条消息
|
||||
* basic_info:**只装用户本人的画像**。
|
||||
仅当 NEW user messages 中**明确**陈述稳定画像字段(如 姓名、年龄、所在地、职业、雇主)时才填写。
|
||||
绝不推断、绝不编造。没有任何字段被明确陈述时输出 `{{}}`。
|
||||
* **硬性规则**:只有用户在 `user` 回合里**明确说出**的字段才能填写。只在
|
||||
assistant 回合出现的内容(包括 assistant 引用旧记忆,如"The user's name is X"
|
||||
/ "用户名是X")一律不算。没有符合条件的字段时,必须输出 `"basic_info": {{}}`。
|
||||
* **绝不**把字段名本身或占位符当值写入("用户"、"The user"、"user"、"name"、
|
||||
"姓名"、"N/A"、"unknown"、"未知"、"未提供"、"-"),宁可省略该字段。
|
||||
* 负例:寒暄如 `[user]: 你好` / `[assistant]: 我可以帮你。`,或
|
||||
`[user]: Reply with exactly: PONG` → `"basic_info": {{}}`。
|
||||
* `name` 的例外:用户自己那条消息上的 `name` 字段,或文首形如
|
||||
"用户名叫X" / "The user's name is X" 的那一行,都是 `name` 的权威来源
|
||||
——即使用户本人从未开口自报姓名。
|
||||
@@ -440,6 +447,13 @@ EXTRACT_PROMPT_ZH_NO_INTENTION = """## 最近 k 条消息
|
||||
* basic_info:**只装用户本人的画像**。
|
||||
仅当 NEW user messages 中**明确**陈述稳定画像字段(如 姓名、年龄、所在地、职业、雇主)时才填写。
|
||||
绝不推断、绝不编造。没有任何字段被明确陈述时输出 `{{}}`。
|
||||
* **硬性规则**:只有用户在 `user` 回合里**明确说出**的字段才能填写。只在
|
||||
assistant 回合出现的内容(包括 assistant 引用旧记忆,如"The user's name is X"
|
||||
/ "用户名是X")一律不算。没有符合条件的字段时,必须输出 `"basic_info": {{}}`。
|
||||
* **绝不**把字段名本身或占位符当值写入("用户"、"The user"、"user"、"name"、
|
||||
"姓名"、"N/A"、"unknown"、"未知"、"未提供"、"-"),宁可省略该字段。
|
||||
* 负例:寒暄如 `[user]: 你好` / `[assistant]: 我可以帮你。`,或
|
||||
`[user]: Reply with exactly: PONG` → `"basic_info": {{}}`。
|
||||
* `name` 的例外:用户自己那条消息上的 `name` 字段,或文首形如
|
||||
"用户名叫X" / "The user's name is X" 的那一行,都是 `name` 的权威来源
|
||||
——即使用户本人从未开口自报姓名。
|
||||
@@ -669,6 +683,23 @@ Memory Date:2025-09-02
|
||||
```
|
||||
职业和所在地是 **John 的**属性,所以进 `memory` 并以"John"作主体,**绝不能**落到 `basic_info` 的 `occupation` / `location` —— `basic_info` 专属于用户本人。只有 `name`(Tim,来自用户消息的 `name` 字段)才该放进去。注意输出语言随输入语言(此例为英文)。
|
||||
|
||||
## 示例 11 —— 反例:寒暄没有 basic_info
|
||||
|
||||
新消息:
|
||||
[{"role": "user", "content": "你好"},
|
||||
{"role": "assistant", "content": "你好!我可以帮你。之前记得 The user's name is 用户."}]
|
||||
Memory Date:2025-09-03
|
||||
|
||||
输出:
|
||||
```json
|
||||
{
|
||||
"memory": [],
|
||||
"intentions": [],
|
||||
"basic_info": {}
|
||||
}
|
||||
```
|
||||
用户没有说任何关于自己的信息。assistant 那句不是 user 回合,"用户" 也是占位符而不是名字。必须输出 `{}`——**绝不能**输出 `{"name": "用户"}`。
|
||||
|
||||
---
|
||||
"""
|
||||
|
||||
|
||||
@@ -26,6 +26,8 @@ from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import re
|
||||
import unicodedata
|
||||
import uuid
|
||||
import weakref
|
||||
from dataclasses import dataclass
|
||||
@@ -208,6 +210,76 @@ def _sanitize_kv(
|
||||
return result
|
||||
|
||||
|
||||
# ================================================================
|
||||
# 占位符守卫(P0-1)
|
||||
# ================================================================
|
||||
# 弱模型(如 qwen3.5-2b)在用户什么都没说时,会把 schema 字段说明里的词当值
|
||||
# 填进 basic_info:{"name": "用户"} / "The user" / "N/A"。每个占位符都会
|
||||
# supersede 掉真实值,演化链变成 费天翔 → Fei → 用户 → The user。
|
||||
# 规则:占位符永远不入库;读侧组装 KV 时占位符也不覆盖已有真实值。
|
||||
|
||||
_PLACEHOLDER_VALUES = frozenset({
|
||||
"用户", "该用户", "本用户", "用户本人",
|
||||
"the user", "the user's", "user", "a user", "this user",
|
||||
"n/a", "na", "none", "null", "nil", "unknown", "unspecified",
|
||||
"not provided", "not specified", "not mentioned",
|
||||
"未提供", "未知", "不详", "未说明", "未提及", "无",
|
||||
"-", "?",
|
||||
})
|
||||
|
||||
# 内置字段的中文标签:弱模型也会把字段说明的中文词当值。
|
||||
_FIELD_LABELS: Dict[str, tuple] = {
|
||||
"name": ("姓名", "名字", "用户名", "用户姓名", "用户名字"),
|
||||
"age": ("年龄", "用户年龄"),
|
||||
"location": ("所在地", "地点", "城市", "用户所在地"),
|
||||
"occupation": ("职业", "工作", "用户职业"),
|
||||
"employer": ("雇主", "公司", "用户雇主"),
|
||||
}
|
||||
|
||||
# 去掉标点/符号后再比较,让 "The user." / "用户。" / "N/A" 都命中。
|
||||
# "-" / "?" 本身就是纯标点,剥完为空串,同样判为占位符。
|
||||
_PUNCT_RE = re.compile(r"[\s\.,;:!?'\"`~()\[\]{}<>/\\|_\-\u3000-\u303f\uff00-\uff0f\uff1a-\uff20]+")
|
||||
|
||||
|
||||
def _placeholder_key(value: str) -> str:
|
||||
s = unicodedata.normalize("NFKC", str(value or "")).strip().lower()
|
||||
s = s.replace("\u2019", "'")
|
||||
s = _PUNCT_RE.sub(" ", s)
|
||||
return " ".join(s.split())
|
||||
|
||||
|
||||
_PLACEHOLDER_KEYS = frozenset(_placeholder_key(v) for v in _PLACEHOLDER_VALUES)
|
||||
|
||||
|
||||
def is_placeholder_value(field_name: str, value: Any) -> bool:
|
||||
"""value 是否为占位符(空 / 用户 / The user / N/A / 字段名本身 等)。
|
||||
|
||||
大小写不敏感、首尾空白与标点不敏感。数字(如 age=30)永远不是占位符。
|
||||
"""
|
||||
if value is None:
|
||||
return True
|
||||
if isinstance(value, bool):
|
||||
return False
|
||||
if isinstance(value, (int, float)):
|
||||
return False
|
||||
key = _placeholder_key(value)
|
||||
if not key:
|
||||
return True
|
||||
if key in _PLACEHOLDER_KEYS:
|
||||
return True
|
||||
field_key = _placeholder_key(field_name)
|
||||
if field_key and key in (field_key, field_key.replace("_", " ")):
|
||||
return True
|
||||
for label in _FIELD_LABELS.get(field_name, ()):
|
||||
if key == _placeholder_key(label):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def _drop_placeholders(kv: Dict[str, Any]) -> Dict[str, Any]:
|
||||
return {k: v for k, v in kv.items() if not is_placeholder_value(k, v)}
|
||||
|
||||
|
||||
# ================================================================
|
||||
# 公共入口:upsert_basic_profile
|
||||
# ================================================================
|
||||
@@ -287,6 +359,8 @@ async def _upsert_basic_profile_unlocked(
|
||||
# L0 Basic Info 从输入、唯一性到落盘都只属于 user_id。
|
||||
|
||||
new_kv = _sanitize_kv(kv or {}, allowed_fields=allowed_fields)
|
||||
# 单调性守卫:占位符永远不覆盖已有值,过滤后为空就不写新版本、不产生新链头。
|
||||
new_kv = _drop_placeholders(new_kv)
|
||||
if not new_kv:
|
||||
return BasicProfileUpsertResult(
|
||||
success=True, changed=False, reason="no valid fields after sanitize"
|
||||
@@ -513,5 +587,8 @@ def _assemble_full_kv_from_nodes(
|
||||
for k, v in kv.items():
|
||||
if allowed_set is not None and k not in allowed_set:
|
||||
continue
|
||||
# 历史上已落盘的占位符版本(如 name=用户)不覆盖更早的真实值。
|
||||
if is_placeholder_value(k, v):
|
||||
continue
|
||||
full_kv[k] = v
|
||||
return full_kv
|
||||
+11
-2
@@ -3089,9 +3089,18 @@ class HyMemoryClient:
|
||||
if self._history_store is not None:
|
||||
try:
|
||||
isolation_key = self._build_isolation_key(uid, agent_id)
|
||||
# 从 content 或 messages 中提取用于记录的文本
|
||||
# 从 content 或 messages 中提取用于记录的文本。messages 与 L1_RAW
|
||||
# 同一规则先裁剪再落审计库(工具输出 / 长回复不原样长期保存)。
|
||||
from .utils.raw_trim import trim_raw_messages
|
||||
history_content = content or "; ".join(
|
||||
f"{m.role}: {m.content}" for m in chat_messages
|
||||
f"{m.role}: {m.content}"
|
||||
for m in trim_raw_messages(
|
||||
chat_messages,
|
||||
tool_max_bytes=getattr(
|
||||
getattr(self._config, "coding", None),
|
||||
"tool_result_max_bytes", None,
|
||||
),
|
||||
)
|
||||
)
|
||||
await self._history_store.record_add(
|
||||
memory_id=result.memory_id,
|
||||
|
||||
@@ -11,6 +11,7 @@ Coding Memory 预处理工具(规则,零 LLM)
|
||||
使用方式与 scene 路由见 docs/scene_coding_usage.md。
|
||||
"""
|
||||
|
||||
import re
|
||||
from typing import Any, Dict, List, Optional, Tuple
|
||||
|
||||
from ..pipelines.base import ChatMessage
|
||||
@@ -63,6 +64,13 @@ DEFAULT_MAX_TOOL_RESULT_BYTES = 2048
|
||||
DEFAULT_HEAD_BYTES = 1024
|
||||
DEFAULT_TAIL_BYTES = 512
|
||||
|
||||
# 本模块自己产出的省略标记。截断结果会再次经过截断(落库前一次、读历史时又一次),
|
||||
# 认出自己的标记才能保证幂等:已截断的文本再截一次原样返回,而不是把省略计数改写。
|
||||
_TOOL_OMIT_MARKER_RE = re.compile(r"\n\n\[\.\.\.\d+ bytes omitted by truncate\.\.\.\]\n\n")
|
||||
# 标记本身的字节数上限(数字位数有限),用于判断「已截断且只超出一个标记的长度」。
|
||||
_TOOL_OMIT_MARKER_MAX_BYTES = 128
|
||||
_ASSISTANT_OMIT_MARKER_RE = re.compile(r" \[\.\.\.\d+ chars omitted\.\.\.\] ")
|
||||
|
||||
|
||||
def truncate_tool_result_text(
|
||||
text: str,
|
||||
@@ -81,6 +89,12 @@ def truncate_tool_result_text(
|
||||
raw = text.encode("utf-8")
|
||||
if len(raw) <= max_bytes:
|
||||
return text
|
||||
# 已截断过(max_bytes 很小时标记本身会让结果略超上限):原样返回,保证幂等。
|
||||
if (
|
||||
len(raw) <= max_bytes + _TOOL_OMIT_MARKER_MAX_BYTES
|
||||
and _TOOL_OMIT_MARKER_RE.search(text)
|
||||
):
|
||||
return text
|
||||
# 自定义 max_bytes 可能小于默认 head+tail(1024+512)。按原比例缩放内容窗口,
|
||||
# 给省略标记预留空间,不能因为窗口和过大而把超限原文直接返回。
|
||||
marker_budget = min(96, max(24, max_bytes // 4))
|
||||
@@ -161,6 +175,10 @@ def truncate_assistant_text(
|
||||
text = "" if text is None else str(text)
|
||||
if len(text) <= head_chars + tail_chars:
|
||||
return text
|
||||
# 已截断过:中段恰好是本函数的省略标记 → 原样返回,保证幂等(否则会把
|
||||
# 省略计数改写成标记自身的长度)。
|
||||
if _ASSISTANT_OMIT_MARKER_RE.fullmatch(text[head_chars:len(text) - tail_chars]):
|
||||
return text
|
||||
omitted = len(text) - head_chars - tail_chars
|
||||
return (
|
||||
text[:head_chars]
|
||||
|
||||
@@ -260,6 +260,7 @@ class EmbedderConfig:
|
||||
max_retries: int = None # 最大重试次数
|
||||
retry_delay: float = None # 重试间隔(秒)
|
||||
timeout: int = None # 请求超时(秒)
|
||||
batch_size: int = None # 单次 HTTP 请求最多带多少条 input(embed_batch 按此切块)
|
||||
|
||||
# 内部平台扩展(extra_headers / extra_body 会透传给 OpenAI client)
|
||||
extra_headers: Optional[Dict[str, str]] = None
|
||||
@@ -294,6 +295,10 @@ class EmbedderConfig:
|
||||
# 请求切断并制造重试风暴。SDK 内层重试已关闭,15s 是每个显式 attempt
|
||||
# 的真实上限;部署可通过 MEMORY_EMBEDDER_TIMEOUT 覆盖。
|
||||
self.timeout = _get_env_int("MEMORY_EMBEDDER_TIMEOUT", 15)
|
||||
if self.batch_size is None:
|
||||
# 大批量(如重新 embed 整个库)不能一次 HTTP 发几千条:多数服务对
|
||||
# input 数组有上限,超了直接 400。按 batch_size 切块逐块发送。
|
||||
self.batch_size = _get_env_int("MEMORY_EMBEDDER_BATCH_SIZE", 64)
|
||||
if self.extra_headers is None:
|
||||
val = os.getenv("MEMORY_EMBEDDER_EXTRA_HEADERS")
|
||||
if val:
|
||||
|
||||
+105
-19
@@ -38,10 +38,12 @@ import importlib.util
|
||||
import json
|
||||
from json import JSONDecodeError
|
||||
import logging
|
||||
import random
|
||||
import threading
|
||||
import time
|
||||
|
||||
from ..config import MemoryConfig
|
||||
from ..embedding import EmbeddingDimensionMismatchError
|
||||
from .workload import embedding_slot
|
||||
from ..utils.log_setup import get_request_id
|
||||
|
||||
@@ -187,6 +189,41 @@ def _redact_headers(headers: Optional[Dict[str, Any]]) -> Optional[Dict[str, Any
|
||||
return out
|
||||
|
||||
|
||||
# Retry-After 的上限:服务端给出超长等待(或恶意值)时不让单次调用挂几十分钟。
|
||||
_RETRY_AFTER_MAX_S = 60.0
|
||||
|
||||
|
||||
def _retry_after_seconds(exc: Exception) -> Optional[float]:
|
||||
"""从 429 异常的响应头里取 Retry-After(秒数或 HTTP 日期),取不到返回 None。"""
|
||||
response = getattr(exc, "response", None)
|
||||
headers = getattr(response, "headers", None)
|
||||
if not headers:
|
||||
return None
|
||||
try:
|
||||
raw = headers.get("retry-after") or headers.get("Retry-After")
|
||||
except Exception:
|
||||
return None
|
||||
if raw is None:
|
||||
return None
|
||||
raw = str(raw).strip()
|
||||
try:
|
||||
seconds = float(raw)
|
||||
except ValueError:
|
||||
try:
|
||||
from email.utils import parsedate_to_datetime
|
||||
from datetime import datetime, timezone
|
||||
|
||||
when = parsedate_to_datetime(raw)
|
||||
if when.tzinfo is None:
|
||||
when = when.replace(tzinfo=timezone.utc)
|
||||
seconds = (when - datetime.now(timezone.utc)).total_seconds()
|
||||
except Exception:
|
||||
return None
|
||||
if seconds != seconds: # NaN
|
||||
return None
|
||||
return min(max(0.0, seconds), _RETRY_AFTER_MAX_S)
|
||||
|
||||
|
||||
def _embeddings_api_url(base_url: str) -> str:
|
||||
"""OpenAI SDK posts to ``{base_url}/embeddings`` (base_url usually ends with /v1)."""
|
||||
base = (base_url or "").rstrip("/")
|
||||
@@ -205,7 +242,8 @@ class EmbedServiceConfig:
|
||||
api_key: str = ""
|
||||
base_url: str = ""
|
||||
embedding_dims: int = 1536
|
||||
batch_size: int = 100
|
||||
# embed_batch 单次 HTTP 最多带多少条 input;超出按块顺序发送
|
||||
batch_size: int = 64
|
||||
enable_cache: bool = True
|
||||
cache_size: int = 10000
|
||||
max_retries: int = 5
|
||||
@@ -287,6 +325,7 @@ class EmbedService:
|
||||
max_retries=embedder.max_retries if embedder.max_retries is not None else 5,
|
||||
retry_delay=embedder.retry_delay if embedder.retry_delay is not None else 3.0,
|
||||
timeout=embedder.timeout if embedder.timeout is not None else 60,
|
||||
batch_size=max(1, int(getattr(embedder, "batch_size", None) or 64)),
|
||||
queue_batch_size=int(os.getenv("MEMORY_EMBED_BATCH_SIZE", "8")),
|
||||
queue_batch_window_ms=float(os.getenv("MEMORY_EMBED_BATCH_WINDOW_MS", "100")),
|
||||
extra_headers=embedder.extra_headers,
|
||||
@@ -640,6 +679,8 @@ class EmbedService:
|
||||
self,
|
||||
texts: List[str],
|
||||
use_cache: bool = True,
|
||||
*,
|
||||
max_retries: Optional[int] = None,
|
||||
) -> List[List[float]]:
|
||||
"""
|
||||
批量向量化
|
||||
@@ -647,17 +688,23 @@ class EmbedService:
|
||||
Args:
|
||||
texts: 文本列表
|
||||
use_cache: 是否使用缓存
|
||||
max_retries: 本次调用的重试次数;None 用配置值。长批量任务(重新
|
||||
embed 整个库)可以给更宽的重试预算,不影响在线路径。
|
||||
|
||||
Returns:
|
||||
向量列表
|
||||
"""
|
||||
vectors, _metas = await self.embed_batch_with_meta(texts, use_cache=use_cache)
|
||||
vectors, _metas = await self.embed_batch_with_meta(
|
||||
texts, use_cache=use_cache, max_retries=max_retries,
|
||||
)
|
||||
return vectors
|
||||
|
||||
async def embed_batch_with_meta(
|
||||
self,
|
||||
texts: List[str],
|
||||
use_cache: bool = True,
|
||||
*,
|
||||
max_retries: Optional[int] = None,
|
||||
) -> Tuple[List[List[float]], List[Dict[str, Any]]]:
|
||||
"""批量向量化,同时返回每条的 provider metadata(非 vector)。"""
|
||||
if not texts:
|
||||
@@ -682,7 +729,12 @@ class EmbedService:
|
||||
indices_to_embed.append(i)
|
||||
|
||||
if texts_to_embed:
|
||||
vectors, batch_metas = await self._embed_texts_with_meta(texts_to_embed)
|
||||
# max_retries 只在显式给出时透传:保持 `_embed_texts_with_meta(texts)`
|
||||
# 这个既有调用形状不变(测试与下游替身按它打桩)。
|
||||
retry_kwargs = {} if max_retries is None else {"max_retries": max_retries}
|
||||
vectors, batch_metas = await self._embed_texts_with_meta(
|
||||
texts_to_embed, **retry_kwargs,
|
||||
)
|
||||
|
||||
for j, vector in enumerate(vectors):
|
||||
idx = indices_to_embed[j]
|
||||
@@ -700,9 +752,9 @@ class EmbedService:
|
||||
return results, metas
|
||||
|
||||
async def _embed_texts_with_meta(
|
||||
self, texts: List[str]
|
||||
self, texts: List[str], *, max_retries: Optional[int] = None,
|
||||
) -> Tuple[List[List[float]], List[Dict[str, Any]]]:
|
||||
"""实际的向量化调用:**一次 HTTP 带走整批**;返回 (vectors, metas)。
|
||||
"""实际的向量化调用:**一次 HTTP 带走一块**;返回 (vectors, metas)。
|
||||
|
||||
早期实现是 `for text in texts: await _embed_openai([text])` 逐条串行,
|
||||
原意是"避免 batch size 限制",但代价极大:线上一批 8 条 × ~5.6s 串行
|
||||
@@ -719,21 +771,34 @@ class EmbedService:
|
||||
截断在这里做(发送前逐条过 `_truncate_for_embedding`):所有 embedding
|
||||
路径(embed / embed_batch / embed_queued / *_with_meta)最终都落到这个
|
||||
方法 —— 放在各入口会漏。理由与阈值见模块头部 `_EMBED_MAX_TOKENS`。
|
||||
|
||||
切块:一次带走整批只适用于小批。几千条的 input 数组会被多数服务直接
|
||||
400(input 上限),所以按 `batch_size`(默认 64)切块,块之间顺序发送。
|
||||
不超过一块时行为与切块前逐字相同(`batch_mode="single_request"`)。
|
||||
"""
|
||||
if not texts:
|
||||
return [], []
|
||||
|
||||
safe_texts = [_truncate_for_embedding(t) for t in texts]
|
||||
vectors, meta = await self._embed_openai(safe_texts)
|
||||
base_meta = dict(meta or {})
|
||||
base_meta["batch_mode"] = "single_request"
|
||||
base_meta["batch_input_count"] = len(safe_texts)
|
||||
|
||||
chunk = max(1, int(self._embed_config.batch_size or 64))
|
||||
vectors: List[List[float]] = []
|
||||
all_metas: List[Dict[str, Any]] = []
|
||||
for idx in range(len(safe_texts)):
|
||||
m = dict(base_meta)
|
||||
m["batch_index"] = idx
|
||||
all_metas.append(m)
|
||||
chunk_count = (len(safe_texts) + chunk - 1) // chunk
|
||||
for start in range(0, len(safe_texts), chunk):
|
||||
part = safe_texts[start:start + chunk]
|
||||
retry_kwargs = {} if max_retries is None else {"max_retries": max_retries}
|
||||
part_vectors, meta = await self._embed_openai(part, **retry_kwargs)
|
||||
base_meta = dict(meta or {})
|
||||
base_meta["batch_mode"] = "single_request" if chunk_count == 1 else "chunked"
|
||||
base_meta["batch_input_count"] = len(part)
|
||||
if chunk_count > 1:
|
||||
base_meta["batch_chunk_index"] = start // chunk
|
||||
base_meta["batch_chunk_count"] = chunk_count
|
||||
for idx in range(len(part)):
|
||||
m = dict(base_meta)
|
||||
m["batch_index"] = start + idx
|
||||
all_metas.append(m)
|
||||
vectors.extend(part_vectors)
|
||||
|
||||
self._last_embed_meta = all_metas[-1] if all_metas else {}
|
||||
return vectors, all_metas
|
||||
@@ -783,7 +848,7 @@ class EmbedService:
|
||||
)
|
||||
|
||||
async def _embed_openai(
|
||||
self, texts: List[str]
|
||||
self, texts: List[str], *, max_retries: Optional[int] = None,
|
||||
) -> Tuple[List[List[float]], Dict[str, Any]]:
|
||||
"""
|
||||
使用 OpenAI 兼容接口向量化
|
||||
@@ -873,7 +938,9 @@ class EmbedService:
|
||||
"endpoint_overridden": bool(_ov),
|
||||
}
|
||||
|
||||
_max_retries = max(0, int(self._embed_config.max_retries or 0))
|
||||
_max_retries = max(0, int(
|
||||
(self._embed_config.max_retries or 0) if max_retries is None else max_retries
|
||||
))
|
||||
_retry_delay = max(0.0, float(self._embed_config.retry_delay or 0.0))
|
||||
last_exc: Optional[Exception] = None
|
||||
|
||||
@@ -919,6 +986,17 @@ class EmbedService:
|
||||
f"got={len(vectors)}"
|
||||
)
|
||||
dims = [len(v) for v in vectors]
|
||||
expected_dims = self._embed_config.embedding_dims
|
||||
if expected_dims:
|
||||
bad = [d for d in dims if d != int(expected_dims)]
|
||||
if bad:
|
||||
# 宽度不对的向量写进集合会把集合的维度钉死在错误值上(Chroma
|
||||
# 首次 add 定维),或在已有集合上整批失败。确定性错误,不重试。
|
||||
raise EmbeddingDimensionMismatchError(
|
||||
"embedding dimension mismatch: "
|
||||
f"expected={int(expected_dims)} got={bad[0]} "
|
||||
f"model={self._embed_config.model}"
|
||||
)
|
||||
meta = {
|
||||
"http_status": raw.status_code,
|
||||
"response_headers": resp_headers,
|
||||
@@ -954,6 +1032,8 @@ class EmbedService:
|
||||
},
|
||||
)
|
||||
return vectors, meta
|
||||
except EmbeddingDimensionMismatchError:
|
||||
raise
|
||||
except Exception as e:
|
||||
last_exc = e
|
||||
_err_name = type(e).__name__
|
||||
@@ -987,12 +1067,18 @@ class EmbedService:
|
||||
if _retryable and attempt < _max_retries:
|
||||
# 逐出可能卡死的 client,下个 attempt 重建干净连接(恢复原防御语义)
|
||||
self._evict_client(_eff_base_url, _eff_api_key, _eff_timeout)
|
||||
_delay = _retry_delay
|
||||
_retry_after = _retry_after_seconds(e) if _status == 429 else None
|
||||
if _retry_after is not None:
|
||||
# 限流时服务端明确告诉了要等多久:按它等,再加一点抖动,
|
||||
# 避免多个 worker 在同一时刻一起醒来再次撞限流。
|
||||
_delay = max(_delay, _retry_after) + random.uniform(0, 0.25 * _retry_after)
|
||||
logger.warning(
|
||||
f"[embed] attempt {attempt + 1}/{_max_retries + 1} failed "
|
||||
f"({_err_name}): {_err_msg[:200]}; retry in {_retry_delay}s"
|
||||
f"({_err_name}): {_err_msg[:200]}; retry in {_delay:.2f}s"
|
||||
)
|
||||
if _retry_delay > 0:
|
||||
await asyncio.sleep(_retry_delay)
|
||||
if _delay > 0:
|
||||
await asyncio.sleep(_delay)
|
||||
continue
|
||||
self._log_embed_call(
|
||||
status="error",
|
||||
|
||||
@@ -22,6 +22,7 @@ import logging
|
||||
import json
|
||||
import threading
|
||||
import time
|
||||
import weakref
|
||||
|
||||
from ..models.memory import MemoryNode, MemoryLayer, MemoryStatus
|
||||
from ..config import MemoryConfig
|
||||
@@ -77,6 +78,21 @@ async def _run_in_kuzu_pool(func, *args, **kwargs):
|
||||
return await run_in_executor_guarded(_kuzu_executor, _measured)
|
||||
|
||||
|
||||
# 本进程里已打开、尚未 close 的 store。drop_graph 据此拒绝删掉一个正被
|
||||
# 活着的 client 使用的图库。WeakSet:store 被回收后自动消失。
|
||||
_LIVE_STORES: "weakref.WeakSet[KuzuGraphStore]" = weakref.WeakSet()
|
||||
|
||||
|
||||
def open_graph_paths() -> List[str]:
|
||||
"""Real paths of the graph databases live stores in this process hold open."""
|
||||
import os
|
||||
return [
|
||||
os.path.realpath(str(store._db_path))
|
||||
for store in list(_LIVE_STORES)
|
||||
if store._db is not None
|
||||
]
|
||||
|
||||
|
||||
def kuzu_executor_snapshot() -> Dict[str, Any]:
|
||||
with _kuzu_stats_lock:
|
||||
return {
|
||||
@@ -350,6 +366,7 @@ class KuzuGraphStore(GraphStoreBase):
|
||||
)
|
||||
self._db = db
|
||||
self._conn = conn
|
||||
_LIVE_STORES.add(self)
|
||||
except asyncio.TimeoutError:
|
||||
logger.warning(
|
||||
f"GraphStore init timed out after 5s (Kuzu file lock contention). "
|
||||
@@ -2441,6 +2458,7 @@ class KuzuGraphStore(GraphStoreBase):
|
||||
async def close(self) -> None:
|
||||
"""关闭连接"""
|
||||
conn, db = self._conn, self._db
|
||||
_LIVE_STORES.discard(self)
|
||||
self._conn = None
|
||||
self._db = None
|
||||
self._available = False
|
||||
|
||||
@@ -89,6 +89,17 @@ def passes_created_after(
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def physical_collection_name(base_name: Optional[str], dims: Optional[int]) -> str:
|
||||
"""The collection name a store opens for ``base_name`` at ``dims``.
|
||||
|
||||
The dims suffix keeps two embedding widths from sharing one collection.
|
||||
`hy_memory.reembed.vector_space_names` uses this too, so callers never
|
||||
re-derive the rule.
|
||||
"""
|
||||
base = base_name or "agent_memories"
|
||||
return f"{base}_{dims}" if dims else base
|
||||
|
||||
|
||||
class VectorStoreBase(ABC):
|
||||
"""
|
||||
向量存储抽象基类
|
||||
@@ -98,13 +109,10 @@ class VectorStoreBase(ABC):
|
||||
|
||||
def __init__(self, config: MemoryConfig):
|
||||
self.config = config
|
||||
base_name = config.vector_store.collection_name or "agent_memories"
|
||||
dims = config.vector_store.embedding_dims
|
||||
# 自动拼接维度后缀,避免不同 embedding 模型写入同一 collection 导致维度冲突
|
||||
if dims:
|
||||
self._collection_name = f"{base_name}_{dims}"
|
||||
else:
|
||||
self._collection_name = base_name
|
||||
self._collection_name = physical_collection_name(
|
||||
config.vector_store.collection_name, config.vector_store.embedding_dims,
|
||||
)
|
||||
|
||||
_supports_retrieval_clauses: bool = False
|
||||
_supports_narrow_episode_queries: bool = False
|
||||
|
||||
@@ -9,10 +9,12 @@ Agent Memory V2 - VectorStore (Chroma)
|
||||
- 同步 API → _run_in_vdb_pool() 包装为异步
|
||||
"""
|
||||
|
||||
from typing import Optional, List, Dict, Any
|
||||
from typing import Optional, List, Dict, Any, Set, Tuple
|
||||
import concurrent.futures
|
||||
import functools
|
||||
import logging
|
||||
import os
|
||||
import weakref
|
||||
|
||||
from ..models.memory import (
|
||||
MemoryNode, MemoryLayer, MemoryStatus,
|
||||
@@ -33,6 +35,30 @@ _vdb_executor = concurrent.futures.ThreadPoolExecutor(
|
||||
)
|
||||
|
||||
|
||||
# 本进程里已 initialize、尚未 close 的 store。drop_vector_space 据此拒绝删掉
|
||||
# 一个正被活着的 client 使用的集合。WeakSet:store 被回收后自动消失。
|
||||
_LIVE_STORES: "weakref.WeakSet[ChromaVectorStore]" = weakref.WeakSet()
|
||||
|
||||
|
||||
def _location_key(vs_config) -> Tuple[str, str]:
|
||||
if getattr(vs_config, "host", None):
|
||||
return ("http", f"{vs_config.host}:{vs_config.port or 8000}")
|
||||
return ("local", os.path.realpath(str(vs_config.persist_directory or "")))
|
||||
|
||||
|
||||
def open_collection_names(location: Tuple[str, str]) -> Set[str]:
|
||||
"""Collections that live stores in this process hold open at ``location``."""
|
||||
names: Set[str] = set()
|
||||
for store in list(_LIVE_STORES):
|
||||
if store._client is None or _location_key(store.config.vector_store) != location:
|
||||
continue
|
||||
names.add(store._collection_name)
|
||||
if store._entity_collection is not None:
|
||||
from ..pipelines._retrieval.config import entity_collection_name
|
||||
names.add(entity_collection_name(store._collection_name))
|
||||
return names
|
||||
|
||||
|
||||
async def _run_in_vdb_pool(func, *args, **kwargs):
|
||||
"""Run a synchronous Chroma call in the dedicated VDB executor."""
|
||||
call = functools.partial(func, *args, **kwargs) if args or kwargs else func
|
||||
@@ -88,6 +114,7 @@ class ChromaVectorStore(VectorStoreBase):
|
||||
return client, collection
|
||||
|
||||
self._client, self._collection = await _run_in_vdb_pool(_init)
|
||||
_LIVE_STORES.add(self)
|
||||
logger.debug(f"VectorStore initialized (Chroma), collection={self._collection_name}")
|
||||
|
||||
# ================================================================
|
||||
@@ -561,6 +588,7 @@ class ChromaVectorStore(VectorStoreBase):
|
||||
async def close(self) -> None:
|
||||
"""关闭客户端"""
|
||||
# Chroma PersistentClient 无需显式关闭
|
||||
_LIVE_STORES.discard(self)
|
||||
self._client = None
|
||||
self._collection = None
|
||||
self._entity_collection = None
|
||||
|
||||
@@ -280,6 +280,22 @@ class MemoryWriter(WritePipeline):
|
||||
custom["source_raw_memory_ids"] = source_ids
|
||||
return custom
|
||||
|
||||
def _flat_trimmed_raw(self, request: WriteRequest) -> str:
|
||||
"""把 request.messages 按 raw 统一规则裁剪后拼成 L1_RAW 文本。
|
||||
|
||||
只裁落库副本;request.messages 不动(本次 extractor 输入仍用完整 messages)。
|
||||
"""
|
||||
import copy as _copy
|
||||
from ..utils.raw_trim import trim_raw_messages
|
||||
|
||||
_coding_cfg = getattr(getattr(self, "config", None), "coding", None)
|
||||
_trimmed_req = _copy.copy(request)
|
||||
_trimmed_req.messages = trim_raw_messages(
|
||||
request.messages,
|
||||
tool_max_bytes=getattr(_coding_cfg, "tool_result_max_bytes", None),
|
||||
)
|
||||
return _trimmed_req.get_flat_content()
|
||||
|
||||
@staticmethod
|
||||
def _attach_client_meta(custom: Dict[str, Any], request: Optional[WriteRequest]) -> None:
|
||||
"""给新建节点挂上调用方 meta(单份 list)。
|
||||
@@ -2554,9 +2570,14 @@ class MemoryWriter(WritePipeline):
|
||||
try:
|
||||
# 参数校验
|
||||
content = request.content
|
||||
# raw 在写入时就按统一规则裁好(见 utils/raw_trim.py):工具输出、长
|
||||
# assistant 回复不再原样长期存储;历史拼接直接用存下来的文本,不再二次裁剪。
|
||||
# request.messages 保持原样——本次 extractor 输入仍是完整 messages。
|
||||
_raw_trimmed = False
|
||||
if not content and request.has_messages():
|
||||
content = request.get_flat_content()
|
||||
content = self._flat_trimmed_raw(request)
|
||||
request.content = content
|
||||
_raw_trimmed = True
|
||||
|
||||
if not content:
|
||||
response.error_code = 400
|
||||
@@ -2627,6 +2648,9 @@ class MemoryWriter(WritePipeline):
|
||||
vector_store = await self._get_vector_store()
|
||||
layer_enum = MemoryLayer.from_string(suggested_layer)
|
||||
_raw_custom: Dict[str, Any] = {}
|
||||
if _raw_trimmed:
|
||||
from ..utils.raw_trim import RAW_TRIMMED_KEY
|
||||
_raw_custom[RAW_TRIMMED_KEY] = True
|
||||
self._attach_client_meta(_raw_custom, request)
|
||||
mem_node = MemoryNode(
|
||||
user_id=request.user_id,
|
||||
@@ -2929,13 +2953,16 @@ class MemoryWriter(WritePipeline):
|
||||
agent_id: Optional[str] = None,
|
||||
exclude_memory_id: str = "",
|
||||
max_turns: int = 20,
|
||||
max_chars_assistant: int = 500,
|
||||
max_chars_assistant: Optional[int] = None,
|
||||
) -> str:
|
||||
"""
|
||||
获取该用户最近的 L1_RAW 对话记录,按轮次拆分后拼成 history context。
|
||||
|
||||
每条 L1_RAW 的 content 是多轮对话([user]: ...\n[assistant]: ...)。
|
||||
拆成单条 message 后,user 消息完整保留,assistant 消息截取前 max_chars_assistant 字符。
|
||||
raw 在写入时已按 utils/raw_trim.py 的规则裁好(custom[RAW_TRIMMED_KEY]),
|
||||
这里拆成单条 message 后直接拼接,不再二次裁剪。该规则之前写入的旧 raw
|
||||
没有这个标记,仍按同一(幂等)规则裁剪后再拼,避免旧的长回复 / 工具输出
|
||||
撑大 prompt。max_chars_assistant 只作用于这些旧 raw,默认同写入规则。
|
||||
最终取最近 max_turns 条 message(注意单位是 message 条数,非对话轮数;
|
||||
调用方按 k 轮 × 2 传入)。
|
||||
|
||||
@@ -2977,23 +3004,33 @@ class MemoryWriter(WritePipeline):
|
||||
# 避免把正文里形如 "[注]: xxx" 的普通文本误判成消息边界。
|
||||
import re as _re
|
||||
from .base import parse_user_name_line
|
||||
_KNOWN_ROLES = {"user", "assistant", "system", "tool"}
|
||||
# 带方括号的任意 label(含对方真人名字)
|
||||
_labeled_prefix = _re.compile(r"^\[([^\]\n]{1,32})\]:\s?")
|
||||
# 无方括号的已知 role(历史数据容错,沿用旧正则的 `\[?...\]?` 宽容度)
|
||||
_bare_role_prefix = _re.compile(r"^(user|assistant|system|tool):\s?")
|
||||
|
||||
# (label, content) 元组列表;label 为 role 或对方真人名字
|
||||
parsed: List[Tuple[str, str]] = []
|
||||
from ..utils.raw_trim import (
|
||||
DEFAULT_RAW_ASSISTANT_MAX_CHARS,
|
||||
RAW_TRIMMED_KEY,
|
||||
trim_raw_body,
|
||||
)
|
||||
if max_chars_assistant is None:
|
||||
max_chars_assistant = DEFAULT_RAW_ASSISTANT_MAX_CHARS
|
||||
_coding_cfg = getattr(getattr(self, "config", None), "coding", None)
|
||||
_tool_max_bytes = getattr(_coding_cfg, "tool_result_max_bytes", None)
|
||||
|
||||
# (label, content, 是否旧 raw 需兼容裁剪) 元组列表;label 为 role 或对方真人名字
|
||||
parsed: List[Tuple[str, str, bool]] = []
|
||||
user_name: str = ""
|
||||
for node in nodes:
|
||||
content = node.content or ""
|
||||
_legacy = not bool((node.custom or {}).get(RAW_TRIMMED_KEY))
|
||||
for _line_idx, line in enumerate(content.split("\n")):
|
||||
m = _labeled_prefix.match(line) or _bare_role_prefix.match(line)
|
||||
if m:
|
||||
label = m.group(1)
|
||||
body = line[m.end():]
|
||||
parsed.append((label, body))
|
||||
parsed.append((label, body, _legacy))
|
||||
continue
|
||||
# 名字行只可能是每个 node content 的第一行(get_flat_content 插在文首)。
|
||||
# 逐 node 判断而非用 `not parsed`:parsed 跨 node 累积,第二个 node
|
||||
@@ -3006,18 +3043,18 @@ class MemoryWriter(WritePipeline):
|
||||
continue
|
||||
if parsed:
|
||||
# 续行:拼回上一条 message(保留换行)
|
||||
prev_label, prev_body = parsed[-1]
|
||||
parsed[-1] = (prev_label, prev_body + "\n" + line)
|
||||
prev_label, prev_body, prev_legacy = parsed[-1]
|
||||
parsed[-1] = (prev_label, prev_body + "\n" + line, prev_legacy)
|
||||
else:
|
||||
# 开头就是无前缀行(异常/老数据):当成 user 消息兜底
|
||||
parsed.append(("user", line))
|
||||
parsed.append(("user", line, _legacy))
|
||||
|
||||
# 取最近 max_turns 条 message(按 message 截断,绝不从消息中间切开)
|
||||
recent = parsed[-max_turns:] if len(parsed) > max_turns else parsed
|
||||
if not recent:
|
||||
return ""
|
||||
|
||||
# 格式化:非 user 侧整条截断(含对方真人),user 完整保留
|
||||
# 格式化:新 raw 直接拼接;旧 raw 按写入同一规则兼容裁剪
|
||||
all_messages: List[str] = []
|
||||
if user_name:
|
||||
from .base import render_user_name_line
|
||||
@@ -3025,17 +3062,18 @@ class MemoryWriter(WritePipeline):
|
||||
|
||||
_name_line = render_user_name_line(
|
||||
user_name,
|
||||
is_chinese("\n".join(b for _, b in recent)),
|
||||
is_chinese("\n".join(b for _, b, _ in recent)),
|
||||
)
|
||||
if _name_line:
|
||||
all_messages.append(_name_line)
|
||||
for label, body in recent:
|
||||
for label, body, legacy in recent:
|
||||
if legacy:
|
||||
body = trim_raw_body(
|
||||
label, body,
|
||||
assistant_max_chars=max_chars_assistant,
|
||||
tool_max_bytes=_tool_max_bytes,
|
||||
)
|
||||
body = body.strip()
|
||||
# 截断口径:assistant + 对方真人(非已知 role 的 label)。
|
||||
# user 完整保留;system / tool 沿用历史行为(不截断)。
|
||||
_truncate = label == "assistant" or label not in _KNOWN_ROLES
|
||||
if _truncate and len(body) > max_chars_assistant:
|
||||
body = body[:max_chars_assistant] + "..."
|
||||
all_messages.append(f"[{label}]: {body}")
|
||||
|
||||
return "\n".join(all_messages)
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,91 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
原始对话(raw)落库前的统一裁剪规则(规则,零 LLM)。
|
||||
|
||||
raw 会被长期保存(MemHub 已取消 raw 的保留期限;lite 模式下 raw 是唯一存储),
|
||||
不裁剪会把工具输出、大段粘贴日志原样存下来。因此 raw 在**写入时**就裁好,
|
||||
读取方(extractor 的「最近 k 条」历史注入)直接拼接,不再二次裁剪。
|
||||
|
||||
规则按说话人标签(ChatMessage.speaker_label() / L1_RAW 里的 ``[label]``):
|
||||
|
||||
- ``user``:完整保留;
|
||||
- ``system``:完整保留(与历史注入原口径一致);
|
||||
- ``tool``:头尾保留、中段替换为 ``[...N bytes omitted by truncate...]``,
|
||||
上限为 ``coding.tool_result_max_bytes``(env ``MEMORY_CODING_TOOL_RESULT_MAX_BYTES``,
|
||||
默认 2048),与 coding 链路同一个函数;
|
||||
- 其余(``assistant``、对方真人名字等非已知 role 的 label):strip 后超过
|
||||
``assistant_max_chars``(默认 500,即历史注入原来的 ``max_chars_assistant``)
|
||||
时截成前 N 个字符 + ``...``。
|
||||
|
||||
所有规则确定且幂等:对已裁剪的文本再裁一次结果不变。
|
||||
"""
|
||||
|
||||
from typing import List, Optional
|
||||
|
||||
from ..pipelines.base import ChatMessage
|
||||
|
||||
# 历史注入原 `_get_recent_history(max_chars_assistant=500)` 的默认值,现为唯一来源。
|
||||
DEFAULT_RAW_ASSISTANT_MAX_CHARS = 500
|
||||
|
||||
# L1_RAW 节点 custom 上的标记:内容已按本模块规则在写入时裁剪。
|
||||
# 历史拼接据此区分「新 raw 直接拼接」与「本规则之前写入的旧 raw 需兼容裁剪」。
|
||||
RAW_TRIMMED_KEY = "raw_trimmed"
|
||||
|
||||
# 不裁剪的标签(tool 单独处理)
|
||||
_KEEP_LABELS = frozenset({"user", "system"})
|
||||
|
||||
|
||||
def trim_raw_body(
|
||||
label: str,
|
||||
body: str,
|
||||
*,
|
||||
assistant_max_chars: int = DEFAULT_RAW_ASSISTANT_MAX_CHARS,
|
||||
tool_max_bytes: Optional[int] = None,
|
||||
) -> str:
|
||||
"""按说话人标签裁剪单条消息正文。幂等。"""
|
||||
if not isinstance(body, str):
|
||||
body = "" if body is None else str(body)
|
||||
if label in _KEEP_LABELS:
|
||||
return body
|
||||
if label == "tool":
|
||||
from ..coding.preproc import (
|
||||
DEFAULT_MAX_TOOL_RESULT_BYTES,
|
||||
truncate_tool_result_text,
|
||||
)
|
||||
|
||||
return truncate_tool_result_text(
|
||||
body, max_bytes=int(tool_max_bytes or DEFAULT_MAX_TOOL_RESULT_BYTES),
|
||||
)
|
||||
stripped = body.strip()
|
||||
if len(stripped) > assistant_max_chars:
|
||||
return stripped[:assistant_max_chars] + "..."
|
||||
return body
|
||||
|
||||
|
||||
def trim_raw_messages(
|
||||
messages: List[ChatMessage],
|
||||
*,
|
||||
assistant_max_chars: int = DEFAULT_RAW_ASSISTANT_MAX_CHARS,
|
||||
tool_max_bytes: Optional[int] = None,
|
||||
) -> List[ChatMessage]:
|
||||
"""返回裁剪后的新列表;不修改入参(messages 仍要原样给 extractor)。"""
|
||||
out: List[ChatMessage] = []
|
||||
for m in messages:
|
||||
new_content = trim_raw_body(
|
||||
m.speaker_label(),
|
||||
m.content,
|
||||
assistant_max_chars=assistant_max_chars,
|
||||
tool_max_bytes=tool_max_bytes,
|
||||
)
|
||||
if new_content == m.content:
|
||||
out.append(m)
|
||||
continue
|
||||
out.append(ChatMessage(
|
||||
role=m.role,
|
||||
content=new_content,
|
||||
name=m.name,
|
||||
tool_calls=list(m.tool_calls),
|
||||
tool_call_id=m.tool_call_id,
|
||||
tool_name=m.tool_name,
|
||||
))
|
||||
return out
|
||||
+2
-2
@@ -18,7 +18,7 @@ If you run into a problem, please open an Issue with the version, platform,repro
|
||||
|
||||
## 发行与平台合同
|
||||
|
||||
源码当前固定使用公开 PyPI 正式版 `hy-memory==2.0.8`。MemHub 源码版本为 `1.0.5`
|
||||
源码当前固定使用公开 PyPI 正式版 `hy-memory==2.0.9`。MemHub 源码版本为 `1.0.5`
|
||||
(build 36),GitHub 仓库为
|
||||
[`Tencent-Hunyuan/Hy-Memory`](https://github.com/Tencent-Hunyuan/Hy-Memory),npm 包名为
|
||||
`memhub-cli`。当前代码架构见
|
||||
@@ -118,7 +118,7 @@ MemHub 的 SQLite 数据默认位于 `~/.one-memory`,不在 npm 包或 Runtime
|
||||
|
||||
## Hy Memory
|
||||
|
||||
SDK 依赖固定为公开 PyPI 正式版 `hy-memory==2.0.8`。SDK 配置、权限边界及 search
|
||||
SDK 依赖固定为公开 PyPI 正式版 `hy-memory==2.0.9`。SDK 配置、权限边界及 search
|
||||
返回格式见 [`MEMORY.md`](MEMORY.md)。HY search 返回的 `content` 已包含 SDK 统一生成的
|
||||
逻辑时间和演化上下文;调用方不应再次转换时间戳或重复拼接 `When`。
|
||||
|
||||
|
||||
@@ -2352,7 +2352,7 @@
|
||||
{
|
||||
"SPDXID": "SPDXRef-Package-hy-memory",
|
||||
"name": "hy-memory",
|
||||
"versionInfo": "2.0.8",
|
||||
"versionInfo": "2.0.9",
|
||||
"downloadLocation": "NOASSERTION",
|
||||
"filesAnalyzed": false,
|
||||
"licenseConcluded": "Apache-2.0",
|
||||
|
||||
@@ -9,7 +9,7 @@ Per-package license texts are not reproduced here yet; the license
|
||||
column is filled in as part of release review, and the SBOM records
|
||||
`NOASSERTION` until then rather than guessing.
|
||||
|
||||
## hy-memory 2.0.8
|
||||
## hy-memory 2.0.9
|
||||
|
||||
License: Apache-2.0
|
||||
|
||||
|
||||
@@ -162,10 +162,54 @@ it("never emits a secret from a malformed manually written event", async () => {
|
||||
command: "logs",
|
||||
state: "empty",
|
||||
events: 0,
|
||||
invalid_lines: 1,
|
||||
invalid_lines: 0,
|
||||
unrecognized_lines: 1,
|
||||
});
|
||||
});
|
||||
|
||||
// After an upgrade the files still hold an older build's records. They are
|
||||
// whole JSON lines the reader leaves out, not damage, so the text output must
|
||||
// not warn about them; only a line that is not JSON is called damaged.
|
||||
it("warns only about lines that are not JSON, not about older records", async () => {
|
||||
const dataDir = await fixture();
|
||||
const older = {
|
||||
schema_version: 0,
|
||||
service: "desktop",
|
||||
component: "desktop.lifecycle",
|
||||
event: "desktop.started",
|
||||
};
|
||||
await writeFile(
|
||||
path.join(dataDir, "logs", "diagnostic-desktop.jsonl"),
|
||||
`${JSON.stringify(older)}\n${JSON.stringify({ ...older, schema_version: 1 })}\n`,
|
||||
{ mode: 0o600 },
|
||||
);
|
||||
let stdout = "";
|
||||
let stderr = "";
|
||||
vi.spyOn(process.stdout, "write").mockImplementation((value) => {
|
||||
stdout += String(value);
|
||||
return true;
|
||||
});
|
||||
vi.spyOn(process.stderr, "write").mockImplementation((value) => {
|
||||
stderr += String(value);
|
||||
return true;
|
||||
});
|
||||
|
||||
expect(await run(["logs"], { ONE_MEMORY_DATA_DIR: dataDir })).toBe(0);
|
||||
expect(stdout).toContain("core.start_failed");
|
||||
expect(stdout).not.toContain("损坏");
|
||||
expect(stderr).toBe("");
|
||||
|
||||
await writeFile(
|
||||
path.join(dataDir, "logs", "diagnostic-cli.jsonl"),
|
||||
'{"schema_version": 1, "event": \n',
|
||||
{ mode: 0o600 },
|
||||
);
|
||||
stdout = "";
|
||||
expect(await run(["logs"], { ONE_MEMORY_DATA_DIR: dataDir })).toBe(0);
|
||||
expect(stdout).toContain("跳过 1 行损坏的诊断记录。");
|
||||
expect(stderr).toBe("memhub: 跳过 1 行损坏的诊断记录。\n");
|
||||
});
|
||||
|
||||
it("rejects invalid filters without touching the log directory", async () => {
|
||||
const dataDir = path.join(
|
||||
await mkdtemp(path.join(os.tmpdir(), "om-cli-no-log-")),
|
||||
|
||||
+145
-11
@@ -190,8 +190,10 @@ import {
|
||||
} from "./managed-cli-link.js";
|
||||
import {
|
||||
addMemory,
|
||||
DEFAULT_USER_ID,
|
||||
isMemoryId,
|
||||
isRequestId,
|
||||
isUserId,
|
||||
MEMORY_KINDS,
|
||||
MEMORY_SCENES,
|
||||
MEMORY_VARIANTS,
|
||||
@@ -209,6 +211,7 @@ import {
|
||||
renderMemoryAddText,
|
||||
renderMemoryDetailText,
|
||||
renderMemoryPageText,
|
||||
userIdParameters,
|
||||
validMemoryText,
|
||||
} from "./memory-report.js";
|
||||
import {
|
||||
@@ -538,6 +541,23 @@ async function runCommand(
|
||||
environment = { ...environment, ONE_MEMORY_DATA_DIR: lifted.dataDir };
|
||||
}
|
||||
}
|
||||
// `--user-id <id>` is global to the memory commands: it names whose
|
||||
// memories are read or written. It is lifted before dispatch so each
|
||||
// command's own parser keeps seeing exactly the arguments it always did.
|
||||
// `sources connect` gives the flag its own meaning and parses it itself.
|
||||
let userId: string | undefined;
|
||||
if (USER_ID_COMMANDS.has(arguments_[0] ?? "")) {
|
||||
const lifted = liftUserIdOption(arguments_);
|
||||
if (lifted === null) {
|
||||
return reject(
|
||||
findCommand(arguments_[0] ?? ""),
|
||||
asJson,
|
||||
"--user-id 无效:只能是 1–64 位字母、数字、点、下划线或连字符。",
|
||||
);
|
||||
}
|
||||
arguments_ = lifted.arguments_;
|
||||
userId = lifted.userId;
|
||||
}
|
||||
environment = await environmentWithManagedDataDir(environment);
|
||||
const command = arguments_[0];
|
||||
if (command === undefined) return reject(undefined, asJson, "缺少命令。");
|
||||
@@ -776,9 +796,11 @@ async function runCommand(
|
||||
const attachment = await attachToRuntimeOrNull(environment);
|
||||
if (attachment === null) return runtimeUnavailable(descriptor, asJson);
|
||||
if (parsed.kind === "status") {
|
||||
const receipt = await readMemoryWrite(attachment, parsed.id).catch(
|
||||
() => undefined,
|
||||
);
|
||||
const receipt = await readMemoryWrite(
|
||||
attachment,
|
||||
parsed.id,
|
||||
userId,
|
||||
).catch(() => undefined);
|
||||
if (receipt === undefined) {
|
||||
return emitFailure(asJson, "write status", "memory_write_read_failed");
|
||||
}
|
||||
@@ -812,6 +834,7 @@ async function runCommand(
|
||||
? {}
|
||||
: { memory_at: parsed.memory_at }),
|
||||
...(parsed.priority === undefined ? {} : { priority: parsed.priority }),
|
||||
...(userId === undefined ? {} : { user_id: userId }),
|
||||
});
|
||||
if (outcome.state !== "accepted") {
|
||||
emit(
|
||||
@@ -957,9 +980,12 @@ async function runCommand(
|
||||
state: "empty",
|
||||
events: 0,
|
||||
invalid_lines: report.invalid_lines,
|
||||
unrecognized_lines: report.unrecognized_lines,
|
||||
})}\n`
|
||||
: renderLogText(report.events, report.invalid_lines),
|
||||
);
|
||||
// Only lines that are not JSON are damage. Records an older build wrote
|
||||
// are left out without a warning: after an upgrade they are expected.
|
||||
if (report.invalid_lines) {
|
||||
process.stderr.write(
|
||||
`${PRODUCT}: 跳过 ${report.invalid_lines} 行损坏的诊断记录。\n`,
|
||||
@@ -1582,6 +1608,7 @@ async function runCommand(
|
||||
limit: parsed.limit,
|
||||
character_budget: parsed.characterBudget,
|
||||
timeout_ms: parsed.timeoutMs,
|
||||
...userIdParameters(userId),
|
||||
})
|
||||
: ({
|
||||
schema_version: 2,
|
||||
@@ -1780,6 +1807,16 @@ async function runCommand(
|
||||
}
|
||||
if (named === "sources" && arguments_[1] !== "list") {
|
||||
const parsed = parseSourcesCommand(arguments_.slice(1));
|
||||
if (
|
||||
!parsed &&
|
||||
arguments_.some((item) => item === "--user-id" || item === "--root")
|
||||
) {
|
||||
return reject(
|
||||
descriptor,
|
||||
asJson,
|
||||
"--user-id 和 --root 只能用于接入单个 hermes 来源(Hermes profile),用户 ID 只能是 1–64 位字母、数字、点、下划线或连字符。",
|
||||
);
|
||||
}
|
||||
if (!parsed) return usage();
|
||||
if (parsed.kind === "receipt") {
|
||||
const connected = await connectRuntime(environment);
|
||||
@@ -2004,7 +2041,11 @@ async function runCommand(
|
||||
);
|
||||
return connected.exitCode;
|
||||
}
|
||||
const outcome = await connected.reader<unknown>("/api/v2/user-profile");
|
||||
const profileUser = userIdParameters(userId);
|
||||
const outcome =
|
||||
profileUser.user_id === undefined
|
||||
? await connected.reader<unknown>("/api/v2/user-profile")
|
||||
: await connected.reader<unknown>("/api/v2/user-profile", profileUser);
|
||||
const value =
|
||||
outcome.state === "ok"
|
||||
? (outcome.data as {
|
||||
@@ -2109,7 +2150,7 @@ async function runCommand(
|
||||
}
|
||||
const { reader, operations } = connected;
|
||||
if (parsed.kind === "list") {
|
||||
const document = await readMemoryPage(reader, parsed.query);
|
||||
const document = await readMemoryPage(reader, parsed.query, userId);
|
||||
emit(
|
||||
asJson
|
||||
? `${JSON.stringify(document)}\n`
|
||||
@@ -2122,6 +2163,7 @@ async function runCommand(
|
||||
reader,
|
||||
parsed.memoryId,
|
||||
parsed.namespace,
|
||||
userId,
|
||||
);
|
||||
emit(
|
||||
asJson
|
||||
@@ -2133,8 +2175,8 @@ async function runCommand(
|
||||
if (parsed.kind === "add" || parsed.kind === "add-status") {
|
||||
const document =
|
||||
parsed.kind === "add"
|
||||
? await addMemory(operations, text ?? "", parsed.requestId)
|
||||
: await readMemoryAddStatus(reader, parsed.requestId);
|
||||
? await addMemory(operations, text ?? "", parsed.requestId, userId)
|
||||
: await readMemoryAddStatus(reader, parsed.requestId, userId);
|
||||
emit(
|
||||
asJson
|
||||
? `${JSON.stringify(document)}\n`
|
||||
@@ -2149,9 +2191,13 @@ async function runCommand(
|
||||
content: text,
|
||||
...namespaceParameters(parsed.namespace),
|
||||
...(parsed.task === undefined ? {} : { task: parsed.task }),
|
||||
...userIdParameters(userId),
|
||||
})
|
||||
: await operations.delete<unknown>(
|
||||
withQuery(memoryPath, namespaceParameters(parsed.namespace)),
|
||||
withQuery(memoryPath, {
|
||||
...namespaceParameters(parsed.namespace),
|
||||
...userIdParameters(userId),
|
||||
}),
|
||||
);
|
||||
const document = {
|
||||
schema_version: 2,
|
||||
@@ -3675,13 +3721,21 @@ async function connectSources(
|
||||
asJson,
|
||||
);
|
||||
}
|
||||
if (parsed.importHistory) {
|
||||
// Another user's Hermes profile is granted and imported in one connect
|
||||
// request: only that request can carry a user and a root.
|
||||
if (
|
||||
parsed.importHistory ||
|
||||
parsed.userId !== undefined ||
|
||||
parsed.root !== undefined
|
||||
) {
|
||||
const document = await connectSourcesWithImport(reader, operations, {
|
||||
sourceIds: parsed.sourceIds,
|
||||
confirmOverrides: parsed.confirmOverrides,
|
||||
...(parsed.requestId === undefined
|
||||
? {}
|
||||
: { requestId: parsed.requestId }),
|
||||
...(parsed.userId === undefined ? {} : { userId: parsed.userId }),
|
||||
...(parsed.root === undefined ? {} : { root: parsed.root }),
|
||||
});
|
||||
emitFlowDocument(document, asJson);
|
||||
return flowExitCode(document);
|
||||
@@ -4101,6 +4155,8 @@ const SDK_MIGRATION_FAILURES: Record<string, string> = {
|
||||
"核对发现新版本还读不到你的全部记忆,没有切换数据源。",
|
||||
sdk_migration_model_profile_required:
|
||||
"迁移需要先有可用的模型配置,用来核对新版本能否读回记忆。请先用 memhub models setup 完成配置,再运行 memhub restart 重试。",
|
||||
sdk_migration_vector_profile_missing:
|
||||
"记忆的向量来自一个已删除的模型配置,当前配置读不回它们,所以没有迁移。请重新添加并启用那个模型配置,再运行 memhub restart 重试。",
|
||||
};
|
||||
|
||||
const MIGRATION_ISSUES_URL =
|
||||
@@ -5131,14 +5187,23 @@ type SourcesCommand =
|
||||
importHistory: boolean;
|
||||
confirmOverrides: boolean;
|
||||
requestId?: string;
|
||||
/** `--user-id`: whose grant (Hermes only). Absent for `local`. */
|
||||
userId?: string;
|
||||
/** `--root`: an absolute root other than the candidate (Hermes only). */
|
||||
root?: string;
|
||||
}
|
||||
| { kind: "all"; importHistory: boolean; confirmOverrides: boolean }
|
||||
| { kind: "receipt"; requestId: string };
|
||||
|
||||
const SOURCE_ID_SHAPE = /^[a-z0-9][a-z0-9-]{0,127}$/;
|
||||
|
||||
/** Only Hermes keeps one history per profile, so only Hermes may be
|
||||
* connected for another user or from another root. */
|
||||
const MULTI_USER_SOURCES = new Set(["hermes"]);
|
||||
|
||||
/** `sources connect <id> [<id> ...] | --all-detected [--import]
|
||||
* [--confirm-overrides] [--request-id <uuid>]` and `sources receipt <id>`.
|
||||
* [--confirm-overrides] [--request-id <uuid>]
|
||||
* [--user-id <id>] [--root <path>]` and `sources receipt <id>`.
|
||||
*
|
||||
* Sources may be named positionally or with repeated `--source` (the old
|
||||
* `init --source` spelling is rewritten to this command). */
|
||||
@@ -5154,6 +5219,8 @@ function parseSourcesCommand(rest: readonly string[]): SourcesCommand | null {
|
||||
const sourceIds: string[] = [];
|
||||
const switches = new Set<string>();
|
||||
let requestId: string | undefined;
|
||||
let userId: string | undefined;
|
||||
let root: string | undefined;
|
||||
for (let index = 1; index < tokens.length; index += 1) {
|
||||
const token = tokens[index];
|
||||
if (["--import", "--confirm-overrides", "--all-detected"].includes(token)) {
|
||||
@@ -5161,6 +5228,21 @@ function parseSourcesCommand(rest: readonly string[]): SourcesCommand | null {
|
||||
switches.add(token);
|
||||
continue;
|
||||
}
|
||||
if (token === "--user-id" || token === "--root") {
|
||||
const value = tokens[index + 1];
|
||||
if (value === undefined || value.startsWith("--")) return null;
|
||||
if (token === "--user-id") {
|
||||
if (userId !== undefined || !isUserId(value)) return null;
|
||||
userId = value;
|
||||
} else {
|
||||
if (root !== undefined) return null;
|
||||
const expanded = expandRootPath(value);
|
||||
if (expanded === null) return null;
|
||||
root = expanded;
|
||||
}
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (token === "--source" || token === "--request-id") {
|
||||
const value = tokens[index + 1];
|
||||
if (value === undefined || value.startsWith("--")) return null;
|
||||
@@ -5184,10 +5266,23 @@ function parseSourcesCommand(rest: readonly string[]): SourcesCommand | null {
|
||||
const confirmOverrides = switches.has("--confirm-overrides");
|
||||
if (
|
||||
requestId !== undefined &&
|
||||
(!OPERATION_ID.test(requestId) || !importHistory)
|
||||
(!OPERATION_ID.test(requestId) ||
|
||||
!(importHistory || userId !== undefined || root !== undefined))
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
// `--user-id local` is the default and changes nothing.
|
||||
if (userId === DEFAULT_USER_ID) userId = undefined;
|
||||
if (userId !== undefined || root !== undefined) {
|
||||
// One Hermes profile per connect: the user and root name one grant.
|
||||
if (
|
||||
switches.has("--all-detected") ||
|
||||
sourceIds.length !== 1 ||
|
||||
!MULTI_USER_SOURCES.has(sourceIds[0])
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
if (switches.has("--all-detected")) {
|
||||
// One names exact sources, the other means "whatever is detected".
|
||||
if (sourceIds.length > 0 || requestId !== undefined) return null;
|
||||
@@ -5200,9 +5295,24 @@ function parseSourcesCommand(rest: readonly string[]): SourcesCommand | null {
|
||||
importHistory,
|
||||
confirmOverrides,
|
||||
...(requestId === undefined ? {} : { requestId }),
|
||||
...(userId === undefined ? {} : { userId }),
|
||||
...(root === undefined ? {} : { root }),
|
||||
};
|
||||
}
|
||||
|
||||
/** `--root` as an absolute path: a leading `~` is the home directory, a
|
||||
* relative path is taken from the working directory. Core expands nothing. */
|
||||
function expandRootPath(value: string): string | null {
|
||||
if (value.length === 0 || /[\0\r\n]/.test(value)) return null;
|
||||
const expanded =
|
||||
value === "~"
|
||||
? os.homedir()
|
||||
: value.startsWith("~/")
|
||||
? path.join(os.homedir(), value.slice(2))
|
||||
: value;
|
||||
return path.resolve(expanded);
|
||||
}
|
||||
|
||||
function parseGraphWidthCommand(
|
||||
rest: readonly string[],
|
||||
): { decision: GraphWidthDecision; confirmed: boolean } | null {
|
||||
@@ -6596,6 +6706,30 @@ const OWN_DATA_DIR_COMMANDS = new Set([
|
||||
|
||||
/** Remove one `--data-dir <absolute path>` from argv; null when it is
|
||||
* repeated, missing its value, or not an absolute path. */
|
||||
/** Memory commands that honour the global `--user-id`. */
|
||||
const USER_ID_COMMANDS = new Set(["memories", "recall", "profile", "write"]);
|
||||
|
||||
/**
|
||||
* Take `--user-id <id>` out of the arguments. The default user (`local`) is
|
||||
* returned as undefined, so a default request names no user at all and stays
|
||||
* byte-identical to one sent before multi-user support.
|
||||
*/
|
||||
function liftUserIdOption(
|
||||
arguments_: readonly string[],
|
||||
): { arguments_: string[]; userId?: string } | null {
|
||||
const index = arguments_.indexOf("--user-id");
|
||||
if (index === -1) return { arguments_: [...arguments_] };
|
||||
if (arguments_.indexOf("--user-id", index + 1) !== -1) return null;
|
||||
const value = arguments_[index + 1];
|
||||
if (value === undefined || value.startsWith("--") || !isUserId(value)) {
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
arguments_: [...arguments_.slice(0, index), ...arguments_.slice(index + 2)],
|
||||
...(value === DEFAULT_USER_ID ? {} : { userId: value }),
|
||||
};
|
||||
}
|
||||
|
||||
function liftDataDirOption(
|
||||
arguments_: readonly string[],
|
||||
): { arguments_: string[]; dataDir?: string } | null {
|
||||
|
||||
@@ -68,6 +68,12 @@ const JSON_OPTION: CommandOption = {
|
||||
flag: "--json",
|
||||
summary: "以 JSON 输出到 stdout,供脚本与 Agent 消费。",
|
||||
};
|
||||
/** Global to the memory commands: whose memories are read or written. */
|
||||
const USER_ID_OPTION: CommandOption = {
|
||||
flag: "--user-id <id>",
|
||||
summary:
|
||||
"读写哪个用户的记忆,默认 local(App 用的就是 local)。1–64 位字母、数字、点、下划线或连字符;其他用户的记忆来自用 sources connect hermes --user-id 接入的 Hermes profile。",
|
||||
};
|
||||
const WATCH_OPTION: CommandOption = {
|
||||
flag: "--watch",
|
||||
summary: "串行持续刷新;Ctrl-C 只停止观察,不停止 Runtime。",
|
||||
@@ -252,15 +258,25 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
{
|
||||
name: "sources",
|
||||
summary:
|
||||
"列出来源,直接接入来源,或按 request id 查接入回执。connect 不加 --import 只授权(处理保持冻结:不导入历史、不扫描新会话);加 --import 同时导入历史并开启持续同步,返回 request id。目录来自环境变量覆盖的来源必须加 --confirm-overrides。",
|
||||
"列出来源,直接接入来源,或按 request id 查接入回执。connect 不加 --import 只授权(处理保持冻结:不导入历史、不扫描新会话);加 --import 同时导入历史并开启持续同步,返回 request id。目录来自环境变量覆盖的来源必须加 --confirm-overrides。Hermes 的每个 profile 是一个独立用户:用 --user-id 和 --root 接入,授权并导入历史(会自动排除 ~/.hermes/profiles/**,各用户互不读取)。",
|
||||
usage:
|
||||
"memhub sources list [--json]\n memhub sources connect <id> [<id> ...] [--import] [--confirm-overrides] [--request-id <uuid>] [--json]\n memhub sources connect --all-detected [--import] [--confirm-overrides] [--json]\n memhub sources receipt <request-id> [--json]",
|
||||
"memhub sources list [--json]\n memhub sources connect <id> [<id> ...] [--import] [--confirm-overrides] [--request-id <uuid>] [--json]\n memhub sources connect hermes --user-id <id> --root <path> [--import] [--request-id <uuid>] [--json]\n memhub sources connect --all-detected [--import] [--confirm-overrides] [--json]\n memhub sources receipt <request-id> [--json]",
|
||||
options: [
|
||||
{
|
||||
flag: "--import",
|
||||
summary:
|
||||
"接入后立即导入历史会话并开启持续同步;不加时只授权,处理保持冻结。",
|
||||
},
|
||||
{
|
||||
flag: "--user-id <id>",
|
||||
summary:
|
||||
"只用于 hermes:这条接入属于哪个用户(默认 local)。和 --root 一起接入一个 Hermes profile,例如 --user-id wife --root ~/.hermes/profiles/wife;其他来源只能是 local。",
|
||||
},
|
||||
{
|
||||
flag: "--root <path>",
|
||||
summary:
|
||||
"只用于 hermes:读取的根目录(~ 会展开为主目录)。默认是 Hermes 自己的目录 ~/.hermes。",
|
||||
},
|
||||
{
|
||||
flag: "--all-detected",
|
||||
summary:
|
||||
@@ -373,7 +389,7 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
summary:
|
||||
"列出、搜索、查看、添加、修改或物理删除记忆(对话、工作、编码三个场景)。add 和 App 的「添加记忆」是同一个入口;delete 不可逆,需 --yes。",
|
||||
usage:
|
||||
"memhub memories list [--scene <all|chat|working|coding>] [--source <id>] [--query <text>] [--status <state>] [--offset <n>] [--limit <n>] [--json]\n memhub memories show <memory-id> [--kind <kind>] [--variant <variant>] [--json]\n memhub memories add <text> [--request-id <uuid>] [--json]\n memhub memories add --content-file <path> [--request-id <uuid>] [--json]\n memhub memories add-status <request-id> [--json]\n memhub memories update <memory-id> --content-file <path> [--kind <kind>] [--variant <variant>] [--task <text>] [--json]\n memhub memories delete <memory-id> [--kind <kind>] [--variant <variant>] [--yes] [--json]",
|
||||
"memhub memories list [--scene <all|chat|working|coding>] [--source <id>] [--query <text>] [--status <state>] [--offset <n>] [--limit <n>] [--user-id <id>] [--json]\n memhub memories show <memory-id> [--kind <kind>] [--variant <variant>] [--user-id <id>] [--json]\n memhub memories add <text> [--request-id <uuid>] [--user-id <id>] [--json]\n memhub memories add --content-file <path> [--request-id <uuid>] [--user-id <id>] [--json]\n memhub memories add-status <request-id> [--user-id <id>] [--json]\n memhub memories update <memory-id> --content-file <path> [--kind <kind>] [--variant <variant>] [--task <text>] [--user-id <id>] [--json]\n memhub memories delete <memory-id> [--kind <kind>] [--variant <variant>] [--yes] [--user-id <id>] [--json]",
|
||||
options: [
|
||||
{
|
||||
flag: "--scene <all|chat|working|coding>",
|
||||
@@ -411,6 +427,7 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
"add 的幂等键;用同一个 id 重试只会读回第一次的结果,不会重复添加。不给时自动生成并输出。",
|
||||
},
|
||||
DESTRUCTIVE_CONFIRM_OPTION,
|
||||
USER_ID_OPTION,
|
||||
JSON_OPTION,
|
||||
],
|
||||
exit_codes: RUNTIME_EXITS,
|
||||
@@ -418,8 +435,8 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
{
|
||||
name: "profile",
|
||||
summary: "读取 SDK 组装后的用户长期画像(L0 + 已启用的长期画像补充)。",
|
||||
usage: "memhub profile [--json]",
|
||||
options: [JSON_OPTION],
|
||||
usage: "memhub profile [--user-id <id>] [--json]",
|
||||
options: [USER_ID_OPTION, JSON_OPTION],
|
||||
exit_codes: RUNTIME_EXITS,
|
||||
},
|
||||
{
|
||||
@@ -475,7 +492,7 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
summary:
|
||||
"从原始对话与已沉淀记忆统一检索上下文;本地只读,不调用模型、不触发补索引。文本输出标明每条是「原始对话摘录」还是「记忆」(JSON 里是 kind: raw|memory)。",
|
||||
usage:
|
||||
"memhub recall <query> [--kind <raw|memory>] [--source <id>] [--limit <n>] [--character-budget <n>] [--timeout-ms <n>] [--json]\n memhub recall --query-file <path> [...]\n memhub recall --stdin [...]",
|
||||
"memhub recall <query> [--kind <raw|memory>] [--source <id>] [--limit <n>] [--character-budget <n>] [--timeout-ms <n>] [--user-id <id>] [--json]\n memhub recall --query-file <path> [...]\n memhub recall --stdin [...]",
|
||||
options: [
|
||||
{
|
||||
flag: "--query-file <path>",
|
||||
@@ -502,6 +519,7 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
flag: "--timeout-ms <n>",
|
||||
summary: "Core 查询时限 50..30000 毫秒,默认 2000。",
|
||||
},
|
||||
USER_ID_OPTION,
|
||||
JSON_OPTION,
|
||||
],
|
||||
exit_codes: RUNTIME_EXITS,
|
||||
@@ -650,7 +668,7 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
summary:
|
||||
"提交一段 OpenAI 格式的对话(messages)到写入队列,异步加工成记忆;或按 request id 查询状态。request id 是幂等键:不给时自动生成并输出,重试请带上同一个。新增一条结论式记忆请用 memories add。",
|
||||
usage:
|
||||
"memhub write submit --messages-file <path> --session <id> [--source <id>] [--request-id <id>] [--memory-at <RFC3339>] [--live] [--json]\n memhub write status <request-id> [--json]",
|
||||
"memhub write submit --messages-file <path> --session <id> [--source <id>] [--request-id <id>] [--memory-at <RFC3339>] [--live] [--user-id <id>] [--json]\n memhub write status <request-id> [--user-id <id>] [--json]",
|
||||
options: [
|
||||
{
|
||||
flag: "--messages-file <path>",
|
||||
@@ -666,6 +684,7 @@ export const COMMANDS: readonly CommandDescriptor[] = [
|
||||
},
|
||||
{ flag: "--memory-at <RFC3339>", summary: "对话发生时间,必须带时区。" },
|
||||
{ flag: "--live", summary: "优先处理。" },
|
||||
USER_ID_OPTION,
|
||||
JSON_OPTION,
|
||||
],
|
||||
exit_codes: RUNTIME_EXITS,
|
||||
|
||||
@@ -10,6 +10,8 @@ export interface ContextSearchInput {
|
||||
limit: number;
|
||||
character_budget: number;
|
||||
timeout_ms: number;
|
||||
/** Whose memories to search. Omitted for the default user (`local`). */
|
||||
user_id?: string;
|
||||
}
|
||||
|
||||
/** The CLI's JSON document mirrors Core's SDK-native context schema v2. */
|
||||
|
||||
@@ -12,6 +12,7 @@ const READ_ONLY_PATHS = [
|
||||
"/api/v1/live-sync",
|
||||
"/api/v1/memory-processing",
|
||||
"/api/v1/model-profiles",
|
||||
"/api/v1/source-grants",
|
||||
"/api/v1/sources",
|
||||
"/api/v2/home-summary",
|
||||
"/api/v2/memory-library",
|
||||
@@ -310,6 +311,8 @@ export async function submitMemoryWrite(
|
||||
messages: readonly OpenAIMessage[];
|
||||
memory_at?: string;
|
||||
priority?: "live" | "normal";
|
||||
/** Whose memory this is. Omitted for the default user (`local`). */
|
||||
user_id?: string;
|
||||
},
|
||||
): Promise<MemoryWriteOutcome> {
|
||||
let response: { status: number; data: unknown };
|
||||
@@ -327,6 +330,9 @@ export async function submitMemoryWrite(
|
||||
...(request.priority === undefined
|
||||
? {}
|
||||
: { priority: request.priority }),
|
||||
...(request.user_id === undefined || request.user_id === "local"
|
||||
? {}
|
||||
: { user_id: request.user_id }),
|
||||
},
|
||||
{
|
||||
headers: { Authorization: `Bearer ${attachment.apiToken}` },
|
||||
@@ -469,11 +475,16 @@ export async function deleteModelProfile(
|
||||
export async function readMemoryWrite(
|
||||
attachment: RuntimeAttachmentLike,
|
||||
requestId: string,
|
||||
/** A receipt belongs to the user that submitted it; omit for `local`. */
|
||||
userId?: string,
|
||||
): Promise<MemoryWriteReceipt | null> {
|
||||
try {
|
||||
const response = await axios.get<MemoryWriteReceipt>(
|
||||
`${baseUrlOf(attachment)}/api/v2/memory-writes/${encodeURIComponent(requestId)}`,
|
||||
{
|
||||
...(userId === undefined || userId === "local"
|
||||
? {}
|
||||
: { params: { user_id: userId } }),
|
||||
headers: { Authorization: `Bearer ${attachment.apiToken}` },
|
||||
timeout: 10_000,
|
||||
proxy: false,
|
||||
|
||||
@@ -6,9 +6,10 @@ const WRITE_PATHS = [
|
||||
] as const;
|
||||
/** `POST /api/v2/memories` adds one memory (the app's 添加记忆). */
|
||||
const MEMORY_ADD_PATH = "/api/v2/memories";
|
||||
/** One SDK memory; delete names its namespace in the query string. */
|
||||
/** One SDK memory; delete names its namespace, and a non-default user, in
|
||||
* the query string. */
|
||||
const SDK_MEMORY_PATH =
|
||||
/^\/api\/v2\/memories\/[A-Za-z0-9][\w.-]{0,127}(?:\?kind=(?:chat|experience|fact)(?:&variant=(?:working|coding))?)?$/;
|
||||
/^\/api\/v2\/memories\/[A-Za-z0-9][\w.-]{0,127}(?:\?(?:kind=(?:chat|experience|fact)(?:&variant=(?:working|coding))?(?:&user_id=[A-Za-z0-9._-]{1,64})?|user_id=[A-Za-z0-9._-]{1,64}))?$/;
|
||||
const MODEL_PROBE_PATH =
|
||||
/^\/api\/v1\/model-profiles\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/probe$/;
|
||||
const MODEL_PROFILE_PATH =
|
||||
|
||||
@@ -110,9 +110,18 @@ export async function connectSourcesWithImport(
|
||||
sourceIds: readonly string[];
|
||||
confirmOverrides: boolean;
|
||||
requestId?: string;
|
||||
/** Whose grant this is. Omitted for the default user (`local`). */
|
||||
userId?: string;
|
||||
/** An absolute root other than the source's candidate (a Hermes
|
||||
* profile). Core reads its identity itself, so the source's candidate
|
||||
* root id and revision are not sent for it. */
|
||||
root?: string;
|
||||
},
|
||||
): Promise<FlowDocument> {
|
||||
const sourceIds = input.sourceIds;
|
||||
// A second user's grant is not a first run, and a custom root has no
|
||||
// candidate the app showed: both are a plain connect.
|
||||
const profile = input.root !== undefined || input.userId !== undefined;
|
||||
if (
|
||||
sourceIds.length < 1 ||
|
||||
sourceIds.length > 32 ||
|
||||
@@ -134,9 +143,14 @@ export async function connectSourcesWithImport(
|
||||
return invalid("source_unavailable");
|
||||
}
|
||||
const items = selected.map(([candidate]) => candidate);
|
||||
const needsOverride = items
|
||||
.filter((item) => item.requires_override_confirmation)
|
||||
.map((item) => item.source_id);
|
||||
// A custom root is the caller's own choice, not the environment override
|
||||
// the confirmation exists for.
|
||||
const needsOverride =
|
||||
input.root !== undefined
|
||||
? []
|
||||
: items
|
||||
.filter((item) => item.requires_override_confirmation)
|
||||
.map((item) => item.source_id);
|
||||
if (needsOverride.length > 0 && !input.confirmOverrides) {
|
||||
return {
|
||||
schema_version: 1,
|
||||
@@ -154,18 +168,22 @@ export async function connectSourcesWithImport(
|
||||
request = buildSourceImportRequest({
|
||||
sourceIds: [...sourceIds],
|
||||
sourceRoots: Object.fromEntries(
|
||||
items.map((item) => [item.source_id, item.candidate_root_id]),
|
||||
items.flatMap((item) =>
|
||||
input.root === undefined
|
||||
? [[item.source_id, item.candidate_root_id]]
|
||||
: [],
|
||||
),
|
||||
),
|
||||
sourceCandidateRevisions: Object.fromEntries(
|
||||
items.flatMap((item) =>
|
||||
item.candidate_revision === undefined
|
||||
item.candidate_revision === undefined || input.root !== undefined
|
||||
? []
|
||||
: [[item.source_id, item.candidate_revision]],
|
||||
),
|
||||
),
|
||||
confirmEnvironmentOverrides: needsOverride.length > 0,
|
||||
fullRescan: false,
|
||||
onboarding: true,
|
||||
onboarding: !profile,
|
||||
enableSync: true,
|
||||
requestId,
|
||||
});
|
||||
@@ -175,7 +193,11 @@ export async function connectSourcesWithImport(
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
const result = await operations.post<unknown>(request.path, request.body);
|
||||
const result = await operations.post<unknown>(request.path, {
|
||||
...request.body,
|
||||
...(input.userId === undefined ? {} : { user_id: input.userId }),
|
||||
...(input.root === undefined ? {} : { root: input.root }),
|
||||
});
|
||||
if (result.state === "rejected") {
|
||||
return rejected(requestId, result.code);
|
||||
}
|
||||
|
||||
@@ -107,7 +107,11 @@ export async function readLogReport(
|
||||
query: LogQuery,
|
||||
): Promise<{
|
||||
events: DiagnosticEventV1[];
|
||||
/** Lines that are not JSON: the only ones `memhub logs` calls damaged. */
|
||||
invalid_lines: number;
|
||||
/** Whole JSON lines the reader leaves out, such as an older build's
|
||||
* records. Nothing is wrong with them, so the text output says nothing. */
|
||||
unrecognized_lines: number;
|
||||
failure?: "log_directory_unreadable";
|
||||
}> {
|
||||
// `readDiagnosticEvents` treats an unreadable logs path as "no events". That
|
||||
@@ -119,6 +123,7 @@ export async function readLogReport(
|
||||
return {
|
||||
events: [],
|
||||
invalid_lines: 0,
|
||||
unrecognized_lines: 0,
|
||||
failure: "log_directory_unreadable",
|
||||
};
|
||||
}
|
||||
@@ -129,6 +134,7 @@ export async function readLogReport(
|
||||
return {
|
||||
events: [],
|
||||
invalid_lines: 0,
|
||||
unrecognized_lines: 0,
|
||||
failure: "log_directory_unreadable",
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,6 +14,25 @@ import { type CoreReader, RESERVED_MEMORY_SEGMENTS } from "./core-client.js";
|
||||
import type { CoreOperations } from "./core-operations.js";
|
||||
import { PRODUCT } from "./version.js";
|
||||
|
||||
/** A MemHub user id, the same shape Core accepts. `local` is the default. */
|
||||
const USER_ID = /^[A-Za-z0-9._-]{1,64}$/;
|
||||
export const DEFAULT_USER_ID = "local";
|
||||
|
||||
export function isUserId(value: string): boolean {
|
||||
return USER_ID.test(value);
|
||||
}
|
||||
|
||||
/**
|
||||
* The `user_id` to send, or nothing. The default user is never named on the
|
||||
* wire, so a request without `--user-id` stays exactly what it was before
|
||||
* multi-user support and still works against an older Core.
|
||||
*/
|
||||
export function userIdParameters(userId?: string): { user_id?: string } {
|
||||
return userId === undefined || userId === DEFAULT_USER_ID
|
||||
? {}
|
||||
: { user_id: userId };
|
||||
}
|
||||
|
||||
/** Output budget: a long memory is shortened visibly, never dropped silently. */
|
||||
const CONTENT_BUDGET = 240;
|
||||
|
||||
@@ -101,10 +120,12 @@ export interface MemoryDetailDocument {
|
||||
export async function readMemoryPage(
|
||||
reader: CoreReader,
|
||||
query: MemoryQuery,
|
||||
userId?: string,
|
||||
): Promise<MemoryPageDocument> {
|
||||
const parameters: Record<string, string | number> = {
|
||||
offset: query.offset,
|
||||
limit: query.limit,
|
||||
...userIdParameters(userId),
|
||||
};
|
||||
if (query.status !== undefined) parameters.statuses = query.status;
|
||||
if (query.source !== undefined) parameters.source = query.source;
|
||||
@@ -156,8 +177,12 @@ export async function readMemoryDetail(
|
||||
reader: CoreReader,
|
||||
memoryId: string,
|
||||
namespace: MemoryNamespace = {},
|
||||
userId?: string,
|
||||
): Promise<MemoryDetailDocument> {
|
||||
const parameters = namespaceParameters(namespace);
|
||||
const parameters = {
|
||||
...namespaceParameters(namespace),
|
||||
...userIdParameters(userId),
|
||||
};
|
||||
const outcome = await reader<unknown>(
|
||||
`/api/v2/memories/${memoryId}`,
|
||||
Object.keys(parameters).length > 0 ? parameters : undefined,
|
||||
@@ -236,6 +261,7 @@ export async function addMemory(
|
||||
operations: CoreOperations,
|
||||
text: string,
|
||||
requestId: string = randomUUID(),
|
||||
userId?: string,
|
||||
): Promise<MemoryAddDocument> {
|
||||
const base = {
|
||||
schema_version: 2 as const,
|
||||
@@ -259,7 +285,10 @@ export async function addMemory(
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
const result = await operations.post<unknown>(request.path, request.body);
|
||||
const result = await operations.post<unknown>(request.path, {
|
||||
...request.body,
|
||||
...userIdParameters(userId),
|
||||
});
|
||||
if (result.state !== "committed") {
|
||||
return { ...base, state: result.state, code: result.code };
|
||||
}
|
||||
@@ -273,6 +302,7 @@ export async function addMemory(
|
||||
export async function readMemoryAddStatus(
|
||||
reader: CoreReader,
|
||||
requestId: string,
|
||||
userId?: string,
|
||||
): Promise<MemoryAddDocument> {
|
||||
const base = {
|
||||
schema_version: 2 as const,
|
||||
@@ -283,7 +313,11 @@ export async function readMemoryAddStatus(
|
||||
if (!UUID.test(requestId)) {
|
||||
return { ...base, state: "invalid", code: "invalid_request_id" };
|
||||
}
|
||||
const outcome = await reader<unknown>(memoryAddStatusPath(requestId));
|
||||
const user = userIdParameters(userId);
|
||||
const outcome =
|
||||
user.user_id === undefined
|
||||
? await reader<unknown>(memoryAddStatusPath(requestId))
|
||||
: await reader<unknown>(memoryAddStatusPath(requestId), user);
|
||||
if (outcome.state === "not_found") {
|
||||
return { ...base, state: "not_found", code: "memory_add_not_found" };
|
||||
}
|
||||
|
||||
@@ -38,6 +38,21 @@ export interface SourcesDocument {
|
||||
state: ReadState["state"];
|
||||
code?: string;
|
||||
sources: Array<Record<string, unknown>>;
|
||||
/** Every grant of every user (`GET /api/v1/source-grants`). Absent when
|
||||
* Core is too old to list them; `sources` is the default user's view. */
|
||||
grants?: SourceGrant[];
|
||||
}
|
||||
|
||||
/** One source grant. Only Hermes has grants for users other than `local`,
|
||||
* one per Hermes profile root. */
|
||||
export interface SourceGrant {
|
||||
user_id: string;
|
||||
source_id: string;
|
||||
root_label: string | null;
|
||||
root_path: string | null;
|
||||
authorized: boolean;
|
||||
revoked_at: string | null;
|
||||
sync_enabled: boolean;
|
||||
}
|
||||
|
||||
export interface SyncDocument {
|
||||
@@ -86,14 +101,66 @@ export async function readSources(
|
||||
sources: [],
|
||||
};
|
||||
}
|
||||
const grants = await readSourceGrants(reader);
|
||||
return {
|
||||
schema_version: SCHEMA_VERSION,
|
||||
product: PRODUCT,
|
||||
state: "ok",
|
||||
sources: result.data.map(projectSource),
|
||||
// `/api/v1/sources` is the default user's view of every source.
|
||||
sources: result.data.map((source) => ({
|
||||
...projectSource(source),
|
||||
user_id: "local",
|
||||
})),
|
||||
...(grants === null ? {} : { grants }),
|
||||
};
|
||||
}
|
||||
|
||||
/** The grants of every user, or null when Core cannot list them (an older
|
||||
* Core answers 404): the source list is then shown as before. */
|
||||
async function readSourceGrants(
|
||||
reader: CoreReader,
|
||||
): Promise<SourceGrant[] | null> {
|
||||
let outcome: ReadOutcome<unknown>;
|
||||
try {
|
||||
outcome = await reader<unknown>("/api/v1/source-grants");
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
if (outcome.state !== "ok") return null;
|
||||
const value = outcome.data;
|
||||
if (!value || typeof value !== "object" || Array.isArray(value)) return null;
|
||||
const items = (value as { grants?: unknown }).grants;
|
||||
if (!Array.isArray(items)) return null;
|
||||
const grants: SourceGrant[] = [];
|
||||
const text = (candidate: unknown): string | null =>
|
||||
typeof candidate === "string" && candidate.length <= 4096
|
||||
? candidate
|
||||
: null;
|
||||
for (const item of items) {
|
||||
if (!item || typeof item !== "object" || Array.isArray(item)) return null;
|
||||
const grant = item as Record<string, unknown>;
|
||||
if (
|
||||
typeof grant.user_id !== "string" ||
|
||||
!/^[A-Za-z0-9._-]{1,64}$/.test(grant.user_id) ||
|
||||
typeof grant.source_id !== "string" ||
|
||||
!/^[a-z0-9][a-z0-9-]{0,127}$/.test(grant.source_id) ||
|
||||
typeof grant.authorized !== "boolean"
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
grants.push({
|
||||
user_id: grant.user_id,
|
||||
source_id: grant.source_id,
|
||||
root_label: text(grant.root_label),
|
||||
root_path: text(grant.root_path),
|
||||
authorized: grant.authorized,
|
||||
revoked_at: text(grant.revoked_at),
|
||||
sync_enabled: grant.sync_enabled === true,
|
||||
});
|
||||
}
|
||||
return grants;
|
||||
}
|
||||
|
||||
export async function readSync(reader: CoreReader): Promise<SyncDocument> {
|
||||
const result = validated(
|
||||
await reader<unknown>("/api/v1/live-sync"),
|
||||
@@ -231,6 +298,22 @@ export function renderSourcesText(document: SourcesDocument): string {
|
||||
);
|
||||
}
|
||||
if (document.sources.length === 0) lines.push("(没有来源)");
|
||||
// The list above is the default user's (`local`). Another user's grant,
|
||||
// a Hermes profile, is listed with its user so it is not mistaken for it.
|
||||
const others = (document.grants ?? []).filter(
|
||||
(grant) => grant.user_id !== "local",
|
||||
);
|
||||
if (others.length > 0) {
|
||||
lines.push("其他用户的连接:");
|
||||
for (const grant of others) {
|
||||
const name =
|
||||
document.sources.find((source) => source.source_id === grant.source_id)
|
||||
?.display_name ?? grant.source_id;
|
||||
lines.push(
|
||||
`- ${name}(用户 ${grant.user_id}):${grant.authorized ? "已连接" : grant.revoked_at ? "已撤销" : "未连接"};处理${grant.sync_enabled ? "已开启" : "已冻结"}${grant.root_path ? `;目录 ${grant.root_path}` : ""}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
lines.push("");
|
||||
return lines.join("\n");
|
||||
}
|
||||
|
||||
@@ -179,12 +179,72 @@ describe("CLI-07/10 source and synchronization reads", () => {
|
||||
sync_enabled: true,
|
||||
sync_completeness: "additions_only",
|
||||
});
|
||||
expect(requestedPaths()).toEqual(["/api/v1/sources"]);
|
||||
// The grants list answers 404 here, as an older Core does: the source
|
||||
// list is shown as before, every row the default user's.
|
||||
expect(report.sources[0].user_id).toBe("local");
|
||||
expect(report.grants).toBeUndefined();
|
||||
expect(requestedPaths()).toEqual([
|
||||
"/api/v1/sources",
|
||||
"/api/v1/source-grants",
|
||||
]);
|
||||
expect(requestedPaths().some((path) => path.includes("detect"))).toBe(
|
||||
false,
|
||||
);
|
||||
});
|
||||
|
||||
it("shows every user's grant, a Hermes profile with its user", async () => {
|
||||
const grants = {
|
||||
schema_version: 1,
|
||||
grants: [
|
||||
{
|
||||
user_id: "local",
|
||||
source_id: "codex",
|
||||
root_label: ".codex",
|
||||
root_path: "/home/synthetic/.codex",
|
||||
authorized: true,
|
||||
revoked_at: null,
|
||||
sync_enabled: true,
|
||||
},
|
||||
{
|
||||
user_id: "wife",
|
||||
source_id: "hermes",
|
||||
root_label: "wife",
|
||||
root_path: "/home/synthetic/.hermes/profiles/wife",
|
||||
authorized: true,
|
||||
revoked_at: null,
|
||||
sync_enabled: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
transport.get.mockImplementation(async (url: string) =>
|
||||
url === "/api/v1/source-grants"
|
||||
? { status: 200, data: grants }
|
||||
: (RESPONSES.get(url) ?? { status: 404, data: {} }),
|
||||
);
|
||||
let streams = captureStreams();
|
||||
try {
|
||||
expect(await run(["sources", "list", "--json"], {})).toBe(0);
|
||||
} finally {
|
||||
streams.restore();
|
||||
}
|
||||
const report = JSON.parse(streams.stdout());
|
||||
expect(report.grants).toEqual(grants.grants);
|
||||
expect(report.sources[0]).toMatchObject({
|
||||
source_id: "codex",
|
||||
user_id: "local",
|
||||
});
|
||||
streams = captureStreams();
|
||||
try {
|
||||
expect(await run(["sources", "list"], {})).toBe(0);
|
||||
} finally {
|
||||
streams.restore();
|
||||
}
|
||||
expect(streams.stdout()).toContain("其他用户的连接:");
|
||||
expect(streams.stdout()).toContain(
|
||||
"hermes(用户 wife):已连接;处理已开启;目录 /home/synthetic/.hermes/profiles/wife",
|
||||
);
|
||||
});
|
||||
|
||||
it("keeps degraded synchronization distinct and prints its error code", async () => {
|
||||
const streams = captureStreams();
|
||||
try {
|
||||
@@ -552,6 +612,7 @@ describe("CLI-19 progress and issue reads", () => {
|
||||
requestedPaths().every((path) =>
|
||||
[
|
||||
"/api/v1/sources",
|
||||
"/api/v1/source-grants",
|
||||
"/api/v1/live-sync",
|
||||
"/api/v1/import-jobs",
|
||||
"/api/v1/memory-processing",
|
||||
|
||||
@@ -0,0 +1,405 @@
|
||||
import { mkdtemp, writeFile } from "node:fs/promises";
|
||||
import os, { tmpdir } from "node:os";
|
||||
import path from "node:path";
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
import { run } from "./cli.js";
|
||||
|
||||
const transport = vi.hoisted(() => ({
|
||||
get: vi.fn(),
|
||||
post: vi.fn(),
|
||||
put: vi.fn(),
|
||||
patch: vi.fn(),
|
||||
delete: vi.fn(),
|
||||
}));
|
||||
const direct = vi.hoisted(() => ({ get: vi.fn(), post: vi.fn() }));
|
||||
vi.mock("axios", () => ({
|
||||
default: {
|
||||
create: vi.fn(() => transport),
|
||||
get: direct.get,
|
||||
post: direct.post,
|
||||
isAxiosError: () => false,
|
||||
},
|
||||
}));
|
||||
|
||||
const runtime = vi.hoisted(() => ({
|
||||
inspectRuntimeStatus: vi.fn(),
|
||||
discoverRuntimeAttachment: vi.fn(),
|
||||
}));
|
||||
vi.mock("@one-memory/runtime-control", async (importOriginal) => ({
|
||||
...(await importOriginal<typeof import("@one-memory/runtime-control")>()),
|
||||
...runtime,
|
||||
}));
|
||||
|
||||
const REQUEST = "33333333-3333-4333-8333-333333333333";
|
||||
const HERMES = {
|
||||
source_id: "hermes",
|
||||
display_name: "Hermes",
|
||||
storage_kinds: ["sqlite"],
|
||||
available: true,
|
||||
authorized: true,
|
||||
detected: null,
|
||||
root_label: ".hermes",
|
||||
candidate_path: "~/.hermes",
|
||||
candidate_kind: "default",
|
||||
candidate_revision: 0,
|
||||
candidate_root_id: "hermes-root-identity",
|
||||
imported_messages: 0,
|
||||
imported_conversations: 0,
|
||||
capabilities: {
|
||||
historical_import: "implemented",
|
||||
incremental_import: "implemented",
|
||||
live_sync: "implemented",
|
||||
recall: "implemented",
|
||||
installer: "not_implemented",
|
||||
verification: "fixture_only",
|
||||
},
|
||||
sync_completeness: "additions_only",
|
||||
location_state: "found",
|
||||
};
|
||||
const CODEX = {
|
||||
...HERMES,
|
||||
source_id: "codex",
|
||||
display_name: "Codex",
|
||||
candidate_root_id: "codex-root-identity",
|
||||
};
|
||||
|
||||
function addReceipt() {
|
||||
return {
|
||||
evidence_id: "44444444-4444-4444-8444-444444444444",
|
||||
text: "Prefers tea",
|
||||
scope: "all-apps",
|
||||
created_at: "2026-10-27T00:00:00Z",
|
||||
state: "pending",
|
||||
task_id: null,
|
||||
memory_ids: [],
|
||||
error: null,
|
||||
};
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
for (const method of [
|
||||
...Object.values(transport),
|
||||
...Object.values(direct),
|
||||
]) {
|
||||
method.mockReset();
|
||||
}
|
||||
runtime.inspectRuntimeStatus.mockResolvedValue({
|
||||
state: "running",
|
||||
code: "runtime_verified",
|
||||
instanceId: "instance-1",
|
||||
host: "127.0.0.1",
|
||||
port: 8765,
|
||||
version: "1.2.3",
|
||||
});
|
||||
runtime.discoverRuntimeAttachment.mockResolvedValue({
|
||||
instanceId: "instance-1",
|
||||
apiToken: "synthetic-runtime-token",
|
||||
host: "127.0.0.1",
|
||||
port: 8765,
|
||||
servicePid: 4242,
|
||||
health: {
|
||||
status: "ok",
|
||||
service: "one-memory-core",
|
||||
version: "1.2.3",
|
||||
instance_id: "instance-1",
|
||||
},
|
||||
});
|
||||
transport.get.mockImplementation(async (url: string) => {
|
||||
if (url === "/api/v1/sources") {
|
||||
return { status: 200, data: [HERMES, CODEX] };
|
||||
}
|
||||
if (url === "/api/v2/user-profile") {
|
||||
return {
|
||||
status: 200,
|
||||
data: { request_id: "r-1", profile: null, elapsed_ms: 1 },
|
||||
};
|
||||
}
|
||||
return { status: 404, data: {} };
|
||||
});
|
||||
transport.post.mockImplementation(
|
||||
async (url: string, body: Record<string, unknown>) =>
|
||||
url === "/api/v1/sources/connect"
|
||||
? {
|
||||
status: 200,
|
||||
data: {
|
||||
request_id: body.request_id,
|
||||
accepted_source_ids: ["hermes"],
|
||||
failed_sources: {},
|
||||
jobs: [],
|
||||
},
|
||||
}
|
||||
: url === "/api/v2/memories"
|
||||
? { status: 201, data: addReceipt() }
|
||||
: { status: 404, data: {} },
|
||||
);
|
||||
transport.put.mockResolvedValue({ status: 200, data: {} });
|
||||
transport.delete.mockResolvedValue({ status: 204, data: "" });
|
||||
direct.post.mockResolvedValue({
|
||||
status: 202,
|
||||
data: {
|
||||
request_id: REQUEST,
|
||||
state: "accepted",
|
||||
created_at: "T1",
|
||||
updated_at: "T1",
|
||||
},
|
||||
});
|
||||
direct.get.mockResolvedValue({
|
||||
data: {
|
||||
request_id: REQUEST,
|
||||
state: "accepted",
|
||||
created_at: "T1",
|
||||
updated_at: "T1",
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
describe("--user-id on the memory commands", () => {
|
||||
it("passes the user as a query parameter to memory reads and deletes", async () => {
|
||||
await capturedRun(["memories", "list", "--user-id", "wife", "--json"]);
|
||||
expect(transport.get).toHaveBeenCalledWith("/api/v2/memory-library", {
|
||||
params: { offset: 0, limit: 100, user_id: "wife" },
|
||||
});
|
||||
// Global: the flag may come before the subcommand too.
|
||||
await capturedRun(["memories", "--user-id", "wife", "show", "m-1"]);
|
||||
expect(transport.get).toHaveBeenCalledWith("/api/v2/memories/m-1", {
|
||||
params: { user_id: "wife" },
|
||||
});
|
||||
await capturedRun(["memories", "add-status", REQUEST, "--user-id", "wife"]);
|
||||
expect(transport.get).toHaveBeenCalledWith(
|
||||
`/api/v2/memories/additions/${REQUEST}`,
|
||||
{ params: { user_id: "wife" } },
|
||||
);
|
||||
await capturedRun(["profile", "--user-id", "wife", "--json"]);
|
||||
expect(transport.get).toHaveBeenCalledWith("/api/v2/user-profile", {
|
||||
params: { user_id: "wife" },
|
||||
});
|
||||
await capturedRun([
|
||||
"memories",
|
||||
"delete",
|
||||
"fact-1",
|
||||
"--kind",
|
||||
"fact",
|
||||
"--yes",
|
||||
"--user-id",
|
||||
"wife",
|
||||
]);
|
||||
expect(transport.delete).toHaveBeenCalledWith(
|
||||
"/api/v2/memories/fact-1?kind=fact&user_id=wife",
|
||||
undefined,
|
||||
);
|
||||
await capturedRun([
|
||||
"memories",
|
||||
"delete",
|
||||
"m-1",
|
||||
"--yes",
|
||||
"--user-id",
|
||||
"wife",
|
||||
]);
|
||||
expect(transport.delete).toHaveBeenCalledWith(
|
||||
"/api/v2/memories/m-1?user_id=wife",
|
||||
undefined,
|
||||
);
|
||||
await capturedRun(["write", "status", REQUEST, "--user-id", "wife"]);
|
||||
expect(direct.get.mock.calls[0][0]).toBe(
|
||||
`http://127.0.0.1:8765/api/v2/memory-writes/${REQUEST}`,
|
||||
);
|
||||
expect(direct.get.mock.calls[0][1].params).toEqual({ user_id: "wife" });
|
||||
});
|
||||
|
||||
it("passes the user in the body of memory writes and searches", async () => {
|
||||
await capturedRun(["memories", "add", "Prefers tea", "--user-id", "wife"]);
|
||||
expect(transport.post.mock.calls[0][0]).toBe("/api/v2/memories");
|
||||
expect(transport.post.mock.calls[0][1]).toMatchObject({
|
||||
text: "Prefers tea",
|
||||
scope: "all-apps",
|
||||
user_id: "wife",
|
||||
});
|
||||
const directory = await mkdtemp(path.join(tmpdir(), "om-user-id-"));
|
||||
const content = path.join(directory, "content.txt");
|
||||
await writeFile(content, "Prefers green tea\n");
|
||||
await capturedRun([
|
||||
"memories",
|
||||
"update",
|
||||
"m-1",
|
||||
"--content-file",
|
||||
content,
|
||||
"--user-id",
|
||||
"wife",
|
||||
]);
|
||||
expect(transport.put.mock.calls[0][0]).toBe("/api/v2/memories/m-1");
|
||||
expect(transport.put.mock.calls[0][1]).toMatchObject({ user_id: "wife" });
|
||||
await capturedRun(["recall", "tea", "--user-id", "wife", "--json"]);
|
||||
const search = transport.post.mock.calls.find(
|
||||
([url]) => url === "/api/v2/context/search",
|
||||
);
|
||||
expect(search?.[1]).toMatchObject({ query: "tea", user_id: "wife" });
|
||||
const messages = path.join(directory, "messages.json");
|
||||
await writeFile(
|
||||
messages,
|
||||
JSON.stringify([{ role: "user", content: "I like tea" }]),
|
||||
);
|
||||
await capturedRun([
|
||||
"write",
|
||||
"submit",
|
||||
"--messages-file",
|
||||
messages,
|
||||
"--session",
|
||||
"s-1",
|
||||
"--user-id",
|
||||
"wife",
|
||||
]);
|
||||
expect(direct.post.mock.calls[0][0]).toBe(
|
||||
"http://127.0.0.1:8765/api/v2/memory-writes",
|
||||
);
|
||||
expect(direct.post.mock.calls[0][1]).toMatchObject({
|
||||
session_id: "s-1",
|
||||
user_id: "wife",
|
||||
});
|
||||
});
|
||||
|
||||
it("names no user by default or for --user-id local", async () => {
|
||||
for (const extra of [[], ["--user-id", "local"]]) {
|
||||
transport.get.mockClear();
|
||||
transport.post.mockClear();
|
||||
await capturedRun(["memories", "list", ...extra, "--json"]);
|
||||
expect(transport.get).toHaveBeenCalledWith("/api/v2/memory-library", {
|
||||
params: { offset: 0, limit: 100 },
|
||||
});
|
||||
await capturedRun(["profile", ...extra]);
|
||||
expect(transport.get).toHaveBeenCalledWith(
|
||||
"/api/v2/user-profile",
|
||||
undefined,
|
||||
);
|
||||
await capturedRun(["memories", "add", "Prefers tea", ...extra]);
|
||||
expect(transport.post.mock.calls[0][1]).not.toHaveProperty("user_id");
|
||||
await capturedRun(["recall", "tea", ...extra, "--json"]);
|
||||
const search = transport.post.mock.calls.find(
|
||||
([url]) => url === "/api/v2/context/search",
|
||||
);
|
||||
expect(search?.[1]).not.toHaveProperty("user_id");
|
||||
}
|
||||
});
|
||||
|
||||
it("refuses a malformed user id before contacting Core", async () => {
|
||||
for (const value of ["bad:id", "", "x".repeat(65), "a b", "--json"]) {
|
||||
const result = await capturedRun([
|
||||
"memories",
|
||||
"list",
|
||||
"--user-id",
|
||||
value,
|
||||
]);
|
||||
expect(result.code).toBe(2);
|
||||
}
|
||||
expect(
|
||||
(await capturedRun(["profile", "--user-id", "a", "--user-id", "b"])).code,
|
||||
).toBe(2);
|
||||
expect((await capturedRun(["recall", "tea", "--user-id"])).code).toBe(2);
|
||||
expect(transport.get).not.toHaveBeenCalled();
|
||||
expect(transport.post).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("sources connect for a Hermes profile", () => {
|
||||
it("connects hermes for another user from its own root", async () => {
|
||||
const result = await capturedRun([
|
||||
"sources",
|
||||
"connect",
|
||||
"hermes",
|
||||
"--user-id",
|
||||
"wife",
|
||||
"--root",
|
||||
"~/.hermes/profiles/wife",
|
||||
"--json",
|
||||
]);
|
||||
expect(result.code).toBe(0);
|
||||
expect(transport.post).toHaveBeenCalledTimes(1);
|
||||
const [url, body] = transport.post.mock.calls[0];
|
||||
expect(url).toBe("/api/v1/sources/connect");
|
||||
expect(body).toMatchObject({
|
||||
source_ids: ["hermes"],
|
||||
// Core reads the custom root's identity itself.
|
||||
source_roots: {},
|
||||
source_candidate_revisions: {},
|
||||
onboarding: false,
|
||||
user_id: "wife",
|
||||
root: path.join(os.homedir(), ".hermes/profiles/wife"),
|
||||
});
|
||||
});
|
||||
|
||||
it("keeps a plain connect unchanged and accepts --import with a profile", async () => {
|
||||
await capturedRun(["sources", "connect", "hermes", "--import", "--json"]);
|
||||
const plain = transport.post.mock.calls[0][1];
|
||||
expect(plain).not.toHaveProperty("user_id");
|
||||
expect(plain).not.toHaveProperty("root");
|
||||
expect(plain).toMatchObject({
|
||||
source_roots: { hermes: "hermes-root-identity" },
|
||||
onboarding: true,
|
||||
});
|
||||
transport.post.mockClear();
|
||||
const result = await capturedRun([
|
||||
"sources",
|
||||
"connect",
|
||||
"hermes",
|
||||
"--import",
|
||||
"--user-id",
|
||||
"wife",
|
||||
"--root",
|
||||
"/profiles/wife",
|
||||
"--request-id",
|
||||
REQUEST,
|
||||
"--json",
|
||||
]);
|
||||
expect(result.code).toBe(0);
|
||||
expect(transport.post.mock.calls[0][1]).toMatchObject({
|
||||
request_id: REQUEST,
|
||||
user_id: "wife",
|
||||
root: "/profiles/wife",
|
||||
});
|
||||
});
|
||||
|
||||
it("refuses --user-id and --root for any source but hermes", async () => {
|
||||
for (const argv of [
|
||||
["sources", "connect", "codex", "--user-id", "wife"],
|
||||
["sources", "connect", "codex", "--root", "/somewhere", "--import"],
|
||||
["sources", "connect", "hermes", "codex", "--user-id", "wife"],
|
||||
["sources", "connect", "--all-detected", "--user-id", "wife"],
|
||||
["sources", "connect", "hermes", "--user-id", "bad:id"],
|
||||
]) {
|
||||
const result = await capturedRun(argv);
|
||||
expect(result.code).toBe(2);
|
||||
expect(result.stderr).toContain("hermes");
|
||||
}
|
||||
expect(transport.post).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
async function capturedRun(arguments_: string[]) {
|
||||
let stdout = "";
|
||||
let stderr = "";
|
||||
const stdoutSpy = vi
|
||||
.spyOn(process.stdout, "write")
|
||||
.mockImplementation((chunk) => {
|
||||
stdout += String(chunk);
|
||||
return true;
|
||||
});
|
||||
const stderrSpy = vi
|
||||
.spyOn(process.stderr, "write")
|
||||
.mockImplementation((chunk) => {
|
||||
stderr += String(chunk);
|
||||
return true;
|
||||
});
|
||||
try {
|
||||
return {
|
||||
code: await run(arguments_, {
|
||||
ONE_MEMORY_DATA_DIR: "/synthetic/data",
|
||||
}),
|
||||
stdout,
|
||||
stderr,
|
||||
};
|
||||
} finally {
|
||||
stdoutSpy.mockRestore();
|
||||
stderrSpy.mockRestore();
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ dependencies = [
|
||||
"fastapi>=0.141.1",
|
||||
"filelock>=3.32.4",
|
||||
# Public SDK version validated against MemHub's permission and recall contracts.
|
||||
"hy-memory==2.0.8",
|
||||
"hy-memory==2.0.9",
|
||||
# chromadb arrives through the HY SDK; locked here so an unrelated upgrade
|
||||
# cannot move the SDK's store. Built-in embedding consumes numpy directly.
|
||||
"chromadb==1.5.9",
|
||||
|
||||
@@ -14,6 +14,7 @@ from collections.abc import (
|
||||
MutableMapping,
|
||||
)
|
||||
from contextlib import asynccontextmanager, nullcontext, suppress
|
||||
from dataclasses import replace
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from functools import partial
|
||||
from pathlib import Path
|
||||
@@ -93,7 +94,6 @@ from one_memory.hy_runtime_config import (
|
||||
from one_memory.hy_sdk_runtime import (
|
||||
AmbiguousMemoryIdError,
|
||||
SdkClientHandle,
|
||||
builtin_retrieval_snapshot,
|
||||
close_all_shared_runtimes,
|
||||
hold_stores_offline,
|
||||
release_stores,
|
||||
@@ -117,6 +117,7 @@ from one_memory.imports.access import (
|
||||
AuthorizedSourceRoot,
|
||||
SourceAccessError,
|
||||
root_identity_matches,
|
||||
source_root_identity,
|
||||
)
|
||||
from one_memory.imports.adapters import (
|
||||
ScanFailure,
|
||||
@@ -157,6 +158,7 @@ from one_memory.imports.sources.common import SourceInstallState
|
||||
from one_memory.imports.sources.registry import (
|
||||
RootCandidateKind,
|
||||
SourceRegistration,
|
||||
SourceRootCandidate,
|
||||
build_source_catalog,
|
||||
workbuddy_default_homes,
|
||||
)
|
||||
@@ -187,6 +189,7 @@ from one_memory.model_presets import seed_preset_profile
|
||||
from one_memory.model_probe import ModelProber, ModelProbeResult
|
||||
from one_memory.model_profiles import (
|
||||
ActiveModelProfileError,
|
||||
EmbeddingBaseUrlRequiredError,
|
||||
ModelCreationOperationConflictError,
|
||||
ModelCreationOperationLookupError,
|
||||
ModelCreationOperationReceipt,
|
||||
@@ -226,6 +229,7 @@ from one_memory.sdk_memory_qa import (
|
||||
)
|
||||
from one_memory.sdk_memory_runtime import SdkMemoryRuntime
|
||||
from one_memory.sdk_migration_log import error_chain_text, error_frames
|
||||
from one_memory.sdk_read_handle import ActiveProfileReadHandle
|
||||
from one_memory.sdk_write_processor import SdkWriteCoordinator
|
||||
from one_memory.secrets import (
|
||||
KeyringSecretStore,
|
||||
@@ -244,7 +248,17 @@ from one_memory.service_levels import (
|
||||
from one_memory.source_import_receipts import SourceImportReceipt, build_source_import_receipt
|
||||
from one_memory.source_read_access import SourceReadAccess
|
||||
from one_memory.source_totals import SourceTotals
|
||||
from one_memory.strict_query import forbid_unknown_query_params
|
||||
from one_memory.target_schema import bootstrap_fresh_management_schema
|
||||
from one_memory.user_scope import (
|
||||
DEFAULT_USER_ID,
|
||||
MULTI_USER_SOURCES,
|
||||
USER_ID_PATTERN,
|
||||
UserId,
|
||||
lane_key,
|
||||
owns,
|
||||
split_lane,
|
||||
)
|
||||
from one_memory.workspace_resolution import resolve_workspace_scopes
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -387,6 +401,12 @@ class CreateImportJobRequest(BaseModel):
|
||||
|
||||
class ConnectSourcesRequest(BaseModel):
|
||||
source_ids: tuple[str, ...] = Field(min_length=1, max_length=32)
|
||||
#: Whose grant this is. Only Hermes may connect a root for a user other
|
||||
#: than `local`: a Hermes profile is another person's history.
|
||||
user_id: UserId = DEFAULT_USER_ID
|
||||
#: A root chosen by the caller instead of the source's candidate, such as
|
||||
#: `~/.hermes/profiles/<name>`. Hermes only; Core computes its identity.
|
||||
root: str | None = Field(default=None, min_length=1, max_length=4096)
|
||||
confirm_environment_overrides: bool = False
|
||||
full_rescan: bool = False
|
||||
onboarding: bool = False
|
||||
@@ -422,6 +442,8 @@ class SdkMemoryUpdateRequest(BaseModel):
|
||||
variant: SdkMemoryVariant | None = None
|
||||
# Experiences only: also replace the task.
|
||||
task: str | None = Field(default=None, min_length=1, max_length=200_000)
|
||||
#: Whose memory this is; another user's id answers 404.
|
||||
user_id: UserId = DEFAULT_USER_ID
|
||||
|
||||
|
||||
class SdkUserProfileResponse(BaseModel):
|
||||
@@ -584,11 +606,15 @@ class ManualExtractReceipt(BaseModel):
|
||||
|
||||
|
||||
class AskMemoryRequest(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid")
|
||||
|
||||
question: str = Field(min_length=1, max_length=2_000)
|
||||
scope: str = Field(default="all-apps", min_length=1, max_length=512)
|
||||
# Host-injected project directory, same boundary as recall. Optional so
|
||||
# the web UI and older callers keep working unchanged.
|
||||
workspace_path: str | None = Field(default=None, max_length=4_096)
|
||||
#: Whose memories answer. Omitted, it is `local`, the App's library.
|
||||
user_id: UserId = DEFAULT_USER_ID
|
||||
|
||||
|
||||
class SdkHomeSummary(BaseModel):
|
||||
@@ -626,6 +652,27 @@ class MemoryGraphResponse(BaseModel):
|
||||
hy_graph_available: bool = True
|
||||
|
||||
|
||||
class SourceGrantView(BaseModel):
|
||||
"""One `(user_id, source_id)` grant, as `GET /api/v1/source-grants` lists it."""
|
||||
|
||||
model_config = ConfigDict(frozen=True, extra="forbid")
|
||||
|
||||
user_id: str
|
||||
source_id: str
|
||||
root_label: str
|
||||
root_path: str
|
||||
authorized: bool
|
||||
revoked_at: datetime | None
|
||||
sync_enabled: bool
|
||||
|
||||
|
||||
class SourceGrantList(BaseModel):
|
||||
model_config = ConfigDict(frozen=True, extra="forbid")
|
||||
|
||||
schema_version: Literal[1] = 1
|
||||
grants: tuple[SourceGrantView, ...]
|
||||
|
||||
|
||||
class SdkMigrationRequired(RuntimeError):
|
||||
"""A serving Core was started on a home that is not on SDK authority."""
|
||||
|
||||
@@ -876,6 +923,16 @@ def create_app(
|
||||
)
|
||||
except sqlite3.Error as error:
|
||||
app.state.memory_visibility_error = str(error)
|
||||
else:
|
||||
# A home an earlier build migrated still carries the grant
|
||||
# triggers whose body reads a dropped table (#233).
|
||||
try:
|
||||
await asyncio.to_thread(
|
||||
memory_visibility.drop_stale_triggers,
|
||||
database_path,
|
||||
)
|
||||
except sqlite3.Error as error:
|
||||
app.state.memory_visibility_error = str(error)
|
||||
model_request_budget = (
|
||||
ModelRequestBudget(
|
||||
database_path,
|
||||
@@ -928,6 +985,7 @@ def create_app(
|
||||
write_queue=memory_write_queue,
|
||||
extraction_settings=app.state.extraction_settings_store,
|
||||
data_dir=runtime_settings.data_dir,
|
||||
user_ids=lambda: _known_user_ids(app),
|
||||
)
|
||||
# C2 owns the single production budget (handle 5s + reserve 250ms,
|
||||
# total 5.25s, lease 10s, renew 1s, claim 250ms). The composition
|
||||
@@ -1100,6 +1158,13 @@ def create_app(
|
||||
source_id
|
||||
for source_id, registration in app.state.source_catalog.items()
|
||||
if registration.capabilities.live_sync is CapabilityState.IMPLEMENTED
|
||||
) + tuple(
|
||||
lane
|
||||
for lane in _other_user_lanes(
|
||||
app.state.source_catalog, app.state.source_grant_store
|
||||
)
|
||||
if app.state.source_catalog[split_lane(lane)[1]].capabilities.live_sync
|
||||
is CapabilityState.IMPLEMENTED
|
||||
)
|
||||
# Resolved before the supervisor is built so it can state truthfully
|
||||
# how it is being driven: watching only applies to roots that exist
|
||||
@@ -1496,9 +1561,12 @@ def create_app(
|
||||
Depends(local_api_guard(runtime_settings, valid_ui_session=ui_session_valid)),
|
||||
Depends(require_external_endpoint),
|
||||
]
|
||||
app.include_router(memory_add_router(protected))
|
||||
# Memory reads and writes refuse a query parameter they do not declare: an
|
||||
# ignored `user_id` would read as isolation that never happened.
|
||||
strict = [*protected, Depends(forbid_unknown_query_params)]
|
||||
app.include_router(memory_add_router(strict))
|
||||
app.include_router(file_import_router(protected))
|
||||
app.include_router(sdk_context_router(protected))
|
||||
app.include_router(sdk_context_router(strict))
|
||||
|
||||
# A4-01: scan-root configuration, so the CLI's `path` command has something
|
||||
# to read instead of refusing.
|
||||
@@ -1512,7 +1580,7 @@ def create_app(
|
||||
|
||||
if getattr(app.state, "memory_write_registry", None) is None:
|
||||
app.state.memory_write_registry = WriteRegistry()
|
||||
app.include_router(sdk_memory_write_router(protected))
|
||||
app.include_router(sdk_memory_write_router(strict))
|
||||
from one_memory.call_event_routes import call_event_router
|
||||
|
||||
app.include_router(call_event_router(protected))
|
||||
@@ -2287,7 +2355,11 @@ def create_app(
|
||||
return SourceSyncState(source_id=source_id, sync_enabled=request.enabled)
|
||||
|
||||
async def _prepare_source_resume(source_id: str) -> None:
|
||||
"""Prepare catch-up work before committing the new desired state."""
|
||||
"""Prepare catch-up work before committing the new desired state.
|
||||
|
||||
`source_id` is a lane key, so another user's lane prepares that
|
||||
user's own cursors and history job.
|
||||
"""
|
||||
await _live_sync(app).initialize_source(source_id, baseline_missing_files=True)
|
||||
active = {
|
||||
ImportStatus.PENDING,
|
||||
@@ -2297,14 +2369,17 @@ def create_app(
|
||||
ImportStatus.FAILED,
|
||||
}
|
||||
if any(
|
||||
job.source_id == source_id and job.operation == "history" and job.status in active
|
||||
lane_key(job.user_id, job.source_id) == source_id
|
||||
and job.operation == "history"
|
||||
and job.status in active
|
||||
for job in _job_store(app).list_jobs()
|
||||
):
|
||||
return
|
||||
user_id, bare_source_id = split_lane(source_id)
|
||||
await asyncio.to_thread(
|
||||
_job_store(app).create,
|
||||
user_id="local",
|
||||
source_id=source_id,
|
||||
user_id=user_id,
|
||||
source_id=bare_source_id,
|
||||
operation="history",
|
||||
)
|
||||
|
||||
@@ -2312,7 +2387,7 @@ def create_app(
|
||||
"""Run work prepared for a source after config.json has committed."""
|
||||
try:
|
||||
for job in _job_store(app).list_jobs():
|
||||
if job.source_id != source_id:
|
||||
if lane_key(job.user_id, job.source_id) != source_id:
|
||||
continue
|
||||
if job.status is ImportStatus.PENDING:
|
||||
_supervisor(app).enqueue(job.job_id)
|
||||
@@ -2341,8 +2416,13 @@ def create_app(
|
||||
response_model=SourceGrantReceipt,
|
||||
dependencies=protected,
|
||||
)
|
||||
async def revoke_source(source_id: str) -> SourceGrantReceipt:
|
||||
async def revoke_source(
|
||||
source_id: str,
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> SourceGrantReceipt:
|
||||
_require_registration(app, source_id)
|
||||
if user_id != DEFAULT_USER_ID:
|
||||
return await _revoke_other_user_grant(source_id, user_id)
|
||||
receipt = _grant_store(app).receipt(
|
||||
user_id="local",
|
||||
source_id=source_id,
|
||||
@@ -2378,6 +2458,65 @@ def create_app(
|
||||
await _refresh_live_watch(app)
|
||||
return receipt
|
||||
|
||||
async def _revoke_other_user_grant(source_id: str, user_id: str) -> SourceGrantReceipt:
|
||||
"""Stop reading another user's root. The App's switch is left alone."""
|
||||
if source_id not in MULTI_USER_SOURCES:
|
||||
raise HTTPException(status_code=422, detail="user_id_requires_multi_user_source")
|
||||
lane = lane_key(user_id, source_id)
|
||||
receipt = await asyncio.to_thread(
|
||||
partial(_grant_store(app).receipt, user_id=user_id, source_id=source_id)
|
||||
)
|
||||
if receipt is None:
|
||||
raise HTTPException(status_code=404, detail="grant_not_found")
|
||||
active_statuses = {
|
||||
ImportStatus.PENDING,
|
||||
ImportStatus.RUNNING,
|
||||
ImportStatus.PAUSED,
|
||||
ImportStatus.INTERRUPTED,
|
||||
ImportStatus.FAILED,
|
||||
}
|
||||
for job in _job_store(app).list_jobs():
|
||||
if lane_key(job.user_id, job.source_id) == lane and job.status in active_statuses:
|
||||
await _supervisor(app).cancel(job.job_id)
|
||||
await _live_sync(app).stop_source(lane)
|
||||
_supervisor(app).unregister_adapter(lane)
|
||||
receipt = await asyncio.to_thread(
|
||||
partial(_grant_store(app).revoke, user_id=user_id, source_id=source_id)
|
||||
)
|
||||
await _refresh_live_watch(app)
|
||||
return receipt
|
||||
|
||||
@app.get(
|
||||
"/api/v1/source-grants",
|
||||
response_model=SourceGrantList,
|
||||
dependencies=protected,
|
||||
)
|
||||
async def list_source_grants() -> SourceGrantList:
|
||||
"""Every grant of every user. `/api/v1/sources` stays `local`'s, as the App reads it."""
|
||||
|
||||
def describe() -> SourceGrantList:
|
||||
config_store = _config_store(app)
|
||||
views = []
|
||||
for receipt, root_path in _grant_store(app).grants():
|
||||
lane = lane_key(receipt.user_id, receipt.source_id)
|
||||
authorized = receipt.revoked_at is None and receipt.revision > 0
|
||||
views.append(
|
||||
SourceGrantView(
|
||||
user_id=receipt.user_id,
|
||||
source_id=receipt.source_id,
|
||||
root_label=receipt.root_label,
|
||||
root_path=_display_candidate_path(
|
||||
Path(root_path), runtime_settings.source_home
|
||||
),
|
||||
authorized=authorized,
|
||||
revoked_at=receipt.revoked_at,
|
||||
sync_enabled=authorized and _lane_sync_enabled(config_store, lane),
|
||||
)
|
||||
)
|
||||
return SourceGrantList(grants=tuple(views))
|
||||
|
||||
return await asyncio.to_thread(describe)
|
||||
|
||||
@app.post(
|
||||
"/api/v1/import-jobs",
|
||||
response_model=ImportJob,
|
||||
@@ -2406,6 +2545,8 @@ def create_app(
|
||||
async def connect_sources(
|
||||
request: ConnectSourcesRequest,
|
||||
) -> ConnectSourcesResponse:
|
||||
if request.user_id != DEFAULT_USER_ID or request.root is not None:
|
||||
return await _connect_other_root(request)
|
||||
if request.onboarding:
|
||||
app.state.history_import_gate_released = False
|
||||
source_ids = tuple(dict.fromkeys(request.source_ids))
|
||||
@@ -2511,6 +2652,103 @@ def create_app(
|
||||
raise
|
||||
return ConnectSourcesResponse(**result.model_dump())
|
||||
|
||||
async def _connect_other_root(request: ConnectSourcesRequest) -> ConnectSourcesResponse:
|
||||
"""Grant one Hermes root to a user: `~/.hermes/profiles/<name>` for its own user.
|
||||
|
||||
Only Hermes holds more than one person's history (one profile per
|
||||
person), so a non-`local` user or a caller-chosen root is refused for
|
||||
every other source. The grant is `(user_id, source_id)`; its cursors,
|
||||
jobs and live sync follow that key.
|
||||
"""
|
||||
source_ids = tuple(dict.fromkeys(request.source_ids))
|
||||
if any(source_id not in MULTI_USER_SOURCES for source_id in source_ids):
|
||||
raise HTTPException(status_code=422, detail="user_id_requires_multi_user_source")
|
||||
if request.root is not None and len(source_ids) != 1:
|
||||
raise HTTPException(status_code=422, detail="source_root_requires_one_source")
|
||||
if request.user_id != DEFAULT_USER_ID and request.root is None:
|
||||
# The user is the root that is read: another user must name theirs,
|
||||
# or they would be handed `local`'s history.
|
||||
raise HTTPException(status_code=422, detail="source_root_required_for_user")
|
||||
if request.onboarding or request.import_upload_id is not None:
|
||||
raise HTTPException(status_code=422, detail="user_id_unsupported_for_request")
|
||||
if request.request_id is None:
|
||||
raise HTTPException(status_code=409, detail="source_confirmation_required")
|
||||
registrations = []
|
||||
source_roots = dict(request.source_roots)
|
||||
for source_id in source_ids:
|
||||
registration = _require_registration(app, source_id)
|
||||
if request.root is not None:
|
||||
root = Path(request.root)
|
||||
if not root.is_absolute():
|
||||
raise HTTPException(status_code=422, detail="source_root_must_be_absolute")
|
||||
# Named outright by the caller, like an environment override:
|
||||
# no saved candidate may replace it, and naming it confirms it.
|
||||
registration = replace(
|
||||
registration,
|
||||
candidate=SourceRootCandidate(
|
||||
path=root, kind=RootCandidateKind.ENVIRONMENT_OVERRIDE
|
||||
),
|
||||
)
|
||||
try:
|
||||
source_roots[source_id] = await asyncio.to_thread(source_root_identity, root)
|
||||
except SourceAccessError as error:
|
||||
raise HTTPException(status_code=409, detail=error.code) from None
|
||||
registrations.append(registration)
|
||||
existing_intent = await asyncio.to_thread(
|
||||
partial(
|
||||
app.state.source_connection_store.get,
|
||||
request.request_id,
|
||||
user_id=request.user_id,
|
||||
)
|
||||
)
|
||||
try:
|
||||
result = await asyncio.to_thread(
|
||||
partial(
|
||||
app.state.source_connection_store.connect,
|
||||
request_id=request.request_id,
|
||||
registrations=tuple(registrations),
|
||||
source_roots=source_roots,
|
||||
confirm_overrides=(
|
||||
request.confirm_environment_overrides or request.root is not None
|
||||
),
|
||||
full_rescan=request.full_rescan,
|
||||
user_id=request.user_id,
|
||||
)
|
||||
)
|
||||
except ConnectionIntentError as error:
|
||||
raise HTTPException(status_code=409, detail=str(error)) from None
|
||||
if existing_intent is not None:
|
||||
return ConnectSourcesResponse(**result.model_dump())
|
||||
for job in result.jobs:
|
||||
registration = _require_registration(app, job.source_id)
|
||||
grant = await asyncio.to_thread(
|
||||
partial(
|
||||
_grant_store(app).authorized_root,
|
||||
user_id=job.user_id,
|
||||
source_id=job.source_id,
|
||||
)
|
||||
)
|
||||
if grant is None:
|
||||
continue
|
||||
lane = lane_key(job.user_id, job.source_id)
|
||||
_supervisor(app).register_adapter(
|
||||
registration.create_adapter(grant), user_id=job.user_id
|
||||
)
|
||||
_detection(app).pop(lane, None)
|
||||
if job.user_id != DEFAULT_USER_ID:
|
||||
if registration.capabilities.live_sync is CapabilityState.IMPLEMENTED:
|
||||
_live_sync(app).ensure_source(lane)
|
||||
# Another user's grant syncs while it stands (see
|
||||
# `_lane_sync_enabled`); the App's switch is not touched.
|
||||
await _prepare_source_resume(lane)
|
||||
await _activate_source_resume(lane)
|
||||
elif request.enable_sync:
|
||||
await _prepare_source_resume(lane)
|
||||
await asyncio.to_thread(_config_store(app).set_sync, job.source_id, True)
|
||||
await _activate_source_resume(lane)
|
||||
await _refresh_live_watch(app)
|
||||
return ConnectSourcesResponse(**result.model_dump())
|
||||
|
||||
@app.get(
|
||||
"/api/v1/source-connections/{request_id}",
|
||||
response_model=ConnectionIntentReceipt,
|
||||
@@ -2527,8 +2765,12 @@ def create_app(
|
||||
response_model=list[ImportJob],
|
||||
dependencies=protected,
|
||||
)
|
||||
def list_import_jobs() -> list[ImportJob]:
|
||||
return _job_store(app).list_jobs()
|
||||
def list_import_jobs(
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> list[ImportJob]:
|
||||
# One user's jobs: the App reads `local`'s and must not show another
|
||||
# user's Hermes import as its own.
|
||||
return [job for job in _job_store(app).list_jobs() if job.user_id == user_id]
|
||||
|
||||
@app.get(
|
||||
"/api/v1/live-sync",
|
||||
@@ -2632,6 +2874,8 @@ def create_app(
|
||||
def create_model_profile(request: ModelProfileInput) -> ModelProfile:
|
||||
try:
|
||||
return _model_profile_store(app).create(request, _secret_store(app))
|
||||
except EmbeddingBaseUrlRequiredError:
|
||||
raise HTTPException(422, "embedding_base_url_required") from None
|
||||
except ModelCreationOperationConflictError:
|
||||
raise HTTPException(409, "model_creation_operation_conflict") from None
|
||||
except ModelCreationOperationLookupError:
|
||||
@@ -2683,6 +2927,8 @@ def create_app(
|
||||
raise HTTPException(status_code=404, detail="model_profile_not_found") from None
|
||||
except ModelProfileConflictError:
|
||||
raise HTTPException(status_code=409, detail="model_profile_conflict") from None
|
||||
except EmbeddingBaseUrlRequiredError:
|
||||
raise HTTPException(status_code=422, detail="embedding_base_url_required") from None
|
||||
except SecretStoreUnavailableError as error:
|
||||
raise HTTPException(
|
||||
status_code=503,
|
||||
@@ -2857,9 +3103,11 @@ def create_app(
|
||||
@app.get(
|
||||
"/api/v2/home-summary",
|
||||
response_model=SdkHomeSummary,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def sdk_home_summary() -> SdkHomeSummary:
|
||||
async def sdk_home_summary(
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> SdkHomeSummary:
|
||||
"""The home card: the memory page's count and its newest memory.
|
||||
|
||||
The count is `memory_stats` total (chat + working + coding
|
||||
@@ -2871,12 +3119,12 @@ def create_app(
|
||||
client = await _sdk_client_handle(app).client()
|
||||
stats = await asyncio.to_thread(
|
||||
client.memory_stats,
|
||||
user_id="local",
|
||||
user_id=user_id,
|
||||
statuses=["active"],
|
||||
)
|
||||
raw = await asyncio.to_thread(
|
||||
client.list_memories,
|
||||
user_id="local",
|
||||
user_id=user_id,
|
||||
scene="all",
|
||||
statuses=["active"],
|
||||
limit=1,
|
||||
@@ -2897,7 +3145,7 @@ def create_app(
|
||||
@app.get(
|
||||
"/api/v2/memory-library",
|
||||
response_model=HySdkMemoryPage,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def sdk_memory_library(
|
||||
statuses: list[str] = Query(default=["active"]), # noqa: B008
|
||||
@@ -2907,6 +3155,7 @@ def create_app(
|
||||
limit: int = Query(default=LIBRARY_PAGE_SIZE, ge=1, le=500),
|
||||
window_id: str | None = Query(default=None, min_length=1, max_length=64),
|
||||
scene: Literal["all", "chat", "working", "coding"] = Query(default="all"),
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> HySdkMemoryPage:
|
||||
"""One page of memories across chat, working and coding.
|
||||
|
||||
@@ -2941,10 +3190,11 @@ def create_app(
|
||||
limit=limit,
|
||||
window_id=window_id,
|
||||
scene=scene,
|
||||
user_id=user_id,
|
||||
)
|
||||
raw = await asyncio.to_thread(
|
||||
client.list_memories,
|
||||
user_id="local",
|
||||
user_id=user_id,
|
||||
scene=scene,
|
||||
statuses=list(statuses),
|
||||
include_sources=[source] if source else None,
|
||||
@@ -2965,12 +3215,13 @@ def create_app(
|
||||
@app.get(
|
||||
"/api/v2/memories/graph",
|
||||
response_model=MemoryGraphResponse,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def sdk_memory_graph(
|
||||
limit: int = Query(default=160, ge=1, le=300),
|
||||
offset: int = Query(default=0, ge=0),
|
||||
source: str | None = Query(default=None, min_length=1),
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> MemoryGraphResponse:
|
||||
"""The memory map on SDK authority: SDK memories plus the Kuzu overlay.
|
||||
|
||||
@@ -2984,7 +3235,7 @@ def create_app(
|
||||
# left list's 20-row pagination window.
|
||||
raw = await asyncio.to_thread(
|
||||
client.list_memories,
|
||||
user_id="local",
|
||||
user_id=user_id,
|
||||
scene="all",
|
||||
statuses=["active"],
|
||||
include_sources=[source] if source else None,
|
||||
@@ -3054,7 +3305,9 @@ def create_app(
|
||||
# source withholds the overlay, as on the legacy map.
|
||||
if not await asyncio.to_thread(_read_access(app).has_revoked_sources):
|
||||
try:
|
||||
hy_graph = await _sdk_memory_runtime(app).graph_snapshot(limit=limit)
|
||||
hy_graph = await _sdk_memory_runtime(app).graph_snapshot(
|
||||
limit=limit, user_id=user_id
|
||||
)
|
||||
except HySdkError:
|
||||
hy_graph = None
|
||||
if hy_graph is not None:
|
||||
@@ -3104,12 +3357,14 @@ def create_app(
|
||||
@app.get(
|
||||
"/api/v2/user-profile",
|
||||
response_model=SdkUserProfileResponse,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def sdk_user_profile() -> SdkUserProfileResponse:
|
||||
async def sdk_user_profile(
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> SdkUserProfileResponse:
|
||||
try:
|
||||
client = await _sdk_client_handle(app).client()
|
||||
value = await asyncio.to_thread(client.get_user_profile, user_id="local")
|
||||
value = await asyncio.to_thread(client.get_user_profile, user_id=user_id)
|
||||
profile = HySdkUserProfile.from_sdk(value)
|
||||
except Exception as error:
|
||||
raise _sdk_http_error(error, "hy_memory_profile_read_failed") from None
|
||||
@@ -3118,18 +3373,23 @@ def create_app(
|
||||
@app.get(
|
||||
"/api/v2/memories/{memory_id}",
|
||||
response_model=HySdkMemoryRecord,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def get_sdk_memory(
|
||||
memory_id: str,
|
||||
kind: SdkMemoryKind | None = None,
|
||||
variant: SdkMemoryVariant | None = None,
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> HySdkMemoryRecord:
|
||||
_check_memory_namespace(kind, variant)
|
||||
try:
|
||||
memory = await _get_sdk_memory(
|
||||
_sdk_client_handle(app), memory_id, kind=kind, variant=variant
|
||||
)
|
||||
# The SDK's `get` takes no user: another user's memory reads as
|
||||
# missing, never as existing.
|
||||
if memory is not None and not owns(memory.user_id, user_id):
|
||||
memory = None
|
||||
except AmbiguousMemoryIdError:
|
||||
raise HTTPException(status_code=409, detail="memory_id_ambiguous") from None
|
||||
except Exception as error:
|
||||
@@ -3141,7 +3401,7 @@ def create_app(
|
||||
@app.put(
|
||||
"/api/v2/memories/{memory_id}",
|
||||
response_model=HySdkMemoryRecord,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def update_sdk_memory(
|
||||
memory_id: str,
|
||||
@@ -3153,6 +3413,13 @@ def create_app(
|
||||
namespace = _namespace_kwargs(request.kind, request.variant)
|
||||
try:
|
||||
async with app.state.sdk_write_coordinator.use_client() as client:
|
||||
# `update` takes no user: read the memory first and refuse
|
||||
# another user's id exactly as a missing one.
|
||||
current = await asyncio.to_thread(client.get, memory_id, **namespace)
|
||||
if current is None or not owns(
|
||||
HySdkMemoryRecord.from_sdk(current).user_id, request.user_id
|
||||
):
|
||||
raise HTTPException(status_code=404, detail="memory_not_found")
|
||||
update_kwargs: dict[str, object] = dict(namespace)
|
||||
if request.task is not None:
|
||||
update_kwargs["task"] = request.task
|
||||
@@ -3190,16 +3457,27 @@ def create_app(
|
||||
@app.delete(
|
||||
"/api/v2/memories/{memory_id}",
|
||||
status_code=204,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def delete_sdk_memory(
|
||||
memory_id: str,
|
||||
kind: SdkMemoryKind | None = None,
|
||||
variant: SdkMemoryVariant | None = None,
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> Response:
|
||||
_check_memory_namespace(kind, variant)
|
||||
try:
|
||||
async with app.state.sdk_write_coordinator.use_client() as client:
|
||||
# `delete` takes no user. Another user's memory is answered
|
||||
# exactly like an id that does not exist: 204, nothing
|
||||
# touched, so the status cannot tell that it exists.
|
||||
current = await asyncio.to_thread(
|
||||
client.get, memory_id, **_namespace_kwargs(kind, variant)
|
||||
)
|
||||
if current is not None and not owns(
|
||||
HySdkMemoryRecord.from_sdk(current).user_id, user_id
|
||||
):
|
||||
return Response(status_code=204)
|
||||
result = await asyncio.to_thread(
|
||||
client.delete, memory_id, **_namespace_kwargs(kind, variant)
|
||||
)
|
||||
@@ -3210,6 +3488,8 @@ def create_app(
|
||||
raise HySdkError(str(error_code or "hy_memory_delete_incomplete"))
|
||||
if result.get("success") is not True and result.get("deleted_count") != 0:
|
||||
raise HySdkError("hy_memory_delete_rejected")
|
||||
except HTTPException:
|
||||
raise
|
||||
except AmbiguousMemoryIdError:
|
||||
raise HTTPException(status_code=409, detail="memory_id_ambiguous") from None
|
||||
except Exception as error:
|
||||
@@ -3219,18 +3499,19 @@ def create_app(
|
||||
@app.get(
|
||||
"/api/v2/raw",
|
||||
response_model=SdkRawPage,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def sdk_raw_library(
|
||||
source: str | None = Query(default=None, min_length=1),
|
||||
offset: int = Query(default=0, ge=0),
|
||||
limit: int = Query(default=100, ge=1, le=500),
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> SdkRawPage:
|
||||
try:
|
||||
client = await _sdk_client_handle(app).client()
|
||||
value = await asyncio.to_thread(
|
||||
client.list_memories,
|
||||
user_id="local",
|
||||
user_id=user_id,
|
||||
layers=["l1_raw"],
|
||||
include_sources=[source] if source else None,
|
||||
offset=offset,
|
||||
@@ -3244,7 +3525,7 @@ def create_app(
|
||||
@app.post(
|
||||
"/api/v2/memories/ask",
|
||||
response_model=SdkMemoryAnswer,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def ask_sdk_memories(
|
||||
request: AskMemoryRequest,
|
||||
@@ -3261,7 +3542,9 @@ def create_app(
|
||||
"om_ask",
|
||||
)
|
||||
try:
|
||||
answer = await _sdk_request_answerer(app).answer(request.question)
|
||||
answer = await _sdk_request_answerer(app).answer(
|
||||
request.question, user_id=request.user_id
|
||||
)
|
||||
except MemoryAnswerError as error:
|
||||
raise HTTPException(status_code=503, detail=str(error)) from None
|
||||
if request.question != "__om_probe__" and access is not None:
|
||||
@@ -3278,7 +3561,7 @@ def create_app(
|
||||
|
||||
@app.post(
|
||||
"/api/v2/memories/ask/stream",
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def ask_sdk_memories_stream(
|
||||
request: AskMemoryRequest,
|
||||
@@ -3300,7 +3583,9 @@ def create_app(
|
||||
|
||||
final: dict[str, object] | None = None
|
||||
try:
|
||||
async for event in answerer.answer_stream(request.question):
|
||||
async for event in answerer.answer_stream(
|
||||
request.question, user_id=request.user_id
|
||||
):
|
||||
if event.get("type") == "final":
|
||||
final = event
|
||||
yield _sse(_serialize_ask_event(event))
|
||||
@@ -3331,7 +3616,7 @@ def create_app(
|
||||
@app.post(
|
||||
"/api/v1/recall",
|
||||
response_model=RecallReceipt,
|
||||
dependencies=protected,
|
||||
dependencies=strict,
|
||||
)
|
||||
async def recall_memories(
|
||||
request: RecallRequest,
|
||||
@@ -3344,16 +3629,20 @@ def create_app(
|
||||
await _require_external_recall_scope(
|
||||
app, http_request, request.scope, request.workspace_path
|
||||
)
|
||||
target = _recall_target(app)
|
||||
target = (
|
||||
_recall_target(app)
|
||||
if request.user_id == DEFAULT_USER_ID
|
||||
else _sdk_recall_target(app, request.user_id)
|
||||
)
|
||||
access = external_access(http_request.headers)
|
||||
receipt = await recall_with_fallback(
|
||||
request,
|
||||
model_ready=lambda: _recall_model_ready(app),
|
||||
recall_memories=target.recall_async,
|
||||
has_memories=lambda: _library_has_memories(app),
|
||||
has_memories=lambda: _library_has_memories(app, request.user_id),
|
||||
raw_sources=lambda: _recall_raw_sources(app, request, access, started),
|
||||
search_raw=lambda query, limit, sources: _search_sdk_raw(
|
||||
app, query, limit=limit, sources=sources
|
||||
app, query, limit=limit, sources=sources, user_id=request.user_id
|
||||
),
|
||||
)
|
||||
event_store = getattr(app.state, "call_event_store", None)
|
||||
@@ -3730,21 +4019,60 @@ def _sync_refused(code: str) -> HTTPException:
|
||||
return HTTPException(status_code=409, detail=code)
|
||||
|
||||
|
||||
def _lane_sync_enabled(config_store: ConfigStore, lane: str) -> bool:
|
||||
"""Whether a lane may sync, before its grant is asked.
|
||||
|
||||
`local` keeps the App's per-source switch in the configuration document,
|
||||
which stays global. Another user's Hermes grant syncs for as long as it
|
||||
stands: connecting it is the consent, revoking it stops it, and it never
|
||||
turns the App's switch on or off.
|
||||
"""
|
||||
user_id, source_id = split_lane(lane)
|
||||
if user_id == DEFAULT_USER_ID:
|
||||
return config_store.sync_enabled(source_id)
|
||||
return source_id in MULTI_USER_SOURCES
|
||||
|
||||
|
||||
def _other_user_lanes(
|
||||
catalog: dict[str, SourceRegistration],
|
||||
grant_store: SourceGrantStore,
|
||||
) -> tuple[str, ...]:
|
||||
"""Lanes of every unrevoked grant held by a user other than `local`."""
|
||||
return tuple(
|
||||
lane_key(receipt.user_id, receipt.source_id)
|
||||
for receipt, _root in grant_store.grants()
|
||||
if receipt.user_id != DEFAULT_USER_ID
|
||||
and receipt.revoked_at is None
|
||||
and receipt.source_id in MULTI_USER_SOURCES
|
||||
and receipt.source_id in catalog
|
||||
)
|
||||
|
||||
|
||||
def _known_user_ids(app: FastAPI) -> tuple[str, ...]:
|
||||
"""`local` and every user holding a grant: the users whose data Core keeps."""
|
||||
users = [DEFAULT_USER_ID]
|
||||
for receipt, _root in _grant_store(app).grants():
|
||||
if receipt.user_id not in users:
|
||||
users.append(receipt.user_id)
|
||||
return tuple(users)
|
||||
|
||||
|
||||
def _granted_roots(
|
||||
source_ids: Iterable[str],
|
||||
grant_store: SourceGrantStore,
|
||||
config_store: ConfigStore,
|
||||
) -> dict[str, Path]:
|
||||
roots: dict[str, Path] = {}
|
||||
for source_id in source_ids:
|
||||
if not config_store.sync_enabled(source_id):
|
||||
for lane in source_ids:
|
||||
if not _lane_sync_enabled(config_store, lane):
|
||||
continue
|
||||
user_id, source_id = split_lane(lane)
|
||||
try:
|
||||
grant = grant_store.authorized_root(user_id="local", source_id=source_id)
|
||||
grant = grant_store.authorized_root(user_id=user_id, source_id=source_id)
|
||||
except SourceAccessError:
|
||||
continue
|
||||
if grant is not None:
|
||||
roots[source_id] = grant.root
|
||||
roots[lane] = grant.root
|
||||
return roots
|
||||
|
||||
|
||||
@@ -3753,6 +4081,14 @@ def _active_adapters(
|
||||
grant_store: SourceGrantStore,
|
||||
) -> dict[str, SourceAdapter]:
|
||||
adapters: dict[str, SourceAdapter] = {}
|
||||
for lane in _other_user_lanes(catalog, grant_store):
|
||||
user_id, source_id = split_lane(lane)
|
||||
try:
|
||||
grant = grant_store.authorized_root(user_id=user_id, source_id=source_id)
|
||||
if grant is not None:
|
||||
adapters[lane] = catalog[source_id].create_adapter(grant)
|
||||
except SourceAccessError:
|
||||
continue
|
||||
for source_id, registration in catalog.items():
|
||||
try:
|
||||
grant = grant_store.authorized_root(
|
||||
@@ -3915,10 +4251,14 @@ def _config_store(app: FastAPI) -> ConfigStore:
|
||||
|
||||
|
||||
def _source_processing_enabled(app: FastAPI, source_id: str) -> bool:
|
||||
if not _config_store(app).sync_enabled(source_id):
|
||||
"""`source_id` is a lane key: another user's lane asks that user's grant."""
|
||||
if not _lane_sync_enabled(_config_store(app), source_id):
|
||||
return False
|
||||
user_id, bare_source_id = split_lane(source_id)
|
||||
try:
|
||||
return _grant_store(app).authorized_root(user_id="local", source_id=source_id) is not None
|
||||
return (
|
||||
_grant_store(app).authorized_root(user_id=user_id, source_id=bare_source_id) is not None
|
||||
)
|
||||
except SourceAccessError:
|
||||
return False
|
||||
|
||||
@@ -4437,13 +4777,32 @@ async def _recall_model_ready(app: FastAPI) -> bool:
|
||||
return profile is not None and bool(profile.capabilities.model_available)
|
||||
|
||||
|
||||
async def _library_has_memories(app: FastAPI) -> bool:
|
||||
def _sdk_recall_target(app: FastAPI, user_id: str) -> SdkRecallTarget:
|
||||
"""Recall over one user's SDK memories; `get` results are kept only if theirs."""
|
||||
handle = _sdk_client_handle(app)
|
||||
|
||||
async def owned(memory_id: str) -> HySdkMemoryRecord | None:
|
||||
memory = await _get_sdk_memory(handle, memory_id)
|
||||
return memory if memory is not None and owns(memory.user_id, user_id) else None
|
||||
|
||||
return SdkRecallTarget(
|
||||
semantic_search=lambda query: _search_sdk_memories(
|
||||
handle,
|
||||
query,
|
||||
user_id=user_id,
|
||||
agent_id="*",
|
||||
),
|
||||
get_memory=owned,
|
||||
)
|
||||
|
||||
|
||||
async def _library_has_memories(app: FastAPI, user_id: str = DEFAULT_USER_ID) -> bool:
|
||||
"""Any active memory at all. Asked only after an empty memory search."""
|
||||
try:
|
||||
client = await _sdk_client_handle(app).client()
|
||||
raw = await asyncio.to_thread(
|
||||
client.list_memories,
|
||||
user_id="local",
|
||||
user_id=user_id,
|
||||
statuses=["active"],
|
||||
limit=1,
|
||||
offset=0,
|
||||
@@ -4501,13 +4860,14 @@ async def _search_sdk_raw(
|
||||
*,
|
||||
limit: int,
|
||||
sources: frozenset[str] | None,
|
||||
user_id: str = DEFAULT_USER_ID,
|
||||
) -> tuple[HySdkRawHit, ...]:
|
||||
"""The imported conversations nearest the query: the SDK raw layer."""
|
||||
client = await _sdk_client_handle(app).client()
|
||||
raw = await asyncio.to_thread(
|
||||
client.search,
|
||||
query,
|
||||
user_ids=["local"],
|
||||
user_ids=[user_id],
|
||||
agent_ids=[],
|
||||
include_sources=sorted(sources) if sources else None,
|
||||
limit=limit,
|
||||
@@ -4525,9 +4885,11 @@ async def _search_sdk_raw(
|
||||
def _sdk_client_handle(app: FastAPI) -> SdkClientHandle:
|
||||
handle = cast(SdkClientHandle | None, app.state.sdk_client_handle)
|
||||
if handle is None:
|
||||
handle = SdkClientHandle(
|
||||
profile=builtin_retrieval_snapshot(),
|
||||
api_key=None,
|
||||
# Reads open the embedding space writes fill: the active profile's,
|
||||
# the built-in one only when none is active (#242).
|
||||
handle = ActiveProfileReadHandle(
|
||||
profiles=_model_profile_store(app),
|
||||
secrets=_secret_store(app),
|
||||
data_dir=cast(Settings, app.state.settings).data_dir,
|
||||
)
|
||||
app.state.sdk_client_handle = handle
|
||||
@@ -4610,6 +4972,7 @@ async def _library_search_page(
|
||||
limit: int,
|
||||
window_id: str | None,
|
||||
scene: str = "all",
|
||||
user_id: str = DEFAULT_USER_ID,
|
||||
) -> HySdkMemoryPage:
|
||||
"""One page of a keyword search, cut from a cached result window.
|
||||
|
||||
@@ -4621,7 +4984,9 @@ async def _library_search_page(
|
||||
SDK so edits and deletes show. The whole library is never listed in Core.
|
||||
"""
|
||||
windows = _library_search_windows(app)
|
||||
key = window_key(query, source, statuses, scene)
|
||||
# The user is part of the window's identity: one user's `window_id` must
|
||||
# never cut a page from another user's matches.
|
||||
key = window_key(query, source, statuses, scene, user_id)
|
||||
window = windows.get(window_id, key) if window_id else None
|
||||
window_reset = window_id is not None and window is None
|
||||
if window is None:
|
||||
@@ -4631,7 +4996,7 @@ async def _library_search_page(
|
||||
query,
|
||||
scene="all",
|
||||
rerank=False,
|
||||
user_ids=["local"],
|
||||
user_ids=[user_id],
|
||||
agent_ids=[],
|
||||
include_sources=[source] if source else None,
|
||||
limit=fetch,
|
||||
@@ -4667,7 +5032,7 @@ async def _library_search_page(
|
||||
except HySdkReadError:
|
||||
skipped += 1
|
||||
continue
|
||||
if record.status == "active":
|
||||
if record.status == "active" and owns(record.user_id, user_id):
|
||||
memories.append(record)
|
||||
_log_skipped_sdk_memories(skipped)
|
||||
return HySdkMemoryPage(
|
||||
@@ -4724,8 +5089,10 @@ def _source_writes_on(app: FastAPI, source_id: str) -> bool:
|
||||
forever with attempts=0 while later jobs ran. Intake, claim and execute
|
||||
all ask this one question.
|
||||
"""
|
||||
if source_id == "one-memory-manual":
|
||||
receipt = _grant_store(app).receipt(user_id="local", source_id=source_id)
|
||||
if split_lane(source_id)[1] == "one-memory-manual":
|
||||
# One switch for hand-added memories, whoever adds them: it is a
|
||||
# management setting, and management stays global.
|
||||
receipt = _grant_store(app).receipt(user_id="local", source_id="one-memory-manual")
|
||||
return receipt is None or receipt.revoked_at is None
|
||||
return _source_processing_enabled(app, source_id)
|
||||
|
||||
@@ -4759,6 +5126,7 @@ def _history_import_gate_released(app: FastAPI) -> bool:
|
||||
job
|
||||
for job in jobs.list_jobs()
|
||||
if job.operation == "history"
|
||||
and job.user_id == DEFAULT_USER_ID
|
||||
and job.source_id in selected
|
||||
and (state.started_at is None or job.created_at >= state.started_at)
|
||||
]
|
||||
|
||||
@@ -584,6 +584,7 @@ def _sdk_migration_status(options: Sequence[str], stream: TextIO) -> int:
|
||||
}
|
||||
else:
|
||||
from one_memory.hy_runtime_config import HY_MEMORY_NAMESPACE
|
||||
from one_memory.hy_sdk_runtime import builtin_retrieval_snapshot
|
||||
from one_memory.sdk_data_plane_migration import (
|
||||
MemoryAuthority,
|
||||
SdkDataPlaneMigrationStore,
|
||||
@@ -595,14 +596,14 @@ def _sdk_migration_status(options: Sequence[str], stream: TextIO) -> int:
|
||||
|
||||
authority = SdkDataPlaneMigrationStore(database_path).authority()
|
||||
if authority is MemoryAuthority.SDK:
|
||||
profile = read_active_profile(database_path)
|
||||
profile = read_active_profile(database_path) or builtin_retrieval_snapshot()
|
||||
leftovers = bool(
|
||||
legacy_tables_present(database_path)
|
||||
or abandoned_staging_present(
|
||||
data_dir=settings.data_dir,
|
||||
namespace=HY_MEMORY_NAMESPACE,
|
||||
)
|
||||
or (profile is not None and legacy_vector_collections(settings.data_dir, profile))
|
||||
or legacy_vector_collections(settings.data_dir, profile)
|
||||
)
|
||||
state = "required" if leftovers else "not_required"
|
||||
else:
|
||||
|
||||
@@ -5,6 +5,8 @@ from typing import Annotated, Literal
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, model_validator
|
||||
|
||||
from one_memory.user_scope import DEFAULT_USER_ID, UserId
|
||||
|
||||
ContextKind = Literal["raw", "memory"]
|
||||
ContextSearchChannel = Literal["lexical", "semantic"]
|
||||
ContextSemanticStatus = Literal["not_searched", "completed", "failed", "timed_out"]
|
||||
@@ -58,6 +60,8 @@ class SdkContextSearchRequest(ContextSearchRequest):
|
||||
limit: int = Field(default=10, ge=1, le=20, strict=True)
|
||||
schema_limit: int = Field(default=3, ge=0, le=20, strict=True)
|
||||
intention_limit: int = Field(default=1, ge=0, le=20, strict=True)
|
||||
#: Whose memories to search. The App never sends it and reads `local`.
|
||||
user_id: UserId = DEFAULT_USER_ID
|
||||
|
||||
|
||||
class ContextMessage(BaseModel):
|
||||
|
||||
@@ -28,6 +28,7 @@ from one_memory.hy_sdk_types import (
|
||||
parse_sdk_search,
|
||||
)
|
||||
from one_memory.imports.storage import EvidenceStore
|
||||
from one_memory.user_scope import owns
|
||||
|
||||
CALL_EVENT_RESPONSE_BUDGET_MS = 250
|
||||
|
||||
@@ -73,7 +74,7 @@ def sdk_context_router(dependencies: Sequence[Depends]) -> APIRouter:
|
||||
raw = await asyncio.to_thread(
|
||||
client.search,
|
||||
value.query,
|
||||
user_ids=["local"],
|
||||
user_ids=[value.user_id],
|
||||
agent_ids=[],
|
||||
include_sources=list(authority.raw_sources or ()),
|
||||
limit=value.limit,
|
||||
@@ -108,7 +109,7 @@ def sdk_context_router(dependencies: Sequence[Depends]) -> APIRouter:
|
||||
raw = await asyncio.to_thread(
|
||||
client.search,
|
||||
value.query,
|
||||
user_ids=["local"],
|
||||
user_ids=[value.user_id],
|
||||
agent_ids=[],
|
||||
limit=value.limit,
|
||||
min_score=sdk_relevance_floor(),
|
||||
@@ -123,7 +124,12 @@ def sdk_context_router(dependencies: Sequence[Depends]) -> APIRouter:
|
||||
for hit in hits:
|
||||
record = await asyncio.to_thread(client.get, hit.memory_id)
|
||||
memory = None if record is None else HySdkMemoryRecord.from_sdk(record)
|
||||
if memory is None or memory.status != "active":
|
||||
# `get` takes no user: a hit is kept only if it is the caller's.
|
||||
if (
|
||||
memory is None
|
||||
or memory.status != "active"
|
||||
or not owns(memory.user_id, value.user_id)
|
||||
):
|
||||
continue
|
||||
items.append(
|
||||
SdkMemoryContextItem(
|
||||
|
||||
@@ -14,7 +14,7 @@ from pathlib import Path
|
||||
from typing import Literal, cast
|
||||
|
||||
HY_MEMORY_DISTRIBUTION = "hy-memory"
|
||||
HY_MEMORY_VERSION = "2.0.8"
|
||||
HY_MEMORY_VERSION = "2.0.9"
|
||||
HY_MEMORY_NAMESPACE = "governed-v2"
|
||||
DiagnosticLogLevel = Literal["error", "warning", "info", "debug"]
|
||||
|
||||
|
||||
@@ -497,7 +497,7 @@ def _ensure_coding_schema(path: Path) -> None:
|
||||
CodingMemoryStore,
|
||||
)
|
||||
|
||||
# Relies on the pinned SDK's internals (hy-memory==2.0.8 is pinned exactly).
|
||||
# Relies on the pinned SDK's internals (hy-memory==2.0.9 is pinned exactly).
|
||||
store = CodingMemoryStore.__new__(CodingMemoryStore)
|
||||
store._db_path = str(path)
|
||||
store._conn = None
|
||||
|
||||
@@ -217,6 +217,33 @@ def builtin_retrieval_snapshot() -> ModelProfileSnapshot:
|
||||
)
|
||||
|
||||
|
||||
def retrieval_view(profile: ModelProfileSnapshot) -> ModelProfileSnapshot:
|
||||
"""The read side of `profile`: its embedding space, and no generation.
|
||||
|
||||
Reads must open the collection writes fill (#242), and the collection is
|
||||
named by the embedding only. Generation stays the built-in placeholder, so
|
||||
a read never needs the generation model. A remote embedding still needs
|
||||
the profile's API key, which `build_sdk_config` uses as the embedding key.
|
||||
"""
|
||||
provider = profile.embedding_provider_kind or profile.provider_kind
|
||||
endpoint: str | None = None
|
||||
if provider is not ProviderKind.LOCAL_ONNX:
|
||||
endpoint = profile.embedding_base_url
|
||||
if not endpoint:
|
||||
raise HySdkRuntimeError("hy_sdk_model_endpoint_missing")
|
||||
return builtin_retrieval_snapshot().model_copy(
|
||||
update={
|
||||
"profile_id": profile.profile_id,
|
||||
"revision": profile.revision,
|
||||
"embedding_provider_kind": provider,
|
||||
"embedding_model": profile.embedding_model,
|
||||
"embedding_base_url": endpoint,
|
||||
"embedding_dimensions": profile.embedding_dimensions,
|
||||
"has_api_key": profile.has_api_key,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def sdk_relevance_floor() -> float:
|
||||
raw = os.environ.get("ONE_MEMORY_HY_RELEVANCE_FLOOR", "").strip()
|
||||
if not raw:
|
||||
@@ -249,10 +276,8 @@ def build_sdk_config(
|
||||
embedding_key = None
|
||||
dimensions = profile.embedding_dimensions or BUILTIN_EMBEDDING_DIMENSIONS
|
||||
else:
|
||||
embedding_endpoint = _openai_endpoint(
|
||||
embedding_provider,
|
||||
profile.embedding_base_url or profile.base_url,
|
||||
)
|
||||
# Never the generation endpoint: the collection name hashes this one.
|
||||
embedding_endpoint = _openai_endpoint(embedding_provider, profile.embedding_base_url)
|
||||
embedding_key = "ollama" if embedding_provider is ProviderKind.OLLAMA else api_key
|
||||
if embedding_provider is ProviderKind.OPENAI_COMPATIBLE and not embedding_key:
|
||||
raise HySdkRuntimeError("hy_sdk_embedding_api_key_missing")
|
||||
@@ -467,7 +492,7 @@ def vector_collection_bases(profile: ModelProfileSnapshot) -> tuple[str, tuple[s
|
||||
endpoint, dimensions = None, profile.embedding_dimensions or BUILTIN_EMBEDDING_DIMENSIONS
|
||||
legacy_endpoint = "local-onnx"
|
||||
else:
|
||||
endpoint = _openai_endpoint(provider, profile.embedding_base_url or profile.base_url)
|
||||
endpoint = _openai_endpoint(provider, profile.embedding_base_url)
|
||||
dimensions = profile.embedding_dimensions
|
||||
legacy_endpoint = endpoint
|
||||
legacy_model = profile.embedding_model or "bge-small-zh-v1.5"
|
||||
|
||||
@@ -31,6 +31,16 @@ class ScanIssueCode(StrEnum):
|
||||
#: import it. Named for the reason, so a reader can tell a setting from
|
||||
#: a record the parser could not use.
|
||||
SUBAGENT_TRACE_DISABLED = "subagent_trace_disabled"
|
||||
#: A host's own notice wearing the user's role — Hermes posts a finished
|
||||
#: background process, and its gateway marks the post as not written by a
|
||||
#: human. Nothing in it is the person's, so it never reaches extraction.
|
||||
INJECTED_MACHINE_NOTICE = "injected_machine_notice"
|
||||
#: The host could not transcribe a voice message and left a placeholder
|
||||
#: naming the audio file. The person did speak, but the placeholder holds
|
||||
#: only a path, which an extractor would otherwise read as a fact.
|
||||
VOICE_PLACEHOLDER = "voice_placeholder"
|
||||
#: A health check such as "Reply with exactly: PONG": no one's words.
|
||||
PROBE = "probe"
|
||||
SOURCE_BUSY = "source_busy"
|
||||
UNSUPPORTED_SCHEMA = "unsupported_schema"
|
||||
BUDGET_EXCEEDED = "budget_exceeded"
|
||||
|
||||
@@ -27,6 +27,7 @@ def discovered_off_loop(
|
||||
*,
|
||||
suffixes: frozenset[str],
|
||||
max_targets: int,
|
||||
excluded_top_directories: frozenset[str] = frozenset(),
|
||||
) -> AsyncIterator[SourceFileDiscoveryEvent]:
|
||||
"""The same walk, for callers that have an event loop to keep free.
|
||||
|
||||
@@ -41,6 +42,7 @@ def discovered_off_loop(
|
||||
grant,
|
||||
suffixes=suffixes,
|
||||
max_targets=max_targets,
|
||||
excluded_top_directories=excluded_top_directories,
|
||||
),
|
||||
scope_key=grant.source_id,
|
||||
)
|
||||
@@ -51,12 +53,15 @@ def discover_source_files(
|
||||
*,
|
||||
suffixes: frozenset[str],
|
||||
max_targets: int,
|
||||
excluded_top_directories: frozenset[str] = frozenset(),
|
||||
) -> Iterator[SourceFileDiscoveryEvent]:
|
||||
"""Metadata only: one lstat per candidate, no open and no per-file grant lookup.
|
||||
|
||||
The grant and root identity are checked once before the walk. Each listed
|
||||
file keeps the grant's check, which runs again when that file is opened;
|
||||
the open itself refuses symlinks and any inode other than the one listed.
|
||||
`excluded_top_directories` are directories directly under the root that
|
||||
are never entered, such as another user's Hermes profiles.
|
||||
"""
|
||||
grant.check_root()
|
||||
inspected = 0
|
||||
@@ -64,8 +69,12 @@ def discover_source_files(
|
||||
grant.root,
|
||||
followlinks=False,
|
||||
):
|
||||
at_root = Path(directory) == grant.root
|
||||
child_directories[:] = sorted(
|
||||
child for child in child_directories if not (Path(directory) / child).is_symlink()
|
||||
child
|
||||
for child in child_directories
|
||||
if not (Path(directory) / child).is_symlink()
|
||||
and not (at_root and child in excluded_top_directories)
|
||||
)
|
||||
for filename in sorted(filenames):
|
||||
if Path(filename).suffix.lower() not in suffixes:
|
||||
|
||||
@@ -252,6 +252,18 @@ class SourceGrantStore:
|
||||
).fetchone()
|
||||
return self._to_receipt(row) if row else None
|
||||
|
||||
def grants(self) -> tuple[tuple[SourceGrantReceipt, str], ...]:
|
||||
"""Every grant of every user, with its granted root path.
|
||||
|
||||
One source may hold several grants, one per `(user_id, source_id)`:
|
||||
a Hermes root for `local` and a Hermes profile for another user.
|
||||
"""
|
||||
with self._connect() as connection:
|
||||
rows = connection.execute(
|
||||
"SELECT * FROM source_grants ORDER BY source_id, user_id"
|
||||
).fetchall()
|
||||
return tuple((self._to_receipt(row), str(row["requested_path"])) for row in rows)
|
||||
|
||||
def require_receipt(self, *, user_id: str, source_id: str) -> SourceGrantReceipt:
|
||||
receipt = self.receipt(user_id=user_id, source_id=source_id)
|
||||
if receipt is None:
|
||||
|
||||
@@ -28,6 +28,7 @@ from one_memory.imports.adapters import (
|
||||
)
|
||||
from one_memory.imports.jobs import ImportJob, ImportJobStore, ImportStatus
|
||||
from one_memory.imports.supervisor import ImportSupervisor
|
||||
from one_memory.user_scope import DEFAULT_USER_ID, lane_key, split_lane
|
||||
|
||||
#: How long an automatic retry will wait for a wedged worker to notice cancel.
|
||||
ABANDON_TIMEOUT_SECONDS = 5.0
|
||||
@@ -64,7 +65,12 @@ class LiveSyncHealth(BaseModel):
|
||||
|
||||
|
||||
class PollingLiveSyncSupervisor:
|
||||
"""Near-live sync that reuses each adapter's persisted incremental cursor."""
|
||||
"""Near-live sync that reuses each adapter's persisted incremental cursor.
|
||||
|
||||
A "source" here is a lane key (`user_scope.lane_key`): the bare source id
|
||||
for `local`, `source@user` for another user's grant. Cursors, jobs and
|
||||
locks are therefore per `(user_id, source_id)`.
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
@@ -92,8 +98,22 @@ class PollingLiveSyncSupervisor:
|
||||
}
|
||||
self._locks = {source_id: asyncio.Lock() for source_id in self.source_ids}
|
||||
self._task: asyncio.Task[None] | None = None
|
||||
self._group: asyncio.TaskGroup | None = None
|
||||
self._observers: set[asyncio.Task[None]] = set()
|
||||
|
||||
def ensure_source(self, source_id: str) -> None:
|
||||
"""Follow a lane granted after start, such as a new Hermes profile."""
|
||||
if source_id in self._locks:
|
||||
return
|
||||
self.source_ids = (*self.source_ids, source_id)
|
||||
self._health.setdefault(
|
||||
source_id,
|
||||
LiveSyncHealth(source_id=source_id, mode=self.mode, state=LiveSyncState.IDLE),
|
||||
)
|
||||
self._locks[source_id] = asyncio.Lock()
|
||||
if self._group is not None:
|
||||
self._group.create_task(self._poll_source(source_id))
|
||||
|
||||
def _set_health(self, source_id: str, value: LiveSyncHealth) -> None:
|
||||
previous = self._health.get(source_id)
|
||||
self._health[source_id] = value
|
||||
@@ -152,7 +172,12 @@ class PollingLiveSyncSupervisor:
|
||||
self._watched_sources = frozenset(source_ids)
|
||||
|
||||
def all_health(self) -> tuple[LiveSyncHealth, ...]:
|
||||
return tuple(self.health(source_id) for source_id in self.source_ids)
|
||||
"""`local`'s lanes only: what the App has always been shown."""
|
||||
return tuple(
|
||||
self.health(source_id)
|
||||
for source_id in self.source_ids
|
||||
if split_lane(source_id)[0] == DEFAULT_USER_ID
|
||||
)
|
||||
|
||||
async def initialize_source(
|
||||
self, source_id: str, *, baseline_missing_files: bool = True
|
||||
@@ -164,11 +189,12 @@ class PollingLiveSyncSupervisor:
|
||||
baselines = (
|
||||
await adapter.live_baseline() if isinstance(adapter, _LiveBaselineAdapter) else {}
|
||||
)
|
||||
user_id, bare_source_id = split_lane(source_id)
|
||||
await in_the_background(
|
||||
partial(
|
||||
self.job_store.ensure_live_cursors,
|
||||
user_id="local",
|
||||
source_id=source_id,
|
||||
user_id=user_id,
|
||||
source_id=bare_source_id,
|
||||
baselines=baselines,
|
||||
baseline_missing_files=baseline_missing_files,
|
||||
)
|
||||
@@ -228,7 +254,7 @@ class PollingLiveSyncSupervisor:
|
||||
(
|
||||
job
|
||||
for job in reversed(source_jobs)
|
||||
if job.source_id == source_id
|
||||
if lane_key(job.user_id, job.source_id) == source_id
|
||||
and job.operation == "sync"
|
||||
and job.status
|
||||
in {
|
||||
@@ -277,13 +303,13 @@ class PollingLiveSyncSupervisor:
|
||||
competing = [
|
||||
job
|
||||
for job in source_jobs
|
||||
if job.source_id == source_id
|
||||
if lane_key(job.user_id, job.source_id) == source_id
|
||||
and job.operation != "sync"
|
||||
and job.status
|
||||
in {ImportStatus.PENDING, ImportStatus.RUNNING, ImportStatus.INTERRUPTED}
|
||||
]
|
||||
bounded_history_incomplete = any(
|
||||
job.source_id == source_id
|
||||
lane_key(job.user_id, job.source_id) == source_id
|
||||
and job.operation == "history"
|
||||
and job.history_after is not None
|
||||
and job.status is not ImportStatus.COMPLETED
|
||||
@@ -379,11 +405,12 @@ class PollingLiveSyncSupervisor:
|
||||
await close()
|
||||
|
||||
async def _live_cursors(self, source_id: str, adapter: object) -> dict[str, SourceCursor]:
|
||||
user_id, bare_source_id = split_lane(source_id)
|
||||
cursors = await in_the_background(
|
||||
partial(
|
||||
self.job_store.get_source_cursors,
|
||||
user_id="local",
|
||||
source_id=source_id,
|
||||
user_id=user_id,
|
||||
source_id=bare_source_id,
|
||||
operation="sync",
|
||||
)
|
||||
)
|
||||
@@ -395,8 +422,8 @@ class PollingLiveSyncSupervisor:
|
||||
return await in_the_background(
|
||||
partial(
|
||||
self.job_store.ensure_live_cursors,
|
||||
user_id="local",
|
||||
source_id=source_id,
|
||||
user_id=user_id,
|
||||
source_id=bare_source_id,
|
||||
baselines=baselines,
|
||||
)
|
||||
)
|
||||
@@ -520,9 +547,13 @@ class PollingLiveSyncSupervisor:
|
||||
async def _run(self) -> None:
|
||||
# A source owns its cadence; one large catch-up cannot delay every
|
||||
# other source. The group keeps shutdown responsible for every poller.
|
||||
async with asyncio.TaskGroup() as group:
|
||||
for source_id in self.source_ids:
|
||||
group.create_task(self._poll_source(source_id))
|
||||
try:
|
||||
async with asyncio.TaskGroup() as group:
|
||||
self._group = group
|
||||
for source_id in self.source_ids:
|
||||
group.create_task(self._poll_source(source_id))
|
||||
finally:
|
||||
self._group = None
|
||||
|
||||
async def _poll_source(self, source_id: str) -> None:
|
||||
while True:
|
||||
|
||||
@@ -3,7 +3,7 @@ import logging
|
||||
import math
|
||||
import sqlite3
|
||||
from collections import Counter
|
||||
from collections.abc import Callable
|
||||
from collections.abc import AsyncIterator, Callable
|
||||
from contextlib import suppress
|
||||
from contextvars import ContextVar
|
||||
from dataclasses import dataclass, field
|
||||
@@ -227,14 +227,17 @@ class ImportRunner:
|
||||
heartbeat = asyncio.create_task(self._keep_alive(job_id=job_id, runner_token=runner_token))
|
||||
pending = _PendingSkips()
|
||||
writes = _PendingWrites()
|
||||
stream = adapter.scan(
|
||||
ScanOptions(
|
||||
cursors=cursors,
|
||||
reuse_listing=(
|
||||
job.operation == "history"
|
||||
or (job.operation == "sync" and job.source_id == "workbuddy")
|
||||
),
|
||||
)
|
||||
stream = _owned_by(
|
||||
adapter.scan(
|
||||
ScanOptions(
|
||||
cursors=cursors,
|
||||
reuse_listing=(
|
||||
job.operation == "history"
|
||||
or (job.operation == "sync" and job.source_id == "workbuddy")
|
||||
),
|
||||
)
|
||||
),
|
||||
job.user_id,
|
||||
)
|
||||
slice_cursors = dict(cursors)
|
||||
next_event: asyncio.Future[ScanEvent] | None = None
|
||||
@@ -924,3 +927,30 @@ async def _settled_work[T](
|
||||
with suppress(asyncio.CancelledError, Exception):
|
||||
task.result()
|
||||
raise
|
||||
|
||||
|
||||
def _owned_by(stream: AsyncIterator[ScanEvent], user_id: str) -> AsyncIterator[ScanEvent]:
|
||||
"""Stamp every scanned record with the user whose root is being read.
|
||||
|
||||
Adapters know nothing of users and emit `local`. Which user a record
|
||||
belongs to is decided by the grant the job reads (a Hermes profile's
|
||||
`state.db` is that profile's user), so the job's user is the record's.
|
||||
`local` passes the stream through untouched.
|
||||
"""
|
||||
if user_id == "local":
|
||||
return stream
|
||||
return _restamped(stream, user_id)
|
||||
|
||||
|
||||
async def _restamped(stream: AsyncIterator[ScanEvent], user_id: str) -> AsyncIterator[ScanEvent]:
|
||||
try:
|
||||
async for event in stream:
|
||||
if isinstance(event, ScannedEvidence) and event.evidence.user_id != user_id:
|
||||
event = event.model_copy(
|
||||
update={"evidence": event.evidence.model_copy(update={"user_id": user_id})}
|
||||
)
|
||||
yield event
|
||||
finally:
|
||||
close = getattr(stream, "aclose", None)
|
||||
if close is not None:
|
||||
await close()
|
||||
@@ -1,4 +1,5 @@
|
||||
import json
|
||||
import re
|
||||
import sqlite3
|
||||
from collections.abc import AsyncIterator, Iterator
|
||||
from functools import partial
|
||||
@@ -87,6 +88,7 @@ class HermesSourceAdapter:
|
||||
self.grant,
|
||||
suffixes=frozenset({".jsonl", ".db"}),
|
||||
max_targets=10_000,
|
||||
excluded_top_directories=frozenset({HERMES_PROFILES_DIRECTORY}),
|
||||
):
|
||||
if isinstance(item, AuthorizedSourceFile) and _is_hermes_target(
|
||||
item.relative_path.as_posix()
|
||||
@@ -100,6 +102,7 @@ class HermesSourceAdapter:
|
||||
self.grant,
|
||||
suffixes=frozenset({".jsonl", ".db"}),
|
||||
max_targets=options.max_scan_targets or 100_000,
|
||||
excluded_top_directories=frozenset({HERMES_PROFILES_DIRECTORY}),
|
||||
):
|
||||
yield ScanProgressEvent(
|
||||
phase=ScanPhase.DISCOVER,
|
||||
@@ -214,7 +217,11 @@ def parse_hermes_rollout_record(
|
||||
message.get("content"),
|
||||
allowed_block_types=frozenset({"text", "input_text", "output_text"}),
|
||||
)
|
||||
text = strip_injected_memory(text)
|
||||
text = strip_injected_memory(text or "")
|
||||
if role == "user":
|
||||
text, injected = gateway_user_text(text)
|
||||
if injected is not None:
|
||||
return ParsedSkip(reason_code=injected, conversation_id=conversation_id)
|
||||
if not text:
|
||||
return ParsedSkip(
|
||||
reason_code=ScanIssueCode.NO_TEXT,
|
||||
@@ -242,8 +249,17 @@ def parse_hermes_rollout_record(
|
||||
)
|
||||
|
||||
|
||||
#: Hermes keeps each extra profile under `<root>/profiles/<name>/`, with its
|
||||
#: own `state.db` and sessions. A profile is another person's history: it is
|
||||
#: read only through its own grant (its own MemHub user), never as part of the
|
||||
#: root above it. Hermes' own export skips this directory for the same reason.
|
||||
HERMES_PROFILES_DIRECTORY = "profiles"
|
||||
|
||||
|
||||
def _is_hermes_target(relative_path: str) -> bool:
|
||||
path = PurePosixPath(relative_path)
|
||||
if path.parts and path.parts[0] == HERMES_PROFILES_DIRECTORY:
|
||||
return False
|
||||
return path.name == "state.db" or (path.suffix == ".jsonl" and "sessions" in path.parts)
|
||||
|
||||
|
||||
@@ -389,6 +405,15 @@ def _read_state_db(
|
||||
# `tool` rows after it hold only what came back.
|
||||
calls = _tool_calls_text(row["tool_calls"]) if role == "assistant" else None
|
||||
content = strip_injected_memory(str(row["content"] or ""))
|
||||
if role == "user":
|
||||
content, injected = gateway_user_text(content)
|
||||
if injected is not None:
|
||||
yield ScanSkip(
|
||||
cursor=cursor,
|
||||
conversation_id=str(row["session_id"]),
|
||||
reason_code=injected,
|
||||
)
|
||||
continue
|
||||
has_text = bool(content.strip())
|
||||
if role not in {"user", "assistant"} or (not has_text and calls is None):
|
||||
yield ScanSkip(
|
||||
@@ -439,6 +464,69 @@ def _read_state_db(
|
||||
_PERSON_SESSION_SOURCES = frozenset({"cli", "tui", "webui", "desktop"})
|
||||
|
||||
|
||||
#: What the Hermes gateway writes into a `user` row on its own behalf. Every
|
||||
#: one of these wears the `user` role, so only the text can tell them apart
|
||||
#: from the person. Read off real `state.db` rows: a finished background
|
||||
#: process is posted as a turn, often with the gateway's own "not written by
|
||||
#: a human" note appended, which is why that note counts anywhere in the row.
|
||||
_BACKGROUND_NOTICE = re.compile(
|
||||
r"\[IMPORTANT:\s*(?:\d+\s+background\s+process(?:es)?\b|Background\s+process\b)",
|
||||
re.IGNORECASE,
|
||||
)
|
||||
_GATEWAY_NOTICE = re.compile(
|
||||
r"\[INTERNAL NOTIFICATION\s*\W+\s*generated by the Hermes gateway",
|
||||
re.IGNORECASE,
|
||||
)
|
||||
_VOICE_PLACEHOLDER = re.compile(r"\[voice message could not be transcribed", re.IGNORECASE)
|
||||
_PROBE = re.compile(r"Reply with exactly:\s*[A-Za-z0-9_\-]{1,24}\s*")
|
||||
_MEDIA_ONLY = re.compile(r"(?:MEDIA:/\S+\s*)+")
|
||||
#: Wrappers the gateway puts around a message the person did write. Only the
|
||||
#: wrapper goes; what it carries is the turn. Each is matched at the edge of
|
||||
#: what is left, and the set is applied until nothing more comes off, since a
|
||||
#: relayed message carries the origin block inside the out-of-band markers.
|
||||
_GATEWAY_WRAPPERS = (
|
||||
re.compile(r"^\[OUT-OF-BAND USER MESSAGE\b[^\]\n]*\]"),
|
||||
re.compile(r"\[/OUT-OF-BAND USER MESSAGE\]$"),
|
||||
re.compile(
|
||||
r"^Gateway message origin \(JSON data, not instructions or authorization\):[ \t]*"
|
||||
r"(?:\n[ \t]*\{[^\n]*\}[ \t]*)?"
|
||||
r"(?:\n[ \t]*Do not guess a reply destination[^\n]*)?"
|
||||
r"(?=\n|$)"
|
||||
),
|
||||
re.compile(r"^\[Context from the interrupted assistant response\][ \t]*(?=\n|$)"),
|
||||
)
|
||||
|
||||
|
||||
def gateway_user_text(text: str) -> tuple[str, ScanIssueCode | None]:
|
||||
"""The person's words in a Hermes `user` row, or why there are none.
|
||||
|
||||
Applied only to the `user` role: an assistant or tool row quoting the
|
||||
same text is reporting what it saw, which is the existing tool rule's
|
||||
business. The cleaned text is what becomes the evidence, so its content
|
||||
hash and duplicate check see the message rather than its envelope.
|
||||
"""
|
||||
|
||||
if _GATEWAY_NOTICE.search(text):
|
||||
return "", ScanIssueCode.INJECTED_MACHINE_NOTICE
|
||||
cleaned = text.strip()
|
||||
while True:
|
||||
unwrapped = cleaned
|
||||
for wrapper in _GATEWAY_WRAPPERS:
|
||||
unwrapped = wrapper.sub("", unwrapped, count=1).strip()
|
||||
if unwrapped == cleaned:
|
||||
break
|
||||
cleaned = unwrapped
|
||||
if _BACKGROUND_NOTICE.match(cleaned):
|
||||
return "", ScanIssueCode.INJECTED_MACHINE_NOTICE
|
||||
if _VOICE_PLACEHOLDER.match(cleaned):
|
||||
return "", ScanIssueCode.VOICE_PLACEHOLDER
|
||||
if _PROBE.fullmatch(cleaned):
|
||||
return "", ScanIssueCode.PROBE
|
||||
if _MEDIA_ONLY.fullmatch(cleaned):
|
||||
return "", ScanIssueCode.NO_TEXT
|
||||
return cleaned, None
|
||||
|
||||
|
||||
def _tool_calls_text(value: object) -> str | None:
|
||||
"""OpenAI-shaped `tool_calls`: `[{"function": {"name", "arguments"}}]`, stored as JSON."""
|
||||
if isinstance(value, str):
|
||||
|
||||
@@ -24,6 +24,7 @@ from one_memory.service_levels import (
|
||||
ServiceLevelScheduler,
|
||||
ServiceResource,
|
||||
)
|
||||
from one_memory.user_scope import lane_key, split_lane
|
||||
|
||||
|
||||
class UnknownSourceError(KeyError):
|
||||
@@ -82,36 +83,45 @@ class ImportSupervisor:
|
||||
self._tasks: dict[str, asyncio.Task[None]] = {}
|
||||
self._drains: dict[str, asyncio.Task[None]] = {}
|
||||
|
||||
def register_adapter(self, adapter: SourceAdapter) -> None:
|
||||
self.adapters[adapter.descriptor.source_id] = adapter
|
||||
def register_adapter(self, adapter: SourceAdapter, *, user_id: str = "local") -> None:
|
||||
"""Adapters are keyed by lane: the source id for `local`, `source@user`
|
||||
for another user's grant of the same source."""
|
||||
self.adapters[lane_key(user_id, adapter.descriptor.source_id)] = adapter
|
||||
|
||||
def unregister_adapter(self, source_id: str) -> None:
|
||||
self.adapters.pop(source_id, None)
|
||||
|
||||
@staticmethod
|
||||
def lane_of(job: ImportJob) -> str:
|
||||
return lane_key(job.user_id, job.source_id)
|
||||
|
||||
def active_job_ids(self) -> frozenset[str]:
|
||||
return frozenset(job_id for job_id, task in self._tasks.items() if not task.done())
|
||||
|
||||
def create_job(
|
||||
self, source_id: str, *, operation: Literal["history", "sync"] = "history"
|
||||
) -> ImportJob:
|
||||
"""`source_id` is a lane key: another user's lane creates that user's job."""
|
||||
if self.source_enabled is not None and not self.source_enabled(source_id):
|
||||
raise SourceAccessError(SourceAccessErrorCode.GRANT_REQUIRED)
|
||||
return self.job_store.create(user_id="local", source_id=source_id, operation=operation)
|
||||
user_id, bare_source_id = split_lane(source_id)
|
||||
return self.job_store.create(user_id=user_id, source_id=bare_source_id, operation=operation)
|
||||
|
||||
def enqueue(self, job_id: str) -> ImportJob:
|
||||
if job_id in self._drains:
|
||||
raise InvalidJobTransitionError("import_cleanup_in_progress")
|
||||
job = self.job_store.require(job_id)
|
||||
if job.source_id not in self.adapters:
|
||||
raise UnknownSourceError(job.source_id)
|
||||
if self.source_enabled is not None and not self.source_enabled(job.source_id):
|
||||
lane = self.lane_of(job)
|
||||
if lane not in self.adapters:
|
||||
raise UnknownSourceError(lane)
|
||||
if self.source_enabled is not None and not self.source_enabled(lane):
|
||||
return job
|
||||
existing = self._tasks.get(job_id)
|
||||
if existing is None or existing.done():
|
||||
self._tasks[job_id] = asyncio.create_task(
|
||||
self._execute(
|
||||
job_id,
|
||||
source_id=job.source_id,
|
||||
source_id=lane,
|
||||
operation=job.operation,
|
||||
)
|
||||
)
|
||||
@@ -130,8 +140,10 @@ class ImportSupervisor:
|
||||
# pending history. Each resumed runner will yield after one bounded slice.
|
||||
for status in (ImportStatus.INTERRUPTED, ImportStatus.PENDING):
|
||||
for job in self.job_store.list_jobs(status=status):
|
||||
if job.source_id in self.adapters:
|
||||
if self.source_enabled is not None and not self.source_enabled(job.source_id):
|
||||
if self.lane_of(job) in self.adapters:
|
||||
if self.source_enabled is not None and not self.source_enabled(
|
||||
self.lane_of(job)
|
||||
):
|
||||
continue
|
||||
if job.status is not ImportStatus.PENDING:
|
||||
self.job_store.queue_for_resume(job.job_id)
|
||||
@@ -227,7 +239,7 @@ class ImportSupervisor:
|
||||
}:
|
||||
return
|
||||
if self.source_enabled is not None and not await in_the_background(
|
||||
self.source_enabled, job.source_id
|
||||
self.source_enabled, self.lane_of(job)
|
||||
):
|
||||
return
|
||||
runner = ImportRunner(
|
||||
@@ -238,7 +250,7 @@ class ImportSupervisor:
|
||||
sdk_queue=self.sdk_queue,
|
||||
sdk_authority=self.sdk_authority,
|
||||
)
|
||||
adapter = self.adapters[job.source_id]
|
||||
adapter = self.adapters[self.lane_of(job)]
|
||||
if self.prepare_adapter is not None:
|
||||
adapter = await self.prepare_adapter(job, adapter)
|
||||
|
||||
@@ -273,7 +285,7 @@ class ImportSupervisor:
|
||||
and retry_attempt < self.max_history_retries
|
||||
and (
|
||||
self.source_enabled is None
|
||||
or await in_the_background(self.source_enabled, current.source_id)
|
||||
or await in_the_background(self.source_enabled, self.lane_of(current))
|
||||
)
|
||||
):
|
||||
delay = self.retry_base_seconds * (2**retry_attempt)
|
||||
|
||||
@@ -7,9 +7,9 @@ between pages. The matches are kept here under an opaque ``window_id`` that
|
||||
the client passes back with the next offset.
|
||||
|
||||
A window is bound to the filters it was searched with (query, source,
|
||||
statuses, scene). It expires after ``ttl_seconds`` without being read, and the
|
||||
store keeps at most ``max_windows`` windows, dropping the least recently read
|
||||
first.
|
||||
statuses, scene) and to the user whose library it searched. It expires after
|
||||
``ttl_seconds`` without being read, and the store keeps at most
|
||||
``max_windows`` windows, dropping the least recently read first.
|
||||
Only memory identities are kept, never content: each page is read fresh from
|
||||
the SDK, so an edit or a delete shows on the next page read.
|
||||
"""
|
||||
@@ -28,13 +28,17 @@ from one_memory.hy_sdk_types import LibraryHit
|
||||
DEFAULT_WINDOW_TTL_SECONDS = 300.0
|
||||
DEFAULT_MAX_WINDOWS = 32
|
||||
|
||||
WindowKey = tuple[str, str | None, tuple[str, ...], str]
|
||||
WindowKey = tuple[str, str | None, tuple[str, ...], str, str]
|
||||
|
||||
|
||||
def window_key(
|
||||
query: str, source: str | None, statuses: list[str], scene: str = "all"
|
||||
query: str,
|
||||
source: str | None,
|
||||
statuses: list[str],
|
||||
scene: str = "all",
|
||||
user_id: str = "local",
|
||||
) -> WindowKey:
|
||||
return (query, source, tuple(sorted(set(statuses))), scene)
|
||||
return (query, source, tuple(sorted(set(statuses))), scene, user_id)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
|
||||
@@ -11,10 +11,11 @@ import asyncio
|
||||
import sqlite3
|
||||
from collections.abc import Sequence
|
||||
from datetime import UTC, datetime
|
||||
from functools import partial
|
||||
from typing import Any, Literal, cast
|
||||
from uuid import UUID
|
||||
|
||||
from fastapi import APIRouter, BackgroundTasks, HTTPException, Request
|
||||
from fastapi import APIRouter, BackgroundTasks, HTTPException, Query, Request
|
||||
from fastapi.params import Depends
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
@@ -34,6 +35,7 @@ from one_memory.memory_server.durable_queue import DurableWriteQueue
|
||||
from one_memory.memory_server.unified_entry import UnifiedWriteIntake
|
||||
from one_memory.memory_tasks import MemoryTaskStatus, MemoryTaskStore
|
||||
from one_memory.secrets import SecretStoreUnavailableError
|
||||
from one_memory.user_scope import DEFAULT_USER_ID, USER_ID_PATTERN, UserId
|
||||
|
||||
SOURCE_ID = "one-memory-manual"
|
||||
MemoryAddState = Literal[
|
||||
@@ -53,6 +55,8 @@ class MemoryAddInput(BaseModel):
|
||||
request_id: UUID
|
||||
text: str = Field(min_length=1, max_length=12_000)
|
||||
scope: Literal["all-apps"]
|
||||
#: Whose memory this is. The App never sends it and writes `local`.
|
||||
user_id: UserId = DEFAULT_USER_ID
|
||||
|
||||
@field_validator("text")
|
||||
@classmethod
|
||||
@@ -108,7 +112,11 @@ class MemoryAdditionStore:
|
||||
|
||||
def save(self, addition: MemoryAddInput) -> EvidenceRecord:
|
||||
now = datetime.now(UTC)
|
||||
if addition.user_id != DEFAULT_USER_ID and not self.sdk_authority:
|
||||
# Legacy authority keeps one person's library only.
|
||||
raise ValueError("memory_add_user_requires_sdk_authority")
|
||||
value = EvidenceInput(
|
||||
user_id=addition.user_id,
|
||||
source_id=SOURCE_ID,
|
||||
conversation_id=f"note:{addition.request_id}",
|
||||
message_id=str(addition.request_id),
|
||||
@@ -200,7 +208,7 @@ class MemoryAdditionStore:
|
||||
)
|
||||
return self.require(value.evidence_id)
|
||||
|
||||
def require(self, evidence_id: str) -> EvidenceRecord:
|
||||
def require(self, evidence_id: str, *, user_id: str = DEFAULT_USER_ID) -> EvidenceRecord:
|
||||
if self.sdk_authority:
|
||||
if self.write_queue is None:
|
||||
raise KeyError(evidence_id)
|
||||
@@ -219,11 +227,11 @@ class MemoryAdditionStore:
|
||||
(item for item in payload.input_records if item.evidence_id == evidence_id),
|
||||
None,
|
||||
)
|
||||
if record is None:
|
||||
if record is None or record.user_id != user_id:
|
||||
raise KeyError(evidence_id)
|
||||
return record
|
||||
record = self.evidence.get(evidence_id)
|
||||
if record is None or record.user_id != "local" or record.source_id != SOURCE_ID:
|
||||
if record is None or record.user_id != user_id or record.source_id != SOURCE_ID:
|
||||
raise KeyError(evidence_id)
|
||||
metadata = record.origin_meta.get(EvidenceOrigin.MANUAL_IMPORT)
|
||||
if metadata is None or metadata.raw_meta.get("input_mode") != "direct_memory_note":
|
||||
@@ -237,8 +245,8 @@ class MemoryAdditionStore:
|
||||
raise ValueError("memory_add_source_revoked")
|
||||
return record
|
||||
|
||||
def receipt(self, evidence_id: str) -> MemoryAddReceipt:
|
||||
record = self.require(evidence_id)
|
||||
def receipt(self, evidence_id: str, *, user_id: str = DEFAULT_USER_ID) -> MemoryAddReceipt:
|
||||
record = self.require(evidence_id, user_id=user_id)
|
||||
if self.sdk_authority:
|
||||
assert self.write_queue is not None
|
||||
with main_database(self.write_queue.database_path).read() as database:
|
||||
@@ -300,10 +308,15 @@ class MemoryAdditionStore:
|
||||
error=error,
|
||||
)
|
||||
|
||||
def receipt_for_request(self, request_id: UUID) -> MemoryAddReceipt:
|
||||
def receipt_for_request(
|
||||
self, request_id: UUID, *, user_id: str = DEFAULT_USER_ID
|
||||
) -> MemoryAddReceipt:
|
||||
identity = str(request_id)
|
||||
if self.sdk_authority:
|
||||
# The Evidence id carries the user, so another user's request id
|
||||
# names a different note and reads as not found.
|
||||
probe = EvidenceInput(
|
||||
user_id=user_id,
|
||||
source_id=SOURCE_ID,
|
||||
conversation_id=f"note:{identity}",
|
||||
message_id=identity,
|
||||
@@ -316,16 +329,16 @@ class MemoryAdditionStore:
|
||||
)
|
||||
},
|
||||
)
|
||||
return self.receipt(probe.evidence_id)
|
||||
return self.receipt(probe.evidence_id, user_id=user_id)
|
||||
with main_database(self.evidence.database_path).read() as db:
|
||||
row = db.execute(
|
||||
"SELECT evidence_id FROM evidence WHERE user_id='local' AND source_id=? "
|
||||
"SELECT evidence_id FROM evidence WHERE user_id=? AND source_id=? "
|
||||
"AND conversation_id=? AND message_id=?",
|
||||
(SOURCE_ID, f"note:{identity}", identity),
|
||||
(user_id, SOURCE_ID, f"note:{identity}", identity),
|
||||
).fetchone()
|
||||
if row is None:
|
||||
raise KeyError(identity)
|
||||
return self.receipt(str(row[0]))
|
||||
return self.receipt(str(row[0]), user_id=user_id)
|
||||
|
||||
|
||||
def memory_add_router(dependencies: Sequence[Depends]) -> APIRouter:
|
||||
@@ -376,14 +389,20 @@ def memory_add_router(dependencies: Sequence[Depends]) -> APIRouter:
|
||||
record = await asyncio.to_thread(additions.save, addition)
|
||||
except ValueError as error:
|
||||
raise HTTPException(409, str(error)) from error
|
||||
saved = await asyncio.to_thread(additions.receipt, record.evidence_id)
|
||||
saved = await asyncio.to_thread(
|
||||
partial(additions.receipt, record.evidence_id, user_id=addition.user_id)
|
||||
)
|
||||
background.add_task(schedule, additions, record)
|
||||
return saved
|
||||
|
||||
@router.get("/additions/{request_id}", response_model=MemoryAddReceipt)
|
||||
def memory_add_status(request_id: UUID, request: Request) -> MemoryAddReceipt:
|
||||
def memory_add_status(
|
||||
request_id: UUID,
|
||||
request: Request,
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> MemoryAddReceipt:
|
||||
try:
|
||||
return store(request).receipt_for_request(request_id)
|
||||
return store(request).receipt_for_request(request_id, user_id=user_id)
|
||||
except KeyError as error:
|
||||
raise HTTPException(404, "memory_add_not_found") from error
|
||||
except ValueError as error:
|
||||
|
||||
@@ -75,7 +75,11 @@ def batch_id(*, internal_session_id: str, first_round: int, last_round: int) ->
|
||||
INTERNAL_SESSION_ID_MAX = 128
|
||||
|
||||
|
||||
def internal_session_id_for(conversation_id: str, source_id: str) -> str:
|
||||
def internal_session_id_for(
|
||||
conversation_id: str,
|
||||
source_id: str,
|
||||
user_id: str = "local",
|
||||
) -> str:
|
||||
"""Normalise a conversation identity to the durable ``internal_session_id``.
|
||||
|
||||
This is the single derivation shared by every Evidence-first intake path.
|
||||
@@ -86,7 +90,17 @@ def internal_session_id_for(conversation_id: str, source_id: str) -> str:
|
||||
per-session serialisation split). Only a value that the contract would have
|
||||
rejected before it ever reached the queue is replaced by the versioned
|
||||
session id, which is deterministic for a given (source, conversation).
|
||||
|
||||
Another user's conversation is always derived with the user in it: two
|
||||
Hermes profiles can hold the same session id, and sharing a session key
|
||||
would serialise and batch one person's turns behind the other's. `local`
|
||||
keeps the identity it always had.
|
||||
"""
|
||||
if user_id != "local":
|
||||
return session_id(
|
||||
harness_id=source_id,
|
||||
external_session_id=f"user:{user_id}|{conversation_id}",
|
||||
)
|
||||
if len(conversation_id) <= INTERNAL_SESSION_ID_MAX:
|
||||
return conversation_id
|
||||
derived = session_id(harness_id=source_id, external_session_id=conversation_id)
|
||||
|
||||
@@ -54,6 +54,7 @@ from one_memory.memory_tasks import (
|
||||
)
|
||||
from one_memory.sdk_migration_log import error_chain_text
|
||||
from one_memory.service_levels import ServiceLevel, service_level_context
|
||||
from one_memory.user_scope import DEFAULT_USER_ID, lane_key, other_user_lane_prefix
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -345,6 +346,27 @@ EVENT_TIME_WINDOW = timedelta(minutes=10)
|
||||
DIRECT_WRITE_SOURCES = frozenset({"one-memory-manual"})
|
||||
|
||||
|
||||
def request_user_id(request: WriteRequest) -> str:
|
||||
"""Whose write this is: its frozen input's user, `local` for id-only rows."""
|
||||
users = {record.user_id for record in request.input_records}
|
||||
if len(users) > 1:
|
||||
raise ValueError("durable_write_multiple_users")
|
||||
return next(iter(users), DEFAULT_USER_ID)
|
||||
|
||||
|
||||
def request_source_key(request: WriteRequest) -> str:
|
||||
"""The FIFO/claim key of a write: its source, per user.
|
||||
|
||||
`local` keeps the bare source id it always had. Another user's Hermes
|
||||
lane is `hermes@user`, so one person's running job never holds the other
|
||||
person's queue and the claim gate answers for that user's grant.
|
||||
"""
|
||||
return lane_key(
|
||||
request_user_id(request),
|
||||
request.source_id or request.internal_session_id,
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class DurableWriteRecord:
|
||||
job_id: str
|
||||
@@ -862,7 +884,7 @@ class DurableWriteQueue:
|
||||
job_id,
|
||||
queue_seq,
|
||||
request.internal_session_id,
|
||||
request.source_id or request.internal_session_id,
|
||||
request_source_key(request),
|
||||
request.batch_identity.batch_id,
|
||||
key,
|
||||
payload,
|
||||
@@ -929,7 +951,9 @@ class DurableWriteQueue:
|
||||
f"{hashlib.sha256(file_key.encode()).hexdigest()}:"
|
||||
f"{hashlib.sha256(record.conversation_id.encode()).hexdigest()}"
|
||||
)
|
||||
session_key = internal_session_id_for(record.conversation_id, record.source_id)
|
||||
session_key = internal_session_id_for(
|
||||
record.conversation_id, record.source_id, record.user_id
|
||||
)
|
||||
written = connection.execute(
|
||||
"SELECT 1 FROM memory_write_jobs AS job, json_each(job.evidence_ids_json) AS ref "
|
||||
"WHERE job.session_key=? AND job.state!='assembling' AND ref.value=? LIMIT 1",
|
||||
@@ -998,7 +1022,7 @@ class DurableWriteQueue:
|
||||
str(uuid4()),
|
||||
queue_seq,
|
||||
session_key,
|
||||
record.source_id,
|
||||
lane_key(record.user_id, record.source_id),
|
||||
assembly_key,
|
||||
assembly_key,
|
||||
payload_json,
|
||||
@@ -1034,10 +1058,13 @@ class DurableWriteQueue:
|
||||
`flush` (history at end of file) completes the last turn and writes a
|
||||
short batch; without it (live polling) those stay in the row.
|
||||
"""
|
||||
# Two users' roots can hold a file with the same relative key (each
|
||||
# Hermes profile has its own `state.db`): only this user's rows.
|
||||
assembly_prefix = f"assembly:{user_id}:{source_id}:"
|
||||
rows = connection.execute(
|
||||
"SELECT * FROM memory_write_jobs WHERE state='assembling' "
|
||||
"AND source_key=? ORDER BY queue_seq",
|
||||
(source_id,),
|
||||
"AND source_key=? AND substr(idempotency_key,1,?)=? ORDER BY queue_seq",
|
||||
(lane_key(user_id, source_id), len(assembly_prefix), assembly_prefix),
|
||||
).fetchall()
|
||||
finalized: list[str] = []
|
||||
for row in rows:
|
||||
@@ -1160,7 +1187,7 @@ class DurableWriteQueue:
|
||||
Same records, same key: a re-read returns the job already written.
|
||||
"""
|
||||
first = records[0]
|
||||
session_id = internal_session_id_for(first.conversation_id, first.source_id)
|
||||
session_id = internal_session_id_for(first.conversation_id, first.source_id, first.user_id)
|
||||
material = ":".join(f"{item.evidence_id}:{item.content_hash}" for item in records)
|
||||
request_id = f"turn:v2:{hashlib.sha256(material.encode()).hexdigest()}"
|
||||
existing = connection.execute(
|
||||
@@ -1205,7 +1232,7 @@ class DurableWriteQueue:
|
||||
job_id,
|
||||
queue_seq,
|
||||
session_id,
|
||||
first.source_id,
|
||||
lane_key(first.user_id, first.source_id),
|
||||
request.batch_identity.batch_id,
|
||||
request_id,
|
||||
json.dumps(
|
||||
@@ -2494,6 +2521,12 @@ async def execute_job(
|
||||
source_id = request.internal_session_id
|
||||
if source_ids and source_ids != {source_id}:
|
||||
raise RuntimeError("durable_write_multiple_sources")
|
||||
users = {getattr(record, "user_id", DEFAULT_USER_ID) for record in records}
|
||||
if len(users) > 1:
|
||||
raise RuntimeError("durable_write_multiple_users")
|
||||
# The gates answer per user: another user's Hermes job asks about
|
||||
# that user's grant, not `local`'s.
|
||||
source_id = lane_key(next(iter(users), DEFAULT_USER_ID), source_id)
|
||||
|
||||
async def mark() -> bool:
|
||||
return await in_the_background(queue.mark_invoked, job_id, owner=owner)
|
||||
@@ -2799,6 +2832,19 @@ class DurableWriteDrain:
|
||||
source_clause = f"AND candidate.source_key IN ({placeholders}) "
|
||||
source_params = tuple(sorted(enabled_sources))
|
||||
direct_sources = ",".join("?" for _ in DIRECT_WRITE_SOURCES)
|
||||
# Another user's hand-added memories are `one-memory-manual@user`:
|
||||
# the same lane ahead of history, still serial per user.
|
||||
direct_lanes = " OR ".join(
|
||||
"substr(candidate.source_key,1,?)=?" for _ in DIRECT_WRITE_SOURCES
|
||||
)
|
||||
direct_lane_params = tuple(
|
||||
value
|
||||
for source in sorted(DIRECT_WRITE_SOURCES)
|
||||
for value in (
|
||||
len(other_user_lane_prefix(source)),
|
||||
other_user_lane_prefix(source),
|
||||
)
|
||||
)
|
||||
# Same eligibility as the window claim below (free lease, no
|
||||
# running job of its source, nothing earlier in its session), but
|
||||
# not bound to the window: a note must not wait for history.
|
||||
@@ -2808,7 +2854,7 @@ class DurableWriteDrain:
|
||||
"WHERE candidate.state=? "
|
||||
"AND (candidate.lease_expires_at IS NULL OR candidate.lease_expires_at < ?) "
|
||||
+ source_clause
|
||||
+ f"AND candidate.source_key IN ({direct_sources}) "
|
||||
+ f"AND (candidate.source_key IN ({direct_sources}) OR {direct_lanes}) "
|
||||
"AND NOT EXISTS ("
|
||||
"SELECT 1 FROM memory_write_jobs AS held "
|
||||
"WHERE held.source_key=candidate.source_key AND held.state=? "
|
||||
@@ -2826,6 +2872,7 @@ class DurableWriteDrain:
|
||||
now.isoformat(),
|
||||
*source_params,
|
||||
*sorted(DIRECT_WRITE_SOURCES),
|
||||
*direct_lane_params,
|
||||
RUNNING,
|
||||
now.isoformat(),
|
||||
*_FIFO_BLOCKING_STATES,
|
||||
|
||||
@@ -19,10 +19,11 @@ does the writing. That separation is D52.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import hashlib
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any, Literal, cast
|
||||
|
||||
from fastapi import APIRouter, HTTPException, Request
|
||||
from fastapi import APIRouter, HTTPException, Query, Request
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
|
||||
from one_memory.imports.models import (
|
||||
@@ -43,6 +44,24 @@ from one_memory.memory_server.durable_queue import (
|
||||
)
|
||||
from one_memory.memory_server.registry import WriteRegistry, WriteState
|
||||
from one_memory.memory_server.submit import WriteConflictError
|
||||
from one_memory.user_scope import DEFAULT_USER_ID, USER_ID_PATTERN, UserId
|
||||
|
||||
#: Durable keys of another user's writes start with this. A `local` request
|
||||
#: id never may, so `local` cannot name another user's receipt.
|
||||
_USER_KEY_PREFIX = "user:"
|
||||
|
||||
|
||||
def durable_request_key(request_id: str, user_id: str) -> str:
|
||||
"""The queue key of a caller's request id, namespaced per user.
|
||||
|
||||
Two users choosing the same request id must not collide: the key is the
|
||||
queue's idempotency key and the SDK's `request_id`. `local` keeps its own
|
||||
request id unchanged.
|
||||
"""
|
||||
if user_id == DEFAULT_USER_ID:
|
||||
return request_id
|
||||
digest = hashlib.sha256(request_id.encode()).hexdigest()
|
||||
return f"{_USER_KEY_PREFIX}{user_id}:{digest}"
|
||||
|
||||
|
||||
class MemoryWriteReceipt(BaseModel):
|
||||
@@ -71,6 +90,7 @@ class SdkMemoryWriteInput(BaseModel):
|
||||
messages: list[OpenAIMessage] = Field(min_length=1, max_length=200)
|
||||
memory_at: datetime | None = None
|
||||
priority: Literal["live", "normal"] = "normal"
|
||||
user_id: UserId = DEFAULT_USER_ID
|
||||
|
||||
|
||||
def _registry(
|
||||
@@ -124,6 +144,9 @@ def sdk_router(dependencies: list[Any] | None = None) -> APIRouter:
|
||||
) -> MemoryWriteReceipt:
|
||||
if not any(message.role == "user" for message in payload.messages):
|
||||
raise HTTPException(422, "messages_require_user_turn")
|
||||
if payload.user_id == DEFAULT_USER_ID and payload.request_id.startswith(_USER_KEY_PREFIX):
|
||||
raise HTTPException(422, "request_id_reserved_prefix")
|
||||
request_key = durable_request_key(payload.request_id, payload.user_id)
|
||||
observed_at = payload.memory_at or datetime(1970, 1, 1, tzinfo=UTC)
|
||||
written_by = {
|
||||
"user": WrittenBy.PERSON,
|
||||
@@ -133,6 +156,7 @@ def sdk_router(dependencies: list[Any] | None = None) -> APIRouter:
|
||||
records = tuple(
|
||||
materialize_write_input(
|
||||
EvidenceInput(
|
||||
user_id=payload.user_id,
|
||||
source_id=payload.source_id,
|
||||
conversation_id=payload.session_id,
|
||||
message_id=f"{payload.request_id}:{index}",
|
||||
@@ -157,6 +181,7 @@ def sdk_router(dependencies: list[Any] | None = None) -> APIRouter:
|
||||
internal_session_id = internal_session_id_for(
|
||||
payload.session_id,
|
||||
payload.source_id,
|
||||
payload.user_id,
|
||||
)
|
||||
contract = WriteRequest(
|
||||
internal_session_id=internal_session_id,
|
||||
@@ -168,7 +193,7 @@ def sdk_router(dependencies: list[Any] | None = None) -> APIRouter:
|
||||
),
|
||||
evidence_ids=[record.evidence_id for record in records],
|
||||
input_records=records,
|
||||
idempotency_key=payload.request_id,
|
||||
idempotency_key=request_key,
|
||||
priority=payload.priority,
|
||||
event_at=payload.memory_at,
|
||||
time_quality="exact" if payload.memory_at is not None else "approximate",
|
||||
@@ -178,7 +203,7 @@ def sdk_router(dependencies: list[Any] | None = None) -> APIRouter:
|
||||
except (WriteConflictError, ValueError) as error:
|
||||
raise HTTPException(409, str(error)) from error
|
||||
return MemoryWriteReceipt(
|
||||
request_id=record.request_id,
|
||||
request_id=payload.request_id,
|
||||
state=record.state,
|
||||
created_at=record.created_at,
|
||||
updated_at=record.updated_at,
|
||||
@@ -186,16 +211,24 @@ def sdk_router(dependencies: list[Any] | None = None) -> APIRouter:
|
||||
)
|
||||
|
||||
@instance.get("/{request_id}", response_model=MemoryWriteReceipt)
|
||||
def status(request_id: str, request: Request) -> MemoryWriteReceipt:
|
||||
def status(
|
||||
request_id: str,
|
||||
request: Request,
|
||||
user_id: str = Query(default=DEFAULT_USER_ID, pattern=USER_ID_PATTERN),
|
||||
) -> MemoryWriteReceipt:
|
||||
# A receipt belongs to the user that submitted it. Another user's key
|
||||
# is namespaced, and `local` may not name a namespaced key directly.
|
||||
if user_id == DEFAULT_USER_ID and request_id.startswith(_USER_KEY_PREFIX):
|
||||
raise HTTPException(404, "unknown request id")
|
||||
registry = _registry(request, write=False)
|
||||
try:
|
||||
record = registry.get(request_id)
|
||||
record = registry.get(durable_request_key(request_id, user_id))
|
||||
except DurableQueueSchemaUnavailableError as error:
|
||||
raise HTTPException(503, str(error)) from error
|
||||
if record is None:
|
||||
raise HTTPException(404, "unknown request id")
|
||||
return MemoryWriteReceipt(
|
||||
request_id=record.request_id,
|
||||
request_id=request_id,
|
||||
state=record.state,
|
||||
created_at=record.created_at,
|
||||
updated_at=record.updated_at,
|
||||
|
||||
@@ -271,7 +271,9 @@ def build_request_from_evidence(
|
||||
# Keep the exact conversation id when it fits the 128-char contract;
|
||||
# otherwise derive the versioned session id, so a long branch id does
|
||||
# not reject the whole history import.
|
||||
internal_session_id=internal_session_id_for(seed.conversation_id, seed.source_id),
|
||||
internal_session_id=internal_session_id_for(
|
||||
seed.conversation_id, seed.source_id, seed.user_id
|
||||
),
|
||||
first_round=first_round,
|
||||
last_round=last_round,
|
||||
evidence_ids=list(ordered),
|
||||
|
||||
@@ -28,6 +28,7 @@ from one_memory.memory_server.contracts import (
|
||||
internal_session_id_for,
|
||||
)
|
||||
from one_memory.memory_server.durable_queue import DurableWriteQueue, DurableWriteRecord
|
||||
from one_memory.user_scope import lane_key
|
||||
|
||||
WritePriority = Literal["live", "normal"]
|
||||
|
||||
@@ -74,7 +75,7 @@ class UnifiedWriteIntake:
|
||||
if priority not in {"live", "normal"}:
|
||||
raise ValueError("priority must be 'live' or 'normal'")
|
||||
if self.source_writes_permitted is not None and not self.source_writes_permitted(
|
||||
record.source_id
|
||||
lane_key(record.user_id, record.source_id)
|
||||
):
|
||||
# Freeze is the product's one Harness processing decision. Refuse
|
||||
# new intake so a frozen source creates no new durable write row;
|
||||
@@ -106,7 +107,9 @@ class UnifiedWriteIntake:
|
||||
last_round: int,
|
||||
priority: WritePriority,
|
||||
) -> WriteRequest:
|
||||
session_id = internal_session_id_for(record.conversation_id, record.source_id)
|
||||
session_id = internal_session_id_for(
|
||||
record.conversation_id, record.source_id, record.user_id
|
||||
)
|
||||
event_at, time_quality = _job_time((record,))
|
||||
request_key = (
|
||||
f"entry:{record.evidence_id}"
|
||||
@@ -145,14 +148,14 @@ class UnifiedWriteIntake:
|
||||
):
|
||||
raise ValueError("records must belong to one conversation")
|
||||
if self.source_writes_permitted is not None and not self.source_writes_permitted(
|
||||
first.source_id
|
||||
lane_key(first.user_id, first.source_id)
|
||||
):
|
||||
raise SourceWriteDisabledError(first.evidence_id)
|
||||
material = ":".join(
|
||||
f"{record.evidence_id}:{record.revision}:{record.content_hash}" for record in records
|
||||
)
|
||||
request_id = f"turn:v1:{sha256(material.encode()).hexdigest()}"
|
||||
session_id = internal_session_id_for(first.conversation_id, first.source_id)
|
||||
session_id = internal_session_id_for(first.conversation_id, first.source_id, first.user_id)
|
||||
event_at, time_quality = _job_time(records)
|
||||
durable = self.queue.submit(
|
||||
WriteRequest(
|
||||
|
||||
@@ -160,7 +160,7 @@ def pending(db: sqlite3.Connection, *, limit: int = 100) -> list[str]:
|
||||
|
||||
|
||||
def _trigger_sql() -> list[tuple[str, str]]:
|
||||
"""(table it depends on, statement) for each trigger."""
|
||||
"""(table it is on, statement) for each trigger."""
|
||||
return [
|
||||
(
|
||||
"evidence",
|
||||
@@ -303,9 +303,61 @@ def install_triggers(db: sqlite3.Connection) -> None:
|
||||
for table, statement in _trigger_sql():
|
||||
if table not in present:
|
||||
continue
|
||||
if not _body_tables(statement) <= present:
|
||||
# SQLite resolves a trigger body only when it fires, so a body
|
||||
# naming a dropped table fails the write it rides on (#233: the
|
||||
# SDK cutover drops `governed_memory_evidence`, and every grant
|
||||
# write then failed). Not installed, and an old copy is removed.
|
||||
cursor.execute(f"DROP TRIGGER IF EXISTS {_trigger_name(statement)}")
|
||||
continue
|
||||
cursor.execute(statement)
|
||||
|
||||
|
||||
def _trigger_name(statement: str) -> str:
|
||||
return statement.split("IF NOT EXISTS", 1)[1].split()[0]
|
||||
|
||||
|
||||
def _body_tables(statement: str) -> set[str]:
|
||||
"""Tables the trigger body reads or writes besides the one it is on."""
|
||||
_head, _begin, body = statement.partition("BEGIN")
|
||||
words = body.replace("(", " ").replace(")", " ").split()
|
||||
return {
|
||||
name
|
||||
for keyword, name in zip(words, words[1:], strict=False)
|
||||
if keyword.upper() in {"FROM", "JOIN", "INTO"}
|
||||
}
|
||||
|
||||
|
||||
def drop_stale_triggers(database_path: Path) -> tuple[str, ...]:
|
||||
"""Drop this module's triggers whose body names a table that is gone.
|
||||
|
||||
Startup on SDK authority does not install the cache (it is read only on
|
||||
legacy authority), but a home migrated by an earlier build still carries
|
||||
the triggers it installed. One whose body reads a dropped table fails
|
||||
every write to the table it is on, so it is dropped here. Idempotent.
|
||||
"""
|
||||
with main_database(database_path).write() as db, db:
|
||||
cursor = db.cursor()
|
||||
cursor.row_factory = sqlite3.Row
|
||||
present = {
|
||||
str(row["name"])
|
||||
for row in cursor.execute("SELECT name FROM sqlite_master WHERE type='table'")
|
||||
}
|
||||
installed = {
|
||||
str(row["name"])
|
||||
for row in cursor.execute("SELECT name FROM sqlite_master WHERE type='trigger'")
|
||||
}
|
||||
dropped = tuple(
|
||||
name
|
||||
for _table, statement in _trigger_sql()
|
||||
if (name := _trigger_name(statement)) in installed
|
||||
and not _body_tables(statement) <= present
|
||||
)
|
||||
for name in dropped:
|
||||
cursor.execute(f"DROP TRIGGER IF EXISTS {name}")
|
||||
return dropped
|
||||
|
||||
|
||||
def startup(database_path: Path) -> None:
|
||||
"""Idempotent: create the derived tables and triggers. No version change.
|
||||
|
||||
|
||||
@@ -564,7 +564,7 @@ def _embedding_request(
|
||||
secret: str | None,
|
||||
) -> tuple[str, str, dict[str, str], dict[str, object]]:
|
||||
provider = profile.embedding_provider_kind or profile.provider_kind
|
||||
base_url = (profile.embedding_base_url or profile.base_url or "").rstrip("/")
|
||||
base_url = (profile.embedding_base_url or "").rstrip("/")
|
||||
if provider is ProviderKind.OLLAMA:
|
||||
return (
|
||||
"POST",
|
||||
|
||||
@@ -97,7 +97,6 @@ class ModelProfileInput(BaseModel):
|
||||
)
|
||||
embedding_provider, resolved_embedding_base_url = resolve_embedding_endpoint(
|
||||
provider_kind=self.provider_kind,
|
||||
base_url=base_url,
|
||||
embedding_model=embedding_model,
|
||||
embedding_provider_kind=embedding_provider_kind,
|
||||
embedding_base_url=embedding_base_url,
|
||||
@@ -107,6 +106,12 @@ class ModelProfileInput(BaseModel):
|
||||
ProviderKind.ANTHROPIC,
|
||||
}:
|
||||
raise ValueError("embedding provider must be OpenAI-compatible, Ollama, or local ONNX")
|
||||
if (
|
||||
embedding_provider is not ProviderKind.LOCAL_ONNX
|
||||
and resolved_embedding_base_url is None
|
||||
):
|
||||
# `ModelProfileStore.create` refuses it with its own code.
|
||||
return self
|
||||
if (
|
||||
embedding_provider is not ProviderKind.LOCAL_ONNX
|
||||
and resolved_embedding_base_url is not None
|
||||
@@ -308,11 +313,12 @@ class ModelProfileStore:
|
||||
f"""
|
||||
UPDATE {table}
|
||||
SET embedding_provider_kind = provider_kind,
|
||||
embedding_base_url = base_url
|
||||
embedding_base_url = COALESCE(embedding_base_url, base_url)
|
||||
WHERE embedding_model IS NOT NULL
|
||||
AND embedding_provider_kind IS NULL
|
||||
"""
|
||||
)
|
||||
_pin_embedding_endpoints(connection, table)
|
||||
connection.execute(
|
||||
"""
|
||||
INSERT OR IGNORE INTO model_profile_versions (
|
||||
@@ -355,11 +361,11 @@ class ModelProfileStore:
|
||||
)
|
||||
embedding_provider_kind, embedding_base_url = resolve_embedding_endpoint(
|
||||
provider_kind=value.provider_kind,
|
||||
base_url=base_url,
|
||||
embedding_model=defaulted_model,
|
||||
embedding_provider_kind=defaulted_provider,
|
||||
embedding_base_url=defaulted_base_url,
|
||||
)
|
||||
require_embedding_base_url(embedding_provider_kind, embedding_base_url)
|
||||
try:
|
||||
with self._connect(writing=True) as connection:
|
||||
connection.execute(
|
||||
@@ -612,7 +618,6 @@ class ModelProfileStore:
|
||||
)
|
||||
embedding_provider_kind, embedding_base_url = resolve_embedding_endpoint(
|
||||
provider_kind=current.provider_kind,
|
||||
base_url=base_url,
|
||||
embedding_model=embedding_model,
|
||||
embedding_provider_kind=(
|
||||
patch.embedding_provider_kind
|
||||
@@ -627,6 +632,7 @@ class ModelProfileStore:
|
||||
)
|
||||
if embedding_provider_kind in {ProviderKind.HY_DEFAULT, ProviderKind.ANTHROPIC}:
|
||||
raise ValueError("embedding provider must be OpenAI-compatible, Ollama, or local ONNX")
|
||||
require_embedding_base_url(embedding_provider_kind, embedding_base_url)
|
||||
if (
|
||||
embedding_provider_kind is not ProviderKind.LOCAL_ONNX
|
||||
and embedding_base_url is not None
|
||||
@@ -1167,21 +1173,77 @@ def attach_disable_thinking(
|
||||
def resolve_embedding_endpoint(
|
||||
*,
|
||||
provider_kind: ProviderKind,
|
||||
base_url: str | None,
|
||||
embedding_model: str | None,
|
||||
embedding_provider_kind: ProviderKind | None,
|
||||
embedding_base_url: str | None,
|
||||
) -> tuple[ProviderKind | None, str | None]:
|
||||
"""The embedding provider and the endpoint exactly as given.
|
||||
|
||||
The endpoint never follows the generation `base_url`: the collection name
|
||||
hashes it, so a proxy or region edit of the generation endpoint moved
|
||||
writes to a new, empty collection, and providers without embeddings were
|
||||
sent embedding requests. `require_embedding_base_url` refuses a remote
|
||||
embedding without one.
|
||||
"""
|
||||
if embedding_model is None:
|
||||
return None, None
|
||||
if embedding_provider_kind is ProviderKind.LOCAL_ONNX:
|
||||
return ProviderKind.LOCAL_ONNX, None
|
||||
if embedding_provider_kind is None:
|
||||
return provider_kind, embedding_base_url or base_url
|
||||
return (
|
||||
embedding_provider_kind,
|
||||
embedding_base_url or DEFAULT_BASE_URLS.get(embedding_provider_kind),
|
||||
)
|
||||
return embedding_provider_kind or provider_kind, embedding_base_url
|
||||
|
||||
|
||||
class EmbeddingBaseUrlRequiredError(ValueError):
|
||||
def __init__(self) -> None:
|
||||
super().__init__("embedding_base_url_required")
|
||||
|
||||
|
||||
def require_embedding_base_url(provider: ProviderKind | None, base_url: str | None) -> None:
|
||||
"""A remote embedding must name its endpoint; the UI may offer the generation one."""
|
||||
if provider not in {None, ProviderKind.LOCAL_ONNX} and not base_url:
|
||||
raise EmbeddingBaseUrlRequiredError()
|
||||
|
||||
|
||||
def pinned_embedding_base_url(
|
||||
*,
|
||||
provider_kind: ProviderKind | str,
|
||||
base_url: str | None,
|
||||
embedding_model: str | None,
|
||||
embedding_provider_kind: ProviderKind | str | None,
|
||||
embedding_base_url: str | None,
|
||||
) -> str | None:
|
||||
"""The endpoint a stored profile's embedding resolved to before it was pinned.
|
||||
|
||||
The Runtime used `embedding_base_url or base_url`, and the provider default
|
||||
only when both were empty (no collection could have existed then). Writing
|
||||
that value keeps the endpoint, and so the collection name, byte-identical.
|
||||
"""
|
||||
provider = ProviderKind(embedding_provider_kind or provider_kind)
|
||||
if embedding_model is None or embedding_base_url or provider is ProviderKind.LOCAL_ONNX:
|
||||
return embedding_base_url
|
||||
return base_url or DEFAULT_BASE_URLS.get(provider)
|
||||
|
||||
|
||||
def _pin_embedding_endpoints(connection: sqlite3.Connection, table: str) -> None:
|
||||
"""Write the resolved endpoint into every remote embedding left without one."""
|
||||
rows = connection.execute(
|
||||
f"SELECT rowid, provider_kind, base_url, embedding_model, embedding_provider_kind "
|
||||
f"FROM {table} WHERE embedding_model IS NOT NULL AND embedding_base_url IS NULL "
|
||||
"AND COALESCE(embedding_provider_kind, provider_kind) != 'local_onnx'"
|
||||
).fetchall()
|
||||
for row in rows:
|
||||
connection.execute(
|
||||
f"UPDATE {table} SET embedding_base_url = ? WHERE rowid = ?",
|
||||
(
|
||||
pinned_embedding_base_url(
|
||||
provider_kind=row["provider_kind"],
|
||||
base_url=row["base_url"],
|
||||
embedding_model=row["embedding_model"],
|
||||
embedding_provider_kind=row["embedding_provider_kind"],
|
||||
embedding_base_url=None,
|
||||
),
|
||||
row["rowid"],
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
def validate_model_base_url(value: str) -> None:
|
||||
|
||||
@@ -22,6 +22,7 @@ from one_memory.semantic_deadline import (
|
||||
normalize_semantic_hits,
|
||||
search_within,
|
||||
)
|
||||
from one_memory.user_scope import DEFAULT_USER_ID, UserId
|
||||
|
||||
|
||||
def recall_blend_mode() -> str:
|
||||
@@ -67,6 +68,8 @@ class RecallRequest(BaseModel):
|
||||
#: Wall-clock budget for candidate gather + score. Not a substitute for
|
||||
#: raising the old newest-500 page; it is the third parallel budget.
|
||||
timeout_ms: int = Field(default=2_000, ge=50, le=30_000)
|
||||
#: Whose memories to recall. Omitted, it is `local`, the App's library.
|
||||
user_id: UserId = DEFAULT_USER_ID
|
||||
|
||||
|
||||
class RecallHit(BaseModel):
|
||||
|
||||
@@ -32,6 +32,7 @@ from one_memory.model_profiles import (
|
||||
attach_disable_thinking,
|
||||
)
|
||||
from one_memory.secrets import SecretStore, SecretStoreUnavailableError
|
||||
from one_memory.user_scope import owns
|
||||
|
||||
_NO_GROUNDING = "现有记忆不足以回答这个问题。"
|
||||
_GROUNDING_LIMIT = 6
|
||||
@@ -117,7 +118,12 @@ class SdkMemoryAnswerer:
|
||||
if hit.memory_id in seen:
|
||||
continue
|
||||
record = await _get_memory(client, hit.memory_id)
|
||||
if record is None or record.status != "active" or not record.is_latest:
|
||||
if (
|
||||
record is None
|
||||
or record.status != "active"
|
||||
or not record.is_latest
|
||||
or not owns(record.user_id, user_id)
|
||||
):
|
||||
continue
|
||||
seen.add(record.memory_id)
|
||||
found.append(_wire_memory(record))
|
||||
|
||||
@@ -5,7 +5,7 @@ from __future__ import annotations
|
||||
import asyncio
|
||||
import logging
|
||||
import re
|
||||
from collections.abc import AsyncIterator
|
||||
from collections.abc import AsyncIterator, Callable, Iterable
|
||||
from contextlib import AsyncExitStack, asynccontextmanager, suppress
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from pathlib import Path
|
||||
@@ -56,8 +56,11 @@ class SdkMemoryRuntime:
|
||||
write_queue: DurableWriteQueue,
|
||||
extraction_settings: ExtractionSettingsStore,
|
||||
data_dir: Path,
|
||||
user_ids: Callable[[], Iterable[str]] = lambda: ("local",),
|
||||
) -> None:
|
||||
self.coordinator = coordinator
|
||||
#: Every user whose raw layer is kept to the retention window.
|
||||
self.user_ids = user_ids
|
||||
self.read_handle = read_handle
|
||||
self.write_queue = write_queue
|
||||
self.extraction_settings = extraction_settings
|
||||
@@ -72,6 +75,12 @@ class SdkMemoryRuntime:
|
||||
)
|
||||
|
||||
async def prune_expired_raw(self, *, now: datetime | None = None) -> int:
|
||||
deleted = 0
|
||||
for user_id in dict.fromkeys(await asyncio.to_thread(lambda: tuple(self.user_ids()))):
|
||||
deleted += await self._prune_expired_raw_for(user_id, now=now)
|
||||
return deleted
|
||||
|
||||
async def _prune_expired_raw_for(self, user_id: str, *, now: datetime | None) -> int:
|
||||
cutoff = (now or datetime.now(UTC)) - timedelta(days=RAW_RETENTION_DAYS)
|
||||
cutoff_timestamp = int(cutoff.timestamp())
|
||||
client = await self.read_handle.client()
|
||||
@@ -79,7 +88,7 @@ class SdkMemoryRuntime:
|
||||
while True:
|
||||
page = await asyncio.to_thread(
|
||||
client.list_memories,
|
||||
user_id="local",
|
||||
user_id=user_id,
|
||||
layers=["l1_raw"],
|
||||
statuses=list(_RAW_STATUSES),
|
||||
order="asc",
|
||||
@@ -95,8 +104,7 @@ class SdkMemoryRuntime:
|
||||
for row in rows
|
||||
if isinstance(row, dict)
|
||||
and isinstance(row.get("memory_id"), str)
|
||||
and int(row.get("memory_at") or row.get("gmt_created") or 0)
|
||||
< cutoff_timestamp
|
||||
and int(row.get("memory_at") or row.get("gmt_created") or 0) < cutoff_timestamp
|
||||
]
|
||||
if not expired:
|
||||
return deleted
|
||||
@@ -114,7 +122,9 @@ class SdkMemoryRuntime:
|
||||
while True:
|
||||
await asyncio.sleep(RAW_RETENTION_CHECK_SECONDS)
|
||||
try:
|
||||
removed = await self.prune_expired_raw()
|
||||
# Its own task, so this pass's use of the read client ends
|
||||
# with it instead of with this loop (see `sdk_read_handle`).
|
||||
removed = await asyncio.create_task(self.prune_expired_raw())
|
||||
if removed:
|
||||
logger.info("sdk_raw_retention_deleted count=%d", removed)
|
||||
except asyncio.CancelledError:
|
||||
@@ -154,11 +164,10 @@ class SdkMemoryRuntime:
|
||||
limit: int = 12,
|
||||
) -> tuple[tuple[str, float], ...]:
|
||||
return tuple(
|
||||
(hit.memory_id, hit.score)
|
||||
for hit in await self.semantic_recall(query, limit=limit)
|
||||
(hit.memory_id, hit.score) for hit in await self.semantic_recall(query, limit=limit)
|
||||
)
|
||||
|
||||
async def graph_snapshot(self, *, limit: int = 300) -> HyGraphSnapshot:
|
||||
async def graph_snapshot(self, *, limit: int = 300, user_id: str = "local") -> HyGraphSnapshot:
|
||||
try:
|
||||
await self.coordinator.active_profile_credentials()
|
||||
except RuntimeError as error:
|
||||
@@ -173,7 +182,7 @@ class SdkMemoryRuntime:
|
||||
return await asyncio.to_thread(
|
||||
read_graph_snapshot,
|
||||
client,
|
||||
"local",
|
||||
user_id,
|
||||
"*",
|
||||
limit,
|
||||
)
|
||||
|
||||
@@ -23,6 +23,7 @@ from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from one_memory.database_access import main_database
|
||||
from one_memory.hy_sdk_runtime import builtin_retrieval_snapshot
|
||||
from one_memory.imports.models import EvidenceRecord
|
||||
from one_memory.imports.storage import EvidenceStore
|
||||
from one_memory.memory_server.contracts import (
|
||||
@@ -51,6 +52,7 @@ from one_memory.sdk_migration_bundle import inspect_sdk_migration_bundle
|
||||
from one_memory.sdk_migration_verify import (
|
||||
MemoryReadbackFailed,
|
||||
ReadbackReport,
|
||||
expected_memory_ids,
|
||||
legacy_memory_ids_from,
|
||||
legacy_memory_ids_from_bundle,
|
||||
read_active_profile,
|
||||
@@ -61,6 +63,8 @@ from one_memory.sdk_vector_reattach import (
|
||||
ReattachedCollection,
|
||||
legacy_vector_collections,
|
||||
reattach_legacy_vectors,
|
||||
stored_memory_ids,
|
||||
vectors_belong_to_another_space,
|
||||
)
|
||||
from one_memory.target_schema import drop_legacy_tables, legacy_tables_present
|
||||
|
||||
@@ -259,6 +263,7 @@ def prepare_legacy_write_queue_for_cutover(database_path: Path) -> tuple[int, in
|
||||
internal_session_id = internal_session_id_for(
|
||||
source.conversation_id,
|
||||
source.source_id,
|
||||
source.user_id,
|
||||
)
|
||||
queue.submit(
|
||||
WriteRequest(
|
||||
@@ -456,13 +461,17 @@ def resume_legacy_cleanup(*, data_dir: Path, database_path: Path) -> tuple[str,
|
||||
bundle_id=marker.backup_bundle_id,
|
||||
)
|
||||
from one_memory.hy_runtime_config import HY_MEMORY_NAMESPACE
|
||||
from one_memory.memory_visibility import drop_stale_triggers
|
||||
|
||||
recover_abandoned_staging(
|
||||
data_dir=data_dir,
|
||||
database_path=database_path,
|
||||
namespace=HY_MEMORY_NAMESPACE,
|
||||
)
|
||||
return drop_legacy_tables(database_path)
|
||||
dropped = drop_legacy_tables(database_path)
|
||||
# The visibility cache's grant triggers read a table just dropped (#233).
|
||||
drop_stale_triggers(database_path)
|
||||
return dropped
|
||||
|
||||
|
||||
MIGRATION_PREFIX = "sdk-authority-v2"
|
||||
@@ -699,13 +708,14 @@ def run_startup_migration(
|
||||
step["authority"] = authority.value
|
||||
log.migration_id = authority_migration
|
||||
with log.step("preflight.profile_read") as step:
|
||||
profile = read_active_profile(database_path)
|
||||
step["profile_present"] = profile is not None
|
||||
active = read_active_profile(database_path)
|
||||
step["profile_present"] = active is not None
|
||||
# No active profile means no generation model, not no embedding: the
|
||||
# vectors are the built-in model's, which is also what the Runtime reads.
|
||||
profile = active if active is not None else builtin_retrieval_snapshot()
|
||||
if authority is MemoryAuthority.SDK:
|
||||
with log.step("preflight.leftovers_scan") as step:
|
||||
vectors_waiting = profile is not None and bool(
|
||||
legacy_vector_collections(data_dir, profile)
|
||||
)
|
||||
vectors_waiting = bool(legacy_vector_collections(data_dir, profile))
|
||||
leftovers = bool(legacy_tables_present(database_path)) or abandoned_staging_present(
|
||||
data_dir=data_dir, namespace=namespace
|
||||
)
|
||||
@@ -716,7 +726,6 @@ def run_startup_migration(
|
||||
reattached: tuple[ReattachedCollection, ...] = ()
|
||||
readback: ReadbackReport | None = None
|
||||
if vectors_waiting:
|
||||
assert profile is not None
|
||||
progress("vectors")
|
||||
with log.step("vectors.reattach") as step:
|
||||
reattached = reattach_legacy_vectors(data_dir, profile)
|
||||
@@ -768,12 +777,12 @@ def run_startup_migration(
|
||||
step["chat"] = len(legacy.chat)
|
||||
step["productivity"] = len(legacy.productivity)
|
||||
step["users"] = len(legacy.users)
|
||||
if profile is None and not legacy.empty:
|
||||
# Without the embedding profile the Runtime's collections cannot be
|
||||
# named, so neither reattached nor read back. Legacy stays intact.
|
||||
log.check("preflight.model_profile_check", "sdk_migration_model_profile_required")
|
||||
raise DataPlaneMigrationError("sdk_migration_model_profile_required")
|
||||
log.check("preflight.model_profile_check", None)
|
||||
if active is None and not legacy.empty and vectors_belong_to_another_space(data_dir, profile):
|
||||
# The memories live in the space of a profile that is no longer active,
|
||||
# so the built-in model cannot read them. Legacy stays intact.
|
||||
log.check("preflight.vector_space_check", "sdk_migration_vector_profile_missing")
|
||||
raise DataPlaneMigrationError("sdk_migration_vector_profile_missing")
|
||||
log.check("preflight.vector_space_check", None)
|
||||
with capture_fence(data_dir):
|
||||
# Builds through 19 left a staged SDK copy beside the original store.
|
||||
# Settling it before the bundle means the bundle holds the original
|
||||
@@ -829,17 +838,23 @@ def run_startup_migration(
|
||||
step.update(preparation.as_document())
|
||||
reattached = ()
|
||||
readback = None
|
||||
if profile is not None:
|
||||
progress("vectors")
|
||||
with log.step("vectors.reattach") as step:
|
||||
reattached = reattach_legacy_vectors(data_dir, profile)
|
||||
step["collections"] = len(reattached)
|
||||
if not legacy.empty:
|
||||
assert profile is not None
|
||||
# Before reattach touches the store, and after the staging
|
||||
# recovery above has settled which store is the original.
|
||||
with log.step("verify.stored_ids") as step:
|
||||
expected, missing = expected_memory_ids(legacy, stored_memory_ids(data_dir))
|
||||
step["chat_expected"] = len(expected.chat)
|
||||
step["chat_missing_before_migration"] = missing
|
||||
progress("vectors")
|
||||
with log.step("vectors.reattach") as step:
|
||||
reattached = reattach_legacy_vectors(data_dir, profile)
|
||||
step["collections"] = len(reattached)
|
||||
if not expected.empty:
|
||||
progress("verify")
|
||||
with log.step("verify.readback") as step:
|
||||
with client_for(profile) as client:
|
||||
readback = verify_readback(client, legacy)
|
||||
readback = verify_readback(
|
||||
client, expected, chat_missing_before_migration=missing
|
||||
)
|
||||
step.update(readback.as_document())
|
||||
if not readback.passed:
|
||||
store.set_phase(migration_id, phase="readback_failed", state="blocked")
|
||||
|
||||
@@ -14,12 +14,12 @@ import json
|
||||
import sqlite3
|
||||
from collections.abc import Iterator
|
||||
from contextlib import closing, contextmanager
|
||||
from dataclasses import dataclass
|
||||
from dataclasses import dataclass, replace
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from one_memory.database_access import main_database
|
||||
from one_memory.model_profiles import ModelProfileSnapshot
|
||||
from one_memory.model_profiles import ModelProfileSnapshot, pinned_embedding_base_url
|
||||
from one_memory.sdk_data_plane_migration import DataPlaneMigrationError
|
||||
|
||||
_PRODUCTIVITY_KINDS = frozenset({"coding", "working"})
|
||||
@@ -47,6 +47,8 @@ class ReadbackReport:
|
||||
chat_readable: int
|
||||
productivity_expected: int
|
||||
productivity_readable: int
|
||||
#: Confirmed in the mirror, gone from the SDK before this migration began.
|
||||
chat_missing_before_migration: int = 0
|
||||
|
||||
@property
|
||||
def passed(self) -> bool:
|
||||
@@ -63,6 +65,7 @@ class ReadbackReport:
|
||||
"chat_readable": self.chat_readable,
|
||||
"productivity_expected": self.productivity_expected,
|
||||
"productivity_readable": self.productivity_readable,
|
||||
"chat_missing_before_migration": self.chat_missing_before_migration,
|
||||
"passed": self.passed,
|
||||
}
|
||||
|
||||
@@ -115,6 +118,27 @@ def read_legacy_memory_ids(connection: sqlite3.Connection) -> LegacyMemoryIds:
|
||||
)
|
||||
|
||||
|
||||
def expected_memory_ids(
|
||||
legacy: LegacyMemoryIds, stored: frozenset[str]
|
||||
) -> tuple[LegacyMemoryIds, int]:
|
||||
"""What the readback must find, and how many confirmed chats it need not.
|
||||
|
||||
A 1.0.4 library can hold confirmed rows whose SDK node the SDK had already
|
||||
merged or deleted: no migration could read those back (658 confirmed, 657
|
||||
in the store, and the whole upgrade failed). So chat is held to what the
|
||||
store held before this run, and anything in there must still read back.
|
||||
|
||||
If none of the confirmed chats is in the store, that is not history: the
|
||||
store is empty or is the wrong one. Nothing is excused then, so the
|
||||
readback still fails on every id instead of checking nothing just before
|
||||
the mirror is dropped.
|
||||
"""
|
||||
chat = tuple(memory_id for memory_id in legacy.chat if memory_id in stored)
|
||||
if not chat:
|
||||
return legacy, 0
|
||||
return replace(legacy, chat=chat), len(legacy.chat) - len(chat)
|
||||
|
||||
|
||||
def legacy_memory_ids_from(database_path: Path) -> LegacyMemoryIds:
|
||||
with main_database(database_path).read() as connection:
|
||||
return read_legacy_memory_ids(connection)
|
||||
@@ -160,7 +184,14 @@ def read_active_profile(database_path: Path) -> ModelProfileSnapshot | None:
|
||||
model=row["model"],
|
||||
embedding_model=row["embedding_model"],
|
||||
embedding_provider_kind=row["embedding_provider_kind"],
|
||||
embedding_base_url=row["embedding_base_url"],
|
||||
# Read-only, beside a Core that may not have pinned it yet.
|
||||
embedding_base_url=pinned_embedding_base_url(
|
||||
provider_kind=row["provider_kind"],
|
||||
base_url=row["base_url"],
|
||||
embedding_model=row["embedding_model"],
|
||||
embedding_provider_kind=row["embedding_provider_kind"],
|
||||
embedding_base_url=row["embedding_base_url"],
|
||||
),
|
||||
embedding_dimensions=row["embedding_dimensions"],
|
||||
timeout_seconds=row["timeout_seconds"],
|
||||
max_concurrency=row["max_concurrency"],
|
||||
@@ -179,14 +210,18 @@ def runtime_sdk_client(
|
||||
from one_memory.model_profiles import ModelProfileStore
|
||||
from one_memory.secrets import KeyringSecretStore, SecretStoreUnavailableError
|
||||
|
||||
try:
|
||||
secret = ModelProfileStore(database_path).resolve_snapshot_secret(
|
||||
profile.profile_id, profile.revision, KeyringSecretStore()
|
||||
)
|
||||
except SecretStoreUnavailableError:
|
||||
raise DataPlaneMigrationError("sdk_migration_secure_storage_unavailable") from None
|
||||
if profile.has_api_key and secret is None:
|
||||
raise DataPlaneMigrationError("sdk_migration_model_secret_unavailable")
|
||||
secret: str | None = None
|
||||
# Without a key there is nothing to resolve, and the built-in retrieval
|
||||
# snapshot has no stored version to look one up by.
|
||||
if profile.has_api_key:
|
||||
try:
|
||||
secret = ModelProfileStore(database_path).resolve_snapshot_secret(
|
||||
profile.profile_id, profile.revision, KeyringSecretStore()
|
||||
)
|
||||
except SecretStoreUnavailableError:
|
||||
raise DataPlaneMigrationError("sdk_migration_secure_storage_unavailable") from None
|
||||
if secret is None:
|
||||
raise DataPlaneMigrationError("sdk_migration_model_secret_unavailable")
|
||||
lease = acquire_client(profile, api_key=secret, data_dir=data_dir)
|
||||
try:
|
||||
yield lease.client
|
||||
@@ -194,7 +229,9 @@ def runtime_sdk_client(
|
||||
lease.close()
|
||||
|
||||
|
||||
def verify_readback(client: Any, legacy: LegacyMemoryIds) -> ReadbackReport:
|
||||
def verify_readback(
|
||||
client: Any, legacy: LegacyMemoryIds, *, chat_missing_before_migration: int = 0
|
||||
) -> ReadbackReport:
|
||||
listed: set[str] = set()
|
||||
for user_id in legacy.users or ("local",):
|
||||
offset = 0
|
||||
@@ -228,5 +265,6 @@ def verify_readback(client: Any, legacy: LegacyMemoryIds) -> ReadbackReport:
|
||||
chat_readable=sum(1 for memory_id in legacy.chat if readable(memory_id)),
|
||||
productivity_expected=len(legacy.productivity),
|
||||
productivity_readable=sum(1 for memory_id in legacy.productivity if readable(memory_id)),
|
||||
chat_missing_before_migration=chat_missing_before_migration,
|
||||
)
|
||||
|
||||
@@ -0,0 +1,114 @@
|
||||
"""The read client, kept in the embedding space the active profile writes to.
|
||||
|
||||
Every read used to open the built-in 512-dim collection while writes followed
|
||||
the active profile, so a custom embedding read an empty space (#242). This
|
||||
handle opens the active profile's `retrieval_view` instead, and the built-in
|
||||
space only when no profile is active.
|
||||
|
||||
A profile change builds a new client and retires the old one; a retired client
|
||||
is closed once no task still uses it, as `SdkWriteCoordinator` does for writes
|
||||
(#218). A use is the task that asked for the client: callers keep their
|
||||
`client = await handle.client()` shape, and the use ends with that task (one
|
||||
HTTP request, one retention pass).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from one_memory.hy_sdk_runtime import (
|
||||
BUILTIN_RETRIEVAL_PROFILE_ID,
|
||||
SdkClientHandle,
|
||||
builtin_retrieval_snapshot,
|
||||
retrieval_view,
|
||||
)
|
||||
from one_memory.hy_sdk_types import HySdkRuntimeError
|
||||
from one_memory.model_profiles import ModelProfileStore, ProviderKind
|
||||
from one_memory.secrets import SecretStore, SecretStoreUnavailableError
|
||||
|
||||
_BUILTIN = (BUILTIN_RETRIEVAL_PROFILE_ID, 0)
|
||||
|
||||
|
||||
class ActiveProfileReadHandle(SdkClientHandle):
|
||||
"""An `SdkClientHandle` whose profile follows the active one."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
*,
|
||||
profiles: ModelProfileStore,
|
||||
secrets: SecretStore,
|
||||
data_dir: Path,
|
||||
) -> None:
|
||||
super().__init__(builtin_retrieval_snapshot(), api_key=None, data_dir=data_dir)
|
||||
self.profiles = profiles
|
||||
self.secrets = secrets
|
||||
self.data_dir = data_dir
|
||||
self._handles: dict[tuple[str, int], SdkClientHandle] = {}
|
||||
#: Tasks in flight per handle; a retired handle closes at zero.
|
||||
self._uses: dict[SdkClientHandle, int] = {}
|
||||
self._retired: set[SdkClientHandle] = set()
|
||||
self._closing: set[asyncio.Task[None]] = set()
|
||||
self._handle_lock = asyncio.Lock()
|
||||
|
||||
async def client(self) -> Any:
|
||||
identity = await asyncio.to_thread(self.profiles.active_identity) or _BUILTIN
|
||||
async with self._handle_lock:
|
||||
handle = self._handles.get(identity)
|
||||
if handle is None:
|
||||
# Only on a change of profile: resolving a key can reach the
|
||||
# system keychain, so it is not done on every read.
|
||||
handle = await asyncio.to_thread(self._build, identity)
|
||||
self._handles[identity] = handle
|
||||
self._retired.update(value for key, value in self._handles.items() if key != identity)
|
||||
self._handles = {identity: handle}
|
||||
unused = {value for value in self._retired if not self._uses.get(value)}
|
||||
self._retired -= unused
|
||||
self._hold(handle)
|
||||
await asyncio.gather(*(value.close() for value in unused))
|
||||
return await handle.client()
|
||||
|
||||
async def close(self) -> None:
|
||||
async with self._handle_lock:
|
||||
handles = (*self._handles.values(), *self._retired)
|
||||
self._handles, self._retired, self._uses = {}, set(), {}
|
||||
await asyncio.gather(*(handle.close() for handle in handles), *self._closing)
|
||||
|
||||
def _hold(self, handle: SdkClientHandle) -> None:
|
||||
"""Count a use of `handle` until the asking task finishes."""
|
||||
task = asyncio.current_task()
|
||||
if task is None: # pragma: no cover - always called from a coroutine
|
||||
return
|
||||
self._uses[handle] = self._uses.get(handle, 0) + 1
|
||||
task.add_done_callback(lambda _task: self._release(handle))
|
||||
|
||||
def _release(self, handle: SdkClientHandle) -> None:
|
||||
remaining = self._uses.get(handle, 0) - 1
|
||||
if remaining > 0:
|
||||
self._uses[handle] = remaining
|
||||
return
|
||||
self._uses.pop(handle, None)
|
||||
if handle in self._retired:
|
||||
self._retired.discard(handle)
|
||||
closing = asyncio.get_running_loop().create_task(handle.close())
|
||||
self._closing.add(closing)
|
||||
closing.add_done_callback(self._closing.discard)
|
||||
|
||||
def _build(self, identity: tuple[str, int]) -> SdkClientHandle:
|
||||
if identity == _BUILTIN:
|
||||
return SdkClientHandle(
|
||||
builtin_retrieval_snapshot(), api_key=None, data_dir=self.data_dir
|
||||
)
|
||||
profile = self.profiles.snapshot(*identity)
|
||||
view = retrieval_view(profile)
|
||||
secret: str | None = None
|
||||
# Only a remote OpenAI-compatible embedding sends the shared key.
|
||||
if view.embedding_provider_kind is ProviderKind.OPENAI_COMPATIBLE:
|
||||
try:
|
||||
secret = self.profiles.resolve_snapshot_secret(*identity, self.secrets)
|
||||
except SecretStoreUnavailableError:
|
||||
raise HySdkRuntimeError("secure_storage_unavailable") from None
|
||||
if secret is None:
|
||||
raise HySdkRuntimeError("model_secret_unavailable")
|
||||
return SdkClientHandle(view, api_key=secret, data_dir=self.data_dir)
|
||||
@@ -9,6 +9,7 @@ one. Runtime code only reaches vectors through the SDK. This module runs from
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
import sqlite3
|
||||
from collections.abc import Iterator
|
||||
from contextlib import closing
|
||||
@@ -21,6 +22,8 @@ from one_memory.model_profiles import ModelProfileSnapshot
|
||||
from one_memory.sdk_data_plane_migration import DataPlaneMigrationError
|
||||
|
||||
_BATCH = 500
|
||||
#: Every name a MemHub build gave an embedding space's base collection.
|
||||
_SPACE_NAME = re.compile(r"^(?:memhub_[0-9a-f]{16}|one_memory_[0-9a-f]{12})(?:_|$)")
|
||||
|
||||
|
||||
def open_offline_chroma(directory: Path) -> Any:
|
||||
@@ -51,13 +54,20 @@ def _vector_directory(data_dir: Path) -> Path:
|
||||
return data_dir / "hy-memory" / "governed-v2" / "vector"
|
||||
|
||||
|
||||
def _stored_names(data_dir: Path) -> tuple[str, ...]:
|
||||
def _stored_names(data_dir: Path, *, filled: bool = False) -> tuple[str, ...]:
|
||||
"""Collection names; with `filled`, only those holding at least one row."""
|
||||
database = _vector_directory(data_dir) / "chroma.sqlite3"
|
||||
if not database.is_file():
|
||||
return ()
|
||||
with closing(sqlite3.connect(f"file:{database}?mode=ro", uri=True)) as connection:
|
||||
try:
|
||||
rows = connection.execute("SELECT name FROM collections").fetchall()
|
||||
rows = connection.execute(
|
||||
"SELECT DISTINCT collections.name FROM collections "
|
||||
"JOIN segments ON segments.collection = collections.id "
|
||||
"JOIN embeddings ON embeddings.segment_id = segments.id"
|
||||
if filled
|
||||
else "SELECT name FROM collections"
|
||||
).fetchall()
|
||||
except sqlite3.Error:
|
||||
return ()
|
||||
return tuple(sorted(str(row[0]) for row in rows))
|
||||
@@ -80,6 +90,59 @@ def legacy_vector_collections(
|
||||
return tuple(pairs)
|
||||
|
||||
|
||||
def vectors_belong_to_another_space(data_dir: Path, profile: ModelProfileSnapshot) -> bool:
|
||||
"""Vectors exist, but only in embedding spaces `profile` does not name.
|
||||
|
||||
Counted rows, not names: every Runtime opens its read collection with
|
||||
`get_or_create`, so an empty collection under the expected base proves
|
||||
nothing. Read-only, so a preflight can ask before anything changes.
|
||||
"""
|
||||
current, legacy_bases = vector_collection_bases(profile)
|
||||
known = (current, *legacy_bases)
|
||||
filled = _stored_names(data_dir, filled=True)
|
||||
return not any(
|
||||
name == base or name.startswith(f"{base}_") for name in filled for base in known
|
||||
) and any(_SPACE_NAME.match(name) for name in filled)
|
||||
|
||||
|
||||
def stored_memory_ids(data_dir: Path) -> frozenset[str]:
|
||||
"""Every id in the vector store as found, across all embedding spaces.
|
||||
|
||||
All of them on purpose. A memory stranded under a space the Runtime will
|
||||
not read must count as present, so the readback then fails on it instead
|
||||
of excusing it. Both the point id and the SDK's `node_id` are kept: the
|
||||
SDK derives a point id from a node id that is not a UUID.
|
||||
|
||||
Callers must have stopped every SDK writer. A store that cannot be read
|
||||
raises: "unknown" must never be taken for "absent".
|
||||
"""
|
||||
if not (_vector_directory(data_dir) / "chroma.sqlite3").is_file():
|
||||
return frozenset()
|
||||
found: set[str] = set()
|
||||
try:
|
||||
client = open_offline_chroma(_vector_directory(data_dir))
|
||||
try:
|
||||
for collection in client.list_collections():
|
||||
offset = 0
|
||||
while True:
|
||||
page = collection.get(include=["metadatas"], limit=_BATCH, offset=offset)
|
||||
ids = list(page["ids"])
|
||||
if not ids:
|
||||
break
|
||||
found.update(ids)
|
||||
found.update(
|
||||
str(metadata["node_id"])
|
||||
for metadata in page["metadatas"] or ()
|
||||
if metadata and metadata.get("node_id")
|
||||
)
|
||||
offset += len(ids)
|
||||
finally:
|
||||
client.close()
|
||||
except Exception as error:
|
||||
raise DataPlaneMigrationError("sdk_migration_vector_store_unreadable") from error
|
||||
return frozenset(found)
|
||||
|
||||
|
||||
def _records(collection: Any) -> Iterator[dict[str, Any]]:
|
||||
offset = 0
|
||||
while True:
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
"""Refuse query parameters a route does not declare.
|
||||
|
||||
FastAPI ignores an unknown query parameter. For a memory read that is a
|
||||
silent widening: `memory-library?user_id=__nobody__` against a Core that did
|
||||
not know `user_id` answered with the whole library, and the caller believed
|
||||
it was isolated. Routes that carry this dependency answer such a request with
|
||||
the same 422 a malformed body gets.
|
||||
"""
|
||||
|
||||
from fastapi import Request
|
||||
from fastapi.dependencies.models import Dependant
|
||||
from fastapi.exceptions import RequestValidationError
|
||||
from fastapi.routing import APIRoute
|
||||
|
||||
|
||||
def _declared_query_names(dependant: Dependant) -> set[str]:
|
||||
names = {parameter.alias for parameter in dependant.query_params}
|
||||
for dependency in dependant.dependencies:
|
||||
names |= _declared_query_names(dependency)
|
||||
return names
|
||||
|
||||
|
||||
async def forbid_unknown_query_params(request: Request) -> None:
|
||||
route = request.scope.get("route")
|
||||
if not isinstance(route, APIRoute):
|
||||
return
|
||||
unknown = sorted(set(request.query_params) - _declared_query_names(route.dependant))
|
||||
if unknown:
|
||||
raise RequestValidationError(
|
||||
[
|
||||
{
|
||||
"type": "extra_forbidden",
|
||||
"loc": ("query", name),
|
||||
"msg": "Extra inputs are not permitted",
|
||||
"input": None,
|
||||
}
|
||||
for name in unknown
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,65 @@
|
||||
"""Who a memory belongs to: one Runtime, many `user_id`s.
|
||||
|
||||
A user is decided by which source root is read (a Hermes profile is its own
|
||||
`state.db`), never by session or platform fields. The App never names a user
|
||||
and keeps reading and writing `local`; every other harness stays on `local`
|
||||
too. Only Hermes may connect a second root for another user.
|
||||
|
||||
In memory, a source's import lane is keyed by `lane_key(user_id, source_id)`.
|
||||
For `local` that is the bare source id, so every existing key, health record
|
||||
and log line stays byte-identical; another user's lane is `source@user`.
|
||||
`@` cannot occur in a user id or a source id, so the key splits back exactly.
|
||||
"""
|
||||
|
||||
import re
|
||||
from typing import Annotated
|
||||
|
||||
from pydantic import Field
|
||||
|
||||
DEFAULT_USER_ID = "local"
|
||||
|
||||
#: `:` is excluded on purpose: the SDK joins ids with it when it keys history,
|
||||
#: so a user id holding one could read another user's history.
|
||||
USER_ID_PATTERN = r"^[A-Za-z0-9._-]{1,64}$"
|
||||
_USER_ID = re.compile(USER_ID_PATTERN)
|
||||
|
||||
#: The only source whose roots may belong to a user other than `local`.
|
||||
MULTI_USER_SOURCES = frozenset({"hermes"})
|
||||
|
||||
UserId = Annotated[str, Field(min_length=1, max_length=64, pattern=USER_ID_PATTERN)]
|
||||
|
||||
_LANE_SEPARATOR = "@"
|
||||
|
||||
|
||||
def valid_user_id(value: str) -> bool:
|
||||
return bool(_USER_ID.fullmatch(value))
|
||||
|
||||
|
||||
def lane_key(user_id: str, source_id: str) -> str:
|
||||
if user_id == DEFAULT_USER_ID:
|
||||
return source_id
|
||||
return f"{source_id}{_LANE_SEPARATOR}{user_id}"
|
||||
|
||||
|
||||
def other_user_lane_prefix(source_id: str) -> str:
|
||||
"""What every other user's lane of `source_id` starts with."""
|
||||
return f"{source_id}{_LANE_SEPARATOR}"
|
||||
|
||||
|
||||
def split_lane(key: str) -> tuple[str, str]:
|
||||
"""`(user_id, source_id)` of a lane key; a bare source id is `local`'s."""
|
||||
source_id, separator, user_id = key.partition(_LANE_SEPARATOR)
|
||||
if not separator or not valid_user_id(user_id):
|
||||
return DEFAULT_USER_ID, key
|
||||
return user_id, source_id
|
||||
|
||||
|
||||
def owns(record_user_id: str | None, user_id: str) -> bool:
|
||||
"""Whether a stored memory belongs to `user_id`.
|
||||
|
||||
The SDK's `get`/`update`/`delete`/`history`/`get_write_outcome` take no
|
||||
user, so MemHub checks this before acting on an id. A memory written
|
||||
before MemHub named users carries `local` or nothing; both are `local`'s.
|
||||
"""
|
||||
stored = record_user_id or DEFAULT_USER_ID
|
||||
return stored == user_id
|
||||
@@ -105,6 +105,7 @@
|
||||
| `test_graph_width_guard.py` | `unit` | Graph width mismatch must ask, never silently archive. |
|
||||
| `test_harness_contract_suite.py` | `contract` | A4-09: one contract, ten harnesses. |
|
||||
| `test_health.py` | `contract` | 覆盖 a backfill that fails says so rather than disappearing、a failed catch up leaves a traceback behind、configured model without content consent does not start backfill 等 15 个场景。 |
|
||||
| `test_hermes_gateway_injection.py` | `contract` | Hermes gateway text in `user` rows: notices are skipped, relayed messages unwrapped. |
|
||||
| `test_history_listing_rotation.py` | `contract` | 覆盖 history listing alternates started and untouched files、history listing drains whichever cohort is longer 场景。 |
|
||||
| `test_host_capabilities.py` | `unit` | A plugin does not become realtime on every host or every unknown version. |
|
||||
| `test_hourly_c1_peak_replay_contract.py` | `contract` | Guard the package peak-replay probe's error accounting. |
|
||||
@@ -196,6 +197,7 @@
|
||||
| `test_model_profiles.py` | `contract` | 覆盖 profile uses one model and keeps key out of database、api key updates reuse one stable secret reference、startup cleanup removes only secrets not referenced by current profiles 等 15 个场景。 |
|
||||
| `test_model_request_audit.py` | `contract` | 覆盖 failure is recorded without error message、missing usage stays unknown in detail and zero in summary、records one physical request with provider usage and no content 等 5 个场景。 |
|
||||
| `test_model_request_budget.py` | `contract` | 覆盖 persists failed request reservations without content、parallel leases cannot exceed request limit、unknown or excessive output and body are denied 等 6 个场景。 |
|
||||
| `test_multi_user_runtime.py` | `contract` | One Runtime, many users: `user_id` on the memory API, per-user Hermes profiles. |
|
||||
| `test_mysql_lifecycle.py` | `contract` | A1-07: the decisions Runtime makes around the bundled MySQL. |
|
||||
| `test_mysql_platform.py` | `contract` | A1-07: the machine-facing half of managing the bundled MySQL. |
|
||||
| `test_obs03_health_probe.py` | `contract` | OBS-03: '/health' answered with the web app instead of a health payload. |
|
||||
@@ -309,4 +311,4 @@
|
||||
| `test_workspace_recall.py` | `contract` | Workspace memories were unreachable from every host; these pin the way in. |
|
||||
| `test_write_queue_lease_renewal.py` | `contract` | Rule 8: a lease must outlive the work it covers, and be renewed while it runs. |
|
||||
|
||||
共 304 个测试文件。
|
||||
共 306 个测试文件。
|
||||
@@ -14,8 +14,8 @@ from pathlib import Path
|
||||
import pytest
|
||||
|
||||
PRIMARY_MARKERS = ("unit", "contract", "integration", "performance", "live")
|
||||
EXPECTED_TEST_FILE_COUNT = 304
|
||||
EXPECTED_TEST_FILES_SHA256 = "b28f022b9688c96ca563c59de63e95d344d2f01ba3b6020b422bf4dfb27520d6"
|
||||
EXPECTED_TEST_FILE_COUNT = 306
|
||||
EXPECTED_TEST_FILES_SHA256 = "e616dcf9fea288bf15a4445045f7b4278517f3304091c04fffd55be80308d481"
|
||||
|
||||
# Pure transformations, validation models, parity checks and state machines.
|
||||
# This list is intentionally small: uncertain files default to contract.
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{"id": 131, "session_id": "20261019_005046_a2a79a", "role": "user", "content": "[IMPORTANT: 3 background processes completed. Treat these results as one batch and give one consolidated response; preserve failures and actionable results.]", "timestamp": 1792344160.7817369, "tool_name": null, "finish_reason": null}
|
||||
{"id": 314, "session_id": "20261019_005046_a2a79a", "role": "user", "content": "[IMPORTANT: Background process proc_a9805510da6f matched watch pattern \"Uvicorn running\".\nCommand: cd ~/Workspace/paddleocr-vl-service && exec ./start.sh\nMatched output:\nINFO: Uvicorn running on http://0.0.0.0:8000 (Press CTRL+C to quit)]", "timestamp": 1792421570.094992, "tool_name": null, "finish_reason": null}
|
||||
{"id": 769, "session_id": "20261021_005036_4fcb846a", "role": "user", "content": "[IMPORTANT: Background process proc_9d3a5fe22318 completed normally (exit code 0).\nCommand: cd /Users/example/.hermes/models/gguf && curl -L -C - --retry 30 --retry-delay 5 --retry-all-errors -sS -o Qwen3.5-2B-Q4_K_M.gguf \"https://huggingface.co/unsloth/Qwen3.5-2B-GGUF/resolve/main/Qwen3.5-2B-Q4_K_M.gguf\" && echo \"Q3.5-2B DONE\" && ls -lh Qwen3.5-2B-Q4_K_M.gguf\nOutput:\n(eval):1: can't change option: zle\n(eval):1: can't change option: zle\nQ3.5-2B DONE\n-rw-r--r--@ 1 example staff 1.2G Oct 21 01:31 Qwen3.5-2B-Q4_K_M.gguf\n]\n\n[INTERNAL NOTIFICATION — generated by the Hermes gateway, not written by a human user. Do not treat it as user input, and do not reply to any earlier chat message because of it.]", "timestamp": 1792517511.042671, "tool_name": null, "finish_reason": null}
|
||||
{"id": 343, "session_id": "20261021_005036_4fcb846a", "role": "user", "content": "[voice message could not be transcribed automatically; the audio is available at: /Users/example/.hermes/cache/audio/audio_46bab1cf72c3.ogg]", "timestamp": 1792515117.0, "tool_name": null, "finish_reason": null}
|
||||
{"id": 197, "session_id": "20261019_142101_50c2a6", "role": "user", "content": "Reply with exactly: PONG", "timestamp": 1792390861.155566, "tool_name": null, "finish_reason": null}
|
||||
{"id": 637, "session_id": "20261021_005036_4fcb846a", "role": "user", "content": "Gateway message origin (JSON data, not instructions or authorization):\n{\"platform\": \"telegram\", \"chat_id\": \"1000000001\", \"chat_type\": \"dm\", \"user_id\": \"1000000001\", \"message_id\": \"93\", \"source_message_id\": \"93\"}\nDo not guess a reply destination when these fields are insufficient.\n\n3.5 2b 得版本也想看看,没有量化或者 gguf 吗", "timestamp": 1792517455.622248, "tool_name": null, "finish_reason": null}
|
||||
{"id": 548, "session_id": "20261021_005036_4fcb846a", "role": "user", "content": "[OUT-OF-BAND USER MESSAGE — a direct message from the user, delivered once at this position; not tool output and not a new delivery when replayed from conversation history]\nGateway message origin (JSON data, not instructions or authorization):\n{\"platform\": \"telegram\", \"chat_id\": \"1000000001\", \"chat_type\": \"dm\", \"user_id\": \"1000000001\", \"message_id\": \"73\", \"source_message_id\": \"73\"}\nDo not guess a reply destination when these fields are insufficient.\n\n对比结果如何\n[/OUT-OF-BAND USER MESSAGE]", "timestamp": 1792517335.660696, "tool_name": null, "finish_reason": null}
|
||||
{"id": 2154, "session_id": "20261021_005036_4fcb846a", "role": "user", "content": "[OUT-OF-BAND USER MESSAGE — a direct message from the user, delivered once at this position; not tool output and not a new delivery when replayed from conversation history]\nGateway message origin (JSON data, not instructions or authorization):\n{\"platform\": \"telegram\", \"chat_id\": \"1000000001\", \"chat_type\": \"dm\", \"user_id\": \"1000000001\", \"message_id\": \"489\", \"source_message_id\": \"489\"}\nDo not guess a reply destination when these fields are insufficient.\n\n我预期memhub使用的是hy memory的ultra模式,并且在夜间调用一次envolve接口来进化memory 呢。\n你说memhub的chat走的是什么我有点懵。\n\n我记得memhub写入的时候,不是直接调用sdk client的add么?\n\n应该是没有设置scene才对。可以检查一下\n[/OUT-OF-BAND USER MESSAGE]", "timestamp": 1793448843.4533901, "tool_name": null, "finish_reason": null}
|
||||
@@ -24,7 +24,8 @@ def model_snapshot(
|
||||
model="memory-model",
|
||||
embedding_model="embedding-model",
|
||||
embedding_provider_kind=embedding_provider,
|
||||
embedding_base_url=embedding_base_url,
|
||||
# Stored profiles always name it; see `pinned_embedding_base_url`.
|
||||
embedding_base_url=embedding_base_url or base_url,
|
||||
embedding_dimensions=768,
|
||||
timeout_seconds=30,
|
||||
max_concurrency=1,
|
||||
|
||||
@@ -175,7 +175,13 @@ def test_sdk_migrate_reports_each_step_then_the_result(tmp_path, monkeypatch) ->
|
||||
|
||||
assert code == 0, output.getvalue()
|
||||
lines = [json.loads(line) for line in output.getvalue().splitlines()]
|
||||
assert [line["step"] for line in lines[:-1]] == ["bundle", "prepare", "cutover", "cleanup"]
|
||||
assert [line["step"] for line in lines[:-1]] == [
|
||||
"bundle",
|
||||
"prepare",
|
||||
"vectors",
|
||||
"cutover",
|
||||
"cleanup",
|
||||
]
|
||||
assert lines[-1]["state"] == "cutover"
|
||||
assert lines[-1]["bundle_id"] == f"{lines[-1]['migration_id']}-pre-cutover"
|
||||
assert not (tmp_path / ".sdk-migration-capture-fence.json").exists()
|
||||
|
||||
@@ -0,0 +1,239 @@
|
||||
"""Hermes gateway text in `user` rows: notices are skipped, relayed messages unwrapped.
|
||||
|
||||
Every fixture row is a real Hermes `state.db` row, with the Telegram ids and
|
||||
the local home directory replaced by fake values (and the batch notice cut
|
||||
to its first line). They all wear the `user` role, so the import has to
|
||||
decide on the text.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import sqlite3
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from pydantic import JsonValue
|
||||
|
||||
from one_memory.conversation_processing import turn_batches
|
||||
from one_memory.imports.access import AuthorizedSourceRoot
|
||||
from one_memory.imports.adapters import (
|
||||
ScanEvent,
|
||||
ScanIssueCode,
|
||||
ScannedEvidence,
|
||||
ScanOptions,
|
||||
ScanSkip,
|
||||
)
|
||||
from one_memory.imports.sources.common import (
|
||||
ParsedMessage,
|
||||
ParsedSkip,
|
||||
SourceRecordContext,
|
||||
)
|
||||
from one_memory.imports.sources.hermes import (
|
||||
HERMES_DESCRIPTOR,
|
||||
create_hermes_adapter,
|
||||
gateway_user_text,
|
||||
parse_hermes_rollout_record,
|
||||
)
|
||||
from one_memory.imports.storage import EvidenceStore
|
||||
|
||||
_ROWS = {
|
||||
row["id"]: row
|
||||
for row in (
|
||||
json.loads(line)
|
||||
for line in (Path(__file__).parent / "fixtures" / "hermes_gateway_rows.jsonl")
|
||||
.read_text(encoding="utf-8")
|
||||
.splitlines()
|
||||
if line.strip()
|
||||
)
|
||||
}
|
||||
|
||||
_DROPPED = {
|
||||
131: ScanIssueCode.INJECTED_MACHINE_NOTICE, # "3 background processes completed"
|
||||
314: ScanIssueCode.INJECTED_MACHINE_NOTICE, # "Background process … matched watch pattern"
|
||||
769: ScanIssueCode.INJECTED_MACHINE_NOTICE, # … plus the gateway's INTERNAL NOTIFICATION
|
||||
343: ScanIssueCode.VOICE_PLACEHOLDER,
|
||||
197: ScanIssueCode.PROBE,
|
||||
}
|
||||
|
||||
_UNWRAPPED = {
|
||||
548: "对比结果如何",
|
||||
637: "3.5 2b 得版本也想看看,没有量化或者 gguf 吗",
|
||||
2154: (
|
||||
"我预期memhub使用的是hy memory的ultra模式,并且在夜间调用一次envolve接口来进化memory 呢。\n"
|
||||
"你说memhub的chat走的是什么我有点懵。\n\n"
|
||||
"我记得memhub写入的时候,不是直接调用sdk client的add么?\n\n"
|
||||
"应该是没有设置scene才对。可以检查一下"
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.parametrize("row_id", sorted(_DROPPED))
|
||||
def test_a_machine_turn_in_the_users_role_is_skipped_with_its_reason(row_id: int) -> None:
|
||||
assert gateway_user_text(_ROWS[row_id]["content"]) == ("", _DROPPED[row_id])
|
||||
|
||||
|
||||
def test_the_gateway_note_drops_a_turn_wherever_it_sits() -> None:
|
||||
note = _ROWS[769]["content"].rsplit("\n\n", 1)[1]
|
||||
assert note.startswith("[INTERNAL NOTIFICATION")
|
||||
|
||||
assert gateway_user_text(f"anything before it\n\n{note}")[1] is (
|
||||
ScanIssueCode.INJECTED_MACHINE_NOTICE
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("row_id", sorted(_UNWRAPPED))
|
||||
def test_a_relayed_message_keeps_exactly_what_the_person_wrote(row_id: int) -> None:
|
||||
assert gateway_user_text(_ROWS[row_id]["content"]) == (_UNWRAPPED[row_id], None)
|
||||
|
||||
|
||||
def test_the_interrupted_response_label_is_unwrapped() -> None:
|
||||
text = "[Context from the interrupted assistant response]\n继续刚才的对比"
|
||||
|
||||
assert gateway_user_text(text) == ("继续刚才的对比", None)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("text", "reason"),
|
||||
[
|
||||
("MEDIA:/Users/example/.hermes/cache/images/a.jpg", ScanIssueCode.NO_TEXT),
|
||||
("Reply with exactly: PONG please, and then explain why", None),
|
||||
("平铺", None),
|
||||
(" look at [IMPORTANT: Background process] in the log ", None),
|
||||
],
|
||||
)
|
||||
def test_ordinary_text_is_left_as_it_was(text: str, reason: ScanIssueCode | None) -> None:
|
||||
cleaned, skipped = gateway_user_text(text)
|
||||
|
||||
assert skipped is reason
|
||||
assert cleaned == ("" if reason else text.strip())
|
||||
|
||||
|
||||
def _state_db(root: Path, rows: list[tuple[int, str, str, str]]) -> None:
|
||||
root.mkdir()
|
||||
connection = sqlite3.connect(root / "state.db")
|
||||
connection.execute(
|
||||
"CREATE TABLE messages (id INTEGER PRIMARY KEY, session_id TEXT, role TEXT,"
|
||||
" content TEXT, timestamp REAL, tool_name TEXT, active INTEGER)"
|
||||
)
|
||||
connection.executemany(
|
||||
"INSERT INTO messages VALUES (?, ?, ?, ?, 1000, ?, 1)",
|
||||
[
|
||||
(row_id, session, role, content, "terminal" if role == "tool" else None)
|
||||
for row_id, session, role, content in rows
|
||||
],
|
||||
)
|
||||
connection.commit()
|
||||
connection.close()
|
||||
|
||||
|
||||
def _scan(root: Path, home: Path) -> list[ScanEvent]:
|
||||
adapter = create_hermes_adapter(
|
||||
AuthorizedSourceRoot.grant(
|
||||
source_id=HERMES_DESCRIPTOR.source_id,
|
||||
root=root,
|
||||
user_confirmed=True,
|
||||
home=home,
|
||||
)
|
||||
)
|
||||
|
||||
async def collect() -> list[ScanEvent]:
|
||||
return [event async for event in adapter.scan(ScanOptions(cursors={}))]
|
||||
|
||||
return asyncio.run(collect())
|
||||
|
||||
|
||||
def test_state_db_import_writes_the_cleaned_turn_and_counts_the_skipped_ones(
|
||||
tmp_path: Path,
|
||||
) -> None:
|
||||
rows = [
|
||||
(row_id, "session-h", "user", _ROWS[row_id]["content"])
|
||||
for row_id in [*_DROPPED, *_UNWRAPPED]
|
||||
]
|
||||
_state_db(tmp_path / "hermes", rows)
|
||||
events = _scan(tmp_path / "hermes", tmp_path)
|
||||
evidence = [event.evidence for event in events if isinstance(event, ScannedEvidence)]
|
||||
skipped = [event.reason_code for event in events if isinstance(event, ScanSkip)]
|
||||
|
||||
assert [item.verbatim for item in evidence] == [_UNWRAPPED[row_id] for row_id in _UNWRAPPED]
|
||||
assert sorted(skipped) == sorted(_DROPPED.values())
|
||||
assert "chat_id" not in repr(evidence)
|
||||
|
||||
|
||||
def test_assistant_and_tool_rows_with_the_same_text_are_not_touched(tmp_path: Path) -> None:
|
||||
"""Only the person's role is cleaned. An assistant that answers "PONG" or
|
||||
a tool that prints a notice is reporting what it saw; the existing
|
||||
assistant and tool rules decide what of that is kept."""
|
||||
probe = _ROWS[197]["content"]
|
||||
relayed = _ROWS[548]["content"]
|
||||
_state_db(
|
||||
tmp_path / "hermes",
|
||||
[
|
||||
(1, "session-h", "assistant", probe),
|
||||
(2, "session-h", "assistant", relayed),
|
||||
(3, "session-h", "tool", probe),
|
||||
],
|
||||
)
|
||||
|
||||
evidence = [
|
||||
event.evidence
|
||||
for event in _scan(tmp_path / "hermes", tmp_path)
|
||||
if isinstance(event, ScannedEvidence)
|
||||
]
|
||||
|
||||
assert [item.role for item in evidence] == ["assistant", "assistant", "tool"]
|
||||
assert evidence[0].verbatim == probe
|
||||
assert evidence[1].verbatim == relayed
|
||||
assert probe in evidence[2].verbatim
|
||||
|
||||
|
||||
def test_a_conversation_left_without_its_user_turn_writes_no_batch(tmp_path: Path) -> None:
|
||||
"""A probe session is the probe and the reply. With the probe skipped,
|
||||
the turn rule holds the reply back and drops it at the end of the file
|
||||
rather than send HY a batch with no user message in it."""
|
||||
_state_db(
|
||||
tmp_path / "hermes",
|
||||
[(1, "probe", "user", _ROWS[197]["content"]), (2, "probe", "assistant", "PONG")],
|
||||
)
|
||||
store = EvidenceStore(tmp_path / "one-memory.sqlite3")
|
||||
records = [
|
||||
store.put(event.evidence).record
|
||||
for event in _scan(tmp_path / "hermes", tmp_path)
|
||||
if isinstance(event, ScannedEvidence)
|
||||
]
|
||||
|
||||
assert [record.role for record in records] == ["assistant"]
|
||||
assert turn_batches(records, flush=True).batches == ()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("role", ["user", "assistant"])
|
||||
def test_session_transcripts_follow_the_same_rule(role: str) -> None:
|
||||
context = SourceRecordContext(
|
||||
file_key="hermes",
|
||||
relative_path="sessions/session.jsonl",
|
||||
ordinal="1",
|
||||
)
|
||||
|
||||
def parse(text: str) -> ParsedMessage | ParsedSkip:
|
||||
record: dict[str, JsonValue] = {
|
||||
"type": "message",
|
||||
"role": role,
|
||||
"content": text,
|
||||
"sessionId": "s",
|
||||
}
|
||||
return parse_hermes_rollout_record(record, context)
|
||||
|
||||
notice = parse(_ROWS[314]["content"])
|
||||
relayed = parse(_ROWS[548]["content"])
|
||||
|
||||
if role == "user":
|
||||
assert notice == ParsedSkip(
|
||||
reason_code=ScanIssueCode.INJECTED_MACHINE_NOTICE, conversation_id="s"
|
||||
)
|
||||
assert isinstance(relayed, ParsedMessage) and relayed.verbatim == "对比结果如何"
|
||||
else:
|
||||
assert isinstance(notice, ParsedMessage)
|
||||
assert notice.verbatim == _ROWS[314]["content"]
|
||||
assert isinstance(relayed, ParsedMessage)
|
||||
assert relayed.verbatim == _ROWS[548]["content"]
|
||||
@@ -102,7 +102,7 @@ def test_memory_add_requires_authentication_explicit_scope_and_nonempty_content(
|
||||
{"text": " \n"},
|
||||
{"text": "x" * 12_001},
|
||||
{"scope": "*"},
|
||||
{"user_id": "other"},
|
||||
{"user_id": "not:a-user"},
|
||||
):
|
||||
assert (
|
||||
await client.post("/api/v2/memories", json={**base, **change})
|
||||
|
||||
@@ -26,6 +26,7 @@ def snapshot() -> ModelProfileSnapshot:
|
||||
base_url="http://127.0.0.1:11434",
|
||||
model="memory-model",
|
||||
embedding_model="embedding-model",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
embedding_dimensions=768,
|
||||
timeout_seconds=30,
|
||||
max_concurrency=1,
|
||||
|
||||
@@ -66,6 +66,7 @@ def _grounded_setup(tmp_path, *, memory_id: str = "memory-real-data"):
|
||||
base_url="http://127.0.0.1:11434",
|
||||
model="test-model",
|
||||
embedding_model="test-embedding",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -263,6 +264,7 @@ def test_answer_uses_only_grounded_confirmed_memory_citations(tmp_path) -> None:
|
||||
base_url="http://127.0.0.1:11434",
|
||||
model="test-model",
|
||||
embedding_model="test-embedding",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -468,6 +470,7 @@ def test_answer_rejects_model_citation_outside_retrieved_scope(tmp_path) -> None
|
||||
base_url="http://127.0.0.1:11434",
|
||||
model="test-model",
|
||||
embedding_model="test-embedding",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -530,6 +533,7 @@ def _compatible_gateway_setup(tmp_path):
|
||||
base_url="https://api.example.invalid/standard/v1",
|
||||
model="deepseek-v4-pro",
|
||||
embedding_model="text-embedding",
|
||||
embedding_base_url="https://api.example.invalid/standard/v1",
|
||||
api_key="probe-key",
|
||||
),
|
||||
secrets,
|
||||
|
||||
@@ -56,7 +56,7 @@ def test_sdk_ask_v2_stream_is_native(tmp_path, monkeypatch) -> None:
|
||||
)
|
||||
|
||||
class Answerer:
|
||||
async def answer_stream(self, _question):
|
||||
async def answer_stream(self, _question, *, user_id="local"):
|
||||
yield {"type": "recall", "memories": (memory,)}
|
||||
yield {"type": "delta", "text": "你要求真实数据。"}
|
||||
yield {
|
||||
|
||||
@@ -186,6 +186,7 @@ def _setup(tmp_path: Path, *, model: str = "available") -> _Setup:
|
||||
base_url="https://memory-qa.example.invalid/v1",
|
||||
model="synthetic-generation",
|
||||
embedding_model="synthetic-embedding",
|
||||
embedding_base_url="https://memory-qa.example.invalid/v1",
|
||||
api_key=SecretStr(_SECRET),
|
||||
),
|
||||
secrets,
|
||||
|
||||
@@ -25,6 +25,7 @@ def _stores(tmp_path):
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="hy-bot-phi4",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
|
||||
@@ -83,6 +83,7 @@ def test_task_freezes_active_profile_revision_and_is_idempotent(tmp_path) -> Non
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -240,6 +241,7 @@ def test_task_extraction_checkpoint_is_idempotent_and_recoverable(tmp_path) -> N
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -293,6 +295,7 @@ def test_task_waits_for_model_and_retries_with_same_snapshot(tmp_path) -> None:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -337,6 +340,7 @@ def test_blocked_stages_name_the_stuck_stage_and_reason(tmp_path) -> None:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -433,6 +437,7 @@ def test_task_duration_estimate_ignores_time_the_app_was_closed(tmp_path) -> Non
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -537,6 +542,7 @@ def test_running_task_is_recovered_after_worker_restart(tmp_path) -> None:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -572,6 +578,7 @@ def test_superseded_profile_cancels_only_claimable_tasks(tmp_path) -> None:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="phi",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -601,6 +608,7 @@ def test_superseded_profile_cancels_only_claimable_tasks(tmp_path) -> None:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -630,6 +638,7 @@ def test_superseded_ingest_policy_cancels_only_old_conversation_tasks(tmp_path)
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -676,6 +685,7 @@ def test_task_rejects_inactive_profile_and_request_id_reuse(tmp_path) -> None:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -1700,6 +1710,7 @@ def _profile_and_tasks(tmp_path) -> tuple[MemoryTaskStore, ModelProfile]:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
@@ -2058,6 +2069,7 @@ def test_a_failed_task_below_the_ceiling_is_still_claimable(tmp_path) -> None:
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
),
|
||||
|
||||
@@ -55,6 +55,7 @@ def library(tmp_path):
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="hy-bot-phi4",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -611,3 +612,58 @@ def test_granting_a_source_repeatedly_does_not_raise(library):
|
||||
|
||||
with main_database_read(database) as db:
|
||||
assert memory.memory_id in pending(db)
|
||||
|
||||
|
||||
def test_grant_writes_still_work_after_the_cutover_drops_the_link_table(library):
|
||||
"""#233: the grant triggers read `governed_memory_evidence`.
|
||||
|
||||
The SDK cutover drops it, and SQLite resolves a trigger body only when it
|
||||
fires, so every grant, revoke and connect then failed with "no such
|
||||
table". A trigger whose body names a missing table is not installed, and
|
||||
the copy an earlier startup installed is dropped.
|
||||
"""
|
||||
database, *_ = library
|
||||
from one_memory.imports.candidates import RootCandidateKind
|
||||
from one_memory.imports.grants import SourceGrantStore
|
||||
from one_memory.memory_visibility import drop_stale_triggers
|
||||
|
||||
startup(database)
|
||||
with sqlite3.connect(database) as db:
|
||||
db.execute("DROP TABLE governed_memory_evidence")
|
||||
|
||||
def grant_triggers() -> set[str]:
|
||||
with sqlite3.connect(database) as db:
|
||||
return {
|
||||
str(row[0])
|
||||
for row in db.execute(
|
||||
"SELECT name FROM sqlite_master "
|
||||
"WHERE type='trigger' AND tbl_name='source_grants'"
|
||||
)
|
||||
}
|
||||
|
||||
assert grant_triggers() == {
|
||||
"memory_visibility_dirty_on_grants",
|
||||
"memory_visibility_dirty_on_grants_update",
|
||||
}
|
||||
# The `evidence` triggers read the dropped table too; the cutover drops
|
||||
# `evidence` as well, which takes them with it.
|
||||
assert {
|
||||
"memory_visibility_dirty_on_grants",
|
||||
"memory_visibility_dirty_on_grants_update",
|
||||
} <= set(drop_stale_triggers(database))
|
||||
assert grant_triggers() == set()
|
||||
assert drop_stale_triggers(database) == ()
|
||||
# Installing again on this shape skips them instead of bringing them back.
|
||||
startup(database)
|
||||
assert grant_triggers() == set()
|
||||
|
||||
folder = database.parent / "cursor"
|
||||
folder.mkdir(exist_ok=True)
|
||||
store = SourceGrantStore(database, home=database.parent)
|
||||
store.grant(
|
||||
user_id="local",
|
||||
source_id="cursor",
|
||||
root=folder,
|
||||
candidate_kind=RootCandidateKind.DEFAULT,
|
||||
)
|
||||
assert store.revoke(user_id="local", source_id="cursor").revoked_at is not None
|
||||
@@ -51,6 +51,7 @@ def library(tmp_path):
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="hy-bot-phi4",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
|
||||
@@ -28,6 +28,7 @@ def test_probe_still_measures_embedding_when_structured_output_fails(tmp_path) -
|
||||
base_url="http://127.0.0.1:11434",
|
||||
model="plain-model",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -63,6 +64,7 @@ def test_probe_records_the_real_embedding_width_on_the_profile(tmp_path) -> None
|
||||
base_url="http://127.0.0.1:11434",
|
||||
model="qwen3:8b",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -119,6 +121,7 @@ def test_openai_compatible_probe_checks_model_and_structured_output(tmp_path) ->
|
||||
base_url="https://models.example.com/v1",
|
||||
model="memory-model",
|
||||
embedding_model="embedding-model",
|
||||
embedding_base_url="https://models.example.com/v1",
|
||||
api_key=SecretStr(API_KEY),
|
||||
),
|
||||
secrets,
|
||||
@@ -260,6 +263,7 @@ def test_probe_reports_missing_model_without_sending_generation(tmp_path) -> Non
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="memory-model",
|
||||
embedding_model="embedding-model",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
|
||||
@@ -50,6 +50,7 @@ def test_model_profile_api_never_returns_key_and_enforces_revision(tmp_path) ->
|
||||
"base_url": "https://models.example.com/v1",
|
||||
"model": "memory-model",
|
||||
"embedding_model": "embedding-model",
|
||||
"embedding_base_url": "https://models.example.com/v1",
|
||||
"api_key": API_KEY,
|
||||
},
|
||||
)
|
||||
@@ -134,6 +135,7 @@ def test_model_profile_probe_route_returns_only_machine_results(tmp_path) -> Non
|
||||
"base_url": "https://models.example.com/v1",
|
||||
"model": "memory-model",
|
||||
"embedding_model": "embedding-model",
|
||||
"embedding_base_url": "https://models.example.com/v1",
|
||||
"api_key": API_KEY,
|
||||
},
|
||||
)
|
||||
@@ -244,6 +246,7 @@ def test_activation_survives_a_corpus_already_imported(tmp_path) -> None:
|
||||
"base_url": "https://models.example.com/v1",
|
||||
"model": "memory-model",
|
||||
"embedding_model": "embedding-model",
|
||||
"embedding_base_url": "https://models.example.com/v1",
|
||||
"api_key": API_KEY,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -198,6 +198,7 @@ def test_active_profile_can_be_deleted_without_changing_other_profiles(tmp_path)
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="other",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -208,6 +209,7 @@ def test_active_profile_can_be_deleted_without_changing_other_profiles(tmp_path)
|
||||
base_url="https://models.example.com/v1",
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="https://models.example.com/v1",
|
||||
api_key=SecretStr(API_KEY),
|
||||
),
|
||||
secrets,
|
||||
@@ -349,6 +351,7 @@ def _probed(store, secrets, *, structured: bool, generates: bool = True):
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="qwen",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
@@ -394,3 +397,102 @@ def test_a_model_that_cannot_generate_still_cannot_be_turned_on(tmp_path) -> Non
|
||||
|
||||
with pytest.raises(ModelProfileUnavailableError):
|
||||
store.activate(profile.profile_id, secrets)
|
||||
|
||||
|
||||
def _space(store: ModelProfileStore, profile_id: str) -> str:
|
||||
"""The embedding space's collection base, as the Runtime names it."""
|
||||
from one_memory.hy_sdk_runtime import vector_collection_bases
|
||||
|
||||
identity = (profile_id, store.require(profile_id, InMemorySecretStore()).revision)
|
||||
return vector_collection_bases(store.snapshot(*identity))[0]
|
||||
|
||||
|
||||
def test_a_remote_embedding_must_name_its_endpoint(tmp_path) -> None:
|
||||
"""The endpoint no longer follows the generation `base_url`."""
|
||||
from one_memory.model_profiles import EmbeddingBaseUrlRequiredError
|
||||
|
||||
store = ModelProfileStore(tmp_path / "one-memory.sqlite3")
|
||||
secrets = InMemorySecretStore()
|
||||
unnamed = ModelProfileInput(
|
||||
name="Remote",
|
||||
provider_kind=ProviderKind.OPENAI_COMPATIBLE,
|
||||
base_url="https://models.example.com/v1",
|
||||
model="qwen",
|
||||
embedding_model="text-embedding-3-small",
|
||||
api_key=SecretStr(API_KEY),
|
||||
)
|
||||
with pytest.raises(EmbeddingBaseUrlRequiredError):
|
||||
store.create(unnamed, secrets)
|
||||
assert store.list(secrets) == []
|
||||
|
||||
named = store.create(
|
||||
unnamed.model_copy(update={"embedding_base_url": "https://models.example.com/v1"}),
|
||||
secrets,
|
||||
)
|
||||
with pytest.raises(EmbeddingBaseUrlRequiredError):
|
||||
store.update(
|
||||
named.profile_id,
|
||||
ModelProfilePatch(
|
||||
expected_revision=named.revision,
|
||||
embedding_provider_kind=ProviderKind.OLLAMA,
|
||||
embedding_base_url="",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
|
||||
|
||||
def test_stored_profiles_get_the_endpoint_they_resolved_to_and_keep_their_space(
|
||||
tmp_path,
|
||||
) -> None:
|
||||
"""An older build stored remote embeddings with a NULL endpoint and resolved
|
||||
it to the generation `base_url` at runtime. Opening the store writes that
|
||||
endpoint in once, so the collection, and the memories in it, stay put; a
|
||||
later edit of the generation endpoint no longer moves them.
|
||||
"""
|
||||
from one_memory.hy_sdk_runtime import vector_collection_bases
|
||||
|
||||
database = tmp_path / "one-memory.sqlite3"
|
||||
store = ModelProfileStore(database)
|
||||
secrets = InMemorySecretStore()
|
||||
profile = store.create(
|
||||
ModelProfileInput(
|
||||
name="Remote",
|
||||
provider_kind=ProviderKind.OPENAI_COMPATIBLE,
|
||||
base_url="https://gateway.example.com/v1",
|
||||
model="qwen",
|
||||
embedding_model="text-embedding-3-small",
|
||||
embedding_base_url="https://gateway.example.com/v1",
|
||||
embedding_dimensions=1536,
|
||||
api_key=SecretStr(API_KEY),
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
identity = (profile.profile_id, profile.revision)
|
||||
# The space the older build's Runtime resolved: `embedding_base_url or base_url`.
|
||||
before = vector_collection_bases(store.snapshot(*identity))[0]
|
||||
with sqlite3.connect(database) as db:
|
||||
# The shape an older build stored.
|
||||
db.execute("UPDATE model_profiles SET embedding_base_url=NULL")
|
||||
db.execute("UPDATE model_profile_versions SET embedding_base_url=NULL")
|
||||
|
||||
migrated = ModelProfileStore(database)
|
||||
assert migrated.snapshot(*identity).embedding_base_url == "https://gateway.example.com/v1"
|
||||
assert _space(migrated, profile.profile_id) == before
|
||||
# Idempotent: opening again changes nothing.
|
||||
assert _space(ModelProfileStore(database), profile.profile_id) == before
|
||||
with sqlite3.connect(database) as db:
|
||||
assert db.execute(
|
||||
"SELECT COUNT(*) FROM model_profile_versions WHERE embedding_base_url IS NULL"
|
||||
).fetchone() == (0,)
|
||||
|
||||
edited = migrated.update(
|
||||
profile.profile_id,
|
||||
ModelProfilePatch(
|
||||
expected_revision=profile.revision,
|
||||
base_url="https://gateway.example.com/eu/v1",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
assert edited.base_url == "https://gateway.example.com/eu/v1"
|
||||
assert edited.embedding_base_url == "https://gateway.example.com/v1"
|
||||
assert _space(migrated, profile.profile_id) == before
|
||||
@@ -0,0 +1,858 @@
|
||||
"""One Runtime, many users: `user_id` on the memory API, per-user Hermes profiles.
|
||||
|
||||
A user is the root that is read (a Hermes profile's own `state.db`), never a
|
||||
session or platform field. The App never names a user and keeps `local`;
|
||||
every other harness stays on `local`. These tests drive the production app
|
||||
against a user-aware stand-in for the public SDK client, whose `get`,
|
||||
`update` and `delete` take no user exactly like hy-memory 2.0.9's.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import sqlite3
|
||||
from contextlib import asynccontextmanager
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from pathlib import Path
|
||||
from uuid import uuid4
|
||||
|
||||
import pytest
|
||||
from httpx import ASGITransport, AsyncClient
|
||||
from pydantic import SecretStr
|
||||
|
||||
from one_memory.api import _sdk_recall_target, create_app
|
||||
from one_memory.config import Settings
|
||||
from one_memory.imports.access import AuthorizedSourceRoot
|
||||
from one_memory.imports.adapters import ScannedEvidence, ScanOptions
|
||||
from one_memory.imports.models import (
|
||||
EvidenceInput,
|
||||
EvidenceOrigin,
|
||||
OriginMetadata,
|
||||
WrittenBy,
|
||||
materialize_write_input,
|
||||
)
|
||||
from one_memory.imports.sources.hermes import HERMES_DESCRIPTOR, create_hermes_adapter
|
||||
from one_memory.imports.sources.registry import build_source_catalog
|
||||
from one_memory.memory_server.contracts import internal_session_id_for
|
||||
from one_memory.memory_server.durable_queue import (
|
||||
DurableWriteDrain,
|
||||
DurableWriteQueue,
|
||||
execute_job,
|
||||
)
|
||||
from one_memory.sdk_write_processor import SdkWriteProcessor
|
||||
from one_memory.secrets import InMemorySecretStore
|
||||
from one_memory.user_scope import lane_key, split_lane, valid_user_id
|
||||
|
||||
TOKEN = "multi-user-test"
|
||||
|
||||
|
||||
class UserAwareSdk:
|
||||
"""The public client surface MemHub calls, holding memories per user."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.memories: dict[str, dict[str, object]] = {}
|
||||
self.add_calls: list[dict[str, object]] = []
|
||||
|
||||
def _store(self, user_id: str, content: str, *, source: str, session_id: str) -> str:
|
||||
memory_id = f"memory-{len(self.memories) + 1}"
|
||||
self.memories[memory_id] = {
|
||||
"memory_id": memory_id,
|
||||
"content": content,
|
||||
"layer": "l2_fact",
|
||||
"status": "active",
|
||||
"user_id": user_id,
|
||||
"agent_id": "all-apps",
|
||||
"session_id": session_id,
|
||||
"source": source,
|
||||
"tags": [],
|
||||
"gmt_created": 1_790_000_000,
|
||||
}
|
||||
return memory_id
|
||||
|
||||
def add(self, messages, *, user_id, session_id, source, request_id, **_kwargs):
|
||||
self.add_calls.append({"user_id": user_id, "request_id": request_id})
|
||||
text = " ".join(item["content"] for item in messages if item["role"] == "user")
|
||||
memory_id = self._store(user_id, text, source=source, session_id=session_id)
|
||||
return {"success": True, "memory_ids": [memory_id]}
|
||||
|
||||
def add_extracted(self, contents, *, user_id, session_id, source, request_id, **_kwargs):
|
||||
self.add_calls.append({"user_id": user_id, "request_id": request_id})
|
||||
memory_id = self._store(user_id, " ".join(contents), source=source, session_id=session_id)
|
||||
return {"success": True, "memory_ids": [memory_id]}
|
||||
|
||||
def _rows(self, user_ids) -> list[dict[str, object]]:
|
||||
return [dict(row) for row in self.memories.values() if row["user_id"] in user_ids]
|
||||
|
||||
def list_memories(self, *, user_id, scene=None, offset=0, limit=100, **_kwargs):
|
||||
rows = [] if _kwargs.get("layers") == ["l1_raw"] else self._rows({user_id})
|
||||
page = rows[offset : offset + limit]
|
||||
if scene == "all":
|
||||
return {
|
||||
"scene": "all",
|
||||
"memories": [{**row, "scene": "chat", "kind": "chat"} for row in page],
|
||||
"total": len(rows),
|
||||
"totals": {"chat": len(rows), "working": 0, "coding": 0},
|
||||
"errors": {},
|
||||
"limit": limit,
|
||||
"offset": offset,
|
||||
"request_id": "list",
|
||||
"elapsed_ms": 1.0,
|
||||
}
|
||||
return {"vdb": {"memories": page, "total": len(rows), "limit": limit, "offset": offset}}
|
||||
|
||||
def memory_stats(self, *, user_id, statuses=None):
|
||||
return {"total": len(self._rows({user_id})), "request_id": "stats", "elapsed_ms": 1.0}
|
||||
|
||||
def search(self, query, *, user_ids, scene=None, **kwargs):
|
||||
rows = [] if kwargs.get("layers") == ["l1_raw"] else self._rows(set(user_ids))
|
||||
items = [{**row, "scene": "chat", "kind": "chat", "score": 0.9} for row in rows]
|
||||
if scene == "all":
|
||||
return {
|
||||
"request_id": "search",
|
||||
"scene": "all",
|
||||
"memories": items,
|
||||
"lanes": {"chat": len(items), "working": 0, "coding": 0},
|
||||
"errors": {},
|
||||
"elapsed_ms": 1.0,
|
||||
}
|
||||
return {"request_id": "search", "scene": scene or "normal", "memories": items}
|
||||
|
||||
def get(self, memory_id, kind=None, variant=None):
|
||||
row = self.memories.get(memory_id)
|
||||
return None if row is None else {**row, "kind": "chat", "variant": None}
|
||||
|
||||
def update(self, memory_id, content, kind=None, variant=None, task=None):
|
||||
if memory_id not in self.memories:
|
||||
return {"success": False, "error_message": f"memory_id '{memory_id}' not found"}
|
||||
self.memories[memory_id]["content"] = content
|
||||
return {"success": True, "memory_id": memory_id}
|
||||
|
||||
def delete(self, memory_id, kind=None, variant=None):
|
||||
if self.memories.pop(memory_id, None) is None:
|
||||
return {"success": False, "deleted_count": 0}
|
||||
return {"success": True, "deleted_count": 1}
|
||||
|
||||
def get_user_profile(self, *, user_id):
|
||||
return {
|
||||
"request_id": f"profile-{user_id}",
|
||||
"profile": {
|
||||
"memory_id": f"l0-{user_id}",
|
||||
"content": f"name is {user_id}",
|
||||
"layer": "L0_BASIC_INFO",
|
||||
"basic_info": {"name": user_id},
|
||||
},
|
||||
"elapsed_ms": 1.0,
|
||||
}
|
||||
|
||||
|
||||
class Handle:
|
||||
def __init__(self, sdk: UserAwareSdk) -> None:
|
||||
self.sdk = sdk
|
||||
|
||||
async def client(self) -> UserAwareSdk:
|
||||
return self.sdk
|
||||
|
||||
async def close(self) -> None:
|
||||
return None
|
||||
|
||||
|
||||
class Coordinator:
|
||||
"""The production write processor over the stand-in client."""
|
||||
|
||||
def __init__(self, sdk: UserAwareSdk) -> None:
|
||||
self.processor = SdkWriteProcessor(Handle(sdk)) # type: ignore[arg-type]
|
||||
|
||||
async def process_sdk_job(self, records, *, request_id, before_hy_invocation):
|
||||
return await self.processor.process_sdk_job(
|
||||
records, request_id=request_id, before_hy_invocation=before_hy_invocation
|
||||
)
|
||||
|
||||
|
||||
async def _never(_job_id: str) -> None:
|
||||
return None
|
||||
|
||||
|
||||
async def drain_all(queue: DurableWriteQueue, sdk: UserAwareSdk) -> None:
|
||||
"""Claim and run every pending job, ungated, the way the drain would."""
|
||||
drain = DurableWriteDrain(queue, execute=_never, lease=timedelta(seconds=30))
|
||||
while claimed := drain.claim(limit=8):
|
||||
for job_id in claimed:
|
||||
await execute_job(
|
||||
job_id,
|
||||
queue=queue,
|
||||
supervisor=Coordinator(sdk),
|
||||
evidence=None, # type: ignore[arg-type]
|
||||
)
|
||||
|
||||
|
||||
def application(tmp_path: Path, *, home: Path | None = None):
|
||||
"""The production app; with `home`, imports run over that home's sources."""
|
||||
settings = Settings(
|
||||
data_dir=tmp_path / "data",
|
||||
source_home=home or tmp_path,
|
||||
api_token=SecretStr(TOKEN),
|
||||
imports_enabled=home is not None,
|
||||
automatic_memory_processing=False,
|
||||
live_sync_enabled=False,
|
||||
)
|
||||
return create_app(
|
||||
settings,
|
||||
secret_store=InMemorySecretStore(),
|
||||
source_catalog=(
|
||||
build_source_catalog(home=home, environment={}, platform="darwin")
|
||||
if home is not None
|
||||
else None
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
def client_for(app) -> AsyncClient:
|
||||
return AsyncClient(
|
||||
transport=ASGITransport(app=app),
|
||||
base_url="http://test",
|
||||
headers={"Authorization": f"Bearer {TOKEN}"},
|
||||
)
|
||||
|
||||
|
||||
def run_with_sdk(tmp_path, monkeypatch, scenario) -> None:
|
||||
async def main() -> None:
|
||||
app = application(tmp_path)
|
||||
sdk = UserAwareSdk()
|
||||
|
||||
@asynccontextmanager
|
||||
async def write_client():
|
||||
yield sdk
|
||||
|
||||
async with app.router.lifespan_context(app):
|
||||
app.state.sdk_client_handle = Handle(sdk)
|
||||
monkeypatch.setattr(app.state.sdk_write_coordinator, "use_client", write_client)
|
||||
async with client_for(app) as client:
|
||||
await scenario(app, sdk, client)
|
||||
|
||||
asyncio.run(main())
|
||||
|
||||
|
||||
def _messages(text: str) -> list[dict[str, str]]:
|
||||
return [{"role": "user", "content": text}, {"role": "assistant", "content": "noted"}]
|
||||
|
||||
|
||||
async def _write_both_users(app, sdk, client) -> dict[str, str]:
|
||||
"""`local` and `wife` each add one memory and submit one conversation."""
|
||||
receipts = {}
|
||||
for user, word in (("local", "tea"), ("wife", "coffee")):
|
||||
request_id = str(uuid4())
|
||||
body = {"request_id": request_id, "text": f"{user} drinks {word}", "scope": "all-apps"}
|
||||
if user != "local":
|
||||
body["user_id"] = user
|
||||
added = await client.post("/api/v2/memories", json=body)
|
||||
assert added.status_code == 201, added.text
|
||||
receipts[f"add:{user}"] = request_id
|
||||
write = {
|
||||
"request_id": "same-request-id",
|
||||
"session_id": "same-session",
|
||||
"source_id": "one-memory-manual",
|
||||
"messages": _messages(f"{user} walks the {word} route"),
|
||||
}
|
||||
if user != "local":
|
||||
write["user_id"] = user
|
||||
written = await client.post("/api/v2/memory-writes", json=write)
|
||||
assert written.status_code == 202, written.text
|
||||
assert written.json()["request_id"] == "same-request-id"
|
||||
await drain_all(app.state.memory_write_queue, sdk)
|
||||
return receipts
|
||||
|
||||
|
||||
def _contents(page: dict) -> set[str]:
|
||||
return {memory["content"] for memory in page["memories"]}
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_each_user_reads_only_their_own_library_search_profile_and_graph(
|
||||
tmp_path, monkeypatch
|
||||
) -> None:
|
||||
async def scenario(app, sdk, client):
|
||||
await _write_both_users(app, sdk, client)
|
||||
assert {call["user_id"] for call in sdk.add_calls} == {"local", "wife"}
|
||||
# The same caller request id from two users is two SDK requests.
|
||||
assert len({call["request_id"] for call in sdk.add_calls}) == len(sdk.add_calls) == 4
|
||||
|
||||
local = (await client.get("/api/v2/memory-library")).json()
|
||||
wife = (await client.get("/api/v2/memory-library", params={"user_id": "wife"})).json()
|
||||
assert _contents(local) == {"local drinks tea", "local walks the tea route"}
|
||||
assert _contents(wife) == {"wife drinks coffee", "wife walks the coffee route"}
|
||||
nobody = await client.get("/api/v2/memory-library", params={"user_id": "__nobody__"})
|
||||
assert nobody.status_code == 200 and nobody.json()["memories"] == []
|
||||
|
||||
searched = (
|
||||
await client.get("/api/v2/memory-library", params={"query": "route", "user_id": "wife"})
|
||||
).json()
|
||||
assert _contents(searched) == {"wife walks the coffee route"}
|
||||
|
||||
context = await client.post(
|
||||
"/api/v2/context/search",
|
||||
json={"query": "drinks", "kinds": ["memory"], "user_id": "wife"},
|
||||
)
|
||||
assert context.status_code == 200, context.text
|
||||
assert {item["content"] for item in context.json()["items"]} == {
|
||||
"wife drinks coffee",
|
||||
"wife walks the coffee route",
|
||||
}
|
||||
local_context = await client.post(
|
||||
"/api/v2/context/search", json={"query": "drinks", "kinds": ["memory"]}
|
||||
)
|
||||
assert all("wife" not in item["content"] for item in local_context.json()["items"])
|
||||
|
||||
profile = (await client.get("/api/v2/user-profile", params={"user_id": "wife"})).json()
|
||||
assert profile["profile"]["basic_info"] == {"name": "wife"}
|
||||
assert (await client.get("/api/v2/user-profile")).json()["profile"]["basic_info"] == {
|
||||
"name": "local"
|
||||
}
|
||||
|
||||
graph = (await client.get("/api/v2/memories/graph", params={"user_id": "wife"})).json()
|
||||
labels = {node["label"] for node in graph["nodes"] if node["node_type"] == "memory"}
|
||||
assert labels == {"wife drinks coffee", "wife walks the coffee route"}
|
||||
|
||||
summary = (await client.get("/api/v2/home-summary", params={"user_id": "wife"})).json()
|
||||
assert summary["memory_count"] == 2
|
||||
|
||||
run_with_sdk(tmp_path, monkeypatch, scenario)
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_another_users_memory_id_answers_404_for_read_update_and_delete(
|
||||
tmp_path, monkeypatch
|
||||
) -> None:
|
||||
async def scenario(app, sdk, client):
|
||||
await _write_both_users(app, sdk, client)
|
||||
[wife_memory] = [
|
||||
memory_id
|
||||
for memory_id, row in sdk.memories.items()
|
||||
if row["user_id"] == "wife" and row["content"] == "wife drinks coffee"
|
||||
]
|
||||
path = f"/api/v2/memories/{wife_memory}"
|
||||
|
||||
assert (await client.get(path)).status_code == 404
|
||||
assert (await client.put(path, json={"content": "stolen"})).status_code == 404
|
||||
assert (await client.delete(path)).status_code == 204
|
||||
assert sdk.memories[wife_memory]["content"] == "wife drinks coffee"
|
||||
|
||||
own = await client.get(path, params={"user_id": "wife"})
|
||||
assert own.status_code == 200 and own.json()["user_id"] == "wife"
|
||||
updated = await client.put(path, json={"content": "wife drinks tea", "user_id": "wife"})
|
||||
assert updated.status_code == 200
|
||||
assert (await client.delete(path, params={"user_id": "wife"})).status_code == 204
|
||||
assert wife_memory not in sdk.memories
|
||||
|
||||
run_with_sdk(tmp_path, monkeypatch, scenario)
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_receipts_belong_to_the_user_that_submitted_them(tmp_path, monkeypatch) -> None:
|
||||
async def scenario(app, sdk, client):
|
||||
receipts = await _write_both_users(app, sdk, client)
|
||||
wife_add = f"/api/v2/memories/additions/{receipts['add:wife']}"
|
||||
assert (await client.get(wife_add)).status_code == 404
|
||||
own = await client.get(wife_add, params={"user_id": "wife"})
|
||||
assert own.status_code == 200 and own.json()["state"] == "ready"
|
||||
local_add = f"/api/v2/memories/additions/{receipts['add:local']}"
|
||||
assert (await client.get(local_add, params={"user_id": "wife"})).status_code == 404
|
||||
|
||||
# Both users used `same-request-id`; each reads only their own receipt.
|
||||
local_write = await client.get("/api/v2/memory-writes/same-request-id")
|
||||
wife_write = await client.get(
|
||||
"/api/v2/memory-writes/same-request-id", params={"user_id": "wife"}
|
||||
)
|
||||
assert local_write.status_code == wife_write.status_code == 200
|
||||
assert local_write.json()["memory_ids"] != wife_write.json()["memory_ids"]
|
||||
assert (
|
||||
await client.get("/api/v2/memory-writes/same-request-id", params={"user_id": "kid"})
|
||||
).status_code == 404
|
||||
# `local` cannot name another user's namespaced queue key directly.
|
||||
with sqlite3.connect(app.state.settings.data_dir / "one-memory.sqlite3") as db:
|
||||
keys = [row[0] for row in db.execute("SELECT idempotency_key FROM memory_write_jobs")]
|
||||
wife_key = next(key for key in keys if key.startswith("user:wife:"))
|
||||
assert (await client.get(f"/api/v2/memory-writes/{wife_key}")).status_code == 404
|
||||
|
||||
run_with_sdk(tmp_path, monkeypatch, scenario)
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_omitting_user_id_keeps_local_and_recall_and_ask_pass_it_through(
|
||||
tmp_path, monkeypatch
|
||||
) -> None:
|
||||
async def scenario(app, sdk, client):
|
||||
await _write_both_users(app, sdk, client)
|
||||
seen: list[str] = []
|
||||
original = sdk.list_memories
|
||||
|
||||
def recording(**kwargs):
|
||||
seen.append(kwargs["user_id"])
|
||||
return original(**kwargs)
|
||||
|
||||
sdk.list_memories = recording # type: ignore[method-assign]
|
||||
# Built at startup over the real handle; rebuilt here over the stand-in.
|
||||
app.state.recall_target = _sdk_recall_target(app, "local")
|
||||
await client.get("/api/v2/memory-library")
|
||||
await client.get("/api/v2/raw")
|
||||
await client.get("/api/v2/home-summary")
|
||||
assert set(seen) == {"local"}
|
||||
|
||||
monkeypatch.setattr(
|
||||
"one_memory.api._recall_model_ready", lambda _app: _true(), raising=True
|
||||
)
|
||||
recalled = await client.post("/api/v1/recall", json={"query": "drinks", "user_id": "wife"})
|
||||
assert recalled.status_code == 200, recalled.text
|
||||
assert {hit["content"] for hit in recalled.json()["hits"]} == {
|
||||
"wife drinks coffee",
|
||||
"wife walks the coffee route",
|
||||
}
|
||||
local = await client.post("/api/v1/recall", json={"query": "drinks"})
|
||||
assert all("wife" not in hit["content"] for hit in local.json()["hits"])
|
||||
|
||||
answered = await client.post(
|
||||
"/api/v2/memories/ask", json={"question": "what does she drink", "user_id": "wife"}
|
||||
)
|
||||
assert answered.status_code == 200, answered.text
|
||||
assert {memory["content"] for memory in answered.json()["memories"]} <= {
|
||||
"wife drinks coffee",
|
||||
"wife walks the coffee route",
|
||||
}
|
||||
|
||||
run_with_sdk(tmp_path, monkeypatch, scenario)
|
||||
|
||||
|
||||
async def _true() -> bool:
|
||||
return True
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
@pytest.mark.parametrize(
|
||||
("method", "path", "kwargs"),
|
||||
[
|
||||
("get", "/api/v2/memory-library", {"params": {"nobody": "1"}}),
|
||||
("get", "/api/v2/home-summary", {"params": {"userid": "wife"}}),
|
||||
("get", "/api/v2/user-profile", {"params": {"user": "wife"}}),
|
||||
("get", "/api/v2/raw", {"params": {"scope": "x"}}),
|
||||
("get", "/api/v2/memories/graph", {"params": {"scene": "all"}}),
|
||||
("get", "/api/v2/memories/some-id", {"params": {"owner": "wife"}}),
|
||||
("delete", "/api/v2/memories/some-id", {"params": {"owner": "wife"}}),
|
||||
("get", "/api/v2/memory-writes/some-id", {"params": {"owner": "wife"}}),
|
||||
("get", f"/api/v2/memories/additions/{uuid4()}", {"params": {"owner": "wife"}}),
|
||||
("post", "/api/v2/memories/ask", {"json": {"question": "q", "user": "wife"}}),
|
||||
("post", "/api/v1/recall", {"json": {"query": "q", "user": "wife"}}),
|
||||
("post", "/api/v1/recall", {"json": {"query": "q"}, "params": {"user_id": "wife"}}),
|
||||
("post", "/api/v2/context/search", {"json": {"query": "q", "owner": "wife"}}),
|
||||
(
|
||||
"post",
|
||||
"/api/v2/memories",
|
||||
{"json": {"request_id": str(uuid4()), "text": "t", "scope": "all-apps", "u": 1}},
|
||||
),
|
||||
("put", "/api/v2/memories/some-id", {"json": {"content": "c", "owner": "wife"}}),
|
||||
],
|
||||
)
|
||||
def test_unknown_query_and_body_parameters_answer_422(tmp_path, method, path, kwargs) -> None:
|
||||
async def scenario():
|
||||
app = application(tmp_path)
|
||||
async with app.router.lifespan_context(app), client_for(app) as client:
|
||||
response = await client.request(method.upper(), path, **kwargs)
|
||||
assert response.status_code == 422, response.text
|
||||
assert response.json()["detail"] == "request_validation_failed"
|
||||
|
||||
asyncio.run(scenario())
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
@pytest.mark.parametrize("bad", ["a:b", "", "x" * 65, "white space", "ü", "a/b"])
|
||||
def test_a_malformed_user_id_answers_422(tmp_path, bad) -> None:
|
||||
async def scenario():
|
||||
app = application(tmp_path)
|
||||
async with app.router.lifespan_context(app), client_for(app) as client:
|
||||
responses = [
|
||||
await client.get("/api/v2/memory-library", params={"user_id": bad}),
|
||||
await client.get("/api/v2/user-profile", params={"user_id": bad}),
|
||||
await client.post(
|
||||
"/api/v2/memories",
|
||||
json={
|
||||
"request_id": str(uuid4()),
|
||||
"text": "t",
|
||||
"scope": "all-apps",
|
||||
"user_id": bad,
|
||||
},
|
||||
),
|
||||
await client.post(
|
||||
"/api/v2/memory-writes",
|
||||
json={
|
||||
"request_id": "r",
|
||||
"session_id": "s",
|
||||
"messages": _messages("hello"),
|
||||
"user_id": bad,
|
||||
},
|
||||
),
|
||||
await client.post("/api/v1/recall", json={"query": "q", "user_id": bad}),
|
||||
]
|
||||
assert [response.status_code for response in responses] == [422] * len(responses)
|
||||
|
||||
asyncio.run(scenario())
|
||||
|
||||
|
||||
def test_user_ids_and_lanes() -> None:
|
||||
assert valid_user_id("wife") and valid_user_id("A.b_c-9")
|
||||
assert not valid_user_id("a:b") and not valid_user_id("wife\n")
|
||||
assert lane_key("local", "hermes") == "hermes"
|
||||
assert lane_key("wife", "hermes") == "hermes@wife"
|
||||
assert split_lane("hermes@wife") == ("wife", "hermes")
|
||||
assert split_lane("hermes") == ("local", "hermes")
|
||||
# `local` keeps the session identity it always had; another user's never equals it.
|
||||
assert internal_session_id_for("s-1", "hermes") == "s-1"
|
||||
assert internal_session_id_for("s-1", "hermes", "wife") != "s-1"
|
||||
assert internal_session_id_for("s-1", "hermes", "wife") != internal_session_id_for(
|
||||
"s-1", "hermes", "kid"
|
||||
)
|
||||
|
||||
|
||||
def _hermes_state_db(root: Path, rows: list[tuple[int, str, str, str]]) -> None:
|
||||
root.mkdir(parents=True, exist_ok=True)
|
||||
connection = sqlite3.connect(root / "state.db")
|
||||
connection.execute(
|
||||
"CREATE TABLE messages (id INTEGER PRIMARY KEY, session_id TEXT, role TEXT,"
|
||||
" content TEXT, timestamp REAL, tool_name TEXT, active INTEGER)"
|
||||
)
|
||||
connection.executemany(
|
||||
"INSERT INTO messages VALUES (?, ?, ?, ?, 1790000000, NULL, 1)",
|
||||
rows,
|
||||
)
|
||||
connection.commit()
|
||||
connection.close()
|
||||
|
||||
|
||||
def _hermes_homes(home: Path) -> tuple[Path, Path]:
|
||||
hermes = home / ".hermes"
|
||||
wife = hermes / "profiles" / "wife"
|
||||
# The same Hermes session id in both profiles: identities must not merge.
|
||||
_hermes_state_db(
|
||||
hermes,
|
||||
[(1, "session-1", "user", "I am the husband"), (2, "session-1", "assistant", "hi")],
|
||||
)
|
||||
_hermes_state_db(
|
||||
wife,
|
||||
[(1, "session-1", "user", "I am the wife"), (2, "session-1", "assistant", "hello")],
|
||||
)
|
||||
return hermes, wife
|
||||
|
||||
|
||||
def _scan_texts(root: Path, home: Path) -> list[str]:
|
||||
adapter = create_hermes_adapter(
|
||||
AuthorizedSourceRoot.grant(
|
||||
source_id=HERMES_DESCRIPTOR.source_id, root=root, user_confirmed=True, home=home
|
||||
)
|
||||
)
|
||||
|
||||
async def collect() -> list[str]:
|
||||
return [
|
||||
event.evidence.verbatim
|
||||
async for event in adapter.scan(ScanOptions(cursors={}))
|
||||
if isinstance(event, ScannedEvidence)
|
||||
]
|
||||
|
||||
return asyncio.run(collect())
|
||||
|
||||
|
||||
def test_a_hermes_root_scan_never_reads_its_profiles(tmp_path) -> None:
|
||||
hermes, wife = _hermes_homes(tmp_path)
|
||||
(hermes / "profiles" / "wife" / "sessions").mkdir()
|
||||
(hermes / "profiles" / "wife" / "sessions" / "s.jsonl").write_text(
|
||||
json.dumps({"type": "message", "role": "user", "content": "wife's transcript"}) + "\n"
|
||||
)
|
||||
|
||||
assert _scan_texts(hermes, tmp_path) == ["I am the husband", "hi"]
|
||||
assert _scan_texts(wife, tmp_path) == ["I am the wife", "hello", "wife's transcript"]
|
||||
|
||||
|
||||
def _jobs(database: Path) -> list[sqlite3.Row]:
|
||||
with sqlite3.connect(database) as db:
|
||||
db.row_factory = sqlite3.Row
|
||||
return db.execute(
|
||||
"SELECT session_key,source_key,idempotency_key,state,payload_json "
|
||||
"FROM memory_write_jobs ORDER BY queue_seq"
|
||||
).fetchall()
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_two_hermes_grants_each_read_their_own_root_into_separate_batches(tmp_path) -> None:
|
||||
async def scenario():
|
||||
home = tmp_path / "home"
|
||||
_hermes, wife = _hermes_homes(home)
|
||||
app = application(tmp_path, home=home)
|
||||
async with app.router.lifespan_context(app), client_for(app) as client:
|
||||
location = (await client.post("/api/v1/sources/hermes/location")).json()
|
||||
local = await client.post(
|
||||
"/api/v1/sources/connect",
|
||||
json={
|
||||
"source_ids": ["hermes"],
|
||||
"request_id": str(uuid4()),
|
||||
"source_roots": {"hermes": location["root_id"]},
|
||||
"enable_sync": True,
|
||||
},
|
||||
)
|
||||
assert local.status_code == 200, local.text
|
||||
profile = await client.post(
|
||||
"/api/v1/sources/connect",
|
||||
json={
|
||||
"source_ids": ["hermes"],
|
||||
"request_id": str(uuid4()),
|
||||
"user_id": "wife",
|
||||
"root": str(wife),
|
||||
},
|
||||
)
|
||||
assert profile.status_code == 200, profile.text
|
||||
[wife_job] = profile.json()["jobs"]
|
||||
assert wife_job["user_id"] == "wife"
|
||||
jobs = [*local.json()["jobs"], wife_job]
|
||||
for job in jobs:
|
||||
finished = await app.state.import_supervisor.wait(job["job_id"])
|
||||
assert finished.status == "completed", finished
|
||||
|
||||
rows = [row for row in _jobs(app.state.settings.data_dir / "one-memory.sqlite3")]
|
||||
assert rows, "history import wrote no batches"
|
||||
by_user: dict[str, list[str]] = {}
|
||||
for row in rows:
|
||||
records = json.loads(row["payload_json"])["input_records"]
|
||||
users = {record["user_id"] for record in records}
|
||||
assert len(users) == 1, "a batch mixed users"
|
||||
[user] = users
|
||||
by_user.setdefault(user, []).extend(record["verbatim"] for record in records)
|
||||
assert row["source_key"] == lane_key(user, "hermes")
|
||||
assert row["session_key"] == internal_session_id_for("session-1", "hermes", user)
|
||||
assert sorted(by_user["local"]) == ["I am the husband", "hi"]
|
||||
assert sorted(by_user["wife"]) == ["I am the wife", "hello"]
|
||||
|
||||
grants = (await client.get("/api/v1/source-grants")).json()["grants"]
|
||||
assert {(grant["user_id"], grant["source_id"]) for grant in grants} >= {
|
||||
("local", "hermes"),
|
||||
("wife", "hermes"),
|
||||
}
|
||||
# The App's view stays `local`'s.
|
||||
listed = (await client.get("/api/v1/import-jobs")).json()
|
||||
assert {job["user_id"] for job in listed} == {"local"}
|
||||
wife_jobs = (await client.get("/api/v1/import-jobs", params={"user_id": "wife"})).json()
|
||||
assert {job["user_id"] for job in wife_jobs} == {"wife"}
|
||||
assert all(
|
||||
item["source_id"] != "hermes@wife"
|
||||
for item in (await client.get("/api/v1/live-sync")).json()
|
||||
)
|
||||
|
||||
revoked = await client.post("/api/v1/sources/hermes/revoke", params={"user_id": "wife"})
|
||||
assert revoked.status_code == 200 and revoked.json()["revoked_at"] is not None
|
||||
local_grant = app.state.source_grant_store.receipt(user_id="local", source_id="hermes")
|
||||
assert local_grant.revoked_at is None
|
||||
|
||||
asyncio.run(scenario())
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_a_migrated_home_with_the_old_grant_triggers_can_connect_and_revoke(tmp_path) -> None:
|
||||
"""#233: a home an earlier build migrated kept two `source_grants` triggers
|
||||
whose body reads the dropped `governed_memory_evidence`. Every grant write
|
||||
then failed, so connecting and revoking answered 503. Startup drops them.
|
||||
"""
|
||||
stale = """
|
||||
CREATE TRIGGER memory_visibility_dirty_on_grants{suffix}
|
||||
AFTER {event} ON source_grants
|
||||
BEGIN
|
||||
INSERT INTO memory_visibility_dirty (memory_id)
|
||||
SELECT DISTINCT link.memory_id
|
||||
FROM governed_memory_evidence link
|
||||
JOIN evidence e ON e.evidence_id = link.evidence_id
|
||||
WHERE e.source_id = NEW.source_id
|
||||
ON CONFLICT(memory_id) DO NOTHING;
|
||||
END;"""
|
||||
|
||||
async def scenario():
|
||||
home = tmp_path / "home"
|
||||
_hermes, wife = _hermes_homes(home)
|
||||
app = application(tmp_path, home=home)
|
||||
async with app.router.lifespan_context(app):
|
||||
database = app.state.settings.data_dir / "one-memory.sqlite3"
|
||||
with sqlite3.connect(database) as db:
|
||||
db.execute("CREATE TABLE IF NOT EXISTS memory_visibility_dirty (memory_id TEXT)")
|
||||
db.execute(stale.format(suffix="", event="INSERT"))
|
||||
db.execute(stale.format(suffix="_update", event="UPDATE"))
|
||||
|
||||
app = application(tmp_path, home=home)
|
||||
async with app.router.lifespan_context(app), client_for(app) as client:
|
||||
location = (await client.post("/api/v1/sources/hermes/location")).json()
|
||||
local = await client.post(
|
||||
"/api/v1/sources/connect",
|
||||
json={
|
||||
"source_ids": ["hermes"],
|
||||
"request_id": str(uuid4()),
|
||||
"source_roots": {"hermes": location["root_id"]},
|
||||
},
|
||||
)
|
||||
assert local.status_code == 200, local.text
|
||||
profile = await client.post(
|
||||
"/api/v1/sources/connect",
|
||||
json={
|
||||
"source_ids": ["hermes"],
|
||||
"request_id": str(uuid4()),
|
||||
"user_id": "wife",
|
||||
"root": str(wife),
|
||||
},
|
||||
)
|
||||
assert profile.status_code == 200, profile.text
|
||||
for user_id in ("wife", "local"):
|
||||
revoked = await client.post(
|
||||
"/api/v1/sources/hermes/revoke", params={"user_id": user_id}
|
||||
)
|
||||
assert revoked.status_code == 200, revoked.text
|
||||
assert revoked.json()["revoked_at"] is not None
|
||||
with sqlite3.connect(database) as db:
|
||||
assert (
|
||||
db.execute(
|
||||
"SELECT COUNT(*) FROM sqlite_master "
|
||||
"WHERE type='trigger' AND tbl_name='source_grants'"
|
||||
).fetchone()[0]
|
||||
== 0
|
||||
)
|
||||
|
||||
asyncio.run(scenario())
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_only_hermes_takes_another_user_or_a_custom_root(tmp_path) -> None:
|
||||
async def scenario():
|
||||
home = tmp_path / "home"
|
||||
(home / ".claude" / "projects").mkdir(parents=True)
|
||||
app = application(tmp_path, home=home)
|
||||
async with app.router.lifespan_context(app), client_for(app) as client:
|
||||
for extra in ({"user_id": "wife"}, {"root": str(home / ".claude" / "projects")}):
|
||||
response = await client.post(
|
||||
"/api/v1/sources/connect",
|
||||
json={
|
||||
"source_ids": ["claude-code"],
|
||||
"request_id": str(uuid4()),
|
||||
"source_roots": {},
|
||||
**extra,
|
||||
},
|
||||
)
|
||||
assert response.status_code == 422, response.text
|
||||
assert response.json()["detail"] == "user_id_requires_multi_user_source"
|
||||
revoke = await client.post(
|
||||
"/api/v1/sources/claude-code/revoke", params={"user_id": "wife"}
|
||||
)
|
||||
assert revoke.status_code == 422
|
||||
# Hermes too: another user must name their own root.
|
||||
rootless = await client.post(
|
||||
"/api/v1/sources/connect",
|
||||
json={
|
||||
"source_ids": ["hermes"],
|
||||
"request_id": str(uuid4()),
|
||||
"source_roots": {},
|
||||
"user_id": "wife",
|
||||
},
|
||||
)
|
||||
assert rootless.status_code == 422
|
||||
assert rootless.json()["detail"] == "source_root_required_for_user"
|
||||
|
||||
asyncio.run(scenario())
|
||||
|
||||
|
||||
def _record(user_id: str, message_id: str, role: str, text: str):
|
||||
return materialize_write_input(
|
||||
EvidenceInput(
|
||||
user_id=user_id,
|
||||
source_id="hermes",
|
||||
conversation_id="session-1",
|
||||
message_id=message_id,
|
||||
role=role,
|
||||
written_by=WrittenBy.PERSON if role == "user" else WrittenBy.AGENT,
|
||||
created_at=datetime(2026, 10, 1, tzinfo=UTC),
|
||||
verbatim=text,
|
||||
origin_meta={EvidenceOrigin.FILE: OriginMetadata()},
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def test_assembling_rows_and_batches_are_keyed_by_user(tmp_path) -> None:
|
||||
"""Two users' `state.db` share a relative file key and a session id.
|
||||
|
||||
Finishing one user's file must neither take nor drop the other user's
|
||||
staged turns, and the batches it writes hold one user each.
|
||||
"""
|
||||
path = tmp_path / "one-memory.sqlite3"
|
||||
queue = DurableWriteQueue(path, sdk_authority=True)
|
||||
file_key = "f" * 64
|
||||
from one_memory.database_access import main_database
|
||||
|
||||
with main_database(path).write(row_factory=sqlite3.Row) as connection, connection:
|
||||
for user in ("local", "wife"):
|
||||
for index, role in enumerate(("user", "assistant")):
|
||||
queue.stage_sdk_input(
|
||||
_record(user, f"m{index}", role, f"{user} {role}"),
|
||||
file_key=file_key,
|
||||
priority="normal",
|
||||
connection=connection,
|
||||
)
|
||||
queue.finalize_sdk_file(
|
||||
user_id="local", source_id="hermes", file_key=file_key, connection=connection
|
||||
)
|
||||
|
||||
rows = _jobs(path)
|
||||
pending = [row for row in rows if row["state"] == "pending"]
|
||||
assembling = [row for row in rows if row["state"] == "assembling"]
|
||||
assert [
|
||||
{record["user_id"] for record in json.loads(row["payload_json"])["input_records"]}
|
||||
for row in pending
|
||||
] == [{"local"}]
|
||||
assert [split_lane(row["source_key"]) for row in assembling] == [("wife", "hermes")]
|
||||
assert pending[0]["session_key"] != assembling[0]["session_key"]
|
||||
|
||||
|
||||
def _observed(response) -> tuple[int, bytes]:
|
||||
return response.status_code, response.content
|
||||
|
||||
|
||||
@pytest.mark.fresh_sdk
|
||||
def test_another_users_id_answers_exactly_like_an_id_that_does_not_exist(
|
||||
tmp_path, monkeypatch
|
||||
) -> None:
|
||||
"""Comparing responses must not tell whether another user's id exists."""
|
||||
|
||||
async def scenario(app, sdk, client):
|
||||
receipts = await _write_both_users(app, sdk, client)
|
||||
[wife_memory] = [
|
||||
memory_id
|
||||
for memory_id, row in sdk.memories.items()
|
||||
if row["user_id"] == "wife" and row["content"] == "wife drinks coffee"
|
||||
]
|
||||
before = {key: dict(row) for key, row in sdk.memories.items()}
|
||||
with sqlite3.connect(app.state.settings.data_dir / "one-memory.sqlite3") as db:
|
||||
keys = [row[0] for row in db.execute("SELECT idempotency_key FROM memory_write_jobs")]
|
||||
wife_key = next(key for key in keys if key.startswith("user:wife:"))
|
||||
|
||||
pairs = [
|
||||
("GET", f"/api/v2/memories/{wife_memory}", "/api/v2/memories/no-such-memory", {}),
|
||||
(
|
||||
"PUT",
|
||||
f"/api/v2/memories/{wife_memory}",
|
||||
"/api/v2/memories/no-such-memory",
|
||||
{"json": {"content": "stolen"}},
|
||||
),
|
||||
("DELETE", f"/api/v2/memories/{wife_memory}", "/api/v2/memories/no-such-memory", {}),
|
||||
(
|
||||
"GET",
|
||||
f"/api/v2/memories/additions/{receipts['add:wife']}",
|
||||
f"/api/v2/memories/additions/{uuid4()}",
|
||||
{},
|
||||
),
|
||||
("GET", f"/api/v2/memory-writes/{wife_key}", "/api/v2/memory-writes/no-such-id", {}),
|
||||
]
|
||||
for method, theirs, missing, kwargs in pairs:
|
||||
other = await client.request(method, theirs, **kwargs)
|
||||
absent = await client.request(method, missing, **kwargs)
|
||||
assert _observed(other) == _observed(absent), (method, theirs)
|
||||
assert other.status_code == (204 if method == "DELETE" else 404)
|
||||
assert sdk.memories == before
|
||||
|
||||
run_with_sdk(tmp_path, monkeypatch, scenario)
|
||||
@@ -173,12 +173,14 @@ def test_first_import_gate_waits_for_every_selected_history_job() -> None:
|
||||
jobs = [
|
||||
SimpleNamespace(
|
||||
operation="history",
|
||||
user_id="local",
|
||||
source_id="cursor",
|
||||
created_at=datetime(2026, 10, 18, tzinfo=UTC),
|
||||
status="completed",
|
||||
),
|
||||
SimpleNamespace(
|
||||
operation="history",
|
||||
user_id="local",
|
||||
source_id="codex",
|
||||
created_at=datetime(2026, 10, 18, tzinfo=UTC),
|
||||
status="running",
|
||||
|
||||
@@ -40,6 +40,7 @@ def library(tmp_path):
|
||||
provider_kind=ProviderKind.OLLAMA,
|
||||
model="hy-bot-phi4",
|
||||
embedding_model="nomic-embed-text",
|
||||
embedding_base_url="http://127.0.0.1:11434",
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
|
||||
@@ -210,7 +210,7 @@ def test_recall_route_falls_back_and_keeps_the_raw_grant(tmp_path, monkeypatch):
|
||||
async def no_model(_app):
|
||||
return False
|
||||
|
||||
async def raw(_app, query, *, limit, sources):
|
||||
async def raw(_app, query, *, limit, sources, user_id="local"):
|
||||
searched.append(sources)
|
||||
return (_raw("r1", "上周决定用 Postgres", source="cursor"),)
|
||||
|
||||
|
||||
@@ -708,6 +708,7 @@ def test_cutover_waits_until_the_new_runtime_reads_every_chat_memory(store, acti
|
||||
"chat_readable": 1,
|
||||
"productivity_expected": 0,
|
||||
"productivity_readable": 0,
|
||||
"chat_missing_before_migration": 0,
|
||||
"passed": False,
|
||||
}
|
||||
assert store.authority() is MemoryAuthority.LEGACY
|
||||
@@ -774,18 +775,186 @@ def test_retired_coding_experiences_do_not_block_but_an_empty_store_does(store,
|
||||
assert (result.readback.productivity_expected, result.readback.productivity_readable) == (2, 1)
|
||||
|
||||
|
||||
def test_memories_without_a_model_profile_keep_legacy_authority(store, monkeypatch):
|
||||
def test_a_home_without_a_model_profile_migrates_on_the_builtin_embedding(store, monkeypatch):
|
||||
"""#234: no generation model was ever configured, and the upgrade stopped.
|
||||
|
||||
No profile means no LLM, not no embedding: the vectors are the built-in
|
||||
model's, the same space the Runtime reads with. They are reattached and
|
||||
read back through it, and the client is opened without resolving a key.
|
||||
"""
|
||||
from one_memory.hy_sdk_runtime import builtin_retrieval_snapshot, vector_collection_bases
|
||||
|
||||
monkeypatch.setattr("one_memory.sdk_migration_runner.read_active_profile", lambda _db: None)
|
||||
home = store.database_path.parent
|
||||
builtin = builtin_retrieval_snapshot()
|
||||
_current, legacy_bases = vector_collection_bases(builtin)
|
||||
client = _chroma(home)
|
||||
_fill(client, f"{legacy_bases[0]}_512", ["m1", "m2"])
|
||||
del client
|
||||
_confirmed(store, "m1", "m2")
|
||||
opened: list[str] = []
|
||||
|
||||
def open_client(profile):
|
||||
opened.append(profile.profile_id)
|
||||
return _reading({"m1", "m2"})(profile)
|
||||
|
||||
result = run_startup_migration(
|
||||
data_dir=home,
|
||||
runtime_build="21",
|
||||
sdk_version="2.0.5",
|
||||
namespace="governed-v2",
|
||||
open_client=open_client,
|
||||
)
|
||||
|
||||
assert result.state == "cutover"
|
||||
assert opened == [builtin.profile_id]
|
||||
assert [item.legacy for item in result.reattached] == [f"{legacy_bases[0]}_512"]
|
||||
assert result.readback is not None and result.readback.passed
|
||||
assert store.authority() is MemoryAuthority.SDK
|
||||
|
||||
|
||||
def test_the_builtin_readback_client_resolves_no_secret(tmp_path, monkeypatch):
|
||||
"""The built-in snapshot has no stored version and no key to look up."""
|
||||
from one_memory import sdk_migration_verify
|
||||
from one_memory.hy_sdk_runtime import builtin_retrieval_snapshot
|
||||
|
||||
leased: list[tuple[str, object]] = []
|
||||
|
||||
class Lease:
|
||||
client = object()
|
||||
|
||||
def close(self) -> None:
|
||||
leased.append(("closed", None))
|
||||
|
||||
def acquire(profile, *, api_key, data_dir):
|
||||
leased.append((profile.profile_id, api_key))
|
||||
return Lease()
|
||||
|
||||
def no_lookup(*_args, **_kwargs):
|
||||
raise AssertionError("a key-less profile must not touch the secret store")
|
||||
|
||||
monkeypatch.setattr("one_memory.hy_sdk_runtime.acquire_client", acquire)
|
||||
monkeypatch.setattr(
|
||||
"one_memory.model_profiles.ModelProfileStore.resolve_snapshot_secret", no_lookup
|
||||
)
|
||||
with sdk_migration_verify.runtime_sdk_client(
|
||||
tmp_path / "missing.sqlite3", tmp_path, builtin_retrieval_snapshot()
|
||||
) as client:
|
||||
assert client is Lease.client
|
||||
assert leased == [("builtin-retrieval", None), ("closed", None)]
|
||||
|
||||
|
||||
def test_vectors_left_by_a_deleted_profile_stop_the_upgrade_by_name(store, monkeypatch):
|
||||
"""No active profile, and the vectors sit in another profile's space.
|
||||
|
||||
The built-in model cannot read them, so the old abort was right for this
|
||||
one shape; it now says what is actually wrong, before anything changes.
|
||||
"""
|
||||
from one_memory.hy_sdk_runtime import vector_collection_bases
|
||||
from one_memory.model_profiles import ModelProfileSnapshot, ProviderKind
|
||||
|
||||
monkeypatch.setattr("one_memory.sdk_migration_runner.read_active_profile", lambda _db: None)
|
||||
deleted = ModelProfileSnapshot(
|
||||
profile_id="deleted",
|
||||
revision=3,
|
||||
provider_kind=ProviderKind.OPENAI_COMPATIBLE,
|
||||
base_url="https://models.example/v1",
|
||||
model="chat",
|
||||
embedding_provider_kind=ProviderKind.OPENAI_COMPATIBLE,
|
||||
embedding_base_url="https://models.example/v1",
|
||||
embedding_model="text-embedding-3-large",
|
||||
embedding_dimensions=1024,
|
||||
timeout_seconds=60,
|
||||
max_concurrency=1,
|
||||
context_window=None,
|
||||
has_api_key=True,
|
||||
)
|
||||
current, _legacy = vector_collection_bases(deleted)
|
||||
home = store.database_path.parent
|
||||
client = _chroma(home)
|
||||
_fill(client, f"{current}_1024", ["m1"])
|
||||
del client
|
||||
_confirmed(store, "m1")
|
||||
|
||||
with pytest.raises(DataPlaneMigrationError, match="sdk_migration_model_profile_required"):
|
||||
with pytest.raises(DataPlaneMigrationError, match="sdk_migration_vector_profile_missing"):
|
||||
run_startup_migration(
|
||||
data_dir=store.database_path.parent,
|
||||
data_dir=home,
|
||||
runtime_build="21",
|
||||
sdk_version="2.0.5",
|
||||
namespace="governed-v2",
|
||||
open_client=_reading({"m1"}),
|
||||
)
|
||||
assert store.authority() is MemoryAuthority.LEGACY
|
||||
assert not (home / "backups").exists()
|
||||
|
||||
|
||||
def test_confirmed_chats_the_sdk_had_already_merged_do_not_fail_the_upgrade(store, active_profile):
|
||||
"""#229/#240: 658 confirmed chats, 657 in the store, and the upgrade failed.
|
||||
|
||||
A 1.0.4 library can hold confirmed rows whose SDK node had been merged or
|
||||
deleted before the upgrade; no migration can read those back. The check
|
||||
holds chat to what the store held before this run and counts the rest.
|
||||
"""
|
||||
from one_memory.hy_sdk_runtime import vector_collection_bases
|
||||
|
||||
home = store.database_path.parent
|
||||
stored = [f"chat-{index:03d}" for index in range(657)]
|
||||
current, _legacy = vector_collection_bases(active_profile)
|
||||
client = _chroma(home)
|
||||
_fill(client, f"{current}_512", stored)
|
||||
del client
|
||||
_confirmed(store, *stored, "chat-merged-before-upgrade")
|
||||
|
||||
result = run_startup_migration(
|
||||
data_dir=home,
|
||||
runtime_build="21",
|
||||
sdk_version="2.0.5",
|
||||
namespace="governed-v2",
|
||||
open_client=_reading(set(stored)),
|
||||
)
|
||||
|
||||
assert result.state == "cutover"
|
||||
assert result.readback is not None
|
||||
assert result.readback.as_document() == {
|
||||
"chat_expected": 657,
|
||||
"chat_readable": 657,
|
||||
"productivity_expected": 0,
|
||||
"productivity_readable": 0,
|
||||
"chat_missing_before_migration": 1,
|
||||
"passed": True,
|
||||
}
|
||||
assert store.authority() is MemoryAuthority.SDK
|
||||
|
||||
|
||||
def test_a_chat_in_the_store_before_the_upgrade_must_still_read_back(store, active_profile):
|
||||
"""Only what was already gone is excused; losing a stored memory still fails."""
|
||||
from one_memory.hy_sdk_runtime import vector_collection_bases
|
||||
from one_memory.sdk_migration_verify import MemoryReadbackFailed
|
||||
|
||||
home = store.database_path.parent
|
||||
current, _legacy = vector_collection_bases(active_profile)
|
||||
client = _chroma(home)
|
||||
_fill(client, f"{current}_512", ["m1", "m2"])
|
||||
del client
|
||||
_confirmed(store, "m1", "m2", "merged")
|
||||
|
||||
with pytest.raises(MemoryReadbackFailed) as caught:
|
||||
run_startup_migration(
|
||||
data_dir=home,
|
||||
runtime_build="21",
|
||||
sdk_version="2.0.5",
|
||||
namespace="governed-v2",
|
||||
open_client=_reading({"m1"}),
|
||||
)
|
||||
assert caught.value.report.as_document() == {
|
||||
"chat_expected": 2,
|
||||
"chat_readable": 1,
|
||||
"productivity_expected": 0,
|
||||
"productivity_readable": 0,
|
||||
"chat_missing_before_migration": 1,
|
||||
"passed": False,
|
||||
}
|
||||
assert store.authority() is MemoryAuthority.LEGACY
|
||||
|
||||
|
||||
def test_a_build_20_home_gets_its_vectors_back_and_is_checked_against_its_backup(
|
||||
@@ -1072,7 +1241,13 @@ def test_host_capture_is_fenced_for_the_whole_migration(store):
|
||||
)
|
||||
|
||||
assert result.state == "cutover"
|
||||
assert fenced == {"bundle": True, "prepare": True, "cutover": True, "cleanup": True}
|
||||
assert fenced == {
|
||||
"bundle": True,
|
||||
"prepare": True,
|
||||
"vectors": True,
|
||||
"cutover": True,
|
||||
"cleanup": True,
|
||||
}
|
||||
assert not sdk_migration_capture_fenced(home)
|
||||
|
||||
|
||||
@@ -1353,7 +1528,7 @@ def test_the_sdk_memory_map_draws_sdk_memories_without_legacy_tables(tmp_path) -
|
||||
original = app.state.sdk_client_handle
|
||||
app.state.sdk_client_handle = Handle()
|
||||
|
||||
async def graph_snapshot(*, limit):
|
||||
async def graph_snapshot(*, limit, user_id="local"):
|
||||
del limit
|
||||
return HyGraphSnapshot(
|
||||
nodes=(HyGraphNode(node_id="t1", content="topic", layer="TOPIC"),),
|
||||
|
||||
@@ -91,7 +91,7 @@ def test_bundle_contains_management_sdk_config_and_verified_manifest(tmp_path):
|
||||
assert manifest["bundle_id"] == "migration-1"
|
||||
assert manifest["sdk_namespace"] == "governed-v2"
|
||||
assert manifest["runtime_build"] == "build-13"
|
||||
assert manifest["snapshot_sdk_version"] == "2.0.8"
|
||||
assert manifest["snapshot_sdk_version"] == "2.0.9"
|
||||
paths = {item["path"]: item for item in manifest["files"]}
|
||||
assert {
|
||||
"management/one-memory.sqlite3",
|
||||
|
||||
@@ -306,7 +306,7 @@ def test_the_runner_names_the_step_and_sub_step_that_failed(tmp_path, monkeypatc
|
||||
("step.finished", "preflight.profile_read"),
|
||||
("step.finished", "preflight.resumable_identity"),
|
||||
("step.finished", "preflight.legacy_ids_scan"),
|
||||
("step.finished", "preflight.model_profile_check"),
|
||||
("step.finished", "preflight.vector_space_check"),
|
||||
("step.finished", "prepare.recover_abandoned_staging"),
|
||||
("step.finished", "bundle.ensure"),
|
||||
("step.finished", "bundle.restore_point"),
|
||||
|
||||
@@ -463,11 +463,17 @@ def test_a_run_killed_after_its_restore_point_is_rolled_back_on_the_next_start(h
|
||||
|
||||
|
||||
def test_a_preflight_failure_changes_nothing_and_needs_no_restore(home, monkeypatch):
|
||||
def unreadable(_data_dir, _profile):
|
||||
raise DataPlaneMigrationError("sdk_migration_vector_profile_missing")
|
||||
|
||||
monkeypatch.setattr("one_memory.sdk_migration_runner.read_active_profile", lambda _db: None)
|
||||
monkeypatch.setattr(
|
||||
"one_memory.sdk_migration_runner.vectors_belong_to_another_space", unreadable
|
||||
)
|
||||
before = _state(home)
|
||||
report: dict[str, object] = {}
|
||||
|
||||
with pytest.raises(DataPlaneMigrationError, match="sdk_migration_model_profile_required"):
|
||||
with pytest.raises(DataPlaneMigrationError, match="sdk_migration_vector_profile_missing"):
|
||||
_run(home, report=report)
|
||||
|
||||
assert report == {}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
"""Model-free SDK search remains available without an active write profile."""
|
||||
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
from types import SimpleNamespace
|
||||
|
||||
@@ -95,3 +96,158 @@ async def test_search_without_profile_uses_public_sdk_search() -> None:
|
||||
assert options["user_ids"] == ["local"]
|
||||
assert options["agent_ids"] == []
|
||||
assert options["scene"] == "normal"
|
||||
|
||||
|
||||
def _activate(profiles, secrets, *, dimensions: int, model: str = "chat"):
|
||||
from pydantic import SecretStr
|
||||
|
||||
from one_memory.model_profiles import ModelCapabilities, ModelProfileInput
|
||||
|
||||
profile = profiles.create(
|
||||
ModelProfileInput(
|
||||
name=f"embedding-{dimensions}",
|
||||
provider_kind=ProviderKind.OPENAI_COMPATIBLE,
|
||||
base_url="https://models.example/v1",
|
||||
model=model,
|
||||
embedding_provider_kind=ProviderKind.OPENAI_COMPATIBLE,
|
||||
embedding_base_url="https://models.example/v1",
|
||||
embedding_model="qwen3-embedding-4b",
|
||||
embedding_dimensions=dimensions,
|
||||
api_key=SecretStr("sk-test"),
|
||||
),
|
||||
secrets,
|
||||
)
|
||||
profiles.record_capabilities(
|
||||
profile.profile_id,
|
||||
expected_revision=profile.revision,
|
||||
capabilities=ModelCapabilities(
|
||||
endpoint_reachable=True,
|
||||
model_available=True,
|
||||
structured_output=True,
|
||||
embedding_available=True,
|
||||
),
|
||||
secrets=secrets,
|
||||
)
|
||||
profiles.activate(profile.profile_id, secrets)
|
||||
return profiles.snapshot(profile.profile_id, profiles.active_identity()[1])
|
||||
|
||||
|
||||
class _Recorder:
|
||||
"""Stands in for `acquire_client`: records the collection each client opens."""
|
||||
|
||||
def __init__(self, data_dir: Path) -> None:
|
||||
self.data_dir = data_dir
|
||||
self.opened: list[tuple[str, int | None, str | None]] = []
|
||||
self.closed: list[str] = []
|
||||
|
||||
def __call__(self, profile, *, api_key, data_dir, http_transport_factory=None):
|
||||
from one_memory.hy_sdk_runtime import build_sdk_config
|
||||
|
||||
config = build_sdk_config(profile, api_key=api_key, data_dir=data_dir)
|
||||
name = config.vector_store.collection_name
|
||||
self.opened.append((name, config.vector_store.embedding_dims, api_key))
|
||||
return SimpleNamespace(
|
||||
client=SimpleNamespace(collection=name),
|
||||
close=lambda: self.closed.append(name),
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_reads_open_the_collection_the_active_profile_writes(
|
||||
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
"""#242: a 2560-dim profile wrote `memhub_<sha>_2560`, reads opened `_512`."""
|
||||
from one_memory.hy_sdk_runtime import build_sdk_config
|
||||
from one_memory.model_profiles import ModelProfileStore
|
||||
from one_memory.sdk_read_handle import ActiveProfileReadHandle
|
||||
from one_memory.secrets import InMemorySecretStore
|
||||
|
||||
recorder = _Recorder(tmp_path)
|
||||
monkeypatch.setattr("one_memory.hy_sdk_runtime.acquire_client", recorder)
|
||||
profiles = ModelProfileStore(tmp_path / "one-memory.sqlite3")
|
||||
secrets = InMemorySecretStore()
|
||||
handle = ActiveProfileReadHandle(profiles=profiles, secrets=secrets, data_dir=tmp_path)
|
||||
|
||||
builtin = build_sdk_config(builtin_retrieval_snapshot(), api_key=None, data_dir=tmp_path)
|
||||
assert (await handle.client()).collection == builtin.vector_store.collection_name
|
||||
|
||||
written = _activate(profiles, secrets, dimensions=2560)
|
||||
writes = build_sdk_config(written, api_key="sk-test", data_dir=tmp_path)
|
||||
|
||||
async def read() -> str:
|
||||
return str((await handle.client()).collection)
|
||||
|
||||
assert await asyncio.create_task(read()) == writes.vector_store.collection_name
|
||||
assert recorder.opened[-1] == (writes.vector_store.collection_name, 2560, "sk-test")
|
||||
assert writes.vector_store.collection_name != builtin.vector_store.collection_name
|
||||
await handle.close()
|
||||
|
||||
|
||||
@pytest.mark.anyio
|
||||
async def test_a_profile_change_rebuilds_reads_without_closing_one_in_flight(
|
||||
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
from one_memory.model_profiles import ModelProfileStore
|
||||
from one_memory.sdk_read_handle import ActiveProfileReadHandle
|
||||
from one_memory.secrets import InMemorySecretStore
|
||||
|
||||
recorder = _Recorder(tmp_path)
|
||||
monkeypatch.setattr("one_memory.hy_sdk_runtime.acquire_client", recorder)
|
||||
profiles = ModelProfileStore(tmp_path / "one-memory.sqlite3")
|
||||
secrets = InMemorySecretStore()
|
||||
handle = ActiveProfileReadHandle(profiles=profiles, secrets=secrets, data_dir=tmp_path)
|
||||
_activate(profiles, secrets, dimensions=1024)
|
||||
|
||||
holding = asyncio.Event()
|
||||
finish = asyncio.Event()
|
||||
|
||||
async def slow_read() -> str:
|
||||
client = await handle.client()
|
||||
holding.set()
|
||||
await finish.wait()
|
||||
return str(client.collection)
|
||||
|
||||
in_flight = asyncio.create_task(slow_read())
|
||||
await holding.wait()
|
||||
[(old, _, _)] = recorder.opened
|
||||
|
||||
_activate(profiles, secrets, dimensions=2560, model="chat-2")
|
||||
|
||||
async def read() -> str:
|
||||
return str((await handle.client()).collection)
|
||||
|
||||
new = await asyncio.create_task(read())
|
||||
assert new != old
|
||||
# The read that started on the old space still has its client.
|
||||
assert recorder.closed == []
|
||||
|
||||
finish.set()
|
||||
assert await in_flight == old
|
||||
for _ in range(5):
|
||||
await asyncio.sleep(0)
|
||||
assert recorder.closed == [old]
|
||||
await handle.close()
|
||||
assert recorder.closed == [old, new]
|
||||
|
||||
|
||||
def test_every_api_read_shares_the_active_profile_handle(tmp_path: Path) -> None:
|
||||
"""Library, search, recall, graph, profile, raw, ask and context all read
|
||||
through `_sdk_client_handle`, so it must be the active-profile handle."""
|
||||
from one_memory.api import _sdk_client_handle
|
||||
from one_memory.config import Settings
|
||||
from one_memory.model_profiles import ModelProfileStore
|
||||
from one_memory.sdk_read_handle import ActiveProfileReadHandle
|
||||
from one_memory.secrets import InMemorySecretStore
|
||||
|
||||
state = SimpleNamespace(
|
||||
sdk_client_handle=None,
|
||||
model_profile_store=ModelProfileStore(tmp_path / "one-memory.sqlite3"),
|
||||
secret_store=InMemorySecretStore(),
|
||||
settings=Settings(_env_file=None, data_dir=tmp_path),
|
||||
)
|
||||
app = SimpleNamespace(state=state)
|
||||
|
||||
handle = _sdk_client_handle(app) # type: ignore[arg-type]
|
||||
|
||||
assert isinstance(handle, ActiveProfileReadHandle)
|
||||
assert _sdk_client_handle(app) is handle is state.sdk_client_handle # type: ignore[arg-type]
|
||||
@@ -57,10 +57,10 @@ def client_for(app, headers=None):
|
||||
|
||||
|
||||
class Answerer:
|
||||
async def answer(self, question):
|
||||
async def answer(self, question, *, user_id="local"):
|
||||
return SdkMemoryAnswer(answer="真实数据。", memories=(MEMORY,), mode="extractive")
|
||||
|
||||
async def answer_stream(self, question):
|
||||
async def answer_stream(self, question, *, user_id="local"):
|
||||
yield {"type": "recall", "memories": (MEMORY,)}
|
||||
yield {
|
||||
"type": "final",
|
||||
|
||||
Generated
+4
-4
@@ -991,7 +991,7 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "hy-memory"
|
||||
version = "2.0.8"
|
||||
version = "2.0.9"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
dependencies = [
|
||||
{ name = "chromadb" },
|
||||
@@ -1008,9 +1008,9 @@ dependencies = [
|
||||
{ name = "scikit-learn" },
|
||||
{ name = "tiktoken" },
|
||||
]
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/21/15/83ca83b649ead238f186fdb33efdc73615fbba279efbbdca3857c1a86beb/hy_memory-2.0.8.tar.gz", hash = "sha256:0fa0ed1a1160b389a3d7c13a9fb6528b140d7ec23cf49e65f1be5974820a576b", size = 856025, upload-time = "2026-10-28T07:35:47.783Z" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/48/28/e01fd9a92cd090c8236df0dd06dae049c5de66345e5bd9653497ed56125e/hy_memory-2.0.9.tar.gz", hash = "sha256:5f55ea92044ced19a00b4e56c565215adedd3439a1bdb9cfe9ffe42387c8f1a1", size = 858323, upload-time = "2026-11-01T00:29:49.914Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/11/6a/c699cac0ff06bd089fceeff90446130763d8187e649dbdb0313014491a10/hy_memory-2.0.8-py3-none-any.whl", hash = "sha256:68bd789df24e51e64bb231e97a8d24ee89b4aa5f9ba14c3e0824589e9213bf7c", size = 921119, upload-time = "2026-10-28T07:35:45.571Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/d5/44/4368555a408a58daf902c81b62184a3c99f12abd45d4f1144bf79f171a6f/hy_memory-2.0.9-py3-none-any.whl", hash = "sha256:95dbea232d2041f9b0ea3d08dd751603c2a5c0e4422b97e74f664e6ca913549e", size = 923250, upload-time = "2026-11-01T00:29:47.814Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1837,7 +1837,7 @@ requires-dist = [
|
||||
{ name = "fastapi", specifier = ">=0.141.1" },
|
||||
{ name = "filelock", specifier = ">=3.32.4" },
|
||||
{ name = "httpx", specifier = ">=0.28.1" },
|
||||
{ name = "hy-memory", specifier = "==2.0.8" },
|
||||
{ name = "hy-memory", specifier = "==2.0.9" },
|
||||
{ name = "keyring", specifier = ">=25.7.0" },
|
||||
{ name = "numpy", specifier = "==2.5.2" },
|
||||
{ name = "onnxruntime", specifier = "==1.23.2" },
|
||||
|
||||
@@ -133,6 +133,7 @@ const SAFE_STABLE_RUNTIME_ERROR_CODES = new Set([
|
||||
"sdk_migration_preflight_failed",
|
||||
"sdk_migration_memory_unreadable",
|
||||
"sdk_migration_model_profile_required",
|
||||
"sdk_migration_vector_profile_missing",
|
||||
"sdk_migration_model_secret_unavailable",
|
||||
"sdk_migration_secure_storage_unavailable",
|
||||
"sdk_migration_disk_space_insufficient",
|
||||
@@ -219,6 +220,8 @@ export const STABLE_RUNTIME_USER_MESSAGES: Record<string, string> = {
|
||||
"升级前核对发现,新版本还读不到你的全部记忆,所以没有切换数据源,旧数据保持原样可用。请把这个提示反馈给我们;原有记忆数据不会丢失。",
|
||||
sdk_migration_model_profile_required:
|
||||
"升级记忆数据格式需要先有可用的模型配置,用来核对新版本能否读回你的记忆。请在旧版本中完成模型配置后重启;你的记忆数据不会受到影响。",
|
||||
sdk_migration_vector_profile_missing:
|
||||
"你的记忆是用一个已删除的模型配置生成向量的,当前没有可用的模型配置能读回它们,所以没有升级。请在旧版本中重新添加那个模型配置并启用后重启;你的记忆数据不会受到影响。",
|
||||
sdk_migration_model_secret_unavailable:
|
||||
"模型密钥读不到(可能被系统钥匙串拒绝),无法核对新版本能否读回你的记忆。请允许 MemHub 访问钥匙串后重新启动;你的记忆数据不会受到影响。",
|
||||
sdk_migration_secure_storage_unavailable:
|
||||
|
||||
@@ -480,6 +480,30 @@ describe("ModelSettings", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("writes the prefilled embedding endpoint instead of leaving it to follow generation", async () => {
|
||||
profiles = [
|
||||
{
|
||||
...profile,
|
||||
embedding_provider_kind: "openai_compatible",
|
||||
embedding_model: "vector-old",
|
||||
embedding_base_url: null,
|
||||
},
|
||||
];
|
||||
render(<ModelSettings />);
|
||||
await userEvent.click(screen.getByRole("button", { name: "编辑配置" }));
|
||||
await userEvent.clear(screen.getByLabelText("向量模型名"));
|
||||
await userEvent.type(screen.getByLabelText("向量模型名"), "vector-new");
|
||||
await userEvent.click(
|
||||
screen.getByRole("button", { name: "高级:自行配置向量模型" }),
|
||||
);
|
||||
await userEvent.click(screen.getByRole("button", { name: "保存修改" }));
|
||||
expect(update).toHaveBeenCalledWith(profile.profile_id, {
|
||||
expected_revision: 1,
|
||||
embedding_model: "vector-new",
|
||||
embedding_base_url: profile.base_url,
|
||||
});
|
||||
});
|
||||
|
||||
it("explicitly switches an edited remote embedding to builtin without retaining its dimensions", async () => {
|
||||
profiles = [
|
||||
{
|
||||
|
||||
@@ -631,10 +631,9 @@ export function ModelSettings({
|
||||
patch.embedding_model = embeddingModel;
|
||||
if (embeddingProvider !== editing.embedding_provider_kind)
|
||||
patch.embedding_provider_kind = embeddingProvider;
|
||||
if (
|
||||
embeddingBaseUrl !==
|
||||
(editing.embedding_base_url ?? editing.base_url ?? "")
|
||||
)
|
||||
// Against the stored value only: the field is prefilled with the
|
||||
// generation endpoint, and Core no longer falls back to it.
|
||||
if (embeddingBaseUrl !== (editing.embedding_base_url ?? ""))
|
||||
patch.embedding_base_url = embeddingBaseUrl;
|
||||
} else if (
|
||||
embeddingModeChanged &&
|
||||
|
||||
@@ -173,10 +173,15 @@ export function OnboardingModelController({
|
||||
draft.embedding_mode === "local"
|
||||
? "bge-small-zh-v1.5"
|
||||
: draft.embedding_model.trim(),
|
||||
// Core no longer lets the embedding endpoint follow the generation
|
||||
// one, so an empty field is written as the endpoint it means.
|
||||
embedding_base_url:
|
||||
draft.embedding_mode === "local"
|
||||
? null
|
||||
: draft.embedding_base_url.trim() || null,
|
||||
: draft.embedding_base_url.trim() ||
|
||||
(draft.embedding_provider_kind === "ollama"
|
||||
? "http://127.0.0.1:11434"
|
||||
: draft.base_url.trim()),
|
||||
embedding_dimensions: draft.embedding_mode === "local" ? 512 : null,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -184,6 +184,9 @@ const SCAN_ISSUE_LABELS: Record<string, string> = {
|
||||
tool_content_excluded: "工具输出不计入原文",
|
||||
internal_reasoning_excluded: "模型的内部思考不计入原文",
|
||||
not_written_by_person: "不是本人写的,未计入",
|
||||
injected_machine_notice: "来源程序自己发的通知,未计入",
|
||||
voice_placeholder: "语音没有转成文字,未计入",
|
||||
probe: "连通性检查消息,未计入",
|
||||
source_busy: "来源正被占用,稍后会自动补读",
|
||||
unsupported_schema: "这个来源的文件格式暂不支持",
|
||||
budget_exceeded: "超出本次处理上限,其余未读",
|
||||
|
||||
Loaded 100 of 113 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user