@sunub/obsidian-mcp-server 0.3.29 → 0.3.30
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/README.md +214 -72
- package/build/index.js +28 -10
- package/build/index.js.map +1 -1
- package/build/server.d.ts +2 -1
- package/build/server.js +7 -1
- package/build/server.js.map +1 -1
- package/build/tools/index.d.ts +1 -1
- package/build/tools/vault/index.d.ts +1 -1
- package/build/tools/vault/params.d.ts +4 -4
- package/build/tools/vault/params.js +3 -3
- package/build/tools/vault/params.js.map +1 -1
- package/build/tools/vault/types/collect_context.d.ts +15 -15
- package/build/tools/vault/types/read_specific.d.ts +46 -46
- package/build/tools/vault/types/read_specific.js +4 -4
- package/build/tools/vault/types/read_specific.js.map +1 -1
- package/build/tools/vault/utils/actions/collect_context.js +15 -10
- package/build/tools/vault/utils/actions/collect_context.js.map +1 -1
- package/build/tools/vault/utils/actions/read.js +48 -12
- package/build/tools/vault/utils/actions/read.js.map +1 -1
- package/build/tools/vault/utils/actions/search.js +7 -3
- package/build/tools/vault/utils/actions/search.js.map +1 -1
- package/build/tools/vault/utils/shared.d.ts +1 -1
- package/build/tools/vault/utils/shared.js +9 -1
- package/build/tools/vault/utils/shared.js.map +1 -1
- package/build/utils/BackgroundTaskRegistry.d.ts +7 -0
- package/build/utils/BackgroundTaskRegistry.js +39 -0
- package/build/utils/BackgroundTaskRegistry.js.map +1 -0
- package/build/utils/Embedder.d.ts +4 -3
- package/build/utils/Embedder.js +20 -8
- package/build/utils/Embedder.js.map +1 -1
- package/build/utils/LocalModelManager.d.ts +45 -0
- package/build/utils/LocalModelManager.js +196 -0
- package/build/utils/LocalModelManager.js.map +1 -0
- package/build/utils/LocalReranker.d.ts +4 -3
- package/build/utils/LocalReranker.js +20 -8
- package/build/utils/LocalReranker.js.map +1 -1
- package/build/utils/RAGIndexer.d.ts +8 -3
- package/build/utils/RAGIndexer.js +61 -34
- package/build/utils/RAGIndexer.js.map +1 -1
- package/build/utils/ServerLifecycle.d.ts +23 -0
- package/build/utils/ServerLifecycle.js +50 -0
- package/build/utils/ServerLifecycle.js.map +1 -0
- package/build/utils/VaultManger/VaultManager.d.ts +2 -1
- package/build/utils/VaultManger/VaultManager.js +81 -59
- package/build/utils/VaultManger/VaultManager.js.map +1 -1
- package/build/utils/VaultWatcher.d.ts +2 -1
- package/build/utils/VaultWatcher.js +3 -6
- package/build/utils/VaultWatcher.js.map +1 -1
- package/build/utils/abort.d.ts +5 -0
- package/build/utils/abort.js +51 -0
- package/build/utils/abort.js.map +1 -0
- package/build/utils/worker/WorkerPool.d.ts +7 -2
- package/build/utils/worker/WorkerPool.js +22 -7
- package/build/utils/worker/WorkerPool.js.map +1 -1
- package/package.json +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/tools/vault/utils/actions/read.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EACN,+BAA+B,
|
|
1
|
+
{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/tools/vault/utils/actions/read.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,11 +43,13 @@ export async function searchDocuments(vaultManager, params) {
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
const effectiveExcerptLength = params.excerptLength ??
|
|
46
|
-
(mode === "none"
|
|
46
|
+
(mode === "none"
|
|
47
|
+
? undefined
|
|
48
|
+
: SEARCH_DEFAULT_EXCERPT[mode]);
|
|
47
49
|
const documentsData = await Promise.all(searchResults.map(async (res) => {
|
|
48
50
|
const doc = res.document;
|
|
49
51
|
let formatted;
|
|
50
|
-
if (params.includeContent) {
|
|
52
|
+
if (params.includeContent && mode !== "summary") {
|
|
51
53
|
const fullDoc = await getDocumentContent(vaultManager, doc.filePath, effectiveExcerptLength);
|
|
52
54
|
formatted = formatDocument({ ...doc, ...fullDoc }, true, effectiveExcerptLength);
|
|
53
55
|
}
|
|
@@ -63,7 +65,9 @@ export async function searchDocuments(vaultManager, params) {
|
|
|
63
65
|
}));
|
|
64
66
|
const sourceChars = searchResults.reduce((sum, res) => sum + res.document.contentLength, 0);
|
|
65
67
|
const maxOutputChars = params.maxOutputChars ??
|
|
66
|
-
(mode === "none"
|
|
68
|
+
(mode === "none"
|
|
69
|
+
? null
|
|
70
|
+
: ACTION_DEFAULT_MAX_OUTPUT_CHARS.search[mode]);
|
|
67
71
|
const basePayload = {
|
|
68
72
|
query: params.keyword,
|
|
69
73
|
found: documentsData.length,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../../src/tools/vault/utils/actions/search.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EACN,+BAA+B,
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../../src/tools/vault/utils/actions/search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ObsidianContentQueryParams } from "../params.js";
|
|
2
|
-
export type CompressionMode = "aggressive" | "balanced" | "none";
|
|
2
|
+
export type CompressionMode = "summary" | "aggressive" | "balanced" | "none";
|
|
3
3
|
export declare const SEARCH_DEFAULT_LIMIT: Record<Exclude<CompressionMode, "none">, number>;
|
|
4
4
|
export declare const SEARCH_DEFAULT_EXCERPT: Record<Exclude<CompressionMode, "none">, number>;
|
|
5
5
|
export declare const READ_DEFAULT_CONTENT_MAX_CHARS: Record<Exclude<CompressionMode, "none">, number>;
|
|
@@ -1,39 +1,47 @@
|
|
|
1
1
|
export const SEARCH_DEFAULT_LIMIT = {
|
|
2
|
+
summary: 3,
|
|
2
3
|
aggressive: 3,
|
|
3
4
|
balanced: 5,
|
|
4
5
|
};
|
|
5
6
|
export const SEARCH_DEFAULT_EXCERPT = {
|
|
7
|
+
summary: 100,
|
|
6
8
|
aggressive: 220,
|
|
7
9
|
balanced: 500,
|
|
8
10
|
};
|
|
9
11
|
export const READ_DEFAULT_CONTENT_MAX_CHARS = {
|
|
12
|
+
summary: 400,
|
|
10
13
|
aggressive: 1200,
|
|
11
14
|
balanced: 2500,
|
|
12
15
|
};
|
|
13
16
|
export const READ_DEFAULT_BACKLINK_LIMIT = {
|
|
17
|
+
summary: 0,
|
|
14
18
|
aggressive: 5,
|
|
15
19
|
balanced: 10,
|
|
16
20
|
};
|
|
17
21
|
export const ACTION_DEFAULT_MAX_OUTPUT_CHARS = {
|
|
18
22
|
search: {
|
|
23
|
+
summary: 800,
|
|
19
24
|
aggressive: 1800,
|
|
20
25
|
balanced: 2500,
|
|
21
26
|
},
|
|
22
27
|
read: {
|
|
28
|
+
summary: 1000,
|
|
23
29
|
aggressive: 2200,
|
|
24
30
|
balanced: 4000,
|
|
25
31
|
},
|
|
26
32
|
collect_context: {
|
|
33
|
+
summary: 1200,
|
|
27
34
|
aggressive: 2800,
|
|
28
35
|
balanced: 5200,
|
|
29
36
|
},
|
|
30
37
|
load_memory: {
|
|
38
|
+
summary: 1000,
|
|
31
39
|
aggressive: 2000,
|
|
32
40
|
balanced: 3200,
|
|
33
41
|
},
|
|
34
42
|
};
|
|
35
43
|
export function resolveCompressionMode(params) {
|
|
36
|
-
return params.compressionMode ?? "
|
|
44
|
+
return params.compressionMode ?? "summary";
|
|
37
45
|
}
|
|
38
46
|
function estimateTokensByChars(chars) {
|
|
39
47
|
return Math.ceil(chars / 3);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/tools/vault/utils/shared.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,oBAAoB,GAG7B;IACH,UAAU,EAAE,CAAC;IACb,QAAQ,EAAE,CAAC;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAG/B;IACH,UAAU,EAAE,GAAG;IACf,QAAQ,EAAE,GAAG;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAGvC;IACH,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,IAAI;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAGpC;IACH,UAAU,EAAE,CAAC;IACb,QAAQ,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAGxC;IACH,MAAM,EAAE;QACP,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;IACD,IAAI,EAAE;QACL,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;IACD,eAAe,EAAE;QAChB,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;IACD,WAAW,EAAE;QACZ,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;CACD,CAAC;AAEF,MAAM,UAAU,sBAAsB,CACrC,MAAkC;IAElC,OAAO,MAAM,CAAC,eAAe,IAAI,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/tools/vault/utils/shared.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,oBAAoB,GAG7B;IACH,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,CAAC;IACb,QAAQ,EAAE,CAAC;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAG/B;IACH,OAAO,EAAE,GAAG;IACZ,UAAU,EAAE,GAAG;IACf,QAAQ,EAAE,GAAG;CACb,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAGvC;IACH,OAAO,EAAE,GAAG;IACZ,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,IAAI;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAGpC;IACH,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,CAAC;IACb,QAAQ,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAGxC;IACH,MAAM,EAAE;QACP,OAAO,EAAE,GAAG;QACZ,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;IACD,IAAI,EAAE;QACL,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;IACD,WAAW,EAAE;QACZ,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI;QAChB,QAAQ,EAAE,IAAI;KACd;CACD,CAAC;AAEF,MAAM,UAAU,sBAAsB,CACrC,MAAkC;IAElC,OAAO,MAAM,CAAC,eAAe,IAAI,SAAS,CAAC;AAC5C,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAa;IAC3C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,8BAA8B,CAG7C,OAAU,EACV,WAMC;IAYD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IACpD,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAC7D,OAAO;QACN,GAAG,OAAO;QACV,WAAW,EAAE;YACZ,GAAG,WAAW;YACd,YAAY;YACZ,gBAAgB;SAChB;KACD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAa;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa,EAAE,SAAiB;IAChE,IAAI,KAAK,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACpD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACxC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QAChB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;AAC/C,CAAC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { createAbortError, isAbortError, withTimeout } from "./abort.js";
|
|
2
|
+
export class BackgroundTaskRegistry {
|
|
3
|
+
tasks = new Map();
|
|
4
|
+
nextId = 0;
|
|
5
|
+
get size() {
|
|
6
|
+
return this.tasks.size;
|
|
7
|
+
}
|
|
8
|
+
run(name, task) {
|
|
9
|
+
const id = `${name}:${this.nextId++}`;
|
|
10
|
+
const controller = new AbortController();
|
|
11
|
+
const promise = task(controller.signal)
|
|
12
|
+
.catch((error) => {
|
|
13
|
+
if (!isAbortError(error)) {
|
|
14
|
+
throw error;
|
|
15
|
+
}
|
|
16
|
+
return undefined;
|
|
17
|
+
})
|
|
18
|
+
.finally(() => {
|
|
19
|
+
this.tasks.delete(id);
|
|
20
|
+
});
|
|
21
|
+
this.tasks.set(id, {
|
|
22
|
+
controller,
|
|
23
|
+
promise: promise.then(() => undefined),
|
|
24
|
+
});
|
|
25
|
+
return promise;
|
|
26
|
+
}
|
|
27
|
+
async abortAll(reason, timeoutMs) {
|
|
28
|
+
if (this.tasks.size === 0) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const abortError = createAbortError(reason);
|
|
32
|
+
const tasks = Array.from(this.tasks.values());
|
|
33
|
+
for (const task of tasks) {
|
|
34
|
+
task.controller.abort(abortError);
|
|
35
|
+
}
|
|
36
|
+
await withTimeout(Promise.allSettled(tasks.map((task) => task.promise)).then(() => undefined), timeoutMs, `Background tasks did not stop within ${timeoutMs}ms`).catch(() => undefined);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=BackgroundTaskRegistry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BackgroundTaskRegistry.js","sourceRoot":"","sources":["../../src/utils/BackgroundTaskRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAOzE,MAAM,OAAO,sBAAsB;IAC1B,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;IAC1C,MAAM,GAAG,CAAC,CAAC;IAEnB,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,GAAG,CACF,IAAY,EACZ,IAAyC;QAEzC,MAAM,EAAE,GAAG,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QAEzC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;aACrC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACzB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,MAAM,KAAK,CAAC;YACb,CAAC;YACD,OAAO,SAAS,CAAC;QAClB,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE;YAClB,UAAU;YACV,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;SACtC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAc,EAAE,SAAiB;QAC/C,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO;QACR,CAAC;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,WAAW,CAChB,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CACzD,GAAG,EAAE,CAAC,SAAS,CACf,EACD,SAAS,EACT,wCAAwC,SAAS,IAAI,CACrD,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC1B,CAAC;CACD"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
declare class EmbedderService {
|
|
2
|
-
|
|
1
|
+
export declare class EmbedderService {
|
|
2
|
+
readonly modelName = "Xenova/paraphrase-multilingual-MiniLM-L12-v2";
|
|
3
3
|
private extractor;
|
|
4
4
|
private tokenizer;
|
|
5
5
|
private initPromise;
|
|
6
6
|
constructor();
|
|
7
7
|
checkModelPresence(): Promise<boolean>;
|
|
8
|
+
hasLocalModelFiles(): boolean;
|
|
8
9
|
init(): Promise<void>;
|
|
10
|
+
dispose(): Promise<void>;
|
|
9
11
|
getTokenCount(text: string): number;
|
|
10
12
|
embed(text: string): Promise<number[]>;
|
|
11
13
|
}
|
|
12
14
|
export declare const localEmbedder: EmbedderService;
|
|
13
|
-
export {};
|
package/build/utils/Embedder.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
1
3
|
import { AutoTokenizer, env, pipeline, } from "@huggingface/transformers";
|
|
2
4
|
import { MODELS_DIR } from "./constants.js";
|
|
3
|
-
class EmbedderService {
|
|
5
|
+
export class EmbedderService {
|
|
4
6
|
modelName = "Xenova/paraphrase-multilingual-MiniLM-L12-v2";
|
|
5
7
|
extractor = null;
|
|
6
8
|
tokenizer = null;
|
|
@@ -11,13 +13,10 @@ class EmbedderService {
|
|
|
11
13
|
env.cacheDir = MODELS_DIR;
|
|
12
14
|
}
|
|
13
15
|
async checkModelPresence() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
catch (_e) {
|
|
19
|
-
return false;
|
|
20
|
-
}
|
|
16
|
+
return this.hasLocalModelFiles();
|
|
17
|
+
}
|
|
18
|
+
hasLocalModelFiles() {
|
|
19
|
+
return existsSync(join(MODELS_DIR, this.modelName));
|
|
21
20
|
}
|
|
22
21
|
async init() {
|
|
23
22
|
if (this.initPromise)
|
|
@@ -28,6 +27,19 @@ class EmbedderService {
|
|
|
28
27
|
})();
|
|
29
28
|
return this.initPromise;
|
|
30
29
|
}
|
|
30
|
+
async dispose() {
|
|
31
|
+
if (this.extractor) {
|
|
32
|
+
try {
|
|
33
|
+
await this.extractor.dispose();
|
|
34
|
+
}
|
|
35
|
+
catch (e) {
|
|
36
|
+
console.error("Failed to dispose extractor:", e);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
this.extractor = null;
|
|
40
|
+
this.tokenizer = null;
|
|
41
|
+
this.initPromise = null;
|
|
42
|
+
}
|
|
31
43
|
getTokenCount(text) {
|
|
32
44
|
if (!this.tokenizer) {
|
|
33
45
|
return Math.ceil(text.length / 4);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Embedder.js","sourceRoot":"","sources":["../../src/utils/Embedder.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,aAAa,EACb,GAAG,EAGH,QAAQ,GACR,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"Embedder.js","sourceRoot":"","sources":["../../src/utils/Embedder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACN,aAAa,EACb,GAAG,EAGH,QAAQ,GACR,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,eAAe;IACX,SAAS,GAAG,8CAA8C,CAAC;IACnE,SAAS,GAAqC,IAAI,CAAC;IACnD,SAAS,GAA+B,IAAI,CAAC;IAC7C,WAAW,GAAyB,IAAI,CAAC;IAEjD;QACC,GAAG,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC9B,GAAG,CAAC,cAAc,GAAG,UAAU,CAAC;QAChC,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC9B,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAClC,CAAC;IAEM,kBAAkB;QACxB,OAAO,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,IAAI;QAChB,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC,WAAW,CAAC;QAE9C,IAAI,CAAC,WAAW,GAAG,CAAC,KAAK,IAAI,EAAE;YAC9B,IAAI,CAAC,SAAS,GAAG,MAAM,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACtE,IAAI,CAAC,SAAS,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtE,CAAC,CAAC,EAAE,CAAC;QAEL,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,OAAO;QACnB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAChC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAC;YAClD,CAAC;QACF,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACzB,CAAC;IAEM,aAAa,CAAC,IAAY;QAChC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAY;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;YACzC,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAa,CAAC;IAC5C,CAAC;CACD;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,eAAe,EAAE,CAAC"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
type LocalModelResource = {
|
|
2
|
+
checkModelPresence: () => Promise<boolean>;
|
|
3
|
+
init: () => Promise<void>;
|
|
4
|
+
dispose: () => void | Promise<void>;
|
|
5
|
+
};
|
|
6
|
+
export interface LocalModelManagerOptions {
|
|
7
|
+
embedder?: LocalModelResource;
|
|
8
|
+
reranker?: LocalModelResource;
|
|
9
|
+
idleTtlMs?: number;
|
|
10
|
+
hardTimeoutMs?: number;
|
|
11
|
+
}
|
|
12
|
+
export declare class LocalModelManager {
|
|
13
|
+
private readonly embedder;
|
|
14
|
+
private readonly reranker;
|
|
15
|
+
private readonly idleTtlMs;
|
|
16
|
+
private readonly hardTimeoutMs;
|
|
17
|
+
private embedderWarmup;
|
|
18
|
+
private rerankerWarmup;
|
|
19
|
+
private embedderState;
|
|
20
|
+
private rerankerState;
|
|
21
|
+
private idleTimer;
|
|
22
|
+
private lateWarmupCleanupScheduled;
|
|
23
|
+
private isShutdown;
|
|
24
|
+
private activeUses;
|
|
25
|
+
constructor(options?: LocalModelManagerOptions);
|
|
26
|
+
get isEmbedderReady(): boolean;
|
|
27
|
+
get isRerankerReady(): boolean;
|
|
28
|
+
hasEmbedderFiles(): Promise<boolean>;
|
|
29
|
+
hasRerankerFiles(): Promise<boolean>;
|
|
30
|
+
withEmbedder<T>(softDeadlineMs: number, fn: (ready: boolean) => Promise<T>): Promise<T>;
|
|
31
|
+
withReranker<T>(softDeadlineMs: number, fn: (ready: boolean) => Promise<T>): Promise<T>;
|
|
32
|
+
beginToolCall(): void;
|
|
33
|
+
endToolCall(): Promise<void>;
|
|
34
|
+
private disposeIdleModels;
|
|
35
|
+
shutdown(): Promise<void>;
|
|
36
|
+
private waitFor;
|
|
37
|
+
private ensureWarmup;
|
|
38
|
+
private warmResource;
|
|
39
|
+
private setState;
|
|
40
|
+
private cancelIdleDispose;
|
|
41
|
+
private scheduleLateWarmupCleanup;
|
|
42
|
+
private scheduleIdleDispose;
|
|
43
|
+
}
|
|
44
|
+
export declare const localModelManager: LocalModelManager;
|
|
45
|
+
export {};
|
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
import { isAbortError, withTimeout } from "./abort.js";
|
|
2
|
+
import { localEmbedder } from "./Embedder.js";
|
|
3
|
+
import { localReranker } from "./LocalReranker.js";
|
|
4
|
+
export class LocalModelManager {
|
|
5
|
+
embedder;
|
|
6
|
+
reranker;
|
|
7
|
+
idleTtlMs;
|
|
8
|
+
hardTimeoutMs;
|
|
9
|
+
embedderWarmup = null;
|
|
10
|
+
rerankerWarmup = null;
|
|
11
|
+
embedderState = "idle";
|
|
12
|
+
rerankerState = "idle";
|
|
13
|
+
idleTimer = null;
|
|
14
|
+
lateWarmupCleanupScheduled = false;
|
|
15
|
+
isShutdown = false;
|
|
16
|
+
activeUses = 0;
|
|
17
|
+
constructor(options = {}) {
|
|
18
|
+
this.embedder = options.embedder ?? localEmbedder;
|
|
19
|
+
this.reranker = options.reranker ?? localReranker;
|
|
20
|
+
this.idleTtlMs = options.idleTtlMs ?? 30 * 1000;
|
|
21
|
+
this.hardTimeoutMs = options.hardTimeoutMs ?? 10 * 1000;
|
|
22
|
+
}
|
|
23
|
+
get isEmbedderReady() {
|
|
24
|
+
return this.embedderState === "ready";
|
|
25
|
+
}
|
|
26
|
+
get isRerankerReady() {
|
|
27
|
+
return this.rerankerState === "ready";
|
|
28
|
+
}
|
|
29
|
+
async hasEmbedderFiles() {
|
|
30
|
+
return this.embedder.checkModelPresence();
|
|
31
|
+
}
|
|
32
|
+
async hasRerankerFiles() {
|
|
33
|
+
return this.reranker.checkModelPresence();
|
|
34
|
+
}
|
|
35
|
+
async withEmbedder(softDeadlineMs, fn) {
|
|
36
|
+
this.activeUses++;
|
|
37
|
+
this.cancelIdleDispose();
|
|
38
|
+
try {
|
|
39
|
+
const ready = await this.waitFor("embedder", softDeadlineMs);
|
|
40
|
+
return await fn(ready);
|
|
41
|
+
}
|
|
42
|
+
finally {
|
|
43
|
+
this.activeUses--;
|
|
44
|
+
this.scheduleIdleDispose();
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
async withReranker(softDeadlineMs, fn) {
|
|
48
|
+
this.activeUses++;
|
|
49
|
+
this.cancelIdleDispose();
|
|
50
|
+
try {
|
|
51
|
+
const ready = await this.waitFor("reranker", softDeadlineMs);
|
|
52
|
+
return await fn(ready);
|
|
53
|
+
}
|
|
54
|
+
finally {
|
|
55
|
+
this.activeUses--;
|
|
56
|
+
this.scheduleIdleDispose();
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
beginToolCall() {
|
|
60
|
+
if (this.isShutdown) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
this.activeUses++;
|
|
64
|
+
this.cancelIdleDispose();
|
|
65
|
+
}
|
|
66
|
+
async endToolCall() {
|
|
67
|
+
if (this.activeUses > 0) {
|
|
68
|
+
this.activeUses--;
|
|
69
|
+
}
|
|
70
|
+
if (this.activeUses === 0) {
|
|
71
|
+
this.cancelIdleDispose();
|
|
72
|
+
await this.disposeIdleModels();
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
async disposeIdleModels() {
|
|
76
|
+
if (this.isShutdown) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const pendingWarmups = [this.embedderWarmup, this.rerankerWarmup].filter((warmup) => warmup !== null);
|
|
80
|
+
const embedderHasPendingWarmup = this.embedderWarmup !== null;
|
|
81
|
+
const rerankerHasPendingWarmup = this.rerankerWarmup !== null;
|
|
82
|
+
this.scheduleLateWarmupCleanup(pendingWarmups);
|
|
83
|
+
await this.embedder.dispose();
|
|
84
|
+
await this.reranker.dispose();
|
|
85
|
+
if (!embedderHasPendingWarmup) {
|
|
86
|
+
this.embedderWarmup = null;
|
|
87
|
+
}
|
|
88
|
+
if (!rerankerHasPendingWarmup) {
|
|
89
|
+
this.rerankerWarmup = null;
|
|
90
|
+
}
|
|
91
|
+
this.embedderState = "idle";
|
|
92
|
+
this.rerankerState = "idle";
|
|
93
|
+
}
|
|
94
|
+
async shutdown() {
|
|
95
|
+
this.isShutdown = true;
|
|
96
|
+
this.cancelIdleDispose();
|
|
97
|
+
await this.embedder.dispose();
|
|
98
|
+
await this.reranker.dispose();
|
|
99
|
+
this.embedderWarmup = null;
|
|
100
|
+
this.rerankerWarmup = null;
|
|
101
|
+
this.embedderState = "idle";
|
|
102
|
+
this.rerankerState = "idle";
|
|
103
|
+
}
|
|
104
|
+
async waitFor(resource, softDeadlineMs) {
|
|
105
|
+
if (this.isShutdown) {
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
108
|
+
const warmup = this.ensureWarmup(resource);
|
|
109
|
+
try {
|
|
110
|
+
const ready = await withTimeout(warmup, softDeadlineMs);
|
|
111
|
+
return ready;
|
|
112
|
+
}
|
|
113
|
+
catch {
|
|
114
|
+
return false;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
ensureWarmup(resource) {
|
|
118
|
+
if (resource === "embedder") {
|
|
119
|
+
if (!this.embedderWarmup) {
|
|
120
|
+
this.embedderWarmup = this.warmResource("embedder");
|
|
121
|
+
}
|
|
122
|
+
return this.embedderWarmup;
|
|
123
|
+
}
|
|
124
|
+
if (!this.rerankerWarmup) {
|
|
125
|
+
this.rerankerWarmup = this.warmResource("reranker");
|
|
126
|
+
}
|
|
127
|
+
return this.rerankerWarmup;
|
|
128
|
+
}
|
|
129
|
+
async warmResource(resource) {
|
|
130
|
+
const target = resource === "embedder" ? this.embedder : this.reranker;
|
|
131
|
+
this.setState(resource, "warming");
|
|
132
|
+
try {
|
|
133
|
+
if (!(await target.checkModelPresence())) {
|
|
134
|
+
this.setState(resource, "degraded");
|
|
135
|
+
return false;
|
|
136
|
+
}
|
|
137
|
+
await withTimeout(target.init(), this.hardTimeoutMs, `${resource} warmup exceeded ${this.hardTimeoutMs}ms`);
|
|
138
|
+
this.setState(resource, "ready");
|
|
139
|
+
return true;
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
if (!isAbortError(error)) {
|
|
143
|
+
this.setState(resource, "degraded");
|
|
144
|
+
}
|
|
145
|
+
return false;
|
|
146
|
+
}
|
|
147
|
+
finally {
|
|
148
|
+
if (resource === "embedder") {
|
|
149
|
+
this.embedderWarmup = null;
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
this.rerankerWarmup = null;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
setState(resource, state) {
|
|
157
|
+
if (resource === "embedder") {
|
|
158
|
+
this.embedderState = state;
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
this.rerankerState = state;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
cancelIdleDispose() {
|
|
165
|
+
if (this.idleTimer) {
|
|
166
|
+
clearTimeout(this.idleTimer);
|
|
167
|
+
this.idleTimer = null;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
scheduleLateWarmupCleanup(pendingWarmups) {
|
|
171
|
+
if (pendingWarmups.length === 0 || this.lateWarmupCleanupScheduled) {
|
|
172
|
+
return;
|
|
173
|
+
}
|
|
174
|
+
this.lateWarmupCleanupScheduled = true;
|
|
175
|
+
void Promise.allSettled(pendingWarmups)
|
|
176
|
+
.then(async () => {
|
|
177
|
+
this.lateWarmupCleanupScheduled = false;
|
|
178
|
+
if (this.activeUses === 0 && !this.isShutdown) {
|
|
179
|
+
await this.disposeIdleModels();
|
|
180
|
+
}
|
|
181
|
+
})
|
|
182
|
+
.catch(() => {
|
|
183
|
+
this.lateWarmupCleanupScheduled = false;
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
scheduleIdleDispose() {
|
|
187
|
+
this.cancelIdleDispose();
|
|
188
|
+
if (this.activeUses === 0) {
|
|
189
|
+
this.idleTimer = setTimeout(() => {
|
|
190
|
+
void this.disposeIdleModels();
|
|
191
|
+
}, this.idleTtlMs);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
export const localModelManager = new LocalModelManager();
|
|
196
|
+
//# sourceMappingURL=LocalModelManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LocalModelManager.js","sourceRoot":"","sources":["../../src/utils/LocalModelManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
declare class Reranker {
|
|
2
|
-
|
|
1
|
+
export declare class Reranker {
|
|
2
|
+
readonly modelName = "Xenova/bge-reranker-base";
|
|
3
3
|
private tokenizer;
|
|
4
4
|
private model;
|
|
5
5
|
private initPromise;
|
|
6
6
|
constructor();
|
|
7
7
|
checkModelPresence(): Promise<boolean>;
|
|
8
|
+
hasLocalModelFiles(): boolean;
|
|
8
9
|
get isReady(): boolean;
|
|
9
10
|
private loadModel;
|
|
10
11
|
init(): Promise<void>;
|
|
12
|
+
dispose(): Promise<void>;
|
|
11
13
|
rerank(query: string, documents: string[]): Promise<{
|
|
12
14
|
document: string;
|
|
13
15
|
score: number;
|
|
14
16
|
}[]>;
|
|
15
17
|
}
|
|
16
18
|
export declare const localReranker: Reranker;
|
|
17
|
-
export {};
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
|
+
import { join } from "node:path";
|
|
1
3
|
import { AutoModelForSequenceClassification, AutoTokenizer, env, } from "@huggingface/transformers";
|
|
2
4
|
import z from "zod";
|
|
3
5
|
import { MODELS_DIR } from "./constants.js";
|
|
@@ -5,7 +7,7 @@ const rerankedResultsSchema = z.array(z.object({
|
|
|
5
7
|
document: z.string(),
|
|
6
8
|
score: z.number(),
|
|
7
9
|
}));
|
|
8
|
-
class Reranker {
|
|
10
|
+
export class Reranker {
|
|
9
11
|
modelName = "Xenova/bge-reranker-base";
|
|
10
12
|
tokenizer = null;
|
|
11
13
|
model = null;
|
|
@@ -16,13 +18,10 @@ class Reranker {
|
|
|
16
18
|
env.cacheDir = MODELS_DIR;
|
|
17
19
|
}
|
|
18
20
|
async checkModelPresence() {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
catch (_e) {
|
|
24
|
-
return false;
|
|
25
|
-
}
|
|
21
|
+
return this.hasLocalModelFiles();
|
|
22
|
+
}
|
|
23
|
+
hasLocalModelFiles() {
|
|
24
|
+
return existsSync(join(MODELS_DIR, this.modelName));
|
|
26
25
|
}
|
|
27
26
|
get isReady() {
|
|
28
27
|
return this.tokenizer !== null && this.model !== null;
|
|
@@ -41,6 +40,19 @@ class Reranker {
|
|
|
41
40
|
}
|
|
42
41
|
return this.initPromise;
|
|
43
42
|
}
|
|
43
|
+
async dispose() {
|
|
44
|
+
if (this.model) {
|
|
45
|
+
try {
|
|
46
|
+
await this.model.dispose();
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
console.error("Failed to dispose reranker model:", e);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
this.tokenizer = null;
|
|
53
|
+
this.model = null;
|
|
54
|
+
this.initPromise = null;
|
|
55
|
+
}
|
|
44
56
|
async rerank(query, documents) {
|
|
45
57
|
if (!this.isReady) {
|
|
46
58
|
await this.init();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalReranker.js","sourceRoot":"","sources":["../../src/utils/LocalReranker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LocalReranker.js","sourceRoot":"","sources":["../../src/utils/LocalReranker.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,12 +24,17 @@ export declare class RAGIndexer {
|
|
|
24
24
|
startIndexing(total: number): void;
|
|
25
25
|
stopIndexing(): void;
|
|
26
26
|
private buildFileRecords;
|
|
27
|
-
processFile(filePath: string, content?: string
|
|
28
|
-
|
|
27
|
+
processFile(filePath: string, content?: string, options?: {
|
|
28
|
+
signal?: AbortSignal;
|
|
29
|
+
}): Promise<void>;
|
|
30
|
+
processFileInMemory(filePath: string, content?: string, options?: {
|
|
31
|
+
signal?: AbortSignal;
|
|
32
|
+
}): Promise<{
|
|
29
33
|
records: VectorRecord[];
|
|
30
34
|
mtime: string;
|
|
31
35
|
} | null>;
|
|
32
|
-
indexAll(vaultPath: string): Promise<void>;
|
|
36
|
+
indexAll(vaultPath: string, signal?: AbortSignal): Promise<void>;
|
|
37
|
+
shutdown(): Promise<void>;
|
|
33
38
|
deleteFile(filePath: string): Promise<void>;
|
|
34
39
|
}
|
|
35
40
|
export declare const ragIndexer: RAGIndexer;
|