@aalis/api-llm 0.10.1 → 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/README.md +5 -5
- package/dist/index.d.ts +13 -16
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -6
- package/dist/index.js.map +1 -1
- package/package.json +6 -9
package/README.md
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# @aalis/api-llm
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
导出服务描述符（运行时值）与类型；不含服务实现
|
|
4
4
|
|
|
5
5
|
## 角色
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
导出服务描述符（运行时值）与类型；不含服务实现
|
|
8
8
|
|
|
9
9
|
## 安装
|
|
10
10
|
|
|
@@ -15,10 +15,10 @@ pnpm add @aalis/api-llm
|
|
|
15
15
|
## 使用
|
|
16
16
|
|
|
17
17
|
```ts
|
|
18
|
-
import
|
|
19
|
-
```
|
|
18
|
+
import { llm } from '@aalis/api-llm';
|
|
20
19
|
|
|
21
|
-
|
|
20
|
+
// uses: { llm }
|
|
21
|
+
```
|
|
22
22
|
|
|
23
23
|
## 许可
|
|
24
24
|
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ToolDefinition } from '@aalis/api-tools';
|
|
2
|
-
import type {
|
|
2
|
+
import type { ServiceRef } from '@aalis/core';
|
|
3
3
|
import type { Message, ToolCall } from '@aalis/schema-message';
|
|
4
4
|
export interface ChatResponse {
|
|
5
5
|
content: string | null;
|
|
@@ -50,7 +50,7 @@ export interface ChatStreamChunk {
|
|
|
50
50
|
export interface ModelInfo {
|
|
51
51
|
id: string;
|
|
52
52
|
/**
|
|
53
|
-
* Capability
|
|
53
|
+
* Capability 字符串数组，取自 model handle 的 `instance.capabilities` 元数据。使用宽松的 string[]
|
|
54
54
|
* 而不是 LLMCapability[]，便于跨插件共享（自定义 capability 也能照常上送给前端）。
|
|
55
55
|
*/
|
|
56
56
|
capabilities: string[];
|
|
@@ -82,16 +82,15 @@ export interface ChatModelRequest {
|
|
|
82
82
|
/**
|
|
83
83
|
* 单个 LLM model 的 service entry。
|
|
84
84
|
*
|
|
85
|
-
* 一个 LLM provider 插件实例（如 plugin-llm-openai
|
|
86
|
-
* 在 apply() 期间为**每个 model 单独**调用 `
|
|
85
|
+
* 一个 LLM provider 插件实例（如 plugin-llm-openai）按其发现的模型列表，
|
|
86
|
+
* 在 apply() 期间为**每个 model 单独**调用 `provide(llm, modelHandle, { entryId })`，
|
|
87
87
|
* model handle 上的 capabilities 字段诚实地反映该 model 的能力。
|
|
88
88
|
*
|
|
89
89
|
* 调用约定：
|
|
90
|
-
* const handle = resolveLLMModel(
|
|
90
|
+
* const handle = resolveLLMModel(llm, ref, ['vision'])?.instance;
|
|
91
91
|
* await handle?.chat({ messages }); // entry 已知道是哪个 model
|
|
92
92
|
*
|
|
93
|
-
*
|
|
94
|
-
* 或 persona.yaml 的 defaultServices 配置（见 plugin-author-guide §11）。
|
|
93
|
+
* 选择默认 model：`services.prefer('llm', '<provider>/<model>')` 或宿主配置的 `servicePreferences`。
|
|
95
94
|
*/
|
|
96
95
|
export interface LLMModel {
|
|
97
96
|
/** model id（provider 内唯一，如 'gpt-4o'）。来源：provider plugin 注册时填入。 */
|
|
@@ -123,6 +122,8 @@ export interface LLMModel {
|
|
|
123
122
|
* 就不显示"刷新"按钮。
|
|
124
123
|
* - 同一 provider 下所有 model entries 共享同一份 refresh 闭包；webui 按 contextId
|
|
125
124
|
* 找到任一 entry 调一次即可。
|
|
125
|
+
* - **失败语义**：发现失败（不可达、超时、非 2xx、响应不是模型列表）时抛错，消息带原因；已注册的
|
|
126
|
+
* entries 原样保留、不增删——不得把失败当成远端没有模型而注销自动发现的条目。经停用或停机中止时同样抛错。
|
|
126
127
|
*/
|
|
127
128
|
refresh?(): Promise<{
|
|
128
129
|
added: string[];
|
|
@@ -160,12 +161,12 @@ declare module '@aalis/schema-config' {
|
|
|
160
161
|
* LLM 模型引用：值形如 `{ provider: string; model: string }`，前端渲染为
|
|
161
162
|
* 联动 select（provider 列表来自 `/api/models/llm` 的 contextId 聚合；
|
|
162
163
|
* model 列表由所选 provider 决定）。运行时由消费方用
|
|
163
|
-
* `resolveLLMModel(
|
|
164
|
+
* `resolveLLMModel(llm, value, caps)` 解析。
|
|
164
165
|
*/
|
|
165
166
|
'llm-ref': true;
|
|
166
167
|
}
|
|
167
168
|
}
|
|
168
|
-
/**
|
|
169
|
+
/** 一个 'llm' entry 的快照（ServiceRef.all() 所返 ServiceView 的 instance/contextId/label 子集）。 */
|
|
169
170
|
export interface LLMModelEntry {
|
|
170
171
|
instance: LLMModel;
|
|
171
172
|
contextId: string;
|
|
@@ -185,7 +186,7 @@ export interface ModelRef {
|
|
|
185
186
|
* 列出（可按能力过滤的）LLM model entries，供 `/model` 列表与前端下拉用。
|
|
186
187
|
* 能力源为 `instance.capabilities`（model 自带元数据），是展示/列举用途，非 DI 选择。
|
|
187
188
|
*/
|
|
188
|
-
export declare function listLLMModels(
|
|
189
|
+
export declare function listLLMModels(source: ServiceRef<LLMModel>, opts?: {
|
|
189
190
|
caps?: readonly LLMCapability[];
|
|
190
191
|
}): LLMModelEntry[];
|
|
191
192
|
/**
|
|
@@ -199,10 +200,6 @@ export declare function listLLMModels(ctx: Context, opts?: {
|
|
|
199
200
|
*
|
|
200
201
|
* requiredCaps 按 handle 元数据 `instance.capabilities` 过滤。找不到返回 undefined。
|
|
201
202
|
*/
|
|
202
|
-
export declare function resolveLLMModel(
|
|
203
|
-
declare
|
|
204
|
-
interface ServiceTypeMap {
|
|
205
|
-
llm: LLMModel;
|
|
206
|
-
}
|
|
207
|
-
}
|
|
203
|
+
export declare function resolveLLMModel(source: ServiceRef<LLMModel>, ref?: ModelRef | null, requiredCaps?: LLMCapability[]): LLMModelEntry | undefined;
|
|
204
|
+
export declare const llm: import("@aalis/core").ServiceDescriptor<LLMModel, ServiceRef<LLMModel>>;
|
|
208
205
|
//# 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":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
//
|
|
3
3
|
// 提供完整的 LLM 抽象 + 能力声明框架。
|
|
4
4
|
// 任何需要调用或实现 LLM 服务的插件都应从本包导入相关类型。
|
|
5
|
+
import { defineService } from '@aalis/core';
|
|
5
6
|
export const LLMCapabilities = {
|
|
6
7
|
Chat: 'chat',
|
|
7
8
|
ToolCalling: 'tool_calling',
|
|
@@ -16,8 +17,8 @@ export const LLMCapabilities = {
|
|
|
16
17
|
* 按能力过滤 LLM entries —— 能力源为 handle 元数据 `instance.capabilities`，
|
|
17
18
|
* 不再依赖 core 的能力过滤（core 已不做能力选择，服务选择走配置 + 按名解析）。
|
|
18
19
|
*/
|
|
19
|
-
function listLLMEntries(
|
|
20
|
-
const all =
|
|
20
|
+
function listLLMEntries(source, caps) {
|
|
21
|
+
const all = source.all();
|
|
21
22
|
if (!caps || caps.length === 0)
|
|
22
23
|
return all;
|
|
23
24
|
return all.filter(e => caps.every(c => (e.instance.capabilities ?? []).includes(c)));
|
|
@@ -26,8 +27,8 @@ function listLLMEntries(ctx, caps) {
|
|
|
26
27
|
* 列出（可按能力过滤的）LLM model entries，供 `/model` 列表与前端下拉用。
|
|
27
28
|
* 能力源为 `instance.capabilities`（model 自带元数据），是展示/列举用途，非 DI 选择。
|
|
28
29
|
*/
|
|
29
|
-
export function listLLMModels(
|
|
30
|
-
return listLLMEntries(
|
|
30
|
+
export function listLLMModels(source, opts) {
|
|
31
|
+
return listLLMEntries(source, opts?.caps);
|
|
31
32
|
}
|
|
32
33
|
/**
|
|
33
34
|
* 把 ref 解析为最匹配的 LLMModel entry。
|
|
@@ -40,8 +41,8 @@ export function listLLMModels(ctx, opts) {
|
|
|
40
41
|
*
|
|
41
42
|
* requiredCaps 按 handle 元数据 `instance.capabilities` 过滤。找不到返回 undefined。
|
|
42
43
|
*/
|
|
43
|
-
export function resolveLLMModel(
|
|
44
|
-
const all = listLLMEntries(
|
|
44
|
+
export function resolveLLMModel(source, ref, requiredCaps) {
|
|
45
|
+
const all = listLLMEntries(source, requiredCaps);
|
|
45
46
|
if (ref?.provider && ref?.model)
|
|
46
47
|
return all.find(e => e.contextId === `${ref.provider}/${ref.model}`);
|
|
47
48
|
if (ref?.provider)
|
|
@@ -50,4 +51,6 @@ export function resolveLLMModel(ctx, ref, requiredCaps) {
|
|
|
50
51
|
return all.find(e => e.instance.id === ref.model);
|
|
51
52
|
return all[0];
|
|
52
53
|
}
|
|
54
|
+
// ----- 服务描述符（按激活绑定；调用型：绑定接口是 ServiceRef）-----
|
|
55
|
+
export const llm = defineService('llm');
|
|
53
56
|
//# 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":"AAAA,uBAAuB;AACvB,EAAE;AACF,yBAAyB;AACzB,kCAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,EAAE;AACF,yBAAyB;AACzB,kCAAkC;AAIlC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAoK5C,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,cAAc;IAC3B,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,kBAAkB,EAAE,qBAAqB;IACzC,KAAK,EAAE,OAAO;CAC0B,CAAC;AAsC3C;;;GAGG;AACH,SAAS,cAAc,CAAC,MAA4B,EAAE,IAA+B;IACnF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC3C,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC3B,MAA4B,EAC5B,IAA0C;IAE1C,OAAO,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAC7B,MAA4B,EAC5B,GAAqB,EACrB,YAA8B;IAE9B,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACjD,IAAI,GAAG,EAAE,QAAQ,IAAI,GAAG,EAAE,KAAK;QAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;IACtG,IAAI,GAAG,EAAE,QAAQ;QAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IACpF,IAAI,GAAG,EAAE,KAAK;QAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;IAClE,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;AAChB,CAAC;AAED,+CAA+C;AAC/C,MAAM,CAAC,MAAM,GAAG,GAAG,aAAa,CAAW,KAAK,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aalis/api-llm",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.12.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -19,20 +19,17 @@
|
|
|
19
19
|
"dist"
|
|
20
20
|
],
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@aalis/schema-message": ">=0.
|
|
23
|
-
"@aalis/api-tools": ">=0.
|
|
24
|
-
"@aalis/schema-config": ">=0.
|
|
22
|
+
"@aalis/schema-message": ">=0.9.0 <1.0.0",
|
|
23
|
+
"@aalis/api-tools": ">=0.10.0 <1.0.0",
|
|
24
|
+
"@aalis/schema-config": ">=0.13.0 <1.0.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"@types/node": "^22.0.0",
|
|
28
28
|
"typescript": "^5.7.0",
|
|
29
|
-
"@aalis/core": "0.
|
|
30
|
-
},
|
|
31
|
-
"aalis": {
|
|
32
|
-
"types": true
|
|
29
|
+
"@aalis/core": "0.18.0"
|
|
33
30
|
},
|
|
34
31
|
"peerDependencies": {
|
|
35
|
-
"@aalis/core": ">=0.
|
|
32
|
+
"@aalis/core": ">=0.18.0 <1.0.0"
|
|
36
33
|
},
|
|
37
34
|
"keywords": [
|
|
38
35
|
"aalis",
|