@aalis/plugin-embedding-openai 0.9.2 → 0.10.1
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.map +1 -1
- package/dist/index.js +32 -7
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD,eAAO,MAAM,IAAI,mCAAmC,CAAC;AACrD,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAC9C,eAAO,MAAM,SAAS,cAAc,CAAC;AACrC,eAAO,MAAM,QAAQ,UAAgB,CAAC;AACtC,eAAO,MAAM,QAAQ,OAAO,CAAC;AAE7B,eAAO,MAAM,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAIzD,eAAO,MAAM,IAAI,mCAAmC,CAAC;AACrD,eAAO,MAAM,WAAW,qBAAqB,CAAC;AAC9C,eAAO,MAAM,SAAS,cAAc,CAAC;AACrC,eAAO,MAAM,QAAQ,UAAgB,CAAC;AACtC,eAAO,MAAM,QAAQ,OAAO,CAAC;AAE7B,eAAO,MAAM,YAAY,EAAE,YAqB1B,CAAC;AAsDF,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BxF"}
|
package/dist/index.js
CHANGED
|
@@ -6,7 +6,12 @@ export const provides = ['embedding'];
|
|
|
6
6
|
export const reusable = true;
|
|
7
7
|
export const configSchema = {
|
|
8
8
|
apiKey: { type: 'string', label: 'API Key', required: true, secret: true, description: 'OpenAI API 密钥' },
|
|
9
|
-
baseUrl: {
|
|
9
|
+
baseUrl: {
|
|
10
|
+
type: 'string',
|
|
11
|
+
label: 'API 地址',
|
|
12
|
+
default: 'https://api.openai.com/v1',
|
|
13
|
+
description: 'API 端点完整前缀（含版本段）；插件只在其后拼 /embeddings 与 /models',
|
|
14
|
+
},
|
|
10
15
|
model: {
|
|
11
16
|
type: 'select',
|
|
12
17
|
label: 'Embedding 模型',
|
|
@@ -14,25 +19,37 @@ export const configSchema = {
|
|
|
14
19
|
dynamicOptions: 'embedding',
|
|
15
20
|
description: '用于生成文本向量的模型',
|
|
16
21
|
},
|
|
22
|
+
timeoutMs: {
|
|
23
|
+
type: 'number',
|
|
24
|
+
label: '请求超时 (ms)',
|
|
25
|
+
default: 30000,
|
|
26
|
+
description: '单次 embedding 请求超时时间。不设上限时启动探测会把插件激活链整条钉住。',
|
|
27
|
+
},
|
|
17
28
|
};
|
|
18
29
|
// ===== 服务实现 =====
|
|
19
30
|
class OpenAIEmbeddingService {
|
|
20
31
|
baseUrl;
|
|
21
32
|
model;
|
|
22
33
|
apiKey;
|
|
23
|
-
|
|
24
|
-
|
|
34
|
+
timeoutMs;
|
|
35
|
+
constructor(baseUrl, model, apiKey, timeoutMs = 30000) {
|
|
36
|
+
this.baseUrl = baseUrl.replace(/\/+$/, '');
|
|
25
37
|
this.model = model;
|
|
26
38
|
this.apiKey = apiKey;
|
|
39
|
+
this.timeoutMs = Math.max(1000, timeoutMs);
|
|
27
40
|
}
|
|
28
41
|
async embed(text) {
|
|
29
|
-
const res = await fetch(`${this.baseUrl}/
|
|
42
|
+
const res = await fetch(`${this.baseUrl}/embeddings`, {
|
|
30
43
|
method: 'POST',
|
|
31
44
|
headers: {
|
|
32
45
|
'Content-Type': 'application/json',
|
|
33
46
|
Authorization: `Bearer ${this.apiKey}`,
|
|
34
47
|
},
|
|
35
48
|
body: JSON.stringify({ model: this.model, input: text }),
|
|
49
|
+
// 没有 signal 的话这次请求永不自行了结：apply 的启动探测 await 它，而插件激活是串行的
|
|
50
|
+
// （PluginManager.recompute 逐个 await activatePlugin），一个卡住的 apply 会钉住整条引导链；
|
|
51
|
+
// 索引路径上则是 memory-vector 的一个并发槽被无限期占用。
|
|
52
|
+
signal: AbortSignal.timeout(this.timeoutMs),
|
|
36
53
|
});
|
|
37
54
|
if (!res.ok) {
|
|
38
55
|
throw new Error(`OpenAI embedding 请求失败: ${res.status} ${res.statusText}`);
|
|
@@ -42,8 +59,9 @@ class OpenAIEmbeddingService {
|
|
|
42
59
|
}
|
|
43
60
|
async listModels() {
|
|
44
61
|
try {
|
|
45
|
-
const res = await fetch(`${this.baseUrl}/
|
|
62
|
+
const res = await fetch(`${this.baseUrl}/models`, {
|
|
46
63
|
headers: { Authorization: `Bearer ${this.apiKey}` },
|
|
64
|
+
signal: AbortSignal.timeout(this.timeoutMs),
|
|
47
65
|
});
|
|
48
66
|
if (!res.ok)
|
|
49
67
|
return [];
|
|
@@ -61,9 +79,16 @@ export async function apply(ctx, config) {
|
|
|
61
79
|
if (!apiKey) {
|
|
62
80
|
throw new Error('OpenAI Embedding 插件需要配置 apiKey');
|
|
63
81
|
}
|
|
64
|
-
|
|
82
|
+
let baseUrl = config.baseUrl ?? 'https://api.openai.com/v1';
|
|
83
|
+
// 一次性迁移（baseUrl 改「完整前缀」语义）：config-sync 会把旧默认值物化进配置文件，
|
|
84
|
+
// 精确命中旧默认时就地升级；自定义端点见 CHANGELOG 迁移说明。
|
|
85
|
+
if (baseUrl === 'https://api.openai.com') {
|
|
86
|
+
ctx.logger.warn('baseUrl 语义已改为完整前缀（插件不再自动拼 /v1）：旧默认值已自动升级为 https://api.openai.com/v1');
|
|
87
|
+
baseUrl = 'https://api.openai.com/v1';
|
|
88
|
+
}
|
|
65
89
|
const model = config.model ?? 'text-embedding-3-small';
|
|
66
|
-
const
|
|
90
|
+
const timeoutMs = config.timeoutMs ?? 30000;
|
|
91
|
+
const service = new OpenAIEmbeddingService(baseUrl, model, apiKey, timeoutMs);
|
|
67
92
|
// 启动时检查连通性（失败不阻塞，只警告）
|
|
68
93
|
try {
|
|
69
94
|
await service.embed('ping');
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,oBAAoB;AAEpB,MAAM,CAAC,MAAM,IAAI,GAAG,gCAAgC,CAAC;AACrD,MAAM,CAAC,MAAM,WAAW,GAAG,kBAAkB,CAAC;AAC9C,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC;AACrC,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,CAAC;AACtC,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC;AAE7B,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,eAAe,EAAE;IACxG,OAAO,EAAE,
|
|
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-openai",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.10.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@types/node": "^22.0.0",
|
|
28
28
|
"typescript": "^5.7.0",
|
|
29
|
-
"@aalis/core": "0.
|
|
29
|
+
"@aalis/core": "0.12.1",
|
|
30
30
|
"@aalis/api-embedding": "0.5.0",
|
|
31
|
-
"@aalis/api-webui": "0.9.
|
|
31
|
+
"@aalis/api-webui": "0.9.2"
|
|
32
32
|
},
|
|
33
33
|
"peerDependencies": {
|
|
34
34
|
"@aalis/core": ">=0.11.0 <1.0.0"
|