@agentica/core 0.32.1 → 0.32.3-dev.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/lib/index.mjs +308 -334
- package/lib/index.mjs.map +1 -1
- package/lib/orchestrate/call.js +87 -107
- package/lib/orchestrate/call.js.map +1 -1
- package/lib/orchestrate/describe.js +5 -50
- package/lib/orchestrate/describe.js.map +1 -1
- package/lib/orchestrate/initialize.js +5 -50
- package/lib/orchestrate/initialize.js.map +1 -1
- package/lib/orchestrate/select.js +107 -126
- package/lib/orchestrate/select.js.map +1 -1
- package/lib/utils/AssistantMessageEmptyError.d.ts +7 -0
- package/lib/utils/AssistantMessageEmptyError.js +17 -0
- package/lib/utils/AssistantMessageEmptyError.js.map +1 -0
- package/lib/utils/ChatGptCompletionMessageUtil.js +15 -8
- package/lib/utils/ChatGptCompletionMessageUtil.js.map +1 -1
- package/lib/utils/ChatGptCompletionStreamingUtil.d.ts +8 -0
- package/lib/utils/ChatGptCompletionStreamingUtil.js +74 -0
- package/lib/utils/ChatGptCompletionStreamingUtil.js.map +1 -0
- package/lib/utils/__retry.d.ts +1 -0
- package/lib/utils/__retry.js +30 -0
- package/lib/utils/__retry.js.map +1 -0
- package/lib/utils/__retry.spec.d.ts +1 -0
- package/lib/utils/__retry.spec.js +172 -0
- package/lib/utils/__retry.spec.js.map +1 -0
- package/package.json +1 -1
- package/src/orchestrate/call.ts +88 -114
- package/src/orchestrate/describe.ts +7 -65
- package/src/orchestrate/initialize.ts +4 -64
- package/src/orchestrate/select.ts +111 -138
- package/src/utils/AssistantMessageEmptyError.ts +13 -0
- package/src/utils/ChatGptCompletionMessageUtil.ts +14 -0
- package/src/utils/ChatGptCompletionStreamingUtil.ts +81 -0
- package/src/utils/__retry.spec.ts +198 -0
- package/src/utils/__retry.ts +18 -0
|
@@ -53,8 +53,9 @@ const AgenticaDefaultPrompt_1 = require("../constants/AgenticaDefaultPrompt");
|
|
|
53
53
|
const AgenticaSystemPrompt_1 = require("../constants/AgenticaSystemPrompt");
|
|
54
54
|
const events_1 = require("../factory/events");
|
|
55
55
|
const histories_1 = require("../factory/histories");
|
|
56
|
-
const
|
|
57
|
-
const
|
|
56
|
+
const __retry_1 = require("../utils/__retry");
|
|
57
|
+
const AssistantMessageEmptyError_1 = require("../utils/AssistantMessageEmptyError");
|
|
58
|
+
const ChatGptCompletionStreamingUtil_1 = require("../utils/ChatGptCompletionStreamingUtil");
|
|
58
59
|
const StreamUtil_1 = require("../utils/StreamUtil");
|
|
59
60
|
const selectFunctionFromContext_1 = require("./internal/selectFunctionFromContext");
|
|
60
61
|
const CONTAINER = {
|
|
@@ -191,146 +192,126 @@ function select(ctx) {
|
|
|
191
192
|
}
|
|
192
193
|
function step(ctx, operations, retry, failures) {
|
|
193
194
|
return __awaiter(this, void 0, void 0, function* () {
|
|
194
|
-
var _a, _b, _c, _d, _e
|
|
195
|
+
var _a, _b, _c, _d, _e;
|
|
196
|
+
const _retryFn = (0, __retry_1.__get_retry)((_b = (_a = ctx.config) === null || _a === void 0 ? void 0 : _a.retry) !== null && _b !== void 0 ? _b : AgenticaConstant_1.AgenticaConstant.RETRY);
|
|
197
|
+
const retryFn = (fn) => __awaiter(this, void 0, void 0, function* () {
|
|
198
|
+
return _retryFn(fn).catch((e) => {
|
|
199
|
+
if (e instanceof AssistantMessageEmptyError_1.AssistantMessageEmptyError) {
|
|
200
|
+
return Symbol("emptyAssistantMessage");
|
|
201
|
+
}
|
|
202
|
+
throw e;
|
|
203
|
+
});
|
|
204
|
+
});
|
|
195
205
|
// ----
|
|
196
206
|
// EXECUTE CHATGPT API
|
|
197
207
|
// ----
|
|
198
|
-
const
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
208
|
+
const completion = yield retryFn((prevError) => __awaiter(this, void 0, void 0, function* () {
|
|
209
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
210
|
+
const stream = yield ctx.request("select", {
|
|
211
|
+
messages: [
|
|
212
|
+
// COMMON SYSTEM PROMPT
|
|
213
|
+
{
|
|
214
|
+
role: "system",
|
|
215
|
+
content: AgenticaDefaultPrompt_1.AgenticaDefaultPrompt.write(ctx.config),
|
|
216
|
+
},
|
|
217
|
+
// CANDIDATE FUNCTIONS
|
|
218
|
+
{
|
|
219
|
+
role: "assistant",
|
|
220
|
+
tool_calls: [
|
|
221
|
+
{
|
|
222
|
+
type: "function",
|
|
223
|
+
id: "getApiFunctions",
|
|
224
|
+
function: {
|
|
225
|
+
name: "getApiFunctions",
|
|
226
|
+
arguments: JSON.stringify({}),
|
|
227
|
+
},
|
|
215
228
|
},
|
|
229
|
+
],
|
|
230
|
+
},
|
|
231
|
+
{
|
|
232
|
+
role: "tool",
|
|
233
|
+
tool_call_id: "getApiFunctions",
|
|
234
|
+
content: JSON.stringify(operations.map(op => (Object.assign({ name: op.name, description: op.function.description }, (op.protocol === "http"
|
|
235
|
+
? {
|
|
236
|
+
method: op.function.method,
|
|
237
|
+
path: op.function.path,
|
|
238
|
+
tags: op.function.tags,
|
|
239
|
+
}
|
|
240
|
+
: {}))))),
|
|
241
|
+
},
|
|
242
|
+
// PREVIOUS HISTORIES
|
|
243
|
+
...ctx.histories.map(histories_1.decodeHistory).flat(),
|
|
244
|
+
// USER INPUT
|
|
245
|
+
{
|
|
246
|
+
role: "user",
|
|
247
|
+
content: ctx.prompt.contents.map(histories_1.decodeUserMessageContent),
|
|
248
|
+
},
|
|
249
|
+
// PREVIOUS ERROR
|
|
250
|
+
...(prevError instanceof AssistantMessageEmptyError_1.AssistantMessageEmptyWithReasoningError ? [
|
|
251
|
+
{
|
|
252
|
+
role: "assistant",
|
|
253
|
+
content: prevError.reasoning,
|
|
216
254
|
},
|
|
217
|
-
],
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
content: JSON.stringify(operations.map(op => (Object.assign({ name: op.name, description: op.function.description }, (op.protocol === "http"
|
|
223
|
-
? {
|
|
224
|
-
method: op.function.method,
|
|
225
|
-
path: op.function.path,
|
|
226
|
-
tags: op.function.tags,
|
|
227
|
-
}
|
|
228
|
-
: {}))))),
|
|
229
|
-
},
|
|
230
|
-
// PREVIOUS HISTORIES
|
|
231
|
-
...ctx.histories.map(histories_1.decodeHistory).flat(),
|
|
232
|
-
// USER INPUT
|
|
233
|
-
{
|
|
234
|
-
role: "user",
|
|
235
|
-
content: ctx.prompt.contents.map(histories_1.decodeUserMessageContent),
|
|
236
|
-
},
|
|
237
|
-
// SYSTEM PROMPT
|
|
238
|
-
{
|
|
239
|
-
role: "system",
|
|
240
|
-
content: (_d = (_c = (_b = (_a = ctx.config) === null || _a === void 0 ? void 0 : _a.systemPrompt) === null || _b === void 0 ? void 0 : _b.select) === null || _c === void 0 ? void 0 : _c.call(_b, ctx.histories)) !== null && _d !== void 0 ? _d : AgenticaSystemPrompt_1.AgenticaSystemPrompt.SELECT,
|
|
241
|
-
},
|
|
242
|
-
// TYPE CORRECTIONS
|
|
243
|
-
...emendMessages(failures !== null && failures !== void 0 ? failures : []),
|
|
244
|
-
],
|
|
245
|
-
// STACK FUNCTIONS
|
|
246
|
-
tools: [{
|
|
247
|
-
type: "function",
|
|
248
|
-
function: {
|
|
249
|
-
name: CONTAINER.functions[0].name,
|
|
250
|
-
description: CONTAINER.functions[0].description,
|
|
251
|
-
/**
|
|
252
|
-
* @TODO fix it
|
|
253
|
-
* The property and value have a type mismatch, but it works.
|
|
254
|
-
*/
|
|
255
|
-
parameters: CONTAINER.functions[0].parameters,
|
|
255
|
+
] : []),
|
|
256
|
+
// SYSTEM PROMPT
|
|
257
|
+
{
|
|
258
|
+
role: "system",
|
|
259
|
+
content: (_d = (_c = (_b = (_a = ctx.config) === null || _a === void 0 ? void 0 : _a.systemPrompt) === null || _b === void 0 ? void 0 : _b.select) === null || _c === void 0 ? void 0 : _c.call(_b, ctx.histories)) !== null && _d !== void 0 ? _d : AgenticaSystemPrompt_1.AgenticaSystemPrompt.SELECT,
|
|
256
260
|
},
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
content: choice.delta.content,
|
|
288
|
-
mpsc,
|
|
289
|
-
};
|
|
290
|
-
mpsc.produce(choice.delta.content);
|
|
291
|
-
const event = (0, events_1.createAssistantMessageEvent)({
|
|
292
|
-
stream: (0, StreamUtil_1.streamDefaultReaderToAsyncGenerator)(mpsc.consumer.getReader()),
|
|
293
|
-
done: () => mpsc.done(),
|
|
294
|
-
get: () => { var _a, _b; return (_b = (_a = selectContext[choice.index]) === null || _a === void 0 ? void 0 : _a.content) !== null && _b !== void 0 ? _b : ""; },
|
|
295
|
-
join: () => __awaiter(this, void 0, void 0, function* () {
|
|
296
|
-
yield mpsc.waitClosed();
|
|
297
|
-
return selectContext[choice.index].content;
|
|
298
|
-
}),
|
|
299
|
-
});
|
|
300
|
-
ctx.dispatch(event);
|
|
261
|
+
// TYPE CORRECTIONS
|
|
262
|
+
...emendMessages(failures !== null && failures !== void 0 ? failures : []),
|
|
263
|
+
],
|
|
264
|
+
// STACK FUNCTIONS
|
|
265
|
+
tools: [{
|
|
266
|
+
type: "function",
|
|
267
|
+
function: {
|
|
268
|
+
name: CONTAINER.functions[0].name,
|
|
269
|
+
description: CONTAINER.functions[0].description,
|
|
270
|
+
/**
|
|
271
|
+
* @TODO fix it
|
|
272
|
+
* The property and value have a type mismatch, but it works.
|
|
273
|
+
*/
|
|
274
|
+
parameters: CONTAINER.functions[0].parameters,
|
|
275
|
+
},
|
|
276
|
+
}],
|
|
277
|
+
tool_choice: retry === 0
|
|
278
|
+
? "auto"
|
|
279
|
+
: "required",
|
|
280
|
+
// parallel_tool_calls: false,
|
|
281
|
+
});
|
|
282
|
+
const completion = yield (0, ChatGptCompletionStreamingUtil_1.reduceStreamingWithDispatch)(stream, (props) => {
|
|
283
|
+
const event = (0, events_1.createAssistantMessageEvent)(props);
|
|
284
|
+
ctx.dispatch(event);
|
|
285
|
+
});
|
|
286
|
+
const allAssistantMessagesEmpty = completion.choices.every(v => v.message.tool_calls == null && v.message.content === "");
|
|
287
|
+
if (allAssistantMessagesEmpty) {
|
|
288
|
+
const firstChoice = completion.choices.at(0);
|
|
289
|
+
if (((_e = firstChoice === null || firstChoice === void 0 ? void 0 : firstChoice.message) === null || _e === void 0 ? void 0 : _e.reasoning) != null) {
|
|
290
|
+
throw new AssistantMessageEmptyError_1.AssistantMessageEmptyWithReasoningError((_g = (_f = firstChoice === null || firstChoice === void 0 ? void 0 : firstChoice.message) === null || _f === void 0 ? void 0 : _f.reasoning) !== null && _g !== void 0 ? _g : "");
|
|
301
291
|
}
|
|
302
|
-
|
|
303
|
-
if (acc.object === "chat.completion.chunk") {
|
|
304
|
-
registerContext([acc, chunk].flatMap(v => v.choices));
|
|
305
|
-
return ChatGptCompletionMessageUtil_1.ChatGptCompletionMessageUtil.merge([acc, chunk]);
|
|
292
|
+
throw new AssistantMessageEmptyError_1.AssistantMessageEmptyError();
|
|
306
293
|
}
|
|
307
|
-
|
|
308
|
-
return ChatGptCompletionMessageUtil_1.ChatGptCompletionMessageUtil.accumulate(acc, chunk);
|
|
294
|
+
return completion;
|
|
309
295
|
}));
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
get: () => { var _a; return (_a = v.message.content) !== null && _a !== void 0 ? _a : ""; },
|
|
319
|
-
join: () => __awaiter(this, void 0, void 0, function* () {
|
|
320
|
-
var _a;
|
|
321
|
-
return (_a = v.message.content) !== null && _a !== void 0 ? _a : "";
|
|
322
|
-
}),
|
|
323
|
-
});
|
|
324
|
-
ctx.dispatch(event);
|
|
296
|
+
if (typeof completion === "symbol") {
|
|
297
|
+
const event = (0, events_1.createAssistantMessageEvent)({
|
|
298
|
+
stream: (0, StreamUtil_1.toAsyncGenerator)(""),
|
|
299
|
+
done: () => true,
|
|
300
|
+
get: () => "",
|
|
301
|
+
join: () => __awaiter(this, void 0, void 0, function* () {
|
|
302
|
+
return "";
|
|
303
|
+
}),
|
|
325
304
|
});
|
|
305
|
+
ctx.dispatch(event);
|
|
306
|
+
return;
|
|
326
307
|
}
|
|
327
308
|
// ----
|
|
328
309
|
// VALIDATION
|
|
329
310
|
// ----
|
|
330
|
-
if (retry++ < ((
|
|
311
|
+
if (retry++ < ((_d = (_c = ctx.config) === null || _c === void 0 ? void 0 : _c.retry) !== null && _d !== void 0 ? _d : AgenticaConstant_1.AgenticaConstant.RETRY)) {
|
|
331
312
|
const failures = [];
|
|
332
313
|
for (const choice of completion.choices) {
|
|
333
|
-
for (const tc of (
|
|
314
|
+
for (const tc of (_e = choice.message.tool_calls) !== null && _e !== void 0 ? _e : []) {
|
|
334
315
|
if (tc.function.name !== "selectFunctions") {
|
|
335
316
|
continue;
|
|
336
317
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../src/orchestrate/select.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../src/orchestrate/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AssistantMessageEmptyWithReasoningError = exports.AssistantMessageEmptyError = void 0;
|
|
4
|
+
class AssistantMessageEmptyError extends Error {
|
|
5
|
+
constructor() {
|
|
6
|
+
super();
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
exports.AssistantMessageEmptyError = AssistantMessageEmptyError;
|
|
10
|
+
class AssistantMessageEmptyWithReasoningError extends AssistantMessageEmptyError {
|
|
11
|
+
constructor(reasoning) {
|
|
12
|
+
super();
|
|
13
|
+
this.reasoning = reasoning;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.AssistantMessageEmptyWithReasoningError = AssistantMessageEmptyWithReasoningError;
|
|
17
|
+
//# sourceMappingURL=AssistantMessageEmptyError.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AssistantMessageEmptyError.js","sourceRoot":"","sources":["../../src/utils/AssistantMessageEmptyError.ts"],"names":[],"mappings":";;;AAAA,MAAa,0BAA2B,SAAQ,KAAK;IACnD;QACE,KAAK,EAAE,CAAC;IACV,CAAC;CACF;AAJD,gEAIC;AAED,MAAa,uCAAwC,SAAQ,0BAA0B;IAErF,YAAY,SAAiB;QAC3B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;CACF;AAND,0FAMC"}
|
|
@@ -16,7 +16,7 @@ function transformCompletionChunk(source) {
|
|
|
16
16
|
function accumulate(origin, chunk) {
|
|
17
17
|
const choices = origin.choices;
|
|
18
18
|
chunk.choices.forEach((choice) => {
|
|
19
|
-
var _a, _b, _c, _d;
|
|
19
|
+
var _a, _b, _c, _d, _e;
|
|
20
20
|
const accChoice = choices[choice.index];
|
|
21
21
|
if (accChoice != null) {
|
|
22
22
|
choices[choice.index] = mergeChoice(accChoice, choice);
|
|
@@ -26,8 +26,7 @@ function accumulate(origin, chunk) {
|
|
|
26
26
|
index: choice.index,
|
|
27
27
|
finish_reason: (_a = choice.finish_reason) !== null && _a !== void 0 ? _a : null,
|
|
28
28
|
logprobs: (_b = choice.logprobs) !== null && _b !== void 0 ? _b : null,
|
|
29
|
-
message: {
|
|
30
|
-
tool_calls: choice.delta.tool_calls !== undefined
|
|
29
|
+
message: Object.assign({ tool_calls: choice.delta.tool_calls !== undefined
|
|
31
30
|
? choice.delta.tool_calls.reduce((acc, cur) => {
|
|
32
31
|
var _a, _b, _c, _d, _e;
|
|
33
32
|
acc[cur.index] = {
|
|
@@ -40,11 +39,10 @@ function accumulate(origin, chunk) {
|
|
|
40
39
|
};
|
|
41
40
|
return acc;
|
|
42
41
|
}, [])
|
|
43
|
-
: undefined,
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
},
|
|
42
|
+
: undefined, content: (_c = choice.delta.content) !== null && _c !== void 0 ? _c : null, refusal: (_d = choice.delta.refusal) !== null && _d !== void 0 ? _d : null, role: "assistant" }, ({
|
|
43
|
+
// for open router
|
|
44
|
+
reasoning: (_e = choice.delta.reasoning) !== null && _e !== void 0 ? _e : null,
|
|
45
|
+
})),
|
|
48
46
|
};
|
|
49
47
|
});
|
|
50
48
|
const usage = (() => {
|
|
@@ -110,6 +108,15 @@ function mergeChoice(acc, cur) {
|
|
|
110
108
|
acc.message.refusal += cur.delta.refusal;
|
|
111
109
|
}
|
|
112
110
|
}
|
|
111
|
+
// for open router
|
|
112
|
+
if (cur.delta.reasoning != null) {
|
|
113
|
+
if (acc.message.reasoning == null) {
|
|
114
|
+
acc.message.reasoning = cur.delta.reasoning;
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
acc.message.reasoning += cur.delta.reasoning;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
113
120
|
if (cur.delta.tool_calls != null) {
|
|
114
121
|
(_a = (_b = acc.message).tool_calls) !== null && _a !== void 0 ? _a : (_b.tool_calls = []);
|
|
115
122
|
const toolCalls = acc.message.tool_calls;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":";;;AAOA,6BAA6B;AAC7B,mDAAgD;AAChD,+EAA4E;AAE5E,SAAS,wBAAwB,CAAC,MAA2B;IAC3D,MAAM,GAAG,GACH,MAAM,YAAY,UAAU,CAAC,CAAC,CAAC,6BAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC3E,MAAM,MAAM,GAAwB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAwB,CAAC;IAC3E,6DAA6D;IAC7D,iCAAiC;IACjC,gEAAgE;IAChE,IAAI;IACJ,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,MAAsB,EAAE,KAA0B;IACpE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAC/B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;QAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG;YACtB,KAAK,EAAE,MAAM,CAAC,KAAK;YAEnB,aAAa,EACT,MAAA,MAAM,CAAC,aAAa,mCAChB,IAA0D;YAElE,QAAQ,EAAE,MAAA,MAAM,CAAC,QAAQ,mCAAI,IAAI;YACjC,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ChatCompletion, ChatCompletionChunk } from "openai/resources";
|
|
2
|
+
declare function reduceStreamingWithDispatch(stream: ReadableStream<ChatCompletionChunk>, eventProcessor: (props: {
|
|
3
|
+
stream: AsyncGenerator<string, undefined, undefined>;
|
|
4
|
+
done: () => boolean;
|
|
5
|
+
get: () => string;
|
|
6
|
+
join: () => Promise<string>;
|
|
7
|
+
}) => void): Promise<ChatCompletion>;
|
|
8
|
+
export { reduceStreamingWithDispatch };
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.reduceStreamingWithDispatch = reduceStreamingWithDispatch;
|
|
13
|
+
const _1 = require(".");
|
|
14
|
+
function reduceStreamingWithDispatch(stream, eventProcessor) {
|
|
15
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
const streamContext = new Map();
|
|
17
|
+
const nullableCompletion = yield _1.StreamUtil.reduce(stream, (accPromise, chunk) => __awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
const acc = yield accPromise;
|
|
19
|
+
const registerContext = (choices) => {
|
|
20
|
+
for (const choice of choices) {
|
|
21
|
+
/**
|
|
22
|
+
* @TODO fix it
|
|
23
|
+
* Sometimes, the complete message arrives along with a finish reason.
|
|
24
|
+
*/
|
|
25
|
+
if (choice.finish_reason != null) {
|
|
26
|
+
const context = streamContext.get(choice.index);
|
|
27
|
+
if (context != null) {
|
|
28
|
+
context.mpsc.close();
|
|
29
|
+
}
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
if (choice.delta.content == null || choice.delta.content === "") {
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
if (streamContext.has(choice.index)) {
|
|
36
|
+
const context = streamContext.get(choice.index);
|
|
37
|
+
context.content += choice.delta.content;
|
|
38
|
+
context.mpsc.produce(choice.delta.content);
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const mpsc = new _1.MPSC();
|
|
42
|
+
streamContext.set(choice.index, {
|
|
43
|
+
content: choice.delta.content,
|
|
44
|
+
mpsc,
|
|
45
|
+
});
|
|
46
|
+
mpsc.produce(choice.delta.content);
|
|
47
|
+
eventProcessor({
|
|
48
|
+
stream: (0, _1.streamDefaultReaderToAsyncGenerator)(mpsc.consumer.getReader()),
|
|
49
|
+
done: () => mpsc.done(),
|
|
50
|
+
get: () => { var _a, _b; return (_b = (_a = streamContext.get(choice.index)) === null || _a === void 0 ? void 0 : _a.content) !== null && _b !== void 0 ? _b : ""; },
|
|
51
|
+
join: () => __awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
yield mpsc.waitClosed();
|
|
53
|
+
return streamContext.get(choice.index).content;
|
|
54
|
+
}),
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
if (acc.object === "chat.completion.chunk") {
|
|
59
|
+
registerContext([acc, chunk].flatMap(v => v.choices));
|
|
60
|
+
return _1.ChatGptCompletionMessageUtil.merge([acc, chunk]);
|
|
61
|
+
}
|
|
62
|
+
registerContext(chunk.choices);
|
|
63
|
+
return _1.ChatGptCompletionMessageUtil.accumulate(acc, chunk);
|
|
64
|
+
}));
|
|
65
|
+
if (nullableCompletion == null) {
|
|
66
|
+
throw new Error("StreamUtil.reduce did not produce a ChatCompletion. Possible causes: the input stream was empty, invalid, or closed prematurely. "
|
|
67
|
+
+ "To debug: check that the stream is properly initialized and contains valid ChatCompletionChunk data. "
|
|
68
|
+
+ "You may also enable verbose logging upstream to inspect the stream contents. "
|
|
69
|
+
+ `Stream locked: ${stream.locked}.`);
|
|
70
|
+
}
|
|
71
|
+
return nullableCompletion;
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=ChatGptCompletionStreamingUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ChatGptCompletionStreamingUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionStreamingUtil.ts"],"names":[],"mappings":";;;;;;;;;;;AAgFS,kEAA2B;AA9EpC,wBAAwG;AAExG,SAAe,2BAA2B,CAAC,MAA2C,EAAE,cAK9E;;QACR,MAAM,aAAa,GAAG,IAAI,GAAG,EAAmD,CAAC;QAEjF,MAAM,kBAAkB,GAAG,MAAM,aAAU,CAAC,MAAM,CAA+C,MAAM,EAAE,CAAO,UAAU,EAAE,KAAK,EAAE,EAAE;YACnI,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC;YAE7B,MAAM,eAAe,GAAG,CACtB,OAAqC,EACrC,EAAE;gBACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B;;;uBAGG;oBACH,IAAI,MAAM,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC;wBACjC,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBAChD,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;4BACpB,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;wBACvB,CAAC;wBACD,SAAS;oBACX,CAAC;oBAED,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;wBAChE,SAAS;oBACX,CAAC;oBAED,IAAI,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;wBACpC,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAE,CAAC;wBACjD,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;wBACxC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC3C,SAAS;oBACX,CAAC;oBAED,MAAM,IAAI,GAAG,IAAI,OAAI,EAAU,CAAC;oBAEhC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE;wBAC9B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;wBAC7B,IAAI;qBACL,CAAC,CAAC;oBACH,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAEnC,cAAc,CAAC;wBACb,MAAM,EAAE,IAAA,sCAAmC,EAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;wBACtE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE;wBACvB,GAAG,EAAE,GAAG,EAAE,eAAC,OAAA,MAAA,MAAA,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,0CAAE,OAAO,mCAAI,EAAE,CAAA,EAAA;wBACzD,IAAI,EAAE,GAAS,EAAE;4BACf,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;4BACxB,OAAO,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAE,CAAC,OAAO,CAAC;wBAClD,CAAC,CAAA;qBACF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC;YACF,IAAI,GAAG,CAAC,MAAM,KAAK,uBAAuB,EAAE,CAAC;gBAC3C,eAAe,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtD,OAAO,+BAA4B,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YAC1D,CAAC;YACD,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC/B,OAAO,+BAA4B,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAA,CAAC,CAAC;QAEH,IAAI,kBAAkB,IAAI,IAAI,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CACb,mIAAmI;kBACjI,uGAAuG;kBACvG,+EAA+E;kBAC/E,kBAAkB,MAAM,CAAC,MAAM,GAAG,CACrC,CAAC;QACJ,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.__get_retry = __get_retry;
|
|
13
|
+
/**
|
|
14
|
+
* @internal
|
|
15
|
+
*/
|
|
16
|
+
function __get_retry(limit) {
|
|
17
|
+
const retryFn = (fn_1, prevError_1, ...args_1) => __awaiter(this, [fn_1, prevError_1, ...args_1], void 0, function* (fn, prevError, attempt = 0) {
|
|
18
|
+
try {
|
|
19
|
+
return yield fn(prevError);
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
if (attempt >= limit - 1) {
|
|
23
|
+
throw error;
|
|
24
|
+
}
|
|
25
|
+
return retryFn(fn, error, attempt + 1);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
return retryFn;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=__retry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"__retry.js","sourceRoot":"","sources":["../../src/utils/__retry.ts"],"names":[],"mappings":";;;;;;;;;;;AAGA,kCAcC;AAjBD;;GAEG;AACH,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,OAAO,GAAG,+BAAyG,EAAE,oEAAjG,EAAuC,EAAE,SAAmB,EAAE,UAAkB,CAAC;QACzG,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,OAAO,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,KAAK,CAAC;YACd,CAAC;YACD,OAAO,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC,CAAA,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|