@ax-llm/ax 9.0.5 → 9.0.9
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/CHANGELOG.md +184 -0
- package/build/module/src/ai/anthropic/api.js +63 -22
- package/build/module/src/ai/anthropic/api.js.map +1 -1
- package/build/module/src/ai/anthropic/types.d.ts +25 -6
- package/build/module/src/ai/base.js +41 -21
- package/build/module/src/ai/base.js.map +1 -1
- package/build/module/src/ai/cohere/api.d.ts +1 -1
- package/build/module/src/ai/cohere/api.js +102 -50
- package/build/module/src/ai/cohere/api.js.map +1 -1
- package/build/module/src/ai/cohere/types.d.ts +32 -15
- package/build/module/src/ai/google-gemini/api.js +14 -18
- package/build/module/src/ai/google-gemini/api.js.map +1 -1
- package/build/module/src/ai/huggingface/api.js +25 -1
- package/build/module/src/ai/huggingface/api.js.map +1 -1
- package/build/module/src/ai/openai/api.js +18 -22
- package/build/module/src/ai/openai/api.js.map +1 -1
- package/build/module/src/ai/types.d.ts +1 -2
- package/build/module/src/ai/util.d.ts +3 -4
- package/build/module/src/ai/util.js +1 -53
- package/build/module/src/ai/util.js.map +1 -1
- package/build/module/src/dsp/generate.js +39 -50
- package/build/module/src/dsp/generate.js.map +1 -1
- package/build/module/src/examples/food-search.js +14 -3
- package/build/module/src/examples/food-search.js.map +1 -1
- package/build/module/src/funcs/functions.js +10 -7
- package/build/module/src/funcs/functions.js.map +1 -1
- package/build/module/src/mem/memory.js +5 -2
- package/build/module/src/mem/memory.js.map +1 -1
- package/package.json +8 -5
- package/build/module/src/text/functions.d.ts +0 -8
- package/build/module/src/text/functions.js +0 -55
- package/build/module/src/text/functions.js.map +0 -1
- package/build/module/src/text/index.d.ts +0 -3
- package/build/module/src/text/index.js +0 -4
- package/build/module/src/text/index.js.map +0 -1
- package/build/module/src/text/jsonschema.d.ts +0 -1
- package/build/module/src/text/jsonschema.js +0 -96
- package/build/module/src/text/jsonschema.js.map +0 -1
- package/build/module/src/text/memory.d.ts +0 -21
- package/build/module/src/text/memory.js +0 -73
- package/build/module/src/text/memory.js.map +0 -1
- package/build/module/src/text/types.d.ts +0 -57
- package/build/module/src/text/types.js +0 -2
- package/build/module/src/text/types.js.map +0 -1
- package/build/module/src/types/index.d.ts +0 -51
- package/build/module/src/types/index.js +0 -2
- package/build/module/src/types/index.js.map +0 -1
|
@@ -2,7 +2,7 @@ import { AxBaseAI, axBaseAIDefaultConfig, axBaseAIDefaultCreativeConfig } from '
|
|
|
2
2
|
import { axModelInfoCohere } from './info.js';
|
|
3
3
|
import { AxAICohereEmbedModel, AxAICohereModel } from './types.js';
|
|
4
4
|
export const axAICohereDefaultConfig = () => structuredClone({
|
|
5
|
-
model: AxAICohereModel.
|
|
5
|
+
model: AxAICohereModel.CommandRPlus,
|
|
6
6
|
embedModel: AxAICohereEmbedModel.EmbedEnglishV30,
|
|
7
7
|
...axBaseAIDefaultConfig()
|
|
8
8
|
});
|
|
@@ -27,7 +27,7 @@ export class AxAICohere extends AxBaseAI {
|
|
|
27
27
|
headers: { Authorization: `Bearer ${apiKey}` },
|
|
28
28
|
modelInfo: axModelInfoCohere,
|
|
29
29
|
models: { model: _config.model },
|
|
30
|
-
supportFor: { functions:
|
|
30
|
+
supportFor: { functions: true, streaming: true },
|
|
31
31
|
options
|
|
32
32
|
});
|
|
33
33
|
this.config = _config;
|
|
@@ -51,34 +51,13 @@ export class AxAICohere extends AxBaseAI {
|
|
|
51
51
|
const model = req.model ?? this.config.model;
|
|
52
52
|
const lastChatMsg = req.chatPrompt.at(-1);
|
|
53
53
|
const restOfChat = req.chatPrompt.slice(0, -1);
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
let message;
|
|
55
|
+
if (lastChatMsg &&
|
|
56
|
+
lastChatMsg.role === 'user' &&
|
|
57
|
+
typeof lastChatMsg.content === 'string') {
|
|
58
|
+
message = lastChatMsg?.content;
|
|
56
59
|
}
|
|
57
|
-
const
|
|
58
|
-
const chatHistory = restOfChat.map((chat) => {
|
|
59
|
-
if (chat.role === 'function') {
|
|
60
|
-
throw new Error('Function calling not supported');
|
|
61
|
-
}
|
|
62
|
-
if (Array.isArray(chat.content)) {
|
|
63
|
-
throw new Error('Multi-modal content not supported');
|
|
64
|
-
}
|
|
65
|
-
let role;
|
|
66
|
-
switch (chat.role) {
|
|
67
|
-
case 'user':
|
|
68
|
-
role = 'USER';
|
|
69
|
-
break;
|
|
70
|
-
case 'system':
|
|
71
|
-
role = 'SYSTEM';
|
|
72
|
-
break;
|
|
73
|
-
case 'assistant':
|
|
74
|
-
role = 'CHATBOT';
|
|
75
|
-
break;
|
|
76
|
-
default:
|
|
77
|
-
role = 'USER';
|
|
78
|
-
break;
|
|
79
|
-
}
|
|
80
|
-
return { role, message: chat.content ?? '' };
|
|
81
|
-
});
|
|
60
|
+
const chatHistory = createHistory(restOfChat);
|
|
82
61
|
const tools = req.functions?.map((v) => {
|
|
83
62
|
const props = {};
|
|
84
63
|
if (v.parameters?.properties) {
|
|
@@ -102,21 +81,21 @@ export class AxAICohere extends AxBaseAI {
|
|
|
102
81
|
.map((chat) => {
|
|
103
82
|
const fn = tools?.find((t) => t.name === chat.functionId);
|
|
104
83
|
if (!fn) {
|
|
105
|
-
throw new Error('
|
|
84
|
+
throw new Error('Function not found');
|
|
106
85
|
}
|
|
107
86
|
return {
|
|
108
87
|
call: { name: fn.name, parameters: fn.parameter_definitions },
|
|
109
|
-
outputs: [{ result: chat.
|
|
88
|
+
outputs: [{ result: chat.result ?? '' }]
|
|
110
89
|
};
|
|
111
90
|
});
|
|
112
91
|
const apiConfig = {
|
|
113
|
-
name: '/v1/
|
|
92
|
+
name: '/v1/chat'
|
|
114
93
|
};
|
|
115
94
|
const reqValue = {
|
|
116
|
-
model,
|
|
117
95
|
message,
|
|
96
|
+
model,
|
|
118
97
|
tools,
|
|
119
|
-
tool_results,
|
|
98
|
+
...(tool_results && !message ? { tool_results } : {}),
|
|
120
99
|
chat_history: chatHistory,
|
|
121
100
|
max_tokens: req.modelConfig?.maxTokens ?? this.config.maxTokens,
|
|
122
101
|
temperature: req.modelConfig?.temperature ?? this.config.temperature,
|
|
@@ -149,6 +128,14 @@ export class AxAICohere extends AxBaseAI {
|
|
|
149
128
|
return [apiConfig, reqValue];
|
|
150
129
|
};
|
|
151
130
|
generateChatResp = (resp) => {
|
|
131
|
+
const modelUsage = resp.meta.billed_units
|
|
132
|
+
? {
|
|
133
|
+
promptTokens: resp.meta.billed_units.input_tokens,
|
|
134
|
+
completionTokens: resp.meta.billed_units.output_tokens,
|
|
135
|
+
totalTokens: resp.meta.billed_units.input_tokens +
|
|
136
|
+
resp.meta.billed_units.output_tokens
|
|
137
|
+
}
|
|
138
|
+
: undefined;
|
|
152
139
|
let finishReason;
|
|
153
140
|
if ('finish_reason' in resp) {
|
|
154
141
|
switch (resp.finish_reason) {
|
|
@@ -169,24 +156,26 @@ export class AxAICohere extends AxBaseAI {
|
|
|
169
156
|
}
|
|
170
157
|
let functionCalls;
|
|
171
158
|
if ('tool_calls' in resp) {
|
|
172
|
-
functionCalls =
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
}) ?? [];
|
|
159
|
+
functionCalls = resp.tool_calls?.map((v) => {
|
|
160
|
+
return {
|
|
161
|
+
id: v.name,
|
|
162
|
+
type: 'function',
|
|
163
|
+
function: { name: v.name, arguments: v.parameters }
|
|
164
|
+
};
|
|
165
|
+
});
|
|
180
166
|
}
|
|
167
|
+
const results = [
|
|
168
|
+
{
|
|
169
|
+
id: resp.generation_id,
|
|
170
|
+
content: resp.text,
|
|
171
|
+
functionCalls,
|
|
172
|
+
finishReason
|
|
173
|
+
}
|
|
174
|
+
];
|
|
181
175
|
return {
|
|
182
|
-
results
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
content: resp.text,
|
|
186
|
-
functionCalls,
|
|
187
|
-
finishReason
|
|
188
|
-
}
|
|
189
|
-
]
|
|
176
|
+
results,
|
|
177
|
+
modelUsage,
|
|
178
|
+
remoteId: resp.response_id
|
|
190
179
|
};
|
|
191
180
|
};
|
|
192
181
|
generateChatStreamResp = (resp, state) => {
|
|
@@ -209,4 +198,67 @@ export class AxAICohere extends AxBaseAI {
|
|
|
209
198
|
};
|
|
210
199
|
};
|
|
211
200
|
}
|
|
201
|
+
function createHistory(chatPrompt) {
|
|
202
|
+
return chatPrompt.map((chat) => {
|
|
203
|
+
let message = '';
|
|
204
|
+
if (chat.role === 'system' ||
|
|
205
|
+
chat.role === 'assistant' ||
|
|
206
|
+
chat.role === 'user') {
|
|
207
|
+
if (typeof chat.content === 'string') {
|
|
208
|
+
message = chat.content;
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
throw new Error('Multi-modal content not supported');
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
switch (chat.role) {
|
|
215
|
+
case 'user':
|
|
216
|
+
return { role: 'USER', message };
|
|
217
|
+
case 'system':
|
|
218
|
+
return { role: 'SYSTEM', message };
|
|
219
|
+
case 'assistant': {
|
|
220
|
+
const toolCalls = createToolCall(chat.functionCalls);
|
|
221
|
+
return {
|
|
222
|
+
role: 'CHATBOT',
|
|
223
|
+
message,
|
|
224
|
+
tool_calls: toolCalls
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
case 'function': {
|
|
228
|
+
const functionCalls = chatPrompt
|
|
229
|
+
.map((v) => {
|
|
230
|
+
if (v.role === 'assistant') {
|
|
231
|
+
return v.functionCalls?.find((f) => f.id === chat.functionId);
|
|
232
|
+
}
|
|
233
|
+
return undefined;
|
|
234
|
+
})
|
|
235
|
+
.filter((v) => v !== undefined);
|
|
236
|
+
const call = createToolCall(functionCalls)?.at(0);
|
|
237
|
+
if (!call) {
|
|
238
|
+
throw new Error('Function call not found');
|
|
239
|
+
}
|
|
240
|
+
const outputs = [{ result: chat.result }];
|
|
241
|
+
return {
|
|
242
|
+
role: 'TOOL',
|
|
243
|
+
tool_results: [
|
|
244
|
+
{
|
|
245
|
+
call,
|
|
246
|
+
outputs
|
|
247
|
+
}
|
|
248
|
+
]
|
|
249
|
+
};
|
|
250
|
+
}
|
|
251
|
+
default:
|
|
252
|
+
throw new Error('Unknown role');
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
function createToolCall(functionCalls) {
|
|
257
|
+
return functionCalls?.map((v) => {
|
|
258
|
+
const parameters = typeof v.function.arguments === 'string'
|
|
259
|
+
? JSON.parse(v.function.arguments)
|
|
260
|
+
: v.function.arguments;
|
|
261
|
+
return { name: v.function.name, parameters };
|
|
262
|
+
});
|
|
263
|
+
}
|
|
212
264
|
//# sourceMappingURL=api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/cohere/api.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAKL,oBAAoB,EAGpB,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAqB,EAAE,CAC5D,eAAe,CAAC;IACd,KAAK,EAAE,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/cohere/api.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAKL,oBAAoB,EAGpB,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAqB,EAAE,CAC5D,eAAe,CAAC;IACd,KAAK,EAAE,eAAe,CAAC,YAAY;IACnC,UAAU,EAAE,oBAAoB,CAAC,eAAe;IAChD,GAAG,qBAAqB,EAAE;CAC3B,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAqB,EAAE,CAC7D,eAAe,CAAC;IACd,KAAK,EAAE,eAAe,CAAC,QAAQ;IAC/B,UAAU,EAAE,oBAAoB,CAAC,eAAe;IAChD,GAAG,6BAA6B,EAAE;CACnC,CAAC,CAAC;AASL,MAAM,OAAO,UAAW,SAAQ,QAM/B;IACS,MAAM,CAAmB;IAEjC,YAAY,EACV,MAAM,EACN,MAAM,EACN,OAAO,EACgC;QACvC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,OAAO,GAAG;YACd,GAAG,uBAAuB,EAAE;YAC5B,GAAG,MAAM;SACV,CAAC;QACF,KAAK,CAAC;YACJ,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,uBAAuB;YAC/B,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE;YAC9C,SAAS,EAAE,iBAAiB;YAC5B,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE;YAChC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;YAChD,OAAO;SACR,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IACxB,CAAC;IAEQ,cAAc;QACrB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,OAAO;YACL,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,aAAa,EAAE,MAAM,CAAC,aAAa;SACnB,CAAC;IACrB,CAAC;IAEQ,eAAe,GAAG,CACzB,GAA4B;IAC5B,6DAA6D;IAC7D,OAAmC,EACL,EAAE;QAChC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAE7C,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE/C,IAAI,OAAqD,CAAC;QAE1D,IACE,WAAW;YACX,WAAW,CAAC,IAAI,KAAK,MAAM;YAC3B,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,EACvC,CAAC;YACD,OAAO,GAAG,WAAW,EAAE,OAAO,CAAC;QACjC,CAAC;QAED,MAAM,WAAW,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAM9C,MAAM,KAAK,GAAmC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACrE,MAAM,KAAK,GAA8B,EAAE,CAAC;YAC5C,IAAI,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC;gBAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBACnE,KAAK,CAAC,GAAG,CAAC,GAAG;wBACX,WAAW,EAAE,KAAK,CAAC,WAAW;wBAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK;qBACxD,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,qBAAqB,EAAE,KAAK;aAC7B,CAAC;QACJ,CAAC,CAAC,CAAC;QAIH,gEAAgE;QAChE,MAAM,YAAY,GAChB,GAAG,CAAC,UACL;aACE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC;aAC1C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACZ,MAAM,EAAE,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1D,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxC,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,qBAAqB,EAAE;gBAC7D,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;aACzC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,UAAU;SACjB,CAAC;QAEF,MAAM,QAAQ,GAA0B;YACtC,OAAO;YACP,KAAK;YACL,KAAK;YACL,GAAG,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,YAAY,EAAE,WAAW;YACzB,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS;YAC/D,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW;YACpE,CAAC,EAAE,GAAG,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI;YAC5C,CAAC,EAAE,GAAG,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI;YAC5C,iBAAiB,EACf,GAAG,CAAC,WAAW,EAAE,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACnE,gBAAgB,EACd,GAAG,CAAC,WAAW,EAAE,eAAe,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe;YACjE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACvC,cAAc,EACZ,GAAG,CAAC,WAAW,EAAE,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa;SAC9D,CAAC;QAEF,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEO,gBAAgB,GAAG,CAC1B,GAA6B,EACE,EAAE;QACjC,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;QAEvD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,WAAW;SAClB,CAAC;QAEF,MAAM,QAAQ,GAAG;YACf,KAAK;YACL,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE;YACtB,UAAU,EAAE,gBAAgB;YAC5B,QAAQ,EAAE,EAAE;SACb,CAAC;QAEF,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEO,gBAAgB,GAAG,CAC1B,IAAsC,EACtB,EAAE;QAClB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY;YACvC,CAAC,CAAC;gBACE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY;gBACjD,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa;gBACtD,WAAW,EACT,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY;oBACnC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa;aACvC;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,YAA0D,CAAC;QAC/D,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;YAC5B,QAAQ,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC3B,KAAK,UAAU;oBACb,YAAY,GAAG,MAAM,CAAC;oBACtB,MAAM;gBACR,KAAK,YAAY;oBACf,YAAY,GAAG,QAAQ,CAAC;oBACxB,MAAM;gBACR,KAAK,OAAO;oBACV,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBAC1C,KAAK,aAAa;oBAChB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBACnD;oBACE,YAAY,GAAG,MAAM,CAAC;oBACtB,MAAM;YACV,CAAC;QACH,CAAC;QAED,IAAI,aAA4D,CAAC;QAEjE,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,CAClC,CAAC,CAAC,EAAiE,EAAE;gBACnE,OAAO;oBACL,EAAE,EAAE,CAAC,CAAC,IAAI;oBACV,IAAI,EAAE,UAAmB;oBACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,UAAU,EAAE;iBACpD,CAAC;YACJ,CAAC,CACF,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAA8B;YACzC;gBACE,EAAE,EAAE,IAAI,CAAC,aAAa;gBACtB,OAAO,EAAE,IAAI,CAAC,IAAI;gBAClB,aAAa;gBACb,YAAY;aACb;SACF,CAAC;QAEF,OAAO;YACL,OAAO;YACP,UAAU;YACV,QAAQ,EAAE,IAAI,CAAC,WAAW;SAC3B,CAAC;IACJ,CAAC,CAAC;IAEO,sBAAsB,GAAG,CAChC,IAA2C,EAC3C,KAAa,EACG,EAAE;QAClB,MAAM,EAAE,GAAG,KAEV,CAAC;QAEF,IAAI,IAAI,CAAC,UAAU,KAAK,cAAc,EAAE,CAAC;YACvC,EAAE,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,aAAa,IAAI,EAAE,CAAC;QACnC,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC,CAAC;IAEO,iBAAiB,GAAG,CAC3B,IAAuC,EACtB,EAAE;QACnB,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,EAAE;YACjB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC,CAAC;CACH;AACD,SAAS,aAAa,CACpB,UAAiD;IAEjD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,IAAI,OAAO,GAAW,EAAE,CAAC;QAEzB,IACE,IAAI,CAAC,IAAI,KAAK,QAAQ;YACtB,IAAI,CAAC,IAAI,KAAK,WAAW;YACzB,IAAI,CAAC,IAAI,KAAK,MAAM,EACpB,CAAC;YACD,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACrC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QAED,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,MAAM;gBACT,OAAO,EAAE,IAAI,EAAE,MAAe,EAAE,OAAO,EAAE,CAAC;YAC5C,KAAK,QAAQ;gBACX,OAAO,EAAE,IAAI,EAAE,QAAiB,EAAE,OAAO,EAAE,CAAC;YAC9C,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACrD,OAAO;oBACL,IAAI,EAAE,SAAkB;oBACxB,OAAO;oBACP,UAAU,EAAE,SAAS;iBACtB,CAAC;YACJ,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,MAAM,aAAa,GAAG,UAAU;qBAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACT,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;wBAC3B,OAAO,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC;oBAChE,CAAC;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC;qBACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;gBAElC,MAAM,IAAI,GAAG,cAAc,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBAElD,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAC7C,CAAC;gBAED,MAAM,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC1C,OAAO;oBACL,IAAI,EAAE,MAAe;oBACrB,YAAY,EAAE;wBACZ;4BACE,IAAI;4BACJ,OAAO;yBACR;qBACF;iBACF,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AACD,SAAS,cAAc,CACrB,aAKC;IAED,OAAO,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,MAAM,UAAU,GACd,OAAO,CAAC,CAAC,QAAQ,CAAC,SAAS,KAAK,QAAQ;YACtC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;YAClC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -27,13 +27,32 @@ export type AxAICohereConfig = AxModelConfig & {
|
|
|
27
27
|
model: AxAICohereModel;
|
|
28
28
|
embedModel: AxAICohereEmbedModel;
|
|
29
29
|
};
|
|
30
|
+
export type AxAICohereChatResponseToolCalls = {
|
|
31
|
+
name: string;
|
|
32
|
+
parameters?: object;
|
|
33
|
+
}[];
|
|
34
|
+
export type AxAICohereChatRequestToolResults = {
|
|
35
|
+
call: AxAICohereChatResponseToolCalls[0];
|
|
36
|
+
outputs: object[];
|
|
37
|
+
}[];
|
|
30
38
|
export type AxAICohereChatRequest = {
|
|
31
|
-
message
|
|
39
|
+
message?: string;
|
|
32
40
|
preamble?: string;
|
|
33
|
-
chat_history: {
|
|
34
|
-
role: 'CHATBOT'
|
|
41
|
+
chat_history: ({
|
|
42
|
+
role: 'CHATBOT';
|
|
35
43
|
message: string;
|
|
36
|
-
|
|
44
|
+
tool_calls?: AxAICohereChatResponseToolCalls;
|
|
45
|
+
} | {
|
|
46
|
+
role: 'SYSTEM';
|
|
47
|
+
message: string;
|
|
48
|
+
} | {
|
|
49
|
+
role: 'USER';
|
|
50
|
+
message: string;
|
|
51
|
+
} | {
|
|
52
|
+
role: 'TOOL';
|
|
53
|
+
message?: string;
|
|
54
|
+
tool_results: AxAICohereChatRequestToolResults;
|
|
55
|
+
})[];
|
|
37
56
|
model: AxAICohereModel | string;
|
|
38
57
|
max_tokens?: number;
|
|
39
58
|
temperature?: number;
|
|
@@ -52,22 +71,20 @@ export type AxAICohereChatRequest = {
|
|
|
52
71
|
required: boolean;
|
|
53
72
|
}>;
|
|
54
73
|
}[];
|
|
55
|
-
tool_results?:
|
|
56
|
-
call: {
|
|
57
|
-
name: string;
|
|
58
|
-
parameters: object;
|
|
59
|
-
};
|
|
60
|
-
outputs: object[];
|
|
61
|
-
}[];
|
|
74
|
+
tool_results?: AxAICohereChatRequestToolResults;
|
|
62
75
|
};
|
|
63
76
|
export type AxAICohereChatResponse = {
|
|
77
|
+
response_id: string;
|
|
78
|
+
meta: {
|
|
79
|
+
billed_units: {
|
|
80
|
+
input_tokens: number;
|
|
81
|
+
output_tokens: number;
|
|
82
|
+
};
|
|
83
|
+
};
|
|
64
84
|
generation_id: string;
|
|
65
85
|
text: string;
|
|
66
86
|
finish_reason: 'COMPLETE' | 'ERROR' | 'ERROR_TOXIC' | 'ERROR_LIMIT' | 'USER_CANCEL' | 'MAX_TOKENS';
|
|
67
|
-
tool_calls:
|
|
68
|
-
name: string;
|
|
69
|
-
parameters: object;
|
|
70
|
-
}[];
|
|
87
|
+
tool_calls: AxAICohereChatResponseToolCalls;
|
|
71
88
|
};
|
|
72
89
|
export type AxAICohereChatResponseDelta = AxAICohereChatResponse & {
|
|
73
90
|
event_type: 'stream-start' | 'text-generation' | 'tool-calls-generation' | 'stream-end';
|
|
@@ -97,14 +97,11 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
97
97
|
: undefined;
|
|
98
98
|
const contents = req.chatPrompt
|
|
99
99
|
.filter((p) => p.role !== 'system')
|
|
100
|
-
.map((
|
|
101
|
-
|
|
102
|
-
throw new Error(`Chat content is empty (index: ${i})`);
|
|
103
|
-
}
|
|
104
|
-
switch (role) {
|
|
100
|
+
.map((msg, i) => {
|
|
101
|
+
switch (msg.role) {
|
|
105
102
|
case 'user': {
|
|
106
|
-
const parts = Array.isArray(
|
|
107
|
-
?
|
|
103
|
+
const parts = Array.isArray(msg.content)
|
|
104
|
+
? msg.content.map((c, i) => {
|
|
108
105
|
switch (c.type) {
|
|
109
106
|
case 'text':
|
|
110
107
|
return { text: c.text };
|
|
@@ -116,24 +113,24 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
116
113
|
throw new Error(`Chat prompt content type not supported (index: ${i})`);
|
|
117
114
|
}
|
|
118
115
|
})
|
|
119
|
-
: [{ text:
|
|
116
|
+
: [{ text: msg.content }];
|
|
120
117
|
return {
|
|
121
118
|
role: 'user',
|
|
122
119
|
parts
|
|
123
120
|
};
|
|
124
121
|
}
|
|
125
122
|
case 'assistant': {
|
|
126
|
-
if ('content' in
|
|
127
|
-
const parts = [{ text:
|
|
123
|
+
if ('content' in msg && typeof msg.content === 'string') {
|
|
124
|
+
const parts = [{ text: msg.content }];
|
|
128
125
|
return {
|
|
129
126
|
role: 'model',
|
|
130
127
|
parts
|
|
131
128
|
};
|
|
132
129
|
}
|
|
133
|
-
let
|
|
134
|
-
if ('functionCalls' in
|
|
135
|
-
|
|
136
|
-
|
|
130
|
+
let parts = [];
|
|
131
|
+
if ('functionCalls' in msg) {
|
|
132
|
+
parts =
|
|
133
|
+
msg.functionCalls?.map((f) => {
|
|
137
134
|
const args = typeof f.function.arguments === 'string'
|
|
138
135
|
? JSON.parse(f.function.arguments)
|
|
139
136
|
: f.function.arguments;
|
|
@@ -145,21 +142,20 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
145
142
|
};
|
|
146
143
|
}) ?? [];
|
|
147
144
|
}
|
|
148
|
-
const parts = functionCalls;
|
|
149
145
|
return {
|
|
150
146
|
role: 'model',
|
|
151
147
|
parts
|
|
152
148
|
};
|
|
153
149
|
}
|
|
154
150
|
case 'function': {
|
|
155
|
-
if (!('functionId' in
|
|
151
|
+
if (!('functionId' in msg)) {
|
|
156
152
|
throw new Error(`Chat prompt functionId is empty (index: ${i})`);
|
|
157
153
|
}
|
|
158
154
|
const parts = [
|
|
159
155
|
{
|
|
160
156
|
functionResponse: {
|
|
161
|
-
name:
|
|
162
|
-
response: { result:
|
|
157
|
+
name: msg.functionId,
|
|
158
|
+
response: { result: msg.result }
|
|
163
159
|
}
|
|
164
160
|
}
|
|
165
161
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/google-gemini/api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/google-gemini/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,31 @@ export class AxAIHuggingFace extends AxBaseAI {
|
|
|
50
50
|
: '';
|
|
51
51
|
const prompt = req.chatPrompt
|
|
52
52
|
?.map((msg) => {
|
|
53
|
-
|
|
53
|
+
switch (msg.role) {
|
|
54
|
+
case 'user':
|
|
55
|
+
return `User: ${msg.content}`;
|
|
56
|
+
case 'system':
|
|
57
|
+
return `System: ${msg.content}`;
|
|
58
|
+
case 'function':
|
|
59
|
+
return `Function Result: ${msg.result}`;
|
|
60
|
+
case 'assistant': {
|
|
61
|
+
const fc = msg.functionCalls
|
|
62
|
+
?.map((fc) => {
|
|
63
|
+
const args = typeof fc.function.arguments === 'string'
|
|
64
|
+
? fc.function.arguments
|
|
65
|
+
: JSON.stringify(fc.function.arguments);
|
|
66
|
+
return `${fc.function.name}(${args})`;
|
|
67
|
+
})
|
|
68
|
+
.join('\n');
|
|
69
|
+
if (fc) {
|
|
70
|
+
return `Assistant: ${msg.content}\n Functions:\n${fc}`;
|
|
71
|
+
}
|
|
72
|
+
return `Assistant: ${msg.content}`;
|
|
73
|
+
}
|
|
74
|
+
default:
|
|
75
|
+
throw new Error(`Unknown role`);
|
|
76
|
+
}
|
|
77
|
+
//return `${msg.role}: ${msg.content}`;
|
|
54
78
|
})
|
|
55
79
|
.join('\n');
|
|
56
80
|
const inputs = `${functionsList} ${prompt}`.trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/huggingface/api.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAEL,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAA0B,EAAE,CACtE,eAAe,CAAC;IACd,KAAK,EAAE,oBAAoB,CAAC,mBAAmB;IAC/C,GAAG,qBAAqB,EAAE;CAC3B,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAA0B,EAAE,CACvE,eAAe,CAAC;IACd,KAAK,EAAE,oBAAoB,CAAC,mBAAmB;IAC/C,GAAG,6BAA6B,EAAE;CACnC,CAAC,CAAC;AASL,MAAM,OAAO,eAAgB,SAAQ,QAMpC;IACS,MAAM,CAAwB;IAEtC,YAAY,EACV,MAAM,EACN,MAAM,EACN,OAAO,EACqC;QAC5C,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,OAAO,GAAG;YACd,GAAG,4BAA4B,EAAE;YACjC,GAAG,MAAM;SACV,CAAC;QACF,KAAK,CAAC;YACJ,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,sCAAsC;YAC9C,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE;YAC9C,SAAS,EAAE,sBAAsB;YACjC,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE;YAChC,OAAO;YACP,UAAU,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE;SACnD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;IACxB,CAAC;IAEQ,cAAc;QACrB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,OAAO;YACL,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,CAAC,EAAE,MAAM,CAAC,CAAC;YACX,eAAe,EAAE,MAAM,CAAC,eAAe;SACvB,CAAC;IACrB,CAAC;IAEQ,eAAe,GAAG,CACzB,GAA4B;IAC5B,6DAA6D;IAC7D,OAAmC,EACJ,EAAE;QACjC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAE7C,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS;YACjC,CAAC,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI;YAC3D,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU;YAC3B,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,OAAO,GAAG,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/huggingface/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { AxBaseAI, axBaseAIDefaultConfig, axBaseAIDefaultCreativeConfig } from '
|
|
|
2
2
|
import { axModelInfoOpenAI } from './info.js';
|
|
3
3
|
import { AxAIOpenAIEmbedModel, AxAIOpenAIModel } from './types.js';
|
|
4
4
|
export const axAIOpenAIDefaultConfig = () => structuredClone({
|
|
5
|
-
model: AxAIOpenAIModel.
|
|
5
|
+
model: AxAIOpenAIModel.GPT4O,
|
|
6
6
|
embedModel: AxAIOpenAIEmbedModel.TextEmbedding3Small,
|
|
7
7
|
...axBaseAIDefaultConfig()
|
|
8
8
|
});
|
|
@@ -169,7 +169,8 @@ export class AxAIOpenAI extends AxBaseAI {
|
|
|
169
169
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
170
170
|
({ delta: { content, role, tool_calls }, finish_reason }) => {
|
|
171
171
|
const finishReason = mapFinishReason(finish_reason);
|
|
172
|
-
const functionCalls = tool_calls
|
|
172
|
+
const functionCalls = tool_calls
|
|
173
|
+
?.map((v) => {
|
|
173
174
|
if (typeof v.id === 'string' &&
|
|
174
175
|
typeof v.index === 'number' &&
|
|
175
176
|
!sstate.indexIdMap[v.index]) {
|
|
@@ -177,7 +178,7 @@ export class AxAIOpenAI extends AxBaseAI {
|
|
|
177
178
|
}
|
|
178
179
|
const id = sstate.indexIdMap[v.index];
|
|
179
180
|
if (!id) {
|
|
180
|
-
|
|
181
|
+
return null;
|
|
181
182
|
}
|
|
182
183
|
return {
|
|
183
184
|
id,
|
|
@@ -187,10 +188,8 @@ export class AxAIOpenAI extends AxBaseAI {
|
|
|
187
188
|
arguments: v.function.arguments
|
|
188
189
|
}
|
|
189
190
|
};
|
|
190
|
-
})
|
|
191
|
-
|
|
192
|
-
// AxChatResponseResult['functionCalls']
|
|
193
|
-
// >;
|
|
191
|
+
})
|
|
192
|
+
.filter((v) => v !== null);
|
|
194
193
|
return {
|
|
195
194
|
content,
|
|
196
195
|
role: role,
|
|
@@ -232,19 +231,16 @@ const mapFinishReason = (finishReason) => {
|
|
|
232
231
|
}
|
|
233
232
|
};
|
|
234
233
|
function createMessages(req) {
|
|
235
|
-
return req.chatPrompt.map((
|
|
236
|
-
|
|
237
|
-
throw new Error('Role does not support array content:' + v.role);
|
|
238
|
-
}
|
|
239
|
-
switch (v.role) {
|
|
234
|
+
return req.chatPrompt.map((msg) => {
|
|
235
|
+
switch (msg.role) {
|
|
240
236
|
case 'system':
|
|
241
|
-
return { role: 'system', content:
|
|
237
|
+
return { role: 'system', content: msg.content };
|
|
242
238
|
case 'user':
|
|
243
|
-
if (Array.isArray(
|
|
239
|
+
if (Array.isArray(msg.content)) {
|
|
244
240
|
return {
|
|
245
241
|
role: 'user',
|
|
246
|
-
name:
|
|
247
|
-
content:
|
|
242
|
+
name: msg.name,
|
|
243
|
+
content: msg.content.map((c) => {
|
|
248
244
|
switch (c.type) {
|
|
249
245
|
case 'text':
|
|
250
246
|
return { type: 'text', text: c.text };
|
|
@@ -261,13 +257,13 @@ function createMessages(req) {
|
|
|
261
257
|
})
|
|
262
258
|
};
|
|
263
259
|
}
|
|
264
|
-
return { role: 'user', content:
|
|
260
|
+
return { role: 'user', content: msg.content, name: msg.name };
|
|
265
261
|
case 'assistant':
|
|
266
262
|
return {
|
|
267
263
|
role: 'assistant',
|
|
268
|
-
content:
|
|
269
|
-
name:
|
|
270
|
-
tool_calls:
|
|
264
|
+
content: msg.content,
|
|
265
|
+
name: msg.name,
|
|
266
|
+
tool_calls: msg.functionCalls?.map((v) => ({
|
|
271
267
|
id: v.id,
|
|
272
268
|
type: 'function',
|
|
273
269
|
function: {
|
|
@@ -281,8 +277,8 @@ function createMessages(req) {
|
|
|
281
277
|
case 'function':
|
|
282
278
|
return {
|
|
283
279
|
role: 'tool',
|
|
284
|
-
content:
|
|
285
|
-
tool_call_id:
|
|
280
|
+
content: msg.result,
|
|
281
|
+
tool_call_id: msg.functionId
|
|
286
282
|
};
|
|
287
283
|
default:
|
|
288
284
|
throw new Error('Invalid role');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/openai/api.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAKL,oBAAoB,EAGpB,eAAe,EAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAqB,EAAE,CAC5D,eAAe,CAAC;IACd,KAAK,EAAE,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../../src/ai/openai/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,6 @@ export type AxFunctionJSONSchema = {
|
|
|
33
33
|
type: string;
|
|
34
34
|
properties?: Record<string, AxFunctionJSONSchema & {
|
|
35
35
|
enum?: string[];
|
|
36
|
-
default?: unknown;
|
|
37
36
|
description: string;
|
|
38
37
|
}>;
|
|
39
38
|
required?: string[];
|
|
@@ -105,7 +104,7 @@ export type AxChatRequest = {
|
|
|
105
104
|
}[];
|
|
106
105
|
} | {
|
|
107
106
|
role: 'function';
|
|
108
|
-
|
|
107
|
+
result: string;
|
|
109
108
|
functionId: string;
|
|
110
109
|
}>[];
|
|
111
110
|
functions?: Readonly<{
|