@agentica/core 0.32.4 → 0.32.6
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/events/AgenticaJsonParseErrorEvent.d.ts +1 -0
- package/lib/events/AgenticaValidateEvent.d.ts +1 -0
- package/lib/factory/events.d.ts +2 -0
- package/lib/factory/events.js +3 -0
- package/lib/factory/events.js.map +1 -1
- package/lib/index.mjs +34 -13
- package/lib/index.mjs.map +1 -1
- package/lib/json/IAgenticaEventJson.d.ts +2 -0
- package/lib/orchestrate/call.js +10 -8
- package/lib/orchestrate/call.js.map +1 -1
- package/lib/orchestrate/cancel.js +2 -1
- package/lib/orchestrate/cancel.js.map +1 -1
- package/lib/orchestrate/select.js +6 -5
- package/lib/orchestrate/select.js.map +1 -1
- package/lib/utils/AssistantMessageEmptyError.js +9 -0
- package/lib/utils/AssistantMessageEmptyError.js.map +1 -1
- package/lib/utils/ChatGptCompletionMessageUtil.js +2 -1
- package/lib/utils/ChatGptCompletionMessageUtil.js.map +1 -1
- package/lib/utils/JsonUtil.d.ts +5 -0
- package/lib/utils/JsonUtil.js +13 -0
- package/lib/utils/JsonUtil.js.map +1 -0
- package/package.json +1 -1
- package/src/events/AgenticaJsonParseErrorEvent.ts +1 -0
- package/src/events/AgenticaValidateEvent.ts +2 -0
- package/src/factory/events.ts +5 -0
- package/src/json/IAgenticaEventJson.ts +4 -0
- package/src/orchestrate/call.ts +7 -3
- package/src/orchestrate/cancel.ts +2 -1
- package/src/orchestrate/select.ts +3 -2
- package/src/utils/AssistantMessageEmptyError.ts +8 -1
- package/src/utils/ChatGptCompletionMessageUtil.ts +2 -1
- package/src/utils/JsonUtil.ts +10 -0
package/lib/orchestrate/call.js
CHANGED
|
@@ -21,12 +21,13 @@ const __retry_1 = require("../utils/__retry");
|
|
|
21
21
|
const AssistantMessageEmptyError_1 = require("../utils/AssistantMessageEmptyError");
|
|
22
22
|
const ChatGptCompletionMessageUtil_1 = require("../utils/ChatGptCompletionMessageUtil");
|
|
23
23
|
const ChatGptCompletionStreamingUtil_1 = require("../utils/ChatGptCompletionStreamingUtil");
|
|
24
|
+
const JsonUtil_1 = require("../utils/JsonUtil");
|
|
24
25
|
const StreamUtil_1 = require("../utils/StreamUtil");
|
|
25
26
|
const cancelFunctionFromContext_1 = require("./internal/cancelFunctionFromContext");
|
|
26
27
|
function call(ctx, operations) {
|
|
27
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
var _a, _b, _c
|
|
29
|
-
const _retryFn = (0, __retry_1.__get_retry)(
|
|
29
|
+
var _a, _b, _c;
|
|
30
|
+
const _retryFn = (0, __retry_1.__get_retry)(1);
|
|
30
31
|
const retryFn = (fn) => __awaiter(this, void 0, void 0, function* () {
|
|
31
32
|
return _retryFn(fn).catch((e) => {
|
|
32
33
|
if (e instanceof AssistantMessageEmptyError_1.AssistantMessageEmptyError) {
|
|
@@ -94,7 +95,6 @@ function call(ctx, operations) {
|
|
|
94
95
|
const completion = yield (0, ChatGptCompletionStreamingUtil_1.reduceStreamingWithDispatch)(stream, (props) => {
|
|
95
96
|
const event = (0, events_1.createAssistantMessageEvent)(props);
|
|
96
97
|
void ctx.dispatch(event).catch(() => { });
|
|
97
|
-
ctx.abortSignal;
|
|
98
98
|
});
|
|
99
99
|
const allAssistantMessagesEmpty = completion.choices.every(v => v.message.tool_calls == null && v.message.content === "");
|
|
100
100
|
if (allAssistantMessagesEmpty) {
|
|
@@ -119,9 +119,9 @@ function call(ctx, operations) {
|
|
|
119
119
|
return [];
|
|
120
120
|
}
|
|
121
121
|
const executes = [];
|
|
122
|
-
const retry = (
|
|
122
|
+
const retry = (_b = (_a = ctx.config) === null || _a === void 0 ? void 0 : _a.retry) !== null && _b !== void 0 ? _b : AgenticaConstant_1.AgenticaConstant.RETRY;
|
|
123
123
|
for (const choice of completion.choices) {
|
|
124
|
-
for (const tc of (
|
|
124
|
+
for (const tc of (_c = choice.message.tool_calls) !== null && _c !== void 0 ? _c : []) {
|
|
125
125
|
if (tc.type === "function") {
|
|
126
126
|
const operation = operations.find(s => s.name === tc.function.name);
|
|
127
127
|
if (operation === undefined) {
|
|
@@ -145,7 +145,7 @@ function call(ctx, operations) {
|
|
|
145
145
|
function predicate(ctx, operation, toolCall, previousValidationErrors, life) {
|
|
146
146
|
return __awaiter(this, void 0, void 0, function* () {
|
|
147
147
|
// CHECK INPUT ARGUMENT
|
|
148
|
-
const call = parseArguments(operation, toolCall);
|
|
148
|
+
const call = parseArguments(operation, toolCall, life);
|
|
149
149
|
yield ctx.dispatch(call);
|
|
150
150
|
if (call.type === "jsonParseError") {
|
|
151
151
|
return correctJsonError(ctx, call, previousValidationErrors, life - 1);
|
|
@@ -157,6 +157,7 @@ function predicate(ctx, operation, toolCall, previousValidationErrors, life) {
|
|
|
157
157
|
id: toolCall.id,
|
|
158
158
|
operation,
|
|
159
159
|
result: check,
|
|
160
|
+
life,
|
|
160
161
|
});
|
|
161
162
|
yield ctx.dispatch(event);
|
|
162
163
|
return correctTypeError(ctx, call, event, [...previousValidationErrors, event], life - 1);
|
|
@@ -229,9 +230,9 @@ function correctJsonError(ctx, parseErrorEvent, previousValidationErrors, life)
|
|
|
229
230
|
});
|
|
230
231
|
});
|
|
231
232
|
}
|
|
232
|
-
function parseArguments(operation, toolCall) {
|
|
233
|
+
function parseArguments(operation, toolCall, life) {
|
|
233
234
|
try {
|
|
234
|
-
const data =
|
|
235
|
+
const data = JsonUtil_1.JsonUtil.parse(toolCall.function.arguments);
|
|
235
236
|
return (0, events_1.createCallEvent)({
|
|
236
237
|
id: toolCall.id,
|
|
237
238
|
operation,
|
|
@@ -244,6 +245,7 @@ function parseArguments(operation, toolCall) {
|
|
|
244
245
|
operation,
|
|
245
246
|
arguments: toolCall.function.arguments,
|
|
246
247
|
errorMessage: error instanceof Error ? error.message : String(error),
|
|
248
|
+
life,
|
|
247
249
|
});
|
|
248
250
|
}
|
|
249
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/orchestrate/call.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/orchestrate/call.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,6 +53,7 @@ const AgenticaDefaultPrompt_1 = require("../constants/AgenticaDefaultPrompt");
|
|
|
53
53
|
const AgenticaSystemPrompt_1 = require("../constants/AgenticaSystemPrompt");
|
|
54
54
|
const histories_1 = require("../factory/histories");
|
|
55
55
|
const ChatGptCompletionMessageUtil_1 = require("../utils/ChatGptCompletionMessageUtil");
|
|
56
|
+
const JsonUtil_1 = require("../utils/JsonUtil");
|
|
56
57
|
const StreamUtil_1 = require("../utils/StreamUtil");
|
|
57
58
|
const cancelFunctionFromContext_1 = require("./internal/cancelFunctionFromContext");
|
|
58
59
|
const CONTAINER = {
|
|
@@ -271,7 +272,7 @@ function step(ctx, operations, retry, failures) {
|
|
|
271
272
|
if (tc.function.name !== "cancelFunctions") {
|
|
272
273
|
continue;
|
|
273
274
|
}
|
|
274
|
-
const input =
|
|
275
|
+
const input = JsonUtil_1.JsonUtil.parse(tc.function.arguments);
|
|
275
276
|
const validation = (() => { const _io0 = input => Array.isArray(input.functions) && input.functions.every(elem => "object" === typeof elem && null !== elem && _io1(elem)); const _io1 = input => "string" === typeof input.reason && "string" === typeof input.name; const _vo0 = (input, _path, _exceptionable = true) => [(Array.isArray(input.functions) || _report(_exceptionable, {
|
|
276
277
|
path: _path + ".functions",
|
|
277
278
|
expected: "Array<___IChatFunctionReference>",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../src/orchestrate/cancel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../src/orchestrate/cancel.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ const histories_1 = require("../factory/histories");
|
|
|
56
56
|
const __retry_1 = require("../utils/__retry");
|
|
57
57
|
const AssistantMessageEmptyError_1 = require("../utils/AssistantMessageEmptyError");
|
|
58
58
|
const ChatGptCompletionStreamingUtil_1 = require("../utils/ChatGptCompletionStreamingUtil");
|
|
59
|
+
const JsonUtil_1 = require("../utils/JsonUtil");
|
|
59
60
|
const StreamUtil_1 = require("../utils/StreamUtil");
|
|
60
61
|
const selectFunctionFromContext_1 = require("./internal/selectFunctionFromContext");
|
|
61
62
|
const CONTAINER = {
|
|
@@ -193,8 +194,8 @@ function select(ctx) {
|
|
|
193
194
|
}
|
|
194
195
|
function step(ctx, operations, retry, failures) {
|
|
195
196
|
return __awaiter(this, void 0, void 0, function* () {
|
|
196
|
-
var _a, _b, _c
|
|
197
|
-
const _retryFn = (0, __retry_1.__get_retry)(
|
|
197
|
+
var _a, _b, _c;
|
|
198
|
+
const _retryFn = (0, __retry_1.__get_retry)(1);
|
|
198
199
|
const retryFn = (fn) => __awaiter(this, void 0, void 0, function* () {
|
|
199
200
|
return _retryFn(fn).catch((e) => {
|
|
200
201
|
if (e instanceof AssistantMessageEmptyError_1.AssistantMessageEmptyError) {
|
|
@@ -311,14 +312,14 @@ function step(ctx, operations, retry, failures) {
|
|
|
311
312
|
// ----
|
|
312
313
|
// VALIDATION
|
|
313
314
|
// ----
|
|
314
|
-
if (retry++ < ((
|
|
315
|
+
if (retry++ < ((_b = (_a = ctx.config) === null || _a === void 0 ? void 0 : _a.retry) !== null && _b !== void 0 ? _b : AgenticaConstant_1.AgenticaConstant.RETRY)) {
|
|
315
316
|
const failures = [];
|
|
316
317
|
for (const choice of completion.choices) {
|
|
317
|
-
for (const tc of (
|
|
318
|
+
for (const tc of (_c = choice.message.tool_calls) !== null && _c !== void 0 ? _c : []) {
|
|
318
319
|
if (tc.function.name !== "selectFunctions") {
|
|
319
320
|
continue;
|
|
320
321
|
}
|
|
321
|
-
const input =
|
|
322
|
+
const input = JsonUtil_1.JsonUtil.parse(tc.function.arguments);
|
|
322
323
|
const validation = (() => { const _io0 = input => Array.isArray(input.functions) && input.functions.every(elem => "object" === typeof elem && null !== elem && _io1(elem)); const _io1 = input => "string" === typeof input.reason && "string" === typeof input.name; const _vo0 = (input, _path, _exceptionable = true) => [(Array.isArray(input.functions) || _report(_exceptionable, {
|
|
323
324
|
path: _path + ".functions",
|
|
324
325
|
expected: "Array<___IChatFunctionReference>",
|
|
@@ -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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"}
|
|
@@ -4,6 +4,15 @@ exports.AssistantMessageEmptyWithReasoningError = exports.AssistantMessageEmptyE
|
|
|
4
4
|
class AssistantMessageEmptyError extends Error {
|
|
5
5
|
constructor() {
|
|
6
6
|
super();
|
|
7
|
+
const proto = new.target.prototype;
|
|
8
|
+
// eslint-disable-next-line
|
|
9
|
+
if (Object.setPrototypeOf) {
|
|
10
|
+
Object.setPrototypeOf(this, proto);
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
// eslint-disable-next-line
|
|
14
|
+
this.__proto__ = proto;
|
|
15
|
+
}
|
|
7
16
|
}
|
|
8
17
|
}
|
|
9
18
|
exports.AssistantMessageEmptyError = AssistantMessageEmptyError;
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"AssistantMessageEmptyError.js","sourceRoot":"","sources":["../../src/utils/AssistantMessageEmptyError.ts"],"names":[],"mappings":";;;AAAA,MAAa,0BAA2B,SAAQ,KAAK;IACnD;QACE,KAAK,EAAE,CAAC;QACR,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;QACnC,2BAA2B;QAC3B,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAAC,CAAC;aAC7D,CAAC;YACJ,2BAA2B;YAC1B,IAAY,CAAC,SAAS,GAAG,KAAK,CAAC;QAClC,CAAC;IACH,CAAC;CACF;AAXD,gEAWC;AAED,MAAa,uCAAwC,SAAQ,0BAA0B;IAErF,YAAY,SAAiB;QAC3B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;CACF;AAND,0FAMC"}
|
|
@@ -4,9 +4,10 @@ exports.ChatGptCompletionMessageUtil = void 0;
|
|
|
4
4
|
// import typia from "typia";
|
|
5
5
|
const ByteArrayUtil_1 = require("./ByteArrayUtil");
|
|
6
6
|
const ChatGptTokenUsageAggregator_1 = require("./ChatGptTokenUsageAggregator");
|
|
7
|
+
const JsonUtil_1 = require("./JsonUtil");
|
|
7
8
|
function transformCompletionChunk(source) {
|
|
8
9
|
const str = source instanceof Uint8Array ? ByteArrayUtil_1.ByteArrayUtil.toUtf8(source) : source;
|
|
9
|
-
const result =
|
|
10
|
+
const result = JsonUtil_1.JsonUtil.parse(str);
|
|
10
11
|
// const valid = typia.validate<ChatCompletionChunk>(result);
|
|
11
12
|
// if (valid.success === false) {
|
|
12
13
|
// console.error("Invalid ChatCompletionChunk", valid.errors);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":";;;AAOA,6BAA6B;AAC7B,mDAAgD;AAChD,+EAA4E;
|
|
1
|
+
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":";;;AAOA,6BAA6B;AAC7B,mDAAgD;AAChD,+EAA4E;AAC5E,yCAAsC;AAEtC,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,mBAAQ,CAAC,KAAK,CAAC,GAAG,CAAwB,CAAC;IAC/E,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,gBACP,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS;oBAC/C,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;wBAC1C,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG;4BACf,EAAE,EAAE,MAAA,GAAG,CAAC,EAAE,mCAAI,EAAE;4BAChB,IAAI,EAAE,UAAU;4BAChB,QAAQ,EAAE;gCACR,IAAI,EAAE,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,IAAI,mCAAI,EAAE;gCAC9B,SAAS,EAAE,MAAA,MAAA,GAAG,CAAC,QAAQ,0CAAE,SAAS,mCAAI,EAAE;6BACzC;yBACF,CAAC;wBACF,OAAO,GAAG,CAAC;oBACb,CAAC,EAAE,EAAqC,CAAC;oBAC3C,CAAC,CAAC,SAAS,EACb,OAAO,EAAE,MAAA,MAAM,CAAC,KAAK,CAAC,OAAO,mCAAI,IAAI,EACrC,OAAO,EAAE,MAAA,MAAM,CAAC,KAAK,CAAC,OAAO,mCAAI,IAAI,EACrC,IAAI,EAAE,WAAW,IACd,CAAC;gBACF,kBAAkB;gBAClB,SAAS,EAAE,MAAC,MAAM,CAAC,KAAgC,CAAC,SAAS,mCAAI,IAAI;aACtE,CAAC,CAC6B;SAClC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;QAClB,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YACxB,OAAO,MAAM,CAAC,KAAK,CAAC;QACtB,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,CAAC;QAED,OAAO,yDAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC;IAEL,uCACK,MAAM,KACT,OAAO;QACP,KAAK,IACL;AACJ,CAAC;AAED,SAAS,KAAK,CAAC,MAA6B;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;QACvC,EAAE,EAAE,UAAU,CAAC,EAAE;QACjB,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,MAAM,EAAE,iBAAiB;QACzB,KAAK,EAAE,SAAS;QAChB,YAAY,EAAE,UAAU,CAAC,YAAY;QACrC,kBAAkB,EAAE,UAAU,CAAC,kBAAkB;KAChC,CAAC,CAAC;IAErB,eAAe;IACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;QAChC,MAAA,MAAM,CAAC,OAAO,CAAC,UAAU,0CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;gBACvC,QAAQ,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,WAAW,CAAC,GAA0B,EAAE,GAA+B;;;IAC9E,IAAI,GAAG,CAAC,aAAa,IAAI,IAAI,IAAI,GAAG,CAAC,aAAa,IAAI,IAAI,EAAE,CAAC;QAC3D,GAAG,CAAC,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC;IACxC,CAAC;IAED,IAAI,GAAG,CAAC,QAAQ,IAAI,IAAI,IAAI,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;QACjD,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;QAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YAChC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QAC1C,CAAC;aACI,CAAC;YACJ,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;QAC9B,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YAChC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QAC1C,CAAC;aACI,CAAC;YACJ,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,kBAAkB;IAClB,IAAK,GAAG,CAAC,KAAgC,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QAC5D,IAAK,GAAG,CAAC,OAAkC,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YAC7D,GAAG,CAAC,OAAkC,CAAC,SAAS,GAAI,GAAG,CAAC,KAAgC,CAAC,SAAS,CAAC;QACtG,CAAC;aACI,CAAC;YACH,GAAG,CAAC,OAA4C,CAAC,SAAS,IAAK,GAAG,CAAC,KAA+B,CAAC,SAAS,CAAC;QAChH,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;QACjC,YAAA,GAAG,CAAC,OAAO,EAAC,UAAU,uCAAV,UAAU,GAAK,EAAE,EAAC;QAC9B,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;QAEzC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;;YACxC,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;gBAC7B,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,cAAc,CACxC,gBAAgB,EAChB,QAAQ,CACT,CAAC;gBACF,OAAO;YACT,CAAC;YAED,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG;gBAC1B,EAAE,EAAE,MAAA,QAAQ,CAAC,EAAE,mCAAI,EAAE;gBACrB,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE;oBACR,IAAI,EAAE,MAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,IAAI,mCAAI,EAAE;oBACnC,SAAS,EAAE,MAAA,MAAA,QAAQ,CAAC,QAAQ,0CAAE,SAAS,mCAAI,EAAE;iBAC9C;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,cAAc,CAAC,GAAkC,EAAE,GAA8C;;IACxG,IAAI,GAAG,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;QACzB,GAAG,CAAC,QAAQ,CAAC,SAAS,IAAI,MAAA,GAAG,CAAC,QAAQ,CAAC,SAAS,mCAAI,EAAE,CAAC;QACvD,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,MAAA,GAAG,CAAC,QAAQ,CAAC,IAAI,mCAAI,EAAE,CAAC;IAC/C,CAAC;IAED,GAAG,CAAC,EAAE,IAAI,MAAA,GAAG,CAAC,EAAE,mCAAI,EAAE,CAAC;IAEvB,OAAO,GAAG,CAAC;AACb,CAAC;AAEY,QAAA,4BAA4B,GAAG;IAC1C,wBAAwB;IACxB,UAAU;IACV,KAAK;IACL,WAAW;IACX,cAAc;CACf,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.JsonUtil = void 0;
|
|
4
|
+
function parse(str) {
|
|
5
|
+
if (str.startsWith("{}{") === true) {
|
|
6
|
+
str = str.substring(2);
|
|
7
|
+
}
|
|
8
|
+
return JSON.parse(str);
|
|
9
|
+
}
|
|
10
|
+
exports.JsonUtil = {
|
|
11
|
+
parse,
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=JsonUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JsonUtil.js","sourceRoot":"","sources":["../../src/utils/JsonUtil.ts"],"names":[],"mappings":";;;AAAA,SAAS,KAAK,CAAC,GAAW;IACxB,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;QACnC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAEY,QAAA,QAAQ,GAAG;IACtB,KAAK;CACN,CAAC"}
|
package/package.json
CHANGED
package/src/factory/events.ts
CHANGED
|
@@ -118,6 +118,7 @@ export function createJsonParseErrorEvent<Model extends ILlmSchema.Model>(props:
|
|
|
118
118
|
operation: AgenticaOperation<Model>;
|
|
119
119
|
arguments: string;
|
|
120
120
|
errorMessage: string;
|
|
121
|
+
life: number;
|
|
121
122
|
}): AgenticaJsonParseErrorEvent<Model> {
|
|
122
123
|
const created_at: string = new Date().toISOString();
|
|
123
124
|
return {
|
|
@@ -127,6 +128,7 @@ export function createJsonParseErrorEvent<Model extends ILlmSchema.Model>(props:
|
|
|
127
128
|
operation: props.operation,
|
|
128
129
|
arguments: props.arguments,
|
|
129
130
|
errorMessage: props.errorMessage,
|
|
131
|
+
life: props.life,
|
|
130
132
|
};
|
|
131
133
|
}
|
|
132
134
|
|
|
@@ -134,6 +136,7 @@ export function createValidateEvent<Model extends ILlmSchema.Model>(props: {
|
|
|
134
136
|
id: string;
|
|
135
137
|
operation: AgenticaOperation<Model>;
|
|
136
138
|
result: IValidation.IFailure;
|
|
139
|
+
life: number;
|
|
137
140
|
}): AgenticaValidateEvent<Model> {
|
|
138
141
|
const created_at: string = new Date().toISOString();
|
|
139
142
|
return {
|
|
@@ -142,12 +145,14 @@ export function createValidateEvent<Model extends ILlmSchema.Model>(props: {
|
|
|
142
145
|
created_at,
|
|
143
146
|
operation: props.operation,
|
|
144
147
|
result: props.result,
|
|
148
|
+
life: props.life,
|
|
145
149
|
toJSON: () => ({
|
|
146
150
|
type: "validate",
|
|
147
151
|
id: props.id,
|
|
148
152
|
created_at,
|
|
149
153
|
operation: props.operation.toJSON(),
|
|
150
154
|
result: props.result,
|
|
155
|
+
life: props.life,
|
|
151
156
|
}),
|
|
152
157
|
};
|
|
153
158
|
}
|
|
@@ -119,6 +119,8 @@ export namespace IAgenticaEventJson {
|
|
|
119
119
|
* Validation result as a failure.
|
|
120
120
|
*/
|
|
121
121
|
result: IValidation.IFailure;
|
|
122
|
+
|
|
123
|
+
life: number;
|
|
122
124
|
}
|
|
123
125
|
|
|
124
126
|
export interface IJsonParseError extends IBase<"jsonParseError"> {
|
|
@@ -138,6 +140,8 @@ export namespace IAgenticaEventJson {
|
|
|
138
140
|
* Error message of the JSON parse error.
|
|
139
141
|
*/
|
|
140
142
|
errorMessage: string;
|
|
143
|
+
|
|
144
|
+
life: number;
|
|
141
145
|
}
|
|
142
146
|
|
|
143
147
|
/**
|
package/src/orchestrate/call.ts
CHANGED
|
@@ -27,6 +27,7 @@ import { __get_retry } from "../utils/__retry";
|
|
|
27
27
|
import { AssistantMessageEmptyError, AssistantMessageEmptyWithReasoningError } from "../utils/AssistantMessageEmptyError";
|
|
28
28
|
import { ChatGptCompletionMessageUtil } from "../utils/ChatGptCompletionMessageUtil";
|
|
29
29
|
import { reduceStreamingWithDispatch } from "../utils/ChatGptCompletionStreamingUtil";
|
|
30
|
+
import { JsonUtil } from "../utils/JsonUtil";
|
|
30
31
|
import { StreamUtil, toAsyncGenerator } from "../utils/StreamUtil";
|
|
31
32
|
|
|
32
33
|
import { cancelFunctionFromContext } from "./internal/cancelFunctionFromContext";
|
|
@@ -35,7 +36,7 @@ export async function call<Model extends ILlmSchema.Model>(
|
|
|
35
36
|
ctx: AgenticaContext<Model> | MicroAgenticaContext<Model>,
|
|
36
37
|
operations: AgenticaOperation<Model>[],
|
|
37
38
|
): Promise<AgenticaExecuteEvent<Model>[]> {
|
|
38
|
-
const _retryFn = __get_retry(
|
|
39
|
+
const _retryFn = __get_retry(1);
|
|
39
40
|
const retryFn = async (fn: (prevError?: unknown) => Promise<OpenAI.ChatCompletion>) => {
|
|
40
41
|
return _retryFn(fn).catch((e) => {
|
|
41
42
|
if (e instanceof AssistantMessageEmptyError) {
|
|
@@ -111,7 +112,6 @@ export async function call<Model extends ILlmSchema.Model>(
|
|
|
111
112
|
const completion = await reduceStreamingWithDispatch(stream, (props) => {
|
|
112
113
|
const event: AgenticaAssistantMessageEvent = createAssistantMessageEvent(props);
|
|
113
114
|
void ctx.dispatch(event).catch(() => {});
|
|
114
|
-
ctx.abortSignal
|
|
115
115
|
});
|
|
116
116
|
|
|
117
117
|
const allAssistantMessagesEmpty = completion.choices.every(v => v.message.tool_calls == null && v.message.content === "");
|
|
@@ -183,6 +183,7 @@ async function predicate<Model extends ILlmSchema.Model>(
|
|
|
183
183
|
= parseArguments(
|
|
184
184
|
operation,
|
|
185
185
|
toolCall,
|
|
186
|
+
life,
|
|
186
187
|
);
|
|
187
188
|
await ctx.dispatch(call);
|
|
188
189
|
if (call.type === "jsonParseError") {
|
|
@@ -196,6 +197,7 @@ async function predicate<Model extends ILlmSchema.Model>(
|
|
|
196
197
|
id: toolCall.id,
|
|
197
198
|
operation,
|
|
198
199
|
result: check,
|
|
200
|
+
life,
|
|
199
201
|
});
|
|
200
202
|
await ctx.dispatch(event);
|
|
201
203
|
return correctTypeError(
|
|
@@ -293,9 +295,10 @@ async function correctJsonError<Model extends ILlmSchema.Model>(
|
|
|
293
295
|
function parseArguments<Model extends ILlmSchema.Model>(
|
|
294
296
|
operation: AgenticaOperation<Model>,
|
|
295
297
|
toolCall: OpenAI.ChatCompletionMessageToolCall,
|
|
298
|
+
life: number,
|
|
296
299
|
): AgenticaCallEvent<Model> | AgenticaJsonParseErrorEvent<Model> {
|
|
297
300
|
try {
|
|
298
|
-
const data: Record<string, unknown> =
|
|
301
|
+
const data: Record<string, unknown> = JsonUtil.parse(toolCall.function.arguments);
|
|
299
302
|
return createCallEvent({
|
|
300
303
|
id: toolCall.id,
|
|
301
304
|
operation,
|
|
@@ -308,6 +311,7 @@ function parseArguments<Model extends ILlmSchema.Model>(
|
|
|
308
311
|
operation,
|
|
309
312
|
arguments: toolCall.function.arguments,
|
|
310
313
|
errorMessage: error instanceof Error ? error.message : String(error),
|
|
314
|
+
life,
|
|
311
315
|
});
|
|
312
316
|
}
|
|
313
317
|
}
|
|
@@ -17,6 +17,7 @@ import { AgenticaDefaultPrompt } from "../constants/AgenticaDefaultPrompt";
|
|
|
17
17
|
import { AgenticaSystemPrompt } from "../constants/AgenticaSystemPrompt";
|
|
18
18
|
import { decodeHistory, decodeUserMessageContent } from "../factory/histories";
|
|
19
19
|
import { ChatGptCompletionMessageUtil } from "../utils/ChatGptCompletionMessageUtil";
|
|
20
|
+
import { JsonUtil } from "../utils/JsonUtil";
|
|
20
21
|
import { StreamUtil } from "../utils/StreamUtil";
|
|
21
22
|
|
|
22
23
|
import { cancelFunctionFromContext } from "./internal/cancelFunctionFromContext";
|
|
@@ -185,7 +186,7 @@ async function step<Model extends ILlmSchema.Model>(
|
|
|
185
186
|
continue;
|
|
186
187
|
}
|
|
187
188
|
|
|
188
|
-
const input: object =
|
|
189
|
+
const input: object = JsonUtil.parse(tc.function.arguments) as object;
|
|
189
190
|
const validation: IValidation<__IChatFunctionReference.IProps>
|
|
190
191
|
= typia.validate<__IChatFunctionReference.IProps>(input);
|
|
191
192
|
if (validation.success === false) {
|
|
@@ -20,6 +20,7 @@ import { decodeHistory, decodeUserMessageContent } from "../factory/histories";
|
|
|
20
20
|
import { __get_retry } from "../utils/__retry";
|
|
21
21
|
import { AssistantMessageEmptyError, AssistantMessageEmptyWithReasoningError } from "../utils/AssistantMessageEmptyError";
|
|
22
22
|
import { reduceStreamingWithDispatch } from "../utils/ChatGptCompletionStreamingUtil";
|
|
23
|
+
import { JsonUtil } from "../utils/JsonUtil";
|
|
23
24
|
import { toAsyncGenerator } from "../utils/StreamUtil";
|
|
24
25
|
|
|
25
26
|
import { selectFunctionFromContext } from "./internal/selectFunctionFromContext";
|
|
@@ -95,7 +96,7 @@ async function step<Model extends ILlmSchema.Model>(
|
|
|
95
96
|
retry: number,
|
|
96
97
|
failures?: IFailure[],
|
|
97
98
|
): Promise<void> {
|
|
98
|
-
const _retryFn = __get_retry(
|
|
99
|
+
const _retryFn = __get_retry(1);
|
|
99
100
|
const retryFn = async (fn: (prevError?: unknown) => Promise<OpenAI.ChatCompletion>) => {
|
|
100
101
|
return _retryFn(fn).catch((e) => {
|
|
101
102
|
if (e instanceof AssistantMessageEmptyError) {
|
|
@@ -228,7 +229,7 @@ async function step<Model extends ILlmSchema.Model>(
|
|
|
228
229
|
if (tc.function.name !== "selectFunctions") {
|
|
229
230
|
continue;
|
|
230
231
|
}
|
|
231
|
-
const input: object =
|
|
232
|
+
const input: object = JsonUtil.parse(tc.function.arguments) as object;
|
|
232
233
|
const validation: IValidation<__IChatFunctionReference.IProps>
|
|
233
234
|
= typia.validate<__IChatFunctionReference.IProps>(input);
|
|
234
235
|
if (validation.success === false) {
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
export class AssistantMessageEmptyError extends Error {
|
|
2
2
|
constructor() {
|
|
3
3
|
super();
|
|
4
|
+
const proto = new.target.prototype;
|
|
5
|
+
// eslint-disable-next-line
|
|
6
|
+
if (Object.setPrototypeOf) { Object.setPrototypeOf(this, proto); }
|
|
7
|
+
else {
|
|
8
|
+
// eslint-disable-next-line
|
|
9
|
+
(this as any).__proto__ = proto;
|
|
10
|
+
}
|
|
4
11
|
}
|
|
5
12
|
}
|
|
6
13
|
|
|
@@ -10,4 +17,4 @@ export class AssistantMessageEmptyWithReasoningError extends AssistantMessageEmp
|
|
|
10
17
|
super();
|
|
11
18
|
this.reasoning = reasoning;
|
|
12
19
|
}
|
|
13
|
-
}
|
|
20
|
+
}
|
|
@@ -8,11 +8,12 @@ import type {
|
|
|
8
8
|
// import typia from "typia";
|
|
9
9
|
import { ByteArrayUtil } from "./ByteArrayUtil";
|
|
10
10
|
import { ChatGptTokenUsageAggregator } from "./ChatGptTokenUsageAggregator";
|
|
11
|
+
import { JsonUtil } from "./JsonUtil";
|
|
11
12
|
|
|
12
13
|
function transformCompletionChunk(source: string | Uint8Array): ChatCompletionChunk {
|
|
13
14
|
const str
|
|
14
15
|
= source instanceof Uint8Array ? ByteArrayUtil.toUtf8(source) : source;
|
|
15
|
-
const result: ChatCompletionChunk =
|
|
16
|
+
const result: ChatCompletionChunk = JsonUtil.parse(str) as ChatCompletionChunk;
|
|
16
17
|
// const valid = typia.validate<ChatCompletionChunk>(result);
|
|
17
18
|
// if (valid.success === false) {
|
|
18
19
|
// console.error("Invalid ChatCompletionChunk", valid.errors);
|