@aalis/plugin-embedding-ollama 0.9.4 → 0.10.0
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/index.d.ts +8 -13
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +47 -32
- package/dist/index.js.map +1 -1
- package/package.json +13 -7
package/dist/index.d.ts
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
export declare const inject: {
|
|
10
|
-
optional: string[];
|
|
11
|
-
};
|
|
12
|
-
export declare const configSchema: ConfigSchema;
|
|
13
|
-
export declare function apply(ctx: Context, config: Record<string, unknown>): Promise<void>;
|
|
1
|
+
declare const _default: import("@aalis/core").PluginDefinition<{
|
|
2
|
+
config: import("@aalis/core").ServiceDescriptor<(identity: symbol) => Readonly<Record<string, unknown>>, Readonly<Record<string, unknown>>>;
|
|
3
|
+
logger: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").Logger, import("@aalis/core").Logger>;
|
|
4
|
+
lifecycle: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").LifecycleCap, import("@aalis/core").LifecycleCap>;
|
|
5
|
+
provide: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").Provide, import("@aalis/core").Provide>;
|
|
6
|
+
doctor: import("@aalis/core/dist/composition/descriptors").OptionalUse<import("@aalis/api-doctor").DoctorService, import("@aalis/api-doctor").BoundDoctor>;
|
|
7
|
+
}>;
|
|
8
|
+
export default _default;
|
|
14
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;AAsMA,wBASG"}
|
package/dist/index.js
CHANGED
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { doctor } from '@aalis/api-doctor';
|
|
2
|
+
import { embedding } from '@aalis/api-embedding';
|
|
3
|
+
import { config, definePlugin, lifecycle, logger, optional, provide } from '@aalis/core';
|
|
2
4
|
// ===== 插件元数据 =====
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export const subsystem = 'embedding';
|
|
6
|
-
export const provides = ['embedding'];
|
|
7
|
-
export const reusable = true;
|
|
8
|
-
/** doctor 为可选依赖：服务注册成功 != 模型可用，健康状况经 registerCheck 上报 */
|
|
9
|
-
export const inject = {
|
|
10
|
-
optional: ['doctor'],
|
|
11
|
-
};
|
|
12
|
-
export const configSchema = {
|
|
5
|
+
const name = '@aalis/plugin-embedding-ollama';
|
|
6
|
+
const configSchema = {
|
|
13
7
|
baseUrl: {
|
|
14
8
|
type: 'string',
|
|
15
9
|
label: 'Ollama 地址',
|
|
@@ -86,9 +80,10 @@ class OllamaEmbeddingService {
|
|
|
86
80
|
* 对端（模型正加载进显存、反代半死）会一直等到 undici 默认 bodyTimeout（300s），
|
|
87
81
|
* 配置的「请求超时」形同虚设，索引路径上的一个并发槽也跟着被占住。
|
|
88
82
|
*/
|
|
89
|
-
async postJson(path, body) {
|
|
83
|
+
async postJson(path, body, options) {
|
|
90
84
|
let lastErr;
|
|
91
85
|
for (let attempt = 0; attempt <= this.retries; attempt++) {
|
|
86
|
+
options?.signal?.throwIfAborted();
|
|
92
87
|
const controller = new AbortController();
|
|
93
88
|
const timer = setTimeout(() => controller.abort(), this.timeoutMs);
|
|
94
89
|
try {
|
|
@@ -96,7 +91,7 @@ class OllamaEmbeddingService {
|
|
|
96
91
|
method: 'POST',
|
|
97
92
|
headers: { 'Content-Type': 'application/json' },
|
|
98
93
|
body: JSON.stringify(body),
|
|
99
|
-
signal: controller.signal,
|
|
94
|
+
signal: options?.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal,
|
|
100
95
|
});
|
|
101
96
|
if (res.ok || res.status < 500 || attempt >= this.retries) {
|
|
102
97
|
return { ok: res.ok, status: res.status, statusText: res.statusText, text: await res.text() };
|
|
@@ -106,6 +101,7 @@ class OllamaEmbeddingService {
|
|
|
106
101
|
lastErr = new Error(`HTTP ${res.status} ${res.statusText}`);
|
|
107
102
|
}
|
|
108
103
|
catch (err) {
|
|
104
|
+
options?.signal?.throwIfAborted();
|
|
109
105
|
lastErr = err;
|
|
110
106
|
if (attempt >= this.retries)
|
|
111
107
|
throw err;
|
|
@@ -116,7 +112,8 @@ class OllamaEmbeddingService {
|
|
|
116
112
|
}
|
|
117
113
|
throw new Error(`Ollama embedding 请求失败: ${formatError(lastErr)}`);
|
|
118
114
|
}
|
|
119
|
-
async embed(text) {
|
|
115
|
+
async embed(text, options) {
|
|
116
|
+
options?.signal?.throwIfAborted();
|
|
120
117
|
// 如果还没检测过，先尝试新版 API。
|
|
121
118
|
// 只有明确的 404/405（端点不存在）才值得试旧端点：网络不通/超时/5xx 是瞬态故障
|
|
122
119
|
// （典型场景是 Ollama 晚于 Aalis 起来，启动探测正好撞上），原样抛出并保持 null，
|
|
@@ -125,23 +122,24 @@ class OllamaEmbeddingService {
|
|
|
125
122
|
// 所以结论只在旧端点真答上来之后才钉成「旧版」，否则连同错误一起抛出、保持 null。
|
|
126
123
|
if (this.useNewApi === null) {
|
|
127
124
|
try {
|
|
128
|
-
const vec = await this.embedNew(text);
|
|
125
|
+
const vec = await this.embedNew(text, options);
|
|
129
126
|
this.useNewApi = true;
|
|
130
127
|
return vec;
|
|
131
128
|
}
|
|
132
129
|
catch (err) {
|
|
130
|
+
options?.signal?.throwIfAborted();
|
|
133
131
|
if (!isEndpointMissing(err))
|
|
134
132
|
throw err;
|
|
135
|
-
const vec = await this.embedLegacy(text);
|
|
133
|
+
const vec = await this.embedLegacy(text, options);
|
|
136
134
|
this.useNewApi = false;
|
|
137
135
|
return vec;
|
|
138
136
|
}
|
|
139
137
|
}
|
|
140
|
-
return this.useNewApi ? this.embedNew(text) : this.embedLegacy(text);
|
|
138
|
+
return this.useNewApi ? this.embedNew(text, options) : this.embedLegacy(text, options);
|
|
141
139
|
}
|
|
142
140
|
/** 新版 Ollama API: POST /api/embed */
|
|
143
|
-
async embedNew(text) {
|
|
144
|
-
const res = await this.postJson('/api/embed', { model: this.model, input: text });
|
|
141
|
+
async embedNew(text, options) {
|
|
142
|
+
const res = await this.postJson('/api/embed', { model: this.model, input: text }, options);
|
|
145
143
|
if (!res.ok) {
|
|
146
144
|
throw statusError(res, '/api/embed');
|
|
147
145
|
}
|
|
@@ -149,8 +147,8 @@ class OllamaEmbeddingService {
|
|
|
149
147
|
return data.embeddings[0];
|
|
150
148
|
}
|
|
151
149
|
/** 旧版 Ollama API: POST /api/embeddings */
|
|
152
|
-
async embedLegacy(text) {
|
|
153
|
-
const res = await this.postJson('/api/embeddings', { model: this.model, prompt: text });
|
|
150
|
+
async embedLegacy(text, options) {
|
|
151
|
+
const res = await this.postJson('/api/embeddings', { model: this.model, prompt: text }, options);
|
|
154
152
|
if (!res.ok) {
|
|
155
153
|
throw statusError(res, '/api/embeddings');
|
|
156
154
|
}
|
|
@@ -159,7 +157,7 @@ class OllamaEmbeddingService {
|
|
|
159
157
|
}
|
|
160
158
|
async listModels() {
|
|
161
159
|
try {
|
|
162
|
-
const res = await fetch(`${this.baseUrl}/api/tags
|
|
160
|
+
const res = await fetch(`${this.baseUrl}/api/tags`, { signal: AbortSignal.timeout(this.timeoutMs) });
|
|
163
161
|
if (!res.ok)
|
|
164
162
|
return [];
|
|
165
163
|
const data = (await res.json());
|
|
@@ -176,7 +174,19 @@ class OllamaEmbeddingService {
|
|
|
176
174
|
}
|
|
177
175
|
}
|
|
178
176
|
// ===== 插件入口 =====
|
|
179
|
-
|
|
177
|
+
/** doctor 是可选依赖：服务注册成功 != 模型可用，健康状况经 registerCheck 上报 */
|
|
178
|
+
const uses = { config, logger, lifecycle, provide, doctor: optional(doctor) };
|
|
179
|
+
export default definePlugin({
|
|
180
|
+
name,
|
|
181
|
+
displayName: 'Ollama Embedding',
|
|
182
|
+
subsystem: 'embedding',
|
|
183
|
+
configSchema,
|
|
184
|
+
reusable: true,
|
|
185
|
+
provides: [embedding],
|
|
186
|
+
uses,
|
|
187
|
+
apply: startOllamaEmbedding,
|
|
188
|
+
});
|
|
189
|
+
async function startOllamaEmbedding({ config, logger, lifecycle, provide, doctor }) {
|
|
180
190
|
const baseUrl = config.baseUrl ?? 'http://localhost:11434';
|
|
181
191
|
const model = config.model ?? 'nomic-embed-text';
|
|
182
192
|
const timeoutMs = config.timeoutMs ?? 30000;
|
|
@@ -185,13 +195,13 @@ export async function apply(ctx, config) {
|
|
|
185
195
|
// 启动时检查连通性（失败不阻塞，只警告）
|
|
186
196
|
try {
|
|
187
197
|
await service.embed('ping');
|
|
188
|
-
|
|
198
|
+
logger.info(`Ollama Embedding 已就绪: ${model} @ ${baseUrl}`);
|
|
189
199
|
}
|
|
190
200
|
catch (err) {
|
|
191
201
|
const msg = err instanceof Error ? err.message : String(err);
|
|
192
|
-
|
|
202
|
+
logger.warn(`Ollama Embedding 连通性检查失败 (${baseUrl}, model=${model}): ${msg}，服务仍将注册`);
|
|
193
203
|
}
|
|
194
|
-
|
|
204
|
+
provide(embedding, service, { label: `Ollama / ${model}` });
|
|
195
205
|
// 连通性失败只 warn、服务照常注册，是刻意的（Ollama 可能晚于 Aalis 起来）。
|
|
196
206
|
// 代价是「服务在、但每次调用都失败」这一态对用户完全不可见：/status 只判存在性，
|
|
197
207
|
// 插件状态是 active，向量记忆则每条消息静默失败。把真实健康状况交给 doctor 上报。
|
|
@@ -204,20 +214,25 @@ export async function apply(ctx, config) {
|
|
|
204
214
|
// 本插件 reusable=true，可按 `name:suffix` 起多实例；doctor 以 spec.id 为键，
|
|
205
215
|
// 同 id 重复注册后者覆盖前者——两个实例共用一个 id 就只有一个的健康度可见，
|
|
206
216
|
// 恰是这条检查要堵的洞。默认实例保持 `embedding.ollama`，多实例带上后缀。
|
|
207
|
-
const checkId =
|
|
208
|
-
? `embedding.ollama.${
|
|
217
|
+
const checkId = lifecycle.id.startsWith(`${name}:`)
|
|
218
|
+
? `embedding.ollama.${lifecycle.id.slice(name.length + 1)}`
|
|
209
219
|
: 'embedding.ollama';
|
|
210
|
-
|
|
220
|
+
doctor.registerCheck({
|
|
211
221
|
id: checkId,
|
|
212
222
|
category: 'service',
|
|
213
|
-
// 不写死 pluginName
|
|
223
|
+
// 不写死 pluginName：绑定门面会填这次激活的 id，多实例才分得清是哪一个
|
|
214
224
|
async run() {
|
|
225
|
+
const controller = new AbortController();
|
|
215
226
|
let timer;
|
|
216
227
|
try {
|
|
217
228
|
await Promise.race([
|
|
218
|
-
service.embed('ping'),
|
|
229
|
+
service.embed('ping', { signal: controller.signal }),
|
|
219
230
|
new Promise((_, reject) => {
|
|
220
|
-
timer = setTimeout(() =>
|
|
231
|
+
timer = setTimeout(() => {
|
|
232
|
+
const error = new Error(`探测超时（${probeTimeoutMs}ms）`);
|
|
233
|
+
controller.abort(error);
|
|
234
|
+
reject(error);
|
|
235
|
+
}, probeTimeoutMs);
|
|
221
236
|
timer.unref?.(); // 待定的探测计时器不该挡住进程优雅退出
|
|
222
237
|
}),
|
|
223
238
|
]);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aalis/plugin-embedding-ollama",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.10.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,12 +26,11 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@types/node": "^22.0.0",
|
|
28
28
|
"typescript": "^5.7.0",
|
|
29
|
-
"@aalis/
|
|
30
|
-
"@aalis/
|
|
31
|
-
"@aalis/api-webui": "0.9.2"
|
|
29
|
+
"@aalis/core": "0.17.0",
|
|
30
|
+
"@aalis/api-webui": "0.10.0"
|
|
32
31
|
},
|
|
33
32
|
"peerDependencies": {
|
|
34
|
-
"@aalis/core": ">=0.
|
|
33
|
+
"@aalis/core": ">=0.17.0 <1.0.0"
|
|
35
34
|
},
|
|
36
35
|
"aalis": {
|
|
37
36
|
"service": {
|
|
@@ -40,12 +39,19 @@
|
|
|
40
39
|
],
|
|
41
40
|
"provides": [
|
|
42
41
|
"embedding"
|
|
42
|
+
],
|
|
43
|
+
"required": [
|
|
44
|
+
"config",
|
|
45
|
+
"lifecycle",
|
|
46
|
+
"logger",
|
|
47
|
+
"provide"
|
|
43
48
|
]
|
|
44
49
|
}
|
|
45
50
|
},
|
|
46
51
|
"dependencies": {
|
|
47
|
-
"@aalis/api-doctor": ">=0.
|
|
48
|
-
"@aalis/
|
|
52
|
+
"@aalis/api-doctor": ">=0.6.0 <1.0.0",
|
|
53
|
+
"@aalis/api-embedding": ">=0.6.0 <1.0.0",
|
|
54
|
+
"@aalis/schema-config": ">=0.12.0 <1.0.0"
|
|
49
55
|
},
|
|
50
56
|
"scripts": {
|
|
51
57
|
"build": "tsc",
|