@aalis/plugin-embedding-openai 0.10.2 → 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 +7 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +40 -36
- package/dist/index.js.map +1 -1
- package/package.json +12 -6
package/dist/index.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
import
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
export
|
|
8
|
-
export declare const configSchema: ConfigSchema;
|
|
9
|
-
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
|
+
}>;
|
|
7
|
+
export default _default;
|
|
10
8
|
//# 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":";;;;;;AAsFA,wBAiCG"}
|
package/dist/index.js
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export const reusable = true;
|
|
7
|
-
export const configSchema = {
|
|
1
|
+
import { embedding } from '@aalis/api-embedding';
|
|
2
|
+
import { config, definePlugin, lifecycle, logger, provide } from '@aalis/core';
|
|
3
|
+
import { missingConfigError } from '@aalis/schema-config';
|
|
4
|
+
// ===== 配置 =====
|
|
5
|
+
const configSchema = {
|
|
8
6
|
apiKey: { type: 'string', label: 'API Key', required: true, secret: true, description: 'OpenAI API 密钥' },
|
|
9
7
|
baseUrl: {
|
|
10
8
|
type: 'string',
|
|
@@ -28,6 +26,7 @@ export const configSchema = {
|
|
|
28
26
|
};
|
|
29
27
|
// ===== 服务实现 =====
|
|
30
28
|
class OpenAIEmbeddingService {
|
|
29
|
+
modelId;
|
|
31
30
|
baseUrl;
|
|
32
31
|
model;
|
|
33
32
|
apiKey;
|
|
@@ -35,6 +34,7 @@ class OpenAIEmbeddingService {
|
|
|
35
34
|
constructor(baseUrl, model, apiKey, timeoutMs = 30000) {
|
|
36
35
|
this.baseUrl = baseUrl.replace(/\/+$/, '');
|
|
37
36
|
this.model = model;
|
|
37
|
+
this.modelId = `openai:${model}`;
|
|
38
38
|
this.apiKey = apiKey;
|
|
39
39
|
this.timeoutMs = Math.max(1000, timeoutMs);
|
|
40
40
|
}
|
|
@@ -48,9 +48,9 @@ class OpenAIEmbeddingService {
|
|
|
48
48
|
Authorization: `Bearer ${this.apiKey}`,
|
|
49
49
|
},
|
|
50
50
|
body: JSON.stringify({ model: this.model, input: text }),
|
|
51
|
-
// 没有 signal 的话这次请求永不自行了结：apply 的启动探测 await
|
|
52
|
-
//
|
|
53
|
-
//
|
|
51
|
+
// 没有 signal 的话这次请求永不自行了结：apply 的启动探测 await 它，卡住的 apply 要等到慢激活阈值
|
|
52
|
+
// 才转入后台、其间排在它后面的插件都在等，此后也一直停在激活中；索引路径上则是 memory-vector 的
|
|
53
|
+
// 一个并发槽被无限期占用。
|
|
54
54
|
signal: options?.signal ? AbortSignal.any([timeoutSignal, options.signal]) : timeoutSignal,
|
|
55
55
|
});
|
|
56
56
|
if (!res.ok) {
|
|
@@ -76,30 +76,34 @@ class OpenAIEmbeddingService {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
// ===== 插件入口 =====
|
|
79
|
-
export
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
}
|
|
79
|
+
export default definePlugin({
|
|
80
|
+
name: '@aalis/plugin-embedding-openai',
|
|
81
|
+
displayName: 'OpenAI Embedding',
|
|
82
|
+
subsystem: 'embedding',
|
|
83
|
+
configSchema,
|
|
84
|
+
reusable: true,
|
|
85
|
+
provides: [embedding],
|
|
86
|
+
uses: { config, logger, lifecycle, provide },
|
|
87
|
+
async apply({ config, logger, lifecycle, provide }) {
|
|
88
|
+
const apiKey = config.apiKey;
|
|
89
|
+
if (!apiKey) {
|
|
90
|
+
throw missingConfigError('apiKey');
|
|
91
|
+
}
|
|
92
|
+
const baseUrl = config.baseUrl ?? 'https://api.openai.com/v1';
|
|
93
|
+
const model = config.model ?? 'text-embedding-3-small';
|
|
94
|
+
const timeoutMs = config.timeoutMs ?? 30000;
|
|
95
|
+
const service = new OpenAIEmbeddingService(baseUrl, model, apiKey, timeoutMs);
|
|
96
|
+
// 启动时检查连通性（失败不阻塞，只警告）；停用或停机时中止
|
|
97
|
+
try {
|
|
98
|
+
await service.embed('ping', { signal: lifecycle.signal });
|
|
99
|
+
logger.info(`OpenAI Embedding 已就绪: ${model} @ ${baseUrl}`);
|
|
100
|
+
}
|
|
101
|
+
catch (err) {
|
|
102
|
+
lifecycle.signal.throwIfAborted();
|
|
103
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
104
|
+
logger.warn(`OpenAI Embedding 连通性检查失败 (${baseUrl}, model=${model}): ${msg}，服务仍将注册`);
|
|
105
|
+
}
|
|
106
|
+
provide(embedding, service, { label: `OpenAI / ${model}` });
|
|
107
|
+
},
|
|
108
|
+
});
|
|
105
109
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
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,22 +26,28 @@
|
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@types/node": "^22.0.0",
|
|
28
28
|
"typescript": "^5.7.0",
|
|
29
|
-
"@aalis/core": "0.
|
|
30
|
-
"@aalis/api-
|
|
31
|
-
"@aalis/api-webui": "0.9.2"
|
|
29
|
+
"@aalis/core": "0.18.0",
|
|
30
|
+
"@aalis/api-webui": "0.11.0"
|
|
32
31
|
},
|
|
33
32
|
"peerDependencies": {
|
|
34
|
-
"@aalis/core": ">=0.
|
|
33
|
+
"@aalis/core": ">=0.18.0 <1.0.0"
|
|
35
34
|
},
|
|
36
35
|
"aalis": {
|
|
37
36
|
"service": {
|
|
38
37
|
"provides": [
|
|
39
38
|
"embedding"
|
|
39
|
+
],
|
|
40
|
+
"required": [
|
|
41
|
+
"config",
|
|
42
|
+
"lifecycle",
|
|
43
|
+
"logger",
|
|
44
|
+
"provide"
|
|
40
45
|
]
|
|
41
46
|
}
|
|
42
47
|
},
|
|
43
48
|
"dependencies": {
|
|
44
|
-
"@aalis/
|
|
49
|
+
"@aalis/api-embedding": ">=0.7.0 <1.0.0",
|
|
50
|
+
"@aalis/schema-config": ">=0.13.0 <1.0.0"
|
|
45
51
|
},
|
|
46
52
|
"scripts": {
|
|
47
53
|
"build": "tsc",
|