@aalis/plugin-embedding-openai 0.11.0 → 0.12.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 +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -16
- package/dist/index.js.map +1 -1
- package/package.json +7 -6
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
declare const _default: import("@aalis/core").PluginDefinition<{
|
|
2
2
|
config: import("@aalis/core").ServiceDescriptor<(identity: symbol) => Readonly<Record<string, unknown>>, Readonly<Record<string, unknown>>>;
|
|
3
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>;
|
|
4
5
|
provide: import("@aalis/core").ServiceDescriptor<(identity: symbol) => import("@aalis/core").Provide, import("@aalis/core").Provide>;
|
|
5
6
|
}>;
|
|
6
7
|
export default _default;
|
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":";;;;;;AAsFA,wBAiCG"}
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { embedding } from '@aalis/api-embedding';
|
|
2
|
-
import { config, definePlugin, logger, provide } from '@aalis/core';
|
|
2
|
+
import { config, definePlugin, lifecycle, logger, provide } from '@aalis/core';
|
|
3
|
+
import { missingConfigError } from '@aalis/schema-config';
|
|
3
4
|
// ===== 配置 =====
|
|
4
5
|
const configSchema = {
|
|
5
6
|
apiKey: { type: 'string', label: 'API Key', required: true, secret: true, description: 'OpenAI API 密钥' },
|
|
@@ -25,6 +26,7 @@ const configSchema = {
|
|
|
25
26
|
};
|
|
26
27
|
// ===== 服务实现 =====
|
|
27
28
|
class OpenAIEmbeddingService {
|
|
29
|
+
modelId;
|
|
28
30
|
baseUrl;
|
|
29
31
|
model;
|
|
30
32
|
apiKey;
|
|
@@ -32,6 +34,7 @@ class OpenAIEmbeddingService {
|
|
|
32
34
|
constructor(baseUrl, model, apiKey, timeoutMs = 30000) {
|
|
33
35
|
this.baseUrl = baseUrl.replace(/\/+$/, '');
|
|
34
36
|
this.model = model;
|
|
37
|
+
this.modelId = `openai:${model}`;
|
|
35
38
|
this.apiKey = apiKey;
|
|
36
39
|
this.timeoutMs = Math.max(1000, timeoutMs);
|
|
37
40
|
}
|
|
@@ -45,9 +48,9 @@ class OpenAIEmbeddingService {
|
|
|
45
48
|
Authorization: `Bearer ${this.apiKey}`,
|
|
46
49
|
},
|
|
47
50
|
body: JSON.stringify({ model: this.model, input: text }),
|
|
48
|
-
// 没有 signal 的话这次请求永不自行了结：apply 的启动探测 await
|
|
49
|
-
//
|
|
50
|
-
//
|
|
51
|
+
// 没有 signal 的话这次请求永不自行了结：apply 的启动探测 await 它，卡住的 apply 要等到慢激活阈值
|
|
52
|
+
// 才转入后台、其间排在它后面的插件都在等，此后也一直停在激活中；索引路径上则是 memory-vector 的
|
|
53
|
+
// 一个并发槽被无限期占用。
|
|
51
54
|
signal: options?.signal ? AbortSignal.any([timeoutSignal, options.signal]) : timeoutSignal,
|
|
52
55
|
});
|
|
53
56
|
if (!res.ok) {
|
|
@@ -80,28 +83,23 @@ export default definePlugin({
|
|
|
80
83
|
configSchema,
|
|
81
84
|
reusable: true,
|
|
82
85
|
provides: [embedding],
|
|
83
|
-
uses: { config, logger, provide },
|
|
84
|
-
async apply({ config, logger, provide }) {
|
|
86
|
+
uses: { config, logger, lifecycle, provide },
|
|
87
|
+
async apply({ config, logger, lifecycle, provide }) {
|
|
85
88
|
const apiKey = config.apiKey;
|
|
86
89
|
if (!apiKey) {
|
|
87
|
-
throw
|
|
88
|
-
}
|
|
89
|
-
let baseUrl = config.baseUrl ?? 'https://api.openai.com/v1';
|
|
90
|
-
// 一次性迁移（baseUrl 改「完整前缀」语义）：config-sync 会把旧默认值物化进配置文件，
|
|
91
|
-
// 精确命中旧默认时就地升级；自定义端点见 CHANGELOG 迁移说明。
|
|
92
|
-
if (baseUrl === 'https://api.openai.com') {
|
|
93
|
-
logger.warn('baseUrl 语义已改为完整前缀（插件不再自动拼 /v1）：旧默认值已自动升级为 https://api.openai.com/v1');
|
|
94
|
-
baseUrl = 'https://api.openai.com/v1';
|
|
90
|
+
throw missingConfigError('apiKey');
|
|
95
91
|
}
|
|
92
|
+
const baseUrl = config.baseUrl ?? 'https://api.openai.com/v1';
|
|
96
93
|
const model = config.model ?? 'text-embedding-3-small';
|
|
97
94
|
const timeoutMs = config.timeoutMs ?? 30000;
|
|
98
95
|
const service = new OpenAIEmbeddingService(baseUrl, model, apiKey, timeoutMs);
|
|
99
|
-
//
|
|
96
|
+
// 启动时检查连通性（失败不阻塞，只警告）；停用或停机时中止
|
|
100
97
|
try {
|
|
101
|
-
await service.embed('ping');
|
|
98
|
+
await service.embed('ping', { signal: lifecycle.signal });
|
|
102
99
|
logger.info(`OpenAI Embedding 已就绪: ${model} @ ${baseUrl}`);
|
|
103
100
|
}
|
|
104
101
|
catch (err) {
|
|
102
|
+
lifecycle.signal.throwIfAborted();
|
|
105
103
|
const msg = err instanceof Error ? err.message : String(err);
|
|
106
104
|
logger.warn(`OpenAI Embedding 连通性检查失败 (${baseUrl}, model=${model}): ${msg}，服务仍将注册`);
|
|
107
105
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtG,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
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.12.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -26,11 +26,11 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@types/node": "^22.0.0",
|
|
28
28
|
"typescript": "^5.7.0",
|
|
29
|
-
"@aalis/core": "0.
|
|
30
|
-
"@aalis/api-webui": "0.
|
|
29
|
+
"@aalis/core": "0.18.0",
|
|
30
|
+
"@aalis/api-webui": "0.11.0"
|
|
31
31
|
},
|
|
32
32
|
"peerDependencies": {
|
|
33
|
-
"@aalis/core": ">=0.
|
|
33
|
+
"@aalis/core": ">=0.18.0 <1.0.0"
|
|
34
34
|
},
|
|
35
35
|
"aalis": {
|
|
36
36
|
"service": {
|
|
@@ -39,14 +39,15 @@
|
|
|
39
39
|
],
|
|
40
40
|
"required": [
|
|
41
41
|
"config",
|
|
42
|
+
"lifecycle",
|
|
42
43
|
"logger",
|
|
43
44
|
"provide"
|
|
44
45
|
]
|
|
45
46
|
}
|
|
46
47
|
},
|
|
47
48
|
"dependencies": {
|
|
48
|
-
"@aalis/api-embedding": ">=0.
|
|
49
|
-
"@aalis/schema-config": ">=0.
|
|
49
|
+
"@aalis/api-embedding": ">=0.7.0 <1.0.0",
|
|
50
|
+
"@aalis/schema-config": ">=0.13.0 <1.0.0"
|
|
50
51
|
},
|
|
51
52
|
"scripts": {
|
|
52
53
|
"build": "tsc",
|