@scotthuang/engram 0.6.4 → 0.6.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/face/src/voice-identify.d.ts +49 -0
- package/dist/face/src/voice-identify.js +273 -0
- package/dist/face/src/voice-identify.js.map +1 -0
- package/dist/face/src/voice-store.d.ts +82 -0
- package/dist/face/src/voice-store.js +360 -0
- package/dist/face/src/voice-store.js.map +1 -0
- package/dist/src/__tests__/config.test.js +2 -3
- package/dist/src/__tests__/config.test.js.map +1 -1
- package/dist/src/config.d.ts +0 -1
- package/dist/src/config.js +1 -3
- package/dist/src/config.js.map +1 -1
- package/dist/src/index.js +172 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/recall.js +4 -3
- package/dist/src/recall.js.map +1 -1
- package/openclaw.plugin.json +0 -6
- package/package.json +1 -1
|
@@ -0,0 +1,360 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Voice Store — 声纹注册 + 匹配逻辑
|
|
3
|
+
*
|
|
4
|
+
* 与 face-store 共享 registry.json 中的 person,扩展 voice embedding 字段。
|
|
5
|
+
*
|
|
6
|
+
* 存储结构(在现有 faces/ 目录下扩展):
|
|
7
|
+
* memory-engram/faces/
|
|
8
|
+
* ├── registry.json ← 统一注册表(person 包含 face + voice)
|
|
9
|
+
* ├── embeddings/ ← 人脸 512d embedding(已有)
|
|
10
|
+
* ├── voice-embeddings/ ← 声纹 192d embedding(新增)
|
|
11
|
+
* │ ├── person_001.json
|
|
12
|
+
* │ └── person_002.json
|
|
13
|
+
* └── voice-samples/ ← 声纹音频样本(新增)
|
|
14
|
+
* ├── person_001/
|
|
15
|
+
* │ ├── 001.wav
|
|
16
|
+
* │ └── 002.wav
|
|
17
|
+
* └── person_002/
|
|
18
|
+
* └── 001.wav
|
|
19
|
+
*/
|
|
20
|
+
import { promises as fs } from "node:fs";
|
|
21
|
+
import { join } from "node:path";
|
|
22
|
+
import { logger } from "../../src/logger.js";
|
|
23
|
+
// ---- 工具函数 ----
|
|
24
|
+
function cosineSimilarity(a, b) {
|
|
25
|
+
if (a.length !== b.length)
|
|
26
|
+
return 0;
|
|
27
|
+
let dot = 0, normA = 0, normB = 0;
|
|
28
|
+
for (let i = 0; i < a.length; i++) {
|
|
29
|
+
dot += a[i] * b[i];
|
|
30
|
+
normA += a[i] * a[i];
|
|
31
|
+
normB += b[i] * b[i];
|
|
32
|
+
}
|
|
33
|
+
const denom = Math.sqrt(normA) * Math.sqrt(normB);
|
|
34
|
+
return denom === 0 ? 0 : dot / denom;
|
|
35
|
+
}
|
|
36
|
+
function meanEmbedding(embeddings) {
|
|
37
|
+
if (embeddings.length === 0)
|
|
38
|
+
return [];
|
|
39
|
+
const dim = embeddings[0].length;
|
|
40
|
+
const result = new Array(dim).fill(0);
|
|
41
|
+
for (const emb of embeddings) {
|
|
42
|
+
for (let i = 0; i < dim; i++)
|
|
43
|
+
result[i] += emb[i];
|
|
44
|
+
}
|
|
45
|
+
for (let i = 0; i < dim; i++)
|
|
46
|
+
result[i] /= embeddings.length;
|
|
47
|
+
let norm = 0;
|
|
48
|
+
for (let i = 0; i < dim; i++)
|
|
49
|
+
norm += result[i] * result[i];
|
|
50
|
+
norm = Math.sqrt(norm);
|
|
51
|
+
if (norm > 0) {
|
|
52
|
+
for (let i = 0; i < dim; i++)
|
|
53
|
+
result[i] /= norm;
|
|
54
|
+
}
|
|
55
|
+
return result;
|
|
56
|
+
}
|
|
57
|
+
// ---- Voice API Client ----
|
|
58
|
+
class VoiceApiClient {
|
|
59
|
+
baseUrl;
|
|
60
|
+
timeoutMs;
|
|
61
|
+
constructor(baseUrl, timeoutMs = 10000) {
|
|
62
|
+
this.baseUrl = baseUrl;
|
|
63
|
+
this.timeoutMs = timeoutMs;
|
|
64
|
+
}
|
|
65
|
+
/** 从音频文件提取 192d 声纹 embedding */
|
|
66
|
+
async extractFromFile(audioPath) {
|
|
67
|
+
try {
|
|
68
|
+
const ctrl = new AbortController();
|
|
69
|
+
const timer = setTimeout(() => ctrl.abort(), this.timeoutMs);
|
|
70
|
+
const res = await fetch(`${this.baseUrl}/api/voice/extract`, {
|
|
71
|
+
method: "POST",
|
|
72
|
+
headers: { "Content-Type": "application/json" },
|
|
73
|
+
body: JSON.stringify({ audio_path: audioPath }),
|
|
74
|
+
signal: ctrl.signal,
|
|
75
|
+
});
|
|
76
|
+
clearTimeout(timer);
|
|
77
|
+
if (!res.ok)
|
|
78
|
+
return null;
|
|
79
|
+
const data = await res.json();
|
|
80
|
+
return data.embedding;
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
logger.error(`[engram:voice-store] Voice extract failed: ${err}`);
|
|
84
|
+
return null;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
/** 从 Base64 音频提取声纹 embedding */
|
|
88
|
+
async extractFromBase64(audioBase64, format = "wav") {
|
|
89
|
+
try {
|
|
90
|
+
const ctrl = new AbortController();
|
|
91
|
+
const timer = setTimeout(() => ctrl.abort(), this.timeoutMs);
|
|
92
|
+
const res = await fetch(`${this.baseUrl}/api/voice/extract-base64`, {
|
|
93
|
+
method: "POST",
|
|
94
|
+
headers: { "Content-Type": "application/json" },
|
|
95
|
+
body: JSON.stringify({ audio_base64: audioBase64, format }),
|
|
96
|
+
signal: ctrl.signal,
|
|
97
|
+
});
|
|
98
|
+
clearTimeout(timer);
|
|
99
|
+
if (!res.ok)
|
|
100
|
+
return null;
|
|
101
|
+
const data = await res.json();
|
|
102
|
+
return data.embedding;
|
|
103
|
+
}
|
|
104
|
+
catch (err) {
|
|
105
|
+
logger.error(`[engram:voice-store] Voice extract-base64 failed: ${err}`);
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
/** 健康检查 */
|
|
110
|
+
async healthCheck() {
|
|
111
|
+
try {
|
|
112
|
+
const ctrl = new AbortController();
|
|
113
|
+
const timer = setTimeout(() => ctrl.abort(), 3000);
|
|
114
|
+
const res = await fetch(`${this.baseUrl}/api/voice/health`, { signal: ctrl.signal });
|
|
115
|
+
clearTimeout(timer);
|
|
116
|
+
return res.ok;
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
return false;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
// ---- 阈值 ----
|
|
124
|
+
const VOICE_MATCH_THRESHOLD = 0.75;
|
|
125
|
+
const VOICE_UNCERTAIN_THRESHOLD = 0.55;
|
|
126
|
+
// ---- VoiceStore 类 ----
|
|
127
|
+
export class VoiceStore {
|
|
128
|
+
workspaceDir;
|
|
129
|
+
apiClient;
|
|
130
|
+
/** 已注册声纹的 embedding 缓存(personId → embedding) */
|
|
131
|
+
embeddingCache = new Map();
|
|
132
|
+
constructor(workspaceDir, serviceUrl = "http://localhost:8765") {
|
|
133
|
+
this.workspaceDir = workspaceDir;
|
|
134
|
+
this.apiClient = new VoiceApiClient(serviceUrl);
|
|
135
|
+
}
|
|
136
|
+
// ---- 路径 ----
|
|
137
|
+
get facesDir() {
|
|
138
|
+
return join(this.workspaceDir, "memory-engram", "faces");
|
|
139
|
+
}
|
|
140
|
+
get registryPath() {
|
|
141
|
+
return join(this.facesDir, "registry.json");
|
|
142
|
+
}
|
|
143
|
+
get voiceEmbeddingsDir() {
|
|
144
|
+
return join(this.facesDir, "voice-embeddings");
|
|
145
|
+
}
|
|
146
|
+
get voiceSamplesDir() {
|
|
147
|
+
return join(this.facesDir, "voice-samples");
|
|
148
|
+
}
|
|
149
|
+
// ---- Registry 读写(共享 faces/registry.json)----
|
|
150
|
+
async loadRegistry() {
|
|
151
|
+
try {
|
|
152
|
+
const raw = await fs.readFile(this.registryPath, "utf-8");
|
|
153
|
+
return JSON.parse(raw);
|
|
154
|
+
}
|
|
155
|
+
catch {
|
|
156
|
+
return { version: 1, persons: [] };
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
async saveRegistry(registry) {
|
|
160
|
+
await fs.mkdir(this.facesDir, { recursive: true });
|
|
161
|
+
await fs.writeFile(this.registryPath, JSON.stringify(registry, null, 2), "utf-8");
|
|
162
|
+
}
|
|
163
|
+
// ---- Voice Embedding 读写 ----
|
|
164
|
+
async loadVoiceEmbedding(personId) {
|
|
165
|
+
if (this.embeddingCache.has(personId)) {
|
|
166
|
+
return this.embeddingCache.get(personId);
|
|
167
|
+
}
|
|
168
|
+
try {
|
|
169
|
+
const raw = await fs.readFile(join(this.voiceEmbeddingsDir, `${personId}.json`), "utf-8");
|
|
170
|
+
const emb = JSON.parse(raw);
|
|
171
|
+
this.embeddingCache.set(personId, emb);
|
|
172
|
+
return emb;
|
|
173
|
+
}
|
|
174
|
+
catch {
|
|
175
|
+
return [];
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
async saveVoiceEmbedding(personId, embedding) {
|
|
179
|
+
await fs.mkdir(this.voiceEmbeddingsDir, { recursive: true });
|
|
180
|
+
await fs.writeFile(join(this.voiceEmbeddingsDir, `${personId}.json`), JSON.stringify(embedding), "utf-8");
|
|
181
|
+
this.embeddingCache.set(personId, embedding);
|
|
182
|
+
}
|
|
183
|
+
// ---- 服务可用性 ----
|
|
184
|
+
async isServiceAvailable() {
|
|
185
|
+
return this.apiClient.healthCheck();
|
|
186
|
+
}
|
|
187
|
+
// ---- 声纹注册 ----
|
|
188
|
+
/**
|
|
189
|
+
* 为已注册的 person 添加声纹
|
|
190
|
+
*
|
|
191
|
+
* @param personId 已注册人物 ID(必须先在 face-store 中注册)
|
|
192
|
+
* @param audioPaths 多段音频路径(建议 3~5 段不同语境)
|
|
193
|
+
*/
|
|
194
|
+
async registerVoice(personId, audioPaths) {
|
|
195
|
+
if (audioPaths.length === 0) {
|
|
196
|
+
return { success: false, sampleCount: 0, error: "No audio files provided" };
|
|
197
|
+
}
|
|
198
|
+
const registry = await this.loadRegistry();
|
|
199
|
+
const person = registry.persons?.find((p) => p.id === personId);
|
|
200
|
+
if (!person) {
|
|
201
|
+
return { success: false, sampleCount: 0, error: `Person ${personId} not found in registry` };
|
|
202
|
+
}
|
|
203
|
+
// 提取每段音频的 embedding
|
|
204
|
+
const embeddings = [];
|
|
205
|
+
const sampleDir = join(this.voiceSamplesDir, personId);
|
|
206
|
+
await fs.mkdir(sampleDir, { recursive: true });
|
|
207
|
+
const existingSamples = person.voiceSampleCount || 0;
|
|
208
|
+
for (let i = 0; i < audioPaths.length; i++) {
|
|
209
|
+
const audioPath = audioPaths[i];
|
|
210
|
+
logger.info(`[engram:voice-store] Extracting voice embedding ${i + 1}/${audioPaths.length}: ${audioPath}`);
|
|
211
|
+
const emb = await this.apiClient.extractFromFile(audioPath);
|
|
212
|
+
if (!emb || emb.length === 0) {
|
|
213
|
+
logger.info(`[engram:voice-store] Failed to extract from ${audioPath}, skipping`);
|
|
214
|
+
continue;
|
|
215
|
+
}
|
|
216
|
+
embeddings.push(emb);
|
|
217
|
+
// 复制音频样本
|
|
218
|
+
const ext = audioPath.split(".").pop() || "wav";
|
|
219
|
+
const samplePath = join(sampleDir, `${String(existingSamples + i + 1).padStart(3, "0")}.${ext}`);
|
|
220
|
+
try {
|
|
221
|
+
await fs.copyFile(audioPath, samplePath);
|
|
222
|
+
}
|
|
223
|
+
catch {
|
|
224
|
+
// non-critical
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
if (embeddings.length === 0) {
|
|
228
|
+
return { success: false, sampleCount: 0, error: "Failed to extract voice embedding from any audio file" };
|
|
229
|
+
}
|
|
230
|
+
// 加载现有 voice embedding,加权合并
|
|
231
|
+
const oldEmb = await this.loadVoiceEmbedding(personId);
|
|
232
|
+
let allEmbeddings = [];
|
|
233
|
+
if (oldEmb.length > 0 && existingSamples > 0) {
|
|
234
|
+
for (let i = 0; i < existingSamples; i++) {
|
|
235
|
+
allEmbeddings.push(oldEmb);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
allEmbeddings.push(...embeddings);
|
|
239
|
+
const avgEmb = meanEmbedding(allEmbeddings);
|
|
240
|
+
await this.saveVoiceEmbedding(personId, avgEmb);
|
|
241
|
+
// 更新 registry
|
|
242
|
+
person.voiceSampleCount = existingSamples + embeddings.length;
|
|
243
|
+
person.voiceEmbeddingFile = `voice-embeddings/${personId}.json`;
|
|
244
|
+
await this.saveRegistry(registry);
|
|
245
|
+
logger.info(`[engram:voice-store] Registered voice for ${person.name} (${personId}): ${embeddings.length} new sample(s), total=${person.voiceSampleCount}`);
|
|
246
|
+
return { success: true, sampleCount: person.voiceSampleCount };
|
|
247
|
+
}
|
|
248
|
+
/**
|
|
249
|
+
* 为已注册的 person 添加声纹(通过 Base64 音频)
|
|
250
|
+
*/
|
|
251
|
+
async registerVoiceBase64(personId, audioBase64Samples) {
|
|
252
|
+
const embeddings = [];
|
|
253
|
+
for (let i = 0; i < audioBase64Samples.length; i++) {
|
|
254
|
+
const { base64, format = "wav" } = audioBase64Samples[i];
|
|
255
|
+
const emb = await this.apiClient.extractFromBase64(base64, format);
|
|
256
|
+
if (emb && emb.length > 0) {
|
|
257
|
+
embeddings.push(emb);
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
if (embeddings.length === 0) {
|
|
261
|
+
return { success: false, sampleCount: 0, error: "Failed to extract any voice embedding" };
|
|
262
|
+
}
|
|
263
|
+
const registry = await this.loadRegistry();
|
|
264
|
+
const person = registry.persons?.find((p) => p.id === personId);
|
|
265
|
+
if (!person) {
|
|
266
|
+
return { success: false, sampleCount: 0, error: `Person ${personId} not found` };
|
|
267
|
+
}
|
|
268
|
+
const existingSamples = person.voiceSampleCount || 0;
|
|
269
|
+
const oldEmb = await this.loadVoiceEmbedding(personId);
|
|
270
|
+
let allEmbeddings = [];
|
|
271
|
+
if (oldEmb.length > 0 && existingSamples > 0) {
|
|
272
|
+
for (let i = 0; i < existingSamples; i++)
|
|
273
|
+
allEmbeddings.push(oldEmb);
|
|
274
|
+
}
|
|
275
|
+
allEmbeddings.push(...embeddings);
|
|
276
|
+
const avgEmb = meanEmbedding(allEmbeddings);
|
|
277
|
+
await this.saveVoiceEmbedding(personId, avgEmb);
|
|
278
|
+
person.voiceSampleCount = existingSamples + embeddings.length;
|
|
279
|
+
person.voiceEmbeddingFile = `voice-embeddings/${personId}.json`;
|
|
280
|
+
await this.saveRegistry(registry);
|
|
281
|
+
return { success: true, sampleCount: person.voiceSampleCount };
|
|
282
|
+
}
|
|
283
|
+
// ---- 声纹匹配 ----
|
|
284
|
+
/**
|
|
285
|
+
* 将一个 voice embedding 与所有已注册声纹匹配
|
|
286
|
+
*
|
|
287
|
+
* @param embedding 待匹配的 192d embedding
|
|
288
|
+
* @returns 最佳匹配结果
|
|
289
|
+
*/
|
|
290
|
+
async matchEmbedding(embedding) {
|
|
291
|
+
const registry = await this.loadRegistry();
|
|
292
|
+
const persons = registry.persons || [];
|
|
293
|
+
let bestMatch = null;
|
|
294
|
+
for (const person of persons) {
|
|
295
|
+
if (!person.voiceEmbeddingFile)
|
|
296
|
+
continue;
|
|
297
|
+
const personEmb = await this.loadVoiceEmbedding(person.id);
|
|
298
|
+
if (personEmb.length === 0)
|
|
299
|
+
continue;
|
|
300
|
+
const sim = cosineSimilarity(embedding, personEmb);
|
|
301
|
+
if (!bestMatch || sim > bestMatch.sim) {
|
|
302
|
+
bestMatch = { personId: person.id, name: person.name, sim };
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
if (bestMatch && bestMatch.sim >= VOICE_MATCH_THRESHOLD) {
|
|
306
|
+
// 更新 heardCount
|
|
307
|
+
const person = persons.find((p) => p.id === bestMatch.personId);
|
|
308
|
+
if (person) {
|
|
309
|
+
person.heardCount = (person.heardCount || 0) + 1;
|
|
310
|
+
person.lastHeardAt = Math.floor(Date.now() / 1000);
|
|
311
|
+
await this.saveRegistry(registry);
|
|
312
|
+
}
|
|
313
|
+
return {
|
|
314
|
+
personId: bestMatch.personId,
|
|
315
|
+
name: bestMatch.name,
|
|
316
|
+
confidence: Math.round(bestMatch.sim * 100) / 100,
|
|
317
|
+
status: "matched",
|
|
318
|
+
};
|
|
319
|
+
}
|
|
320
|
+
else if (bestMatch && bestMatch.sim >= VOICE_UNCERTAIN_THRESHOLD) {
|
|
321
|
+
return {
|
|
322
|
+
personId: null,
|
|
323
|
+
name: `unknown (疑似 ${bestMatch.name})`,
|
|
324
|
+
confidence: Math.round(bestMatch.sim * 100) / 100,
|
|
325
|
+
status: "uncertain",
|
|
326
|
+
};
|
|
327
|
+
}
|
|
328
|
+
else {
|
|
329
|
+
return {
|
|
330
|
+
personId: null,
|
|
331
|
+
name: "unknown",
|
|
332
|
+
confidence: bestMatch ? Math.round(bestMatch.sim * 100) / 100 : 0,
|
|
333
|
+
status: "unknown",
|
|
334
|
+
};
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
/**
|
|
338
|
+
* 从音频文件提取 embedding 并匹配
|
|
339
|
+
*/
|
|
340
|
+
async extractAndMatch(audioPath) {
|
|
341
|
+
const emb = await this.apiClient.extractFromFile(audioPath);
|
|
342
|
+
if (!emb || emb.length === 0)
|
|
343
|
+
return null;
|
|
344
|
+
return this.matchEmbedding(emb);
|
|
345
|
+
}
|
|
346
|
+
/**
|
|
347
|
+
* 列出所有有声纹注册的人物
|
|
348
|
+
*/
|
|
349
|
+
async listVoicePersons() {
|
|
350
|
+
const registry = await this.loadRegistry();
|
|
351
|
+
return (registry.persons || [])
|
|
352
|
+
.filter((p) => p.voiceSampleCount > 0)
|
|
353
|
+
.map((p) => ({
|
|
354
|
+
id: p.id,
|
|
355
|
+
name: p.name,
|
|
356
|
+
voiceSampleCount: p.voiceSampleCount || 0,
|
|
357
|
+
}));
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
//# sourceMappingURL=voice-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"voice-store.js","sourceRoot":"","sources":["../../../face/src/voice-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ describe("parseConfig", () => {
|
|
|
6
6
|
expect(config.shortTermDays).toBe(DEFAULTS.shortTermDays);
|
|
7
7
|
expect(config.halfLifeDays).toBe(DEFAULTS.halfLifeDays);
|
|
8
8
|
expect(config.recallTopK).toBe(DEFAULTS.recallTopK);
|
|
9
|
-
expect(config.minScore).toBe(DEFAULTS.minScore);
|
|
10
9
|
expect(config.vectorWeight).toBe(DEFAULTS.vectorWeight);
|
|
11
10
|
expect(config.textWeight).toBe(DEFAULTS.textWeight);
|
|
12
11
|
});
|
|
@@ -16,9 +15,9 @@ describe("parseConfig", () => {
|
|
|
16
15
|
expect(config.halfLifeDays).toBe(30);
|
|
17
16
|
});
|
|
18
17
|
it("overrides defaults with provided values", () => {
|
|
19
|
-
const config = parseConfig({ shortTermDays: 14,
|
|
18
|
+
const config = parseConfig({ shortTermDays: 14, vectorWeight: 0.8 });
|
|
20
19
|
expect(config.shortTermDays).toBe(14);
|
|
21
|
-
expect(config.
|
|
20
|
+
expect(config.vectorWeight).toBe(0.8);
|
|
22
21
|
// 其他值保持默认
|
|
23
22
|
expect(config.halfLifeDays).toBe(DEFAULTS.halfLifeDays);
|
|
24
23
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/__tests__/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAErD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/__tests__/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAErD,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;QACrE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,UAAU;QACV,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,aAAa,EAAE,KAAY,EAAE,YAAY,EAAE,IAAW,EAAE,CAAC,CAAC;QACvF,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/src/config.d.ts
CHANGED
package/dist/src/config.js
CHANGED
|
@@ -6,7 +6,6 @@ export const DEFAULTS = {
|
|
|
6
6
|
shortTermDays: 14,
|
|
7
7
|
halfLifeDays: 30,
|
|
8
8
|
recallTopK: 3,
|
|
9
|
-
minScore: 0.01,
|
|
10
9
|
vectorWeight: 0.7,
|
|
11
10
|
textWeight: 0.3,
|
|
12
11
|
settleModel: "MiniMax-M2.7-highspeed",
|
|
@@ -61,7 +60,6 @@ export function parseConfig(raw) {
|
|
|
61
60
|
shortTermDays: typeof raw.shortTermDays === "number" ? raw.shortTermDays : DEFAULTS.shortTermDays,
|
|
62
61
|
halfLifeDays: typeof raw.halfLifeDays === "number" ? raw.halfLifeDays : DEFAULTS.halfLifeDays,
|
|
63
62
|
recallTopK: typeof raw.recallTopK === "number" ? raw.recallTopK : DEFAULTS.recallTopK,
|
|
64
|
-
minScore: typeof raw.minScore === "number" ? raw.minScore : DEFAULTS.minScore,
|
|
65
63
|
vectorWeight: typeof raw.vectorWeight === "number" ? raw.vectorWeight : DEFAULTS.vectorWeight,
|
|
66
64
|
textWeight: typeof raw.textWeight === "number" ? raw.textWeight : DEFAULTS.textWeight,
|
|
67
65
|
settleModel: typeof raw.settleModel === "string" ? raw.settleModel : DEFAULTS.settleModel,
|
|
@@ -73,7 +71,7 @@ export function parseConfig(raw) {
|
|
|
73
71
|
logDir: typeof raw.logDir === "string" ? raw.logDir : undefined,
|
|
74
72
|
saveStagingFile: typeof raw.saveStagingFile === "boolean" ? raw.saveStagingFile : true,
|
|
75
73
|
};
|
|
76
|
-
logger.info(`[engram:config] Parsed: shortTermDays=${config.shortTermDays} halfLifeDays=${config.halfLifeDays} recallTopK=${config.recallTopK}
|
|
74
|
+
logger.info(`[engram:config] Parsed: shortTermDays=${config.shortTermDays} halfLifeDays=${config.halfLifeDays} recallTopK=${config.recallTopK} vectorWeight=${config.vectorWeight} textWeight=${config.textWeight}`);
|
|
77
75
|
logger.info(`[engram:config] Embedding: model=${config.embedding.model} dims=${config.embedding.dimensions} hasApiKey=${!!config.embedding.apiKey} baseUrl=${config.embedding.baseUrl.slice(0, 40)}`);
|
|
78
76
|
logger.info(`[engram:config] Condense: model=${config.condense.model} hasApiKey=${!!config.condense.apiKey}`);
|
|
79
77
|
logger.info(`[engram:config] QueryRewrite: enabled=${config.queryRewrite.enabled} timeoutMs=${config.queryRewrite.timeoutMs}`);
|
package/dist/src/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|