dsh-data-domain-knowledge 0.1.1-alpha.2 → 0.1.1-alpha.4
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 +33 -16
- package/lib/client.js +1042 -2097
- package/lib/contract-refs.d.ts +0 -1
- package/lib/doc-page.js +1 -1
- package/lib/pages.js +2489 -1060
- package/lib/types/agent-behavior-rules.d.ts.map +1 -1
- package/lib/types/agent-behavior-rules.js +3 -2
- package/lib/types/agent-behavior-rules.js.map +1 -1
- package/lib/types/axis-contract.js +1 -1
- package/lib/types/axis-contract.js.map +1 -1
- package/lib/types/card-organize.d.ts +2 -1
- package/lib/types/card-organize.d.ts.map +1 -1
- package/lib/types/card-organize.js +5 -3
- package/lib/types/card-organize.js.map +1 -1
- package/lib/types/config-schema.d.ts +1 -1
- package/lib/types/config-schema.js +1 -1
- package/lib/types/convert/host.d.ts +2 -3
- package/lib/types/convert/host.d.ts.map +1 -1
- package/lib/types/convert/host.js +11 -2
- package/lib/types/convert/host.js.map +1 -1
- package/lib/types/convert/ingest.d.ts +14 -20
- package/lib/types/convert/ingest.d.ts.map +1 -1
- package/lib/types/convert/ingest.js +8 -5
- package/lib/types/convert/ingest.js.map +1 -1
- package/lib/types/diagnosis/store.d.ts +2 -2
- package/lib/types/diagnosis/store.d.ts.map +1 -1
- package/lib/types/diagnosis/store.js +10 -2
- package/lib/types/diagnosis/store.js.map +1 -1
- package/lib/types/diagnosis/types.d.ts +1 -1
- package/lib/types/diagnosis/types.js +1 -1
- package/lib/types/extract-model.d.ts +3 -0
- package/lib/types/extract-model.d.ts.map +1 -1
- package/lib/types/extract-model.js.map +1 -1
- package/lib/types/images.js +1 -1
- package/lib/types/index.d.ts +0 -4
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/index.js +99 -91
- package/lib/types/index.js.map +1 -1
- package/lib/types/knowledge-bases.d.ts +3 -0
- package/lib/types/knowledge-bases.d.ts.map +1 -1
- package/lib/types/knowledge-bases.js +22 -2
- package/lib/types/knowledge-bases.js.map +1 -1
- package/lib/types/knowledge-contract.d.ts +6 -0
- package/lib/types/knowledge-contract.d.ts.map +1 -1
- package/lib/types/knowledge-contract.js +6 -2
- package/lib/types/knowledge-contract.js.map +1 -1
- package/lib/types/layout.d.ts +9 -26
- package/lib/types/layout.d.ts.map +1 -1
- package/lib/types/layout.js +10 -28
- package/lib/types/layout.js.map +1 -1
- package/lib/types/materialize-snapshot.d.ts +5 -0
- package/lib/types/materialize-snapshot.d.ts.map +1 -1
- package/lib/types/migrate.d.ts +3 -1
- package/lib/types/migrate.d.ts.map +1 -1
- package/lib/types/migrate.js +3 -1
- package/lib/types/migrate.js.map +1 -1
- package/lib/types/model-text.d.ts +7 -0
- package/lib/types/model-text.d.ts.map +1 -1
- package/lib/types/model-text.js +31 -9
- package/lib/types/model-text.js.map +1 -1
- package/lib/types/organize-contract.d.ts.map +1 -1
- package/lib/types/organize-contract.js +2 -1
- package/lib/types/organize-contract.js.map +1 -1
- package/lib/types/pipeline/engine.d.ts +28 -4
- package/lib/types/pipeline/engine.d.ts.map +1 -1
- package/lib/types/pipeline/engine.js +68 -15
- package/lib/types/pipeline/engine.js.map +1 -1
- package/lib/types/pipeline/progress.d.ts +12 -0
- package/lib/types/pipeline/progress.d.ts.map +1 -0
- package/lib/types/pipeline/progress.js +37 -0
- package/lib/types/pipeline/progress.js.map +1 -0
- package/lib/types/pipeline/resumable-extract.d.ts +45 -0
- package/lib/types/pipeline/resumable-extract.d.ts.map +1 -0
- package/lib/types/pipeline/resumable-extract.js +262 -0
- package/lib/types/pipeline/resumable-extract.js.map +1 -0
- package/lib/types/pipeline/store.d.ts +8 -2
- package/lib/types/pipeline/store.d.ts.map +1 -1
- package/lib/types/pipeline/store.js +27 -5
- package/lib/types/pipeline/store.js.map +1 -1
- package/lib/types/pipeline/types.d.ts +56 -0
- package/lib/types/pipeline/types.d.ts.map +1 -1
- package/lib/types/pipeline/types.js +18 -1
- package/lib/types/pipeline/types.js.map +1 -1
- package/lib/types/present.d.ts +1 -1
- package/lib/types/present.js +1 -1
- package/lib/types/preset-ids.d.ts +0 -1
- package/lib/types/preset-ids.d.ts.map +1 -1
- package/lib/types/preset-ids.js +0 -3
- package/lib/types/preset-ids.js.map +1 -1
- package/lib/types/query-analysis.d.ts +0 -5
- package/lib/types/query-analysis.d.ts.map +1 -1
- package/lib/types/query-analysis.js +0 -16
- package/lib/types/query-analysis.js.map +1 -1
- package/lib/types/recall-delivery.d.ts +36 -0
- package/lib/types/recall-delivery.d.ts.map +1 -0
- package/lib/types/recall-delivery.js +16 -0
- package/lib/types/recall-delivery.js.map +1 -0
- package/lib/types/retrieval/scope.d.ts +17 -0
- package/lib/types/retrieval/scope.d.ts.map +1 -0
- package/lib/types/retrieval/scope.js +11 -0
- package/lib/types/retrieval/scope.js.map +1 -0
- package/lib/types/runtime.d.ts +75 -14
- package/lib/types/runtime.d.ts.map +1 -1
- package/lib/types/runtime.js +454 -198
- package/lib/types/runtime.js.map +1 -1
- package/lib/types/settings-volatile.d.ts +0 -7
- package/lib/types/settings-volatile.d.ts.map +1 -1
- package/lib/types/settings-volatile.js +0 -7
- package/lib/types/settings-volatile.js.map +1 -1
- package/lib/types/source-identity.d.ts +34 -0
- package/lib/types/source-identity.d.ts.map +1 -0
- package/lib/types/source-identity.js +85 -0
- package/lib/types/source-identity.js.map +1 -0
- package/lib/types/source-read.d.ts +18 -0
- package/lib/types/source-read.d.ts.map +1 -0
- package/lib/types/source-read.js +49 -0
- package/lib/types/source-read.js.map +1 -0
- package/lib/types/store/axis-references.d.ts.map +1 -1
- package/lib/types/store/axis-references.js +5 -3
- package/lib/types/store/axis-references.js.map +1 -1
- package/lib/types/store/knowledge-db.d.ts +5 -29
- package/lib/types/store/knowledge-db.d.ts.map +1 -1
- package/lib/types/store/knowledge-db.js +57 -2
- package/lib/types/store/knowledge-db.js.map +1 -1
- package/lib/types/store/source-identity.d.ts +8 -0
- package/lib/types/store/source-identity.d.ts.map +1 -0
- package/lib/types/store/source-identity.js +56 -0
- package/lib/types/store/source-identity.js.map +1 -0
- package/lib/types/types.d.ts +46 -5
- package/lib/types/types.d.ts.map +1 -1
- package/lib/types/types.js +6 -3
- package/lib/types/types.js.map +1 -1
- package/lib/types/wiki-availability.d.ts +11 -0
- package/lib/types/wiki-availability.d.ts.map +1 -0
- package/lib/types/wiki-availability.js +39 -0
- package/lib/types/wiki-availability.js.map +1 -0
- package/lib/types/wiki-finalize.d.ts +4 -2
- package/lib/types/wiki-finalize.d.ts.map +1 -1
- package/lib/types/wiki-finalize.js +9 -27
- package/lib/types/wiki-finalize.js.map +1 -1
- package/lib/types/wiki-links.d.ts +35 -0
- package/lib/types/wiki-links.d.ts.map +1 -0
- package/lib/types/wiki-links.js +129 -0
- package/lib/types/wiki-links.js.map +1 -0
- package/lib/types/wiki-trial-types.d.ts +3 -0
- package/lib/types/wiki-trial-types.d.ts.map +1 -1
- package/lib/types/wiki-trial.d.ts +3 -3
- package/lib/types/wiki-trial.d.ts.map +1 -1
- package/lib/types/wiki-trial.js +14 -3
- package/lib/types/wiki-trial.js.map +1 -1
- package/package.json +16 -16
- package/scripts/doctor.mjs +0 -7
- package/scripts/setup-embedding.sh +0 -0
- package/src/agent-behavior-rules.ts +3 -2
- package/src/axis-contract.ts +1 -1
- package/src/card-organize.ts +5 -3
- package/src/client/AttributionEventGuide.tsx +3 -3
- package/src/client/AxisMatrix.tsx +86 -19
- package/src/client/AxisRegistrySection.tsx +1 -1
- package/src/client/CompileSettingsView.tsx +473 -0
- package/src/client/DirectoryPicker.tsx +0 -2
- package/src/client/ExtractionTasksPage.tsx +557 -423
- package/src/client/GuideArchitectureCanvas.tsx +5 -12
- package/src/client/ImportFilesDialog.tsx +1 -0
- package/src/client/InfoHint.tsx +1 -1
- package/src/client/KnowledgeBaseTab.tsx +141 -148
- package/src/client/KnowledgePanel.tsx +16 -9
- package/src/client/OperationLogTab.tsx +1 -1
- package/src/client/PipelineRunView.tsx +173 -0
- package/src/client/RecallPanel.tsx +5 -16
- package/src/client/TabGuide.tsx +3 -7
- package/src/client/WikiFlowPanel.tsx +10 -11
- package/src/client/arch/NodeLogicPanel.tsx +3 -3
- package/src/client/arch/model.ts +5 -113
- package/src/client/architecture.css +1 -1
- package/src/client/architecture.tsx +13 -27
- package/src/client/attribution/AttributionTab.tsx +141 -10
- package/src/client/pages.css +305 -180
- package/src/client/pages.tsx +7 -12
- package/src/client/styles.css +15 -96
- package/src/config-schema.ts +1 -1
- package/src/convert/host.ts +13 -5
- package/src/convert/ingest.ts +20 -7
- package/src/diagnosis/store.ts +7 -2
- package/src/diagnosis/types.ts +1 -1
- package/src/extract-model.ts +3 -0
- package/src/images.ts +1 -1
- package/src/index.ts +92 -97
- package/src/knowledge-bases.ts +23 -3
- package/src/knowledge-contract.ts +7 -2
- package/src/layout.ts +10 -32
- package/src/materialize-snapshot.ts +1 -0
- package/src/migrate.ts +3 -1
- package/src/model-text.ts +33 -11
- package/src/organize-contract.ts +2 -1
- package/src/pipeline/engine.ts +85 -22
- package/src/pipeline/progress.ts +40 -0
- package/src/pipeline/resumable-extract.ts +233 -0
- package/src/pipeline/store.ts +28 -6
- package/src/pipeline/types.ts +47 -2
- package/src/present.ts +1 -1
- package/src/preset-ids.ts +0 -4
- package/src/query-analysis.ts +0 -20
- package/src/recall-delivery.ts +19 -0
- package/src/retrieval/scope.ts +10 -0
- package/src/runtime.ts +412 -206
- package/src/settings-volatile.ts +0 -7
- package/src/source-identity.ts +85 -0
- package/src/source-read.ts +47 -0
- package/src/store/axis-references.ts +5 -3
- package/src/store/knowledge-db.ts +54 -2
- package/src/store/source-identity.ts +42 -0
- package/src/types.ts +18 -5
- package/src/wiki-availability.ts +37 -0
- package/src/wiki-finalize.ts +9 -25
- package/src/wiki-links.ts +120 -0
- package/src/wiki-trial-types.ts +3 -2
- package/src/wiki-trial.ts +17 -6
- package/lib/types/intent/engine.d.ts +0 -122
- package/lib/types/intent/engine.d.ts.map +0 -1
- package/lib/types/intent/engine.js +0 -488
- package/lib/types/intent/engine.js.map +0 -1
- package/lib/types/intent/host.d.ts +0 -68
- package/lib/types/intent/host.d.ts.map +0 -1
- package/lib/types/intent/host.js +0 -249
- package/lib/types/intent/host.js.map +0 -1
- package/lib/types/intent/scope.d.ts +0 -25
- package/lib/types/intent/scope.d.ts.map +0 -1
- package/lib/types/intent/scope.js +0 -116
- package/lib/types/intent/scope.js.map +0 -1
- package/lib/types/intent/store.d.ts +0 -33
- package/lib/types/intent/store.d.ts.map +0 -1
- package/lib/types/intent/store.js +0 -239
- package/lib/types/intent/store.js.map +0 -1
- package/lib/types/intent/tools.d.ts +0 -62
- package/lib/types/intent/tools.d.ts.map +0 -1
- package/lib/types/intent/tools.js +0 -130
- package/lib/types/intent/tools.js.map +0 -1
- package/lib/types/intent/types.d.ts +0 -170
- package/lib/types/intent/types.d.ts.map +0 -1
- package/lib/types/intent/types.js +0 -56
- package/lib/types/intent/types.js.map +0 -1
- package/src/client/IntentLogic.tsx +0 -192
- package/src/client/IntentTab.tsx +0 -343
- package/src/client/TypeDefinitionDrawer.tsx +0 -195
- package/src/intent/README.md +0 -42
- package/src/intent/engine.ts +0 -515
- package/src/intent/host.ts +0 -315
- package/src/intent/scope.ts +0 -125
- package/src/intent/store.ts +0 -218
- package/src/intent/tools.ts +0 -154
- package/src/intent/types.ts +0 -229
package/lib/types/migrate.js
CHANGED
|
@@ -69,7 +69,9 @@ function skipped(reason, from, to) {
|
|
|
69
69
|
* 把旧版完整的 Agent 根目录合并到新的固定根目录。
|
|
70
70
|
*
|
|
71
71
|
* 这和 `migrateLegacyKnowledgeTree` 不同:后者只认识一棵知识库树,而这里要把
|
|
72
|
-
* `domain_knowledge`、`memory`、`
|
|
72
|
+
* `domain_knowledge`、`memory`、`resource` 与 `tmp` 一起搬走。历史 `intent` 目录不再由插件
|
|
73
|
+
* 读取或迁移;如果它仍在旧根路径中,会阻止旧根目录被清空,保留原始数据供用户自行处理。
|
|
74
|
+
* 目标里已经有
|
|
73
75
|
* 同名目录时逐层合并,任何同名文件都不覆盖,并把冲突留下来交给界面报告。
|
|
74
76
|
*/
|
|
75
77
|
export function migrateLegacyAgentRoot(input) {
|
package/lib/types/migrate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/migrate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,9 @@ interface StreamChunkLike {
|
|
|
35
35
|
failure?: {
|
|
36
36
|
code?: string;
|
|
37
37
|
message?: string;
|
|
38
|
+
status?: number;
|
|
39
|
+
requestId?: string;
|
|
40
|
+
retryAfterMs?: number;
|
|
38
41
|
};
|
|
39
42
|
};
|
|
40
43
|
}
|
|
@@ -72,12 +75,14 @@ export declare function buildModelRequest(input: {
|
|
|
72
75
|
system?: string;
|
|
73
76
|
prompt: string;
|
|
74
77
|
reasoningEffort?: string;
|
|
78
|
+
maxTokens?: number;
|
|
75
79
|
/** 路由与缓存亲和的会话身份。知识编译用 `knowledge:<库 id>`。 */
|
|
76
80
|
sessionId: string;
|
|
77
81
|
}): {
|
|
78
82
|
provider: string;
|
|
79
83
|
model: string;
|
|
80
84
|
reasoningEffort?: string;
|
|
85
|
+
maxTokens?: number;
|
|
81
86
|
system?: string;
|
|
82
87
|
sessionId: string;
|
|
83
88
|
messages: Array<{
|
|
@@ -139,6 +144,8 @@ export interface ModelRetryOptions {
|
|
|
139
144
|
}) => string | null) | null;
|
|
140
145
|
/** 注入 sleep,测试里不必真的等。 */
|
|
141
146
|
sleep?: (ms: number) => Promise<void>;
|
|
147
|
+
signal?: AbortSignal;
|
|
148
|
+
jitter?: boolean;
|
|
142
149
|
}
|
|
143
150
|
/**
|
|
144
151
|
* 用**同一个请求**重发几次,直到成功或遇到不可重试的失败。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-text.d.ts","sourceRoot":"","sources":["../../src/model-text.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,6CAA6C;AAC7C,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"model-text.d.ts","sourceRoot":"","sources":["../../src/model-text.ts"],"names":[],"mappings":"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"}
|
package/lib/types/model-text.js
CHANGED
|
@@ -27,11 +27,12 @@
|
|
|
27
27
|
* 排查的人一眼能看出这些调用是谁发的(同一个头的值还会出现在上游的日志里)。
|
|
28
28
|
*/
|
|
29
29
|
export function buildModelRequest(input) {
|
|
30
|
-
const { provider, model, system, prompt, reasoningEffort, sessionId } = input;
|
|
30
|
+
const { provider, model, system, prompt, reasoningEffort, maxTokens, sessionId } = input;
|
|
31
31
|
return {
|
|
32
32
|
provider,
|
|
33
33
|
model,
|
|
34
34
|
...(reasoningEffort ? { reasoningEffort } : {}),
|
|
35
|
+
...(maxTokens !== undefined ? { maxTokens } : {}),
|
|
35
36
|
...(system ? { system } : {}),
|
|
36
37
|
sessionId,
|
|
37
38
|
messages: [{ role: 'user', content: [{ type: 'text', text: prompt }] }],
|
|
@@ -69,8 +70,10 @@ export async function collectModelText(stream, onUsage, onDelta) {
|
|
|
69
70
|
if (failure || finish === 'error' || finish === 'aborted' || finish === 'max-tokens') {
|
|
70
71
|
const code = failure?.code?.trim() || (finish === 'max-tokens' ? 'OUTPUT_TRUNCATED' : '未知错误码');
|
|
71
72
|
const message = failure?.message?.trim() || (finish === 'max-tokens' ? '输出达到长度上限,部分返回已保留,请调整模型限制后重试' : '模型服务没有给出说明');
|
|
72
|
-
throw new Error(`模型调用失败(${code}):${message}`);
|
|
73
|
+
throw Object.assign(new Error(`模型调用失败(${code}):${message}`), { code, status: failure?.status, requestId: failure?.requestId, retryAfterMs: failure?.retryAfterMs });
|
|
73
74
|
}
|
|
75
|
+
if (!finish && text.length > 0)
|
|
76
|
+
throw new Error('Stream ended without finish_reason;部分返回已保留');
|
|
74
77
|
if (text.length === 0) {
|
|
75
78
|
// 走到这里说明流正常结束(或者压根没有 finish 块)却没有一个字符。
|
|
76
79
|
throw new Error(`模型没有返回任何文本(结束原因:${finish ?? '没有收到 finish 块'})`);
|
|
@@ -99,7 +102,7 @@ export async function collectModelText(stream, onUsage, onDelta) {
|
|
|
99
102
|
*/
|
|
100
103
|
export function isRetryableModelFailure(error) {
|
|
101
104
|
const message = error instanceof Error ? error.message : String(error);
|
|
102
|
-
const code = /模型调用失败(([^)]*))/.exec(message)?.[1]?.trim().toUpperCase() ?? '';
|
|
105
|
+
const code = (typeof error?.code === 'string' ? String(error.code).toUpperCase() : '') || (/模型调用失败(([^)]*))/.exec(message)?.[1]?.trim().toUpperCase() ?? '');
|
|
103
106
|
// 明确不可重试:配置问题与用户取消。宁可让人去改设置,也不要在错的地方重试。
|
|
104
107
|
if (['ABORTED', 'INVALID_CREDENTIAL', 'AUTH', 'UNAUTHORIZED', 'NOT_FOUND', 'INVALID_REQUEST', 'CONTEXT_LENGTH', 'OUTPUT_TRUNCATED'].includes(code))
|
|
105
108
|
return false;
|
|
@@ -109,9 +112,10 @@ export function isRetryableModelFailure(error) {
|
|
|
109
112
|
// 没有 code 的情况(旧适配器、或错误被包了一层):按可辨认的措辞判断。
|
|
110
113
|
if (/没有返回任何文本|没有收到 finish 块|Stream ended without finish_reason/i.test(message))
|
|
111
114
|
return true;
|
|
112
|
-
if (/ECONNRESET|ECONNREFUSED|ETIMEDOUT|EPIPE|socket hang up|premature close|other side closed|fetch failed|network error|HTTP 5\d\d|HTTP 429/i.test(message))
|
|
115
|
+
if (/request\s+timed?\s*out|request_timeout|timeout_error|ECONNRESET|ECONNREFUSED|ETIMEDOUT|EPIPE|socket hang up|premature close|other side closed|fetch failed|network error|HTTP 5\d\d|HTTP 429/i.test(message))
|
|
113
116
|
return true;
|
|
114
|
-
|
|
117
|
+
const status = Number(error?.status);
|
|
118
|
+
return status === 408 || status === 429 || (status >= 500 && status < 600);
|
|
115
119
|
}
|
|
116
120
|
/**
|
|
117
121
|
* 用**同一个请求**重发几次,直到成功或遇到不可重试的失败。
|
|
@@ -125,25 +129,38 @@ export function isRetryableModelFailure(error) {
|
|
|
125
129
|
export async function callModelWithRetry(send, options = {}) {
|
|
126
130
|
const attempts = Math.max(1, Math.floor(options.attempts ?? 3));
|
|
127
131
|
const delays = options.delaysMs ?? [2000, 6000];
|
|
128
|
-
const sleep = options.sleep ?? ((ms) => new Promise(
|
|
132
|
+
const sleep = options.sleep ?? ((ms) => new Promise((resolve, reject) => {
|
|
133
|
+
const done = () => { options.signal?.removeEventListener('abort', abort); resolve(); };
|
|
134
|
+
const timer = setTimeout(done, ms);
|
|
135
|
+
const abort = () => { clearTimeout(timer); reject(options.signal?.reason); };
|
|
136
|
+
options.signal?.addEventListener('abort', abort, { once: true });
|
|
137
|
+
if (options.signal?.aborted)
|
|
138
|
+
abort();
|
|
139
|
+
}));
|
|
129
140
|
const notice = options.notice === undefined
|
|
130
141
|
? (info) => `\n\n[模型流中断(${info.error instanceof Error ? info.error.message : String(info.error)}),正在重试 ${info.attempt}/${info.attempts - 1}]\n\n`
|
|
131
142
|
: options.notice;
|
|
132
143
|
let lastError;
|
|
133
144
|
for (let attempt = 1; attempt <= attempts; attempt++) {
|
|
145
|
+
options.signal?.throwIfAborted();
|
|
134
146
|
try {
|
|
135
147
|
return await send(text => options.onDelta?.(text));
|
|
136
148
|
}
|
|
137
149
|
catch (error) {
|
|
138
150
|
lastError = error;
|
|
139
|
-
if (
|
|
151
|
+
if (!isRetryableModelFailure(error))
|
|
140
152
|
throw error;
|
|
141
|
-
|
|
153
|
+
if (attempt >= attempts)
|
|
154
|
+
break;
|
|
155
|
+
const retryAfter = Number(error?.retryAfterMs);
|
|
156
|
+
const baseDelay = Number.isFinite(retryAfter) && retryAfter >= 0 ? Math.min(60_000, retryAfter) : delays[Math.min(attempt - 1, delays.length - 1)] ?? 0;
|
|
157
|
+
const delayMs = Math.round(baseDelay * (options.jitter === false ? 1 : 0.7 + Math.random() * 0.6));
|
|
142
158
|
options.onRetry?.({ attempt, attempts, error, delayMs });
|
|
143
159
|
const line = notice?.({ attempt, attempts, error }) ?? '';
|
|
144
160
|
if (line)
|
|
145
161
|
options.onDelta?.(line);
|
|
146
162
|
await sleep(delayMs);
|
|
163
|
+
options.signal?.throwIfAborted();
|
|
147
164
|
}
|
|
148
165
|
}
|
|
149
166
|
/**
|
|
@@ -153,6 +170,11 @@ export async function callModelWithRetry(send, options = {}) {
|
|
|
153
170
|
* 后者查额度、代理和上游状态。不写这一句,新加的重试在界面上等于不存在。
|
|
154
171
|
*/
|
|
155
172
|
const message = lastError instanceof Error ? lastError.message : String(lastError);
|
|
156
|
-
|
|
173
|
+
if (attempts === 1)
|
|
174
|
+
throw lastError;
|
|
175
|
+
const details = lastError;
|
|
176
|
+
throw Object.assign(new Error(`${message}(已自动重试 ${attempts - 1} 次仍失败;可继续未完成部分)`, { cause: lastError }), {
|
|
177
|
+
code: details?.code, status: details?.status, requestId: details?.requestId, retryAfterMs: details?.retryAfterMs,
|
|
178
|
+
});
|
|
157
179
|
}
|
|
158
180
|
//# sourceMappingURL=model-text.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-text.js","sourceRoot":"","sources":["../../src/model-text.ts"],"names":[],"mappings":"AAqCA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,UAAU,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"model-text.js","sourceRoot":"","sources":["../../src/model-text.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organize-contract.d.ts","sourceRoot":"","sources":["../../src/organize-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,MAAM,GAAG,KAAc,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"organize-contract.d.ts","sourceRoot":"","sources":["../../src/organize-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,MAAM,GAAG,KAAc,GAAG,MAAM,CAiE7E"}
|
|
@@ -18,7 +18,7 @@ export function buildOrganizeSystem(wikiKind = 'fact') {
|
|
|
18
18
|
return [
|
|
19
19
|
'你在把一批已经抽好的知识组织成一张 Wiki 卡片。',
|
|
20
20
|
'',
|
|
21
|
-
`文件类型:${wikiKind === 'way' ? 'Wiki Way
|
|
21
|
+
`文件类型:${wikiKind === 'way' ? 'Wiki Way;同一 Object × Action × Scene 坐标下的 Procedure' : 'Wiki Fact;同一 Object × Action × Scene 坐标下的 Fact'}。不得把不同坐标的内容合并。空坐标分量不表示通用,保留每条的条件、状态与限制。`,
|
|
22
22
|
'这些条目是 Knowledge 真源。你不许新增、',
|
|
23
23
|
'删除或改动它们说的事实。你能做的是:分小节、定顺序、把它们改写成读得下去的',
|
|
24
24
|
'叙述、给卡片起一个自然的标题、写一句概述。',
|
|
@@ -32,6 +32,7 @@ export function buildOrganizeSystem(wikiKind = 'fact') {
|
|
|
32
32
|
'3. **每句都要挂引用。** 陈述事实的句子末尾挂 `[^知识id]`,可以挂多个。',
|
|
33
33
|
' 只有很短的导语(「这一节讲取数流程」)可以不挂。长句子不挂引用 = 没有来源的',
|
|
34
34
|
' 断言,整份方案会被打回。',
|
|
35
|
+
'涉及其他 Object 的定义或方法时,使用给定目标的双链,不把另一份 Wiki 的全文复制进来。无法唯一定位时保留对象原名,由程序补充导航,不编造链接或新坐标。',
|
|
35
36
|
'4. **标题只做归纳,不要机械拼接。** 标题要能让人一眼知道卡片讲什么;不要照抄候选卡名,',
|
|
36
37
|
' 不要写成「对象的动作」「动作的动作」这类重复结构,不要加入知识里没有的新事实。',
|
|
37
38
|
' 保留区分这张卡所需的业务对象、字段名和动作词。知识条目附带的原文标题路径是定位线索,',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"organize-contract.js","sourceRoot":"","sources":["../../src/organize-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAA2B,MAAM;IACnE,OAAO;QACL,4BAA4B;QAC5B,EAAE;QACF,QAAQ,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"organize-contract.js","sourceRoot":"","sources":["../../src/organize-contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAA2B,MAAM;IACnE,OAAO;QACL,4BAA4B;QAC5B,EAAE;QACF,QAAQ,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,oDAAoD,CAAC,CAAC,CAAC,gDAAgD,yCAAyC;QAC7K,2BAA2B;QAC3B,uCAAuC;QACvC,uBAAuB;QACvB,EAAE;QACF,SAAS;QACT,EAAE;QACF,2CAA2C;QAC3C,gCAAgC;QAChC,4CAA4C;QAC5C,wCAAwC;QACxC,6CAA6C;QAC7C,4CAA4C;QAC5C,iBAAiB;QACjB,mFAAmF;QACnF,iDAAiD;QACjD,4CAA4C;QAC5C,+CAA+C;QAC/C,uCAAuC;QACvC,EAAE;QACF,WAAW;QACX,EAAE;QACF,sDAAsD;QACtD,uBAAuB;QACvB,uBAAuB;QACvB,uBAAuB;QACvB,EAAE;QACF,SAAS;QACT,EAAE;QACF,2BAA2B;QAC3B,EAAE;QACF,SAAS;QACT,GAAG;QACH,8CAA8C;QAC9C,6CAA6C;QAC7C,iBAAiB;QACjB,OAAO;QACP,4BAA4B;QAC5B,mBAAmB;QACnB,sDAAsD;QACtD,yEAAyE;QACzE,4DAA4D;QAC5D,oGAAoG;QACpG,qDAAqD;QACrD,SAAS;QACT,OAAO;QACP,KAAK;QACL,GAAG;QACH,KAAK;QACL,EAAE;QACF,6DAA6D;QAC7D,0CAA0C;QAC1C,EAAE;QACF,kCAAkC;QAClC,2CAA2C;QAC3C,oCAAoC;QACpC,kDAAkD;QAClD,uCAAuC;QACvC,mFAAmF;QACnF,uDAAuD;KACxD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACd,CAAC"}
|
|
@@ -2,7 +2,7 @@ import type { ModelCall } from '../extract-model.js';
|
|
|
2
2
|
import type { SourceRaw, WikiTypeDef } from '../types.js';
|
|
3
3
|
import type { TrialReport } from '../wiki-trial-types.js';
|
|
4
4
|
import { PipelineStore, type ExtractionCheckpoint } from './store.js';
|
|
5
|
-
import { type MaterializationBatch, type MaterializationGroup, type PipelineAction, type PipelineModel, type PipelineSelection, type PipelineStage, type PipelineTask } from './types.js';
|
|
5
|
+
import { type ExtractionTimeoutMinutes, type MaterializationBatch, type MaterializationGroup, type PipelineAction, type PipelineActivityUpdate, type PipelineItemState, type PipelineModel, type PipelineSelection, type PipelineStage, type PipelineTask } from './types.js';
|
|
6
6
|
export interface PipelineSource extends SourceRaw {
|
|
7
7
|
version: number;
|
|
8
8
|
sourceHash: string;
|
|
@@ -13,6 +13,7 @@ export interface PipelineContext {
|
|
|
13
13
|
why?: string;
|
|
14
14
|
};
|
|
15
15
|
note: string;
|
|
16
|
+
extractionTimeoutMinutes?: ExtractionTimeoutMinutes;
|
|
16
17
|
profile?: WikiTypeDef;
|
|
17
18
|
organize: boolean;
|
|
18
19
|
format: 'json' | 'table';
|
|
@@ -21,6 +22,26 @@ export interface PipelineBuildResult {
|
|
|
21
22
|
summary: string;
|
|
22
23
|
skipped?: boolean;
|
|
23
24
|
}
|
|
25
|
+
export interface PipelineDeriveProgress {
|
|
26
|
+
done: number;
|
|
27
|
+
total: number;
|
|
28
|
+
reused: number;
|
|
29
|
+
failed?: number;
|
|
30
|
+
phase: PipelineActivityUpdate['phase'];
|
|
31
|
+
summary: string;
|
|
32
|
+
item?: {
|
|
33
|
+
id: string;
|
|
34
|
+
title: string;
|
|
35
|
+
state: PipelineItemState['state'];
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
export interface ExtractionExecution {
|
|
39
|
+
fingerprint: string;
|
|
40
|
+
force: boolean;
|
|
41
|
+
signal: AbortSignal;
|
|
42
|
+
checkpoint: () => Promise<void>;
|
|
43
|
+
progress: (text: string, activity?: PipelineActivityUpdate) => void;
|
|
44
|
+
}
|
|
24
45
|
export interface PipelineHost {
|
|
25
46
|
capture(): PipelineContext;
|
|
26
47
|
serialize<T>(work: () => Promise<T>): Promise<T>;
|
|
@@ -28,12 +49,12 @@ export interface PipelineHost {
|
|
|
28
49
|
/** One source by id. Same shape as an element of `sources()`. */
|
|
29
50
|
source(sourceId: string): Promise<PipelineSource | undefined>;
|
|
30
51
|
fingerprint(source: PipelineSource, context: PipelineContext): Promise<string>;
|
|
31
|
-
extract(source: PipelineSource, context: PipelineContext, output: (text: string) => void): Promise<TrialReport>;
|
|
52
|
+
extract(source: PipelineSource, context: PipelineContext, output: (text: string) => void, execution: ExtractionExecution): Promise<TrialReport>;
|
|
32
53
|
normalize(source: PipelineSource, checkpoint: ExtractionCheckpoint, context: PipelineContext, force: boolean, output: (text: string) => void): Promise<{
|
|
33
54
|
reused: boolean;
|
|
34
55
|
warnings: string[];
|
|
35
56
|
}>;
|
|
36
|
-
derive?(sourceIds: string[] | undefined, context: PipelineContext, force: boolean, output: (text: string) => void, checkpoint: () => Promise<void
|
|
57
|
+
derive?(sourceIds: string[] | undefined, context: PipelineContext, force: boolean, output: (text: string) => void, checkpoint: () => Promise<void>, progress?: (value: PipelineDeriveProgress) => void): Promise<{
|
|
37
58
|
done: number;
|
|
38
59
|
total: number;
|
|
39
60
|
reused: number;
|
|
@@ -41,7 +62,8 @@ export interface PipelineHost {
|
|
|
41
62
|
}>;
|
|
42
63
|
groups(context: PipelineContext): Promise<MaterializationBatch>;
|
|
43
64
|
materialize(group: MaterializationGroup, context: PipelineContext, output: (text: string) => void, snapshot: unknown): Promise<void>;
|
|
44
|
-
|
|
65
|
+
link?(): Promise<string>;
|
|
66
|
+
build(taskId: string, checkpoint: () => Promise<void>, progress?: (text: string) => void): Promise<PipelineBuildResult>;
|
|
45
67
|
record(checkpoint: ExtractionCheckpoint): Promise<void>;
|
|
46
68
|
}
|
|
47
69
|
/** One writer queue per base, shared with the legacy index builder. */
|
|
@@ -58,6 +80,8 @@ export declare class KnowledgePipeline {
|
|
|
58
80
|
close(): void;
|
|
59
81
|
control(id: string, action: PipelineAction): PipelineTask;
|
|
60
82
|
private patch;
|
|
83
|
+
private observe;
|
|
84
|
+
private item;
|
|
61
85
|
private finishStage;
|
|
62
86
|
private checkpoint;
|
|
63
87
|
private output;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/pipeline/engine.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACrE,OAAO,
|
|
1
|
+
{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/pipeline/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
-
import { PIPELINE_ACTIVE_STATES, PIPELINE_STAGE_LABEL } from './types.js';
|
|
2
|
+
import { PIPELINE_ACTIVE_STATES, PIPELINE_STAGE_LABEL, normalizeExtractionTimeoutMinutes } from './types.js';
|
|
3
3
|
class TaskCancelled extends Error {
|
|
4
4
|
}
|
|
5
5
|
/** One writer queue per base, shared with the legacy index builder. */
|
|
@@ -11,6 +11,10 @@ export class KnowledgePipeline {
|
|
|
11
11
|
constructor(store, host) {
|
|
12
12
|
this.store = store;
|
|
13
13
|
this.host = host;
|
|
14
|
+
for (const previous of store.tasks(10000).tasks.filter(task => task.recoverableOnRestart && !task.recoveryTaskId)) {
|
|
15
|
+
const resumed = this.start(previous.stage, { ...previous.selection, force: false });
|
|
16
|
+
this.patch(previous.id, { recoverableOnRestart: false, recoveryTaskId: resumed.task.id, summary: '服务重启,已自动创建续跑任务;复用已完成分片。' });
|
|
17
|
+
}
|
|
14
18
|
}
|
|
15
19
|
start(stage, selection = {}) {
|
|
16
20
|
if (this.closed)
|
|
@@ -21,15 +25,16 @@ export class KnowledgePipeline {
|
|
|
21
25
|
if (value !== undefined && (!Array.isArray(value) || value.length === 0 || value.some(id => typeof id !== 'string' || !id.trim())))
|
|
22
26
|
throw new Error('选择范围不能为空;不传范围表示处理当前阶段的全部待办');
|
|
23
27
|
}
|
|
24
|
-
const
|
|
28
|
+
const captured = this.host.capture();
|
|
29
|
+
const context = { ...captured, extractionTimeoutMinutes: normalizeExtractionTimeoutMinutes(captured.extractionTimeoutMinutes) };
|
|
25
30
|
const { call: _call, why: _why, ...model } = context.model;
|
|
26
31
|
const task = {
|
|
27
|
-
id: `pipeline_${randomUUID()}`, stage, state: 'queued', selection: structuredClone(selection), model,
|
|
32
|
+
id: `pipeline_${randomUUID()}`, stage, state: 'queued', selection: structuredClone(selection), model, extractionTimeoutMinutes: context.extractionTimeoutMinutes,
|
|
28
33
|
queuedAt: new Date().toISOString(), done: 0, total: 0, reused: 0, failed: 0,
|
|
29
34
|
summary: '等待运行', warnings: [],
|
|
30
35
|
};
|
|
31
36
|
this.store.putTask(task);
|
|
32
|
-
this.controls.set(task.id, { pause: false, cancel: false });
|
|
37
|
+
this.controls.set(task.id, { abort: new AbortController(), pause: false, cancel: false });
|
|
33
38
|
const completion = this.host.serialize(() => this.execute(task.id, context));
|
|
34
39
|
// Starting a background task must not create an unhandled rejection.
|
|
35
40
|
void completion.catch(() => undefined);
|
|
@@ -38,6 +43,7 @@ export class KnowledgePipeline {
|
|
|
38
43
|
close() {
|
|
39
44
|
this.closed = true;
|
|
40
45
|
for (const control of this.controls.values()) {
|
|
46
|
+
control.abort.abort(new TaskCancelled('知识库已关闭,已完成结果保留'));
|
|
41
47
|
control.cancel = true;
|
|
42
48
|
control.pause = false;
|
|
43
49
|
control.resume?.();
|
|
@@ -50,20 +56,21 @@ export class KnowledgePipeline {
|
|
|
50
56
|
throw new Error('任务已结束;请重新运行所需阶段');
|
|
51
57
|
if (action === 'pause') {
|
|
52
58
|
control.pause = true;
|
|
53
|
-
this.patch(id, { state: task.state === 'queued' ? 'paused' : 'pausing', summary: '
|
|
59
|
+
this.patch(id, { state: task.state === 'queued' ? 'paused' : 'pausing', summary: '已请求暂停,当前步骤到达安全点后生效;已保存结果保留' });
|
|
54
60
|
}
|
|
55
61
|
else if (action === 'resume') {
|
|
56
62
|
if (!control.pause)
|
|
57
63
|
throw new Error('任务没有暂停');
|
|
58
64
|
control.pause = false;
|
|
59
|
-
this.patch(id, { state: task.startedAt ? 'running' : 'queued' });
|
|
65
|
+
this.patch(id, { state: task.startedAt ? 'running' : 'queued', summary: task.startedAt ? '已继续运行' : '等待运行' });
|
|
60
66
|
control.resume?.();
|
|
61
67
|
control.resume = undefined;
|
|
62
68
|
}
|
|
63
69
|
else {
|
|
70
|
+
control.abort.abort(new TaskCancelled('任务已停止,已完成分片保留'));
|
|
64
71
|
control.cancel = true;
|
|
65
72
|
control.pause = false;
|
|
66
|
-
this.patch(id, { state: 'cancelling', summary: '
|
|
73
|
+
this.patch(id, { state: 'cancelling', summary: '已请求停止,正在结束当前步骤;已保存结果保留' });
|
|
67
74
|
control.resume?.();
|
|
68
75
|
}
|
|
69
76
|
return this.store.task(id);
|
|
@@ -73,6 +80,16 @@ export class KnowledgePipeline {
|
|
|
73
80
|
this.store.putTask(task);
|
|
74
81
|
return task;
|
|
75
82
|
}
|
|
83
|
+
observe(id, activity, text) {
|
|
84
|
+
const observed = { ...activity, at: new Date().toISOString() };
|
|
85
|
+
const task = this.patch(id, { activity: observed, ...(text ? { summary: text } : {}) });
|
|
86
|
+
if (text)
|
|
87
|
+
this.store.event(id, 'progress', text, task.currentStage === 'extract' || task.currentStage === 'normalize' ? activity.objectId : undefined, task.currentStage, observed);
|
|
88
|
+
}
|
|
89
|
+
item(id, stage, key, value) {
|
|
90
|
+
const task = this.store.task(id);
|
|
91
|
+
this.patch(id, { items: { ...task.items, [stage]: { ...task.items?.[stage], [key]: value } } });
|
|
92
|
+
}
|
|
76
93
|
finishStage(id, outcome) {
|
|
77
94
|
const task = this.store.task(id);
|
|
78
95
|
if (task.currentStage)
|
|
@@ -98,6 +115,10 @@ export class KnowledgePipeline {
|
|
|
98
115
|
if (!buffer)
|
|
99
116
|
return;
|
|
100
117
|
this.store.event(id, 'output', buffer, sourceId, stage);
|
|
118
|
+
const activity = this.store.task(id)?.activity;
|
|
119
|
+
// Persist liveness at most once a second; raw output remains in the event stream.
|
|
120
|
+
if (activity && Date.now() - Date.parse(activity.at) >= 1000)
|
|
121
|
+
this.observe(id, { ...activity, phase: 'receiving' });
|
|
101
122
|
buffer = '';
|
|
102
123
|
last = Date.now();
|
|
103
124
|
};
|
|
@@ -150,13 +171,19 @@ export class KnowledgePipeline {
|
|
|
150
171
|
for (const stage of stages) {
|
|
151
172
|
await this.checkpoint(id);
|
|
152
173
|
this.patch(id, { currentStage: stage, done: 0, total: 0, reused: 0, failed: 0, summary: PIPELINE_STAGE_LABEL[stage] });
|
|
153
|
-
this.
|
|
174
|
+
this.observe(id, { phase: 'preparing' }, `开始${PIPELINE_STAGE_LABEL[stage]}`);
|
|
154
175
|
if (stage === 'derive') {
|
|
155
176
|
if (!this.host.derive)
|
|
156
177
|
throw new Error('当前运行时不支持 Case 提炼');
|
|
157
178
|
const output = this.output(id, stage);
|
|
179
|
+
this.observe(id, { phase: 'processing' }, '正在检查 Case 并提炼可复用方法');
|
|
158
180
|
try {
|
|
159
|
-
const result = await this.host.derive(task.selection.sourceIds, context, Boolean(task.selection.force), output.append, () => this.checkpoint(id)
|
|
181
|
+
const result = await this.host.derive(task.selection.sourceIds, context, Boolean(task.selection.force), output.append, () => this.checkpoint(id), value => {
|
|
182
|
+
this.patch(id, { done: value.done, total: value.total, reused: value.reused, failed: value.failed ?? 0 });
|
|
183
|
+
if (value.item)
|
|
184
|
+
this.item(id, stage, value.item.id, { title: value.item.title, state: value.item.state });
|
|
185
|
+
this.observe(id, { phase: value.phase, objectId: value.item?.id, objectTitle: value.item?.title }, value.summary);
|
|
186
|
+
});
|
|
160
187
|
this.patch(id, result);
|
|
161
188
|
this.finishStage(id, result);
|
|
162
189
|
}
|
|
@@ -166,8 +193,10 @@ export class KnowledgePipeline {
|
|
|
166
193
|
continue;
|
|
167
194
|
}
|
|
168
195
|
if (stage === 'build') {
|
|
169
|
-
|
|
196
|
+
this.observe(id, { phase: 'processing' }, '正在构建并发布检索索引');
|
|
197
|
+
const result = await this.host.build(id, () => this.checkpoint(id), text => this.observe(id, { phase: 'processing' }, text));
|
|
170
198
|
this.patch(id, { done: 1, total: 1, summary: result.summary });
|
|
199
|
+
this.observe(id, { phase: 'completed' }, result.summary);
|
|
171
200
|
this.finishStage(id, result);
|
|
172
201
|
continue;
|
|
173
202
|
}
|
|
@@ -190,10 +219,13 @@ export class KnowledgePipeline {
|
|
|
190
219
|
* 「坐标有歧义」与「来源变了、抽取结果还没归一」是两件事,报同一句话会让读的人
|
|
191
220
|
* 去查错的地方。更要紧的是范围:按 `sourceIds` / `groupKeys` 缩小的那一趟,
|
|
192
221
|
* 如果拿全库的数字报 `partial`,调用方会去重试一件它明确排除的事 —— 而它其实
|
|
193
|
-
*
|
|
194
|
-
*
|
|
222
|
+
* 全都做完了。被阻断的 Knowledge 保留来源归属和可确定的分组键,因此也按
|
|
223
|
+
* 同一选择范围计数;尚无坐标的行只参与来源范围与全库统计。
|
|
195
224
|
*/
|
|
196
|
-
const ambiguous = scoped
|
|
225
|
+
const ambiguous = scoped
|
|
226
|
+
? (batch.blockedItems ?? []).filter(item => (!affectedSources || item.sourceIds.some(id => affectedSources.has(id)))
|
|
227
|
+
&& (!selected || (item.groupKey !== undefined && selected.has(item.groupKey)))).length
|
|
228
|
+
: batch.blockedAmbiguous;
|
|
197
229
|
const awaiting = scoped
|
|
198
230
|
? groups.filter(group => group.state === 'blocked' && inScope(group)).reduce((sum, group) => sum + group.knowledgeCount, 0)
|
|
199
231
|
: batch.blockedAwaitingNormalize;
|
|
@@ -211,7 +243,10 @@ export class KnowledgePipeline {
|
|
|
211
243
|
this.patch(id, { total: pending.length });
|
|
212
244
|
for (const group of pending) {
|
|
213
245
|
await this.checkpoint(id);
|
|
246
|
+
this.item(id, stage, group.key, { state: 'processing', title: group.title });
|
|
247
|
+
this.observe(id, { phase: 'processing', objectId: group.key, objectTitle: group.title }, `正在物化:${group.title}`);
|
|
214
248
|
const output = this.output(id, stage);
|
|
249
|
+
let itemError;
|
|
215
250
|
try {
|
|
216
251
|
await this.host.materialize(group, context, output.append, batch.snapshot);
|
|
217
252
|
}
|
|
@@ -219,6 +254,7 @@ export class KnowledgePipeline {
|
|
|
219
254
|
if (cause instanceof TaskCancelled)
|
|
220
255
|
throw cause;
|
|
221
256
|
const message = `${group.title}:${cause instanceof Error ? cause.message : String(cause)}`;
|
|
257
|
+
itemError = message;
|
|
222
258
|
const current = this.store.task(id);
|
|
223
259
|
this.patch(id, { failed: current.failed + 1, warnings: [...current.warnings, message] });
|
|
224
260
|
this.store.event(id, 'warning', message, undefined, stage);
|
|
@@ -226,9 +262,14 @@ export class KnowledgePipeline {
|
|
|
226
262
|
finally {
|
|
227
263
|
output.flush();
|
|
228
264
|
}
|
|
265
|
+
this.item(id, stage, group.key, { state: itemError ? 'failed' : 'succeeded', title: group.title, summary: itemError });
|
|
266
|
+
this.observe(id, { phase: itemError ? 'failed' : 'completed', objectId: group.key, objectTitle: group.title }, itemError ?? `已保存卡片:${group.title}`);
|
|
229
267
|
const current = this.store.task(id);
|
|
230
268
|
this.patch(id, { done: current.done + 1, summary: `已物化 ${current.done + 1}/${pending.length} 张:${group.title}` });
|
|
231
269
|
}
|
|
270
|
+
await this.checkpoint(id);
|
|
271
|
+
if (this.host.link)
|
|
272
|
+
this.store.event(id, 'output', await this.host.link(), undefined, stage);
|
|
232
273
|
const current = this.store.task(id);
|
|
233
274
|
/**
|
|
234
275
|
* 阶段结论要给 `summary`:任务列表的四段步轨读的是 `results[stage]`,
|
|
@@ -236,6 +277,7 @@ export class KnowledgePipeline {
|
|
|
236
277
|
* 同一件事在半个屏幕上两种说法。
|
|
237
278
|
*/
|
|
238
279
|
this.finishStage(id, {
|
|
280
|
+
blocked: deferred,
|
|
239
281
|
summary: `已物化 ${current.done - current.failed}/${current.total} 张${deferred > 0 ? `;${deferred} 条待归一` : ''}${affectedSources !== undefined ? `(按来源范围缩小:${affectedSources.size} 份来源)` : ''}`,
|
|
240
282
|
});
|
|
241
283
|
/**
|
|
@@ -252,9 +294,11 @@ export class KnowledgePipeline {
|
|
|
252
294
|
this.patch(id, { total: sources.length });
|
|
253
295
|
for (const source of sources) {
|
|
254
296
|
await this.checkpoint(id);
|
|
255
|
-
this.
|
|
297
|
+
this.item(id, stage, source.sourceId, { state: 'processing', title: source.title });
|
|
298
|
+
this.observe(id, { phase: 'processing', objectId: source.sourceId, objectTitle: source.title }, `${PIPELINE_STAGE_LABEL[stage]}:${source.title}`);
|
|
256
299
|
const output = this.output(id, stage, source.sourceId);
|
|
257
300
|
let reused = false;
|
|
301
|
+
let itemError;
|
|
258
302
|
try {
|
|
259
303
|
if (stage === 'extract') {
|
|
260
304
|
const fingerprint = await this.host.fingerprint(source, context);
|
|
@@ -264,7 +308,12 @@ export class KnowledgePipeline {
|
|
|
264
308
|
reused = true;
|
|
265
309
|
}
|
|
266
310
|
else {
|
|
267
|
-
const report = await this.host.extract(source, context, output.append
|
|
311
|
+
const report = await this.host.extract(source, context, output.append, {
|
|
312
|
+
fingerprint, force: task.selection.force === true, signal: this.controls.get(id).abort.signal,
|
|
313
|
+
checkpoint: () => this.checkpoint(id), progress: (text, activity) => {
|
|
314
|
+
this.observe(id, activity ?? { phase: 'processing', objectId: source.sourceId, objectTitle: source.title }, text);
|
|
315
|
+
},
|
|
316
|
+
});
|
|
268
317
|
if (this.closed)
|
|
269
318
|
throw new TaskCancelled('知识库已关闭,已完成结果保留');
|
|
270
319
|
const checkpoint = { id: `extract_${randomUUID()}`, sourceId: source.sourceId, sourceVersion: source.version, sourceHash: source.sourceHash, fingerprint, report, createdAt: new Date().toISOString() };
|
|
@@ -294,6 +343,7 @@ export class KnowledgePipeline {
|
|
|
294
343
|
const detail = report.exceptions.slice(0, 3).map(item => `${item.step}:${item.message}`).join(';');
|
|
295
344
|
throw new Error(`${report.model.why ?? '抽取返回未通过校验'}${detail === '' ? '' : `(${detail})`}`);
|
|
296
345
|
}
|
|
346
|
+
this.observe(id, { ...this.store.task(id).activity, phase: 'saving' }, '正在提交文档抽取结果');
|
|
297
347
|
this.store.saveExtraction(checkpoint);
|
|
298
348
|
}
|
|
299
349
|
}
|
|
@@ -315,6 +365,7 @@ export class KnowledgePipeline {
|
|
|
315
365
|
if (cause instanceof TaskCancelled)
|
|
316
366
|
throw cause;
|
|
317
367
|
const message = `${source.title}:${cause instanceof Error ? cause.message : String(cause)}`;
|
|
368
|
+
itemError = message;
|
|
318
369
|
const current = this.store.task(id);
|
|
319
370
|
this.patch(id, { failed: current.failed + 1, warnings: [...current.warnings, message] });
|
|
320
371
|
this.store.event(id, 'warning', message, source.sourceId, stage);
|
|
@@ -322,6 +373,8 @@ export class KnowledgePipeline {
|
|
|
322
373
|
finally {
|
|
323
374
|
output.flush();
|
|
324
375
|
}
|
|
376
|
+
this.item(id, stage, source.sourceId, { state: itemError ? 'failed' : reused ? 'reused' : 'succeeded', title: source.title, summary: itemError });
|
|
377
|
+
this.observe(id, { ...this.store.task(id).activity, phase: itemError ? 'failed' : reused ? 'reused' : 'completed' }, itemError ?? `${source.title}:${reused ? '复用已有结果' : '处理完成'}`);
|
|
325
378
|
const current = this.store.task(id);
|
|
326
379
|
this.patch(id, { done: current.done + 1, reused: current.reused + Number(reused), summary: `${PIPELINE_STAGE_LABEL[stage]} ${current.done + 1}/${sources.length}${reused ? ' · 复用已有结果' : ''}` });
|
|
327
380
|
}
|