@agentica/core 0.45.0-dev.20260426 → 0.45.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 +136 -40
- package/lib/index.mjs.map +1 -1
- package/lib/orchestrate/cancel.js +102 -12
- package/lib/orchestrate/cancel.js.map +1 -1
- package/lib/orchestrate/select.js +102 -12
- package/lib/orchestrate/select.js.map +1 -1
- package/lib/utils/ChatGptCompletionMessageUtil.d.ts +12 -0
- package/lib/utils/ChatGptCompletionMessageUtil.js +20 -6
- package/lib/utils/ChatGptCompletionMessageUtil.js.map +1 -1
- package/lib/utils/ChatGptCompletionStreamingUtil.js +6 -2
- package/lib/utils/ChatGptCompletionStreamingUtil.js.map +1 -1
- package/package.json +3 -3
- package/src/orchestrate/cancel.ts +152 -38
- package/src/orchestrate/select.ts +136 -20
- package/src/utils/ChatGptCompletionMessageUtil.ts +19 -5
- package/src/utils/ChatGptCompletionStreamingUtil.ts +6 -2
|
@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
48
48
|
exports.cancel = cancel;
|
|
49
49
|
const __typia_transform__validateReport = __importStar(require("typia/lib/internal/_validateReport"));
|
|
50
50
|
const __typia_transform__llmApplicationFinalize = __importStar(require("typia/lib/internal/_llmApplicationFinalize"));
|
|
51
|
+
const utils_1 = require("@typia/utils");
|
|
51
52
|
const typia_1 = __importDefault(require("typia"));
|
|
52
53
|
const AgenticaConstant_1 = require("../constants/AgenticaConstant");
|
|
53
54
|
const AgenticaDefaultPrompt_1 = require("../constants/AgenticaDefaultPrompt");
|
|
@@ -270,14 +271,49 @@ function step(ctx, operations, retry, failures) {
|
|
|
270
271
|
if (tc.type !== "function" || tc.function.name !== "cancelFunctions") {
|
|
271
272
|
continue;
|
|
272
273
|
}
|
|
273
|
-
|
|
274
|
-
|
|
274
|
+
// LENIENT JSON PARSING
|
|
275
|
+
//
|
|
276
|
+
// A malformed JSON string is reported back to the LLM as a parse
|
|
277
|
+
// failure, mirroring `call.ts`. On success the parsed `.data` (never
|
|
278
|
+
// the `IJsonParseResult` wrapper itself) is forwarded to validation.
|
|
279
|
+
const parsed = FUNCTION.parse(tc.function.arguments);
|
|
280
|
+
if (parsed.success === false) {
|
|
281
|
+
failures.push({
|
|
282
|
+
kind: "parse",
|
|
283
|
+
id: tc.id,
|
|
284
|
+
name: tc.function.name,
|
|
285
|
+
failure: parsed,
|
|
286
|
+
});
|
|
287
|
+
continue;
|
|
288
|
+
}
|
|
289
|
+
const validation = FUNCTION.validate(parsed.data);
|
|
275
290
|
if (validation.success === false) {
|
|
276
291
|
failures.push({
|
|
292
|
+
kind: "validation",
|
|
277
293
|
id: tc.id,
|
|
278
294
|
name: tc.function.name,
|
|
279
295
|
validation,
|
|
280
296
|
});
|
|
297
|
+
continue;
|
|
298
|
+
}
|
|
299
|
+
// FUNCTION EXISTENCE
|
|
300
|
+
//
|
|
301
|
+
// `typia` only proves that `name` is a `string`; it cannot know which
|
|
302
|
+
// functions are currently selected. A name that is not stacked would
|
|
303
|
+
// otherwise be silently dropped by `cancelFunctionFromContext`, so
|
|
304
|
+
// report it back to the LLM as an `IValidation.IFailure`.
|
|
305
|
+
const referenceErrors = validateFunctionExistence(ctx, validation.data);
|
|
306
|
+
if (referenceErrors.length > 0) {
|
|
307
|
+
failures.push({
|
|
308
|
+
kind: "validation",
|
|
309
|
+
id: tc.id,
|
|
310
|
+
name: tc.function.name,
|
|
311
|
+
validation: {
|
|
312
|
+
success: false,
|
|
313
|
+
data: validation.data,
|
|
314
|
+
errors: referenceErrors,
|
|
315
|
+
},
|
|
316
|
+
});
|
|
281
317
|
}
|
|
282
318
|
}
|
|
283
319
|
}
|
|
@@ -299,11 +335,14 @@ function step(ctx, operations, retry, failures) {
|
|
|
299
335
|
else if (tc.function.name !== "cancelFunctions") {
|
|
300
336
|
continue;
|
|
301
337
|
}
|
|
302
|
-
|
|
303
|
-
|
|
338
|
+
// Reuse the lenient parser + validator so that arguments accepted
|
|
339
|
+
// by the VALIDATION retry above are processed consistently here.
|
|
340
|
+
const parsed = FUNCTION.parse(tc.function.arguments);
|
|
341
|
+
const validation = FUNCTION.validate(parsed.data);
|
|
342
|
+
if (validation.success === false) {
|
|
304
343
|
continue;
|
|
305
344
|
}
|
|
306
|
-
for (const reference of
|
|
345
|
+
for (const reference of validation.data.functions) {
|
|
307
346
|
(0, cancelFunctionFromContext_1.cancelFunctionFromContext)(ctx, reference, assistant === undefined ? undefined : { assistant });
|
|
308
347
|
}
|
|
309
348
|
}
|
|
@@ -322,25 +361,76 @@ function emendMessages(failures) {
|
|
|
322
361
|
id: f.id,
|
|
323
362
|
function: {
|
|
324
363
|
name: f.name,
|
|
325
|
-
arguments:
|
|
364
|
+
arguments: f.kind === "parse"
|
|
365
|
+
? f.failure.input
|
|
366
|
+
: JSON.stringify(f.validation.data),
|
|
326
367
|
},
|
|
327
368
|
},
|
|
328
369
|
],
|
|
329
370
|
},
|
|
330
371
|
{
|
|
331
372
|
role: "tool",
|
|
332
|
-
content: JSON.stringify(f.validation.errors),
|
|
333
373
|
tool_call_id: f.id,
|
|
374
|
+
content: f.kind === "parse"
|
|
375
|
+
? (0, utils_1.dedent) `
|
|
376
|
+
Invalid JSON format.
|
|
377
|
+
|
|
378
|
+
Here is the detailed parsing failure information,
|
|
379
|
+
including error messages and their locations within the input:
|
|
380
|
+
|
|
381
|
+
\`\`\`json
|
|
382
|
+
${JSON.stringify(f.failure.errors)}
|
|
383
|
+
\`\`\`
|
|
384
|
+
|
|
385
|
+
And here is the partially parsed data that was successfully
|
|
386
|
+
extracted before the error occurred:
|
|
387
|
+
|
|
388
|
+
\`\`\`json
|
|
389
|
+
${JSON.stringify(f.failure.data)}
|
|
390
|
+
\`\`\`
|
|
391
|
+
`
|
|
392
|
+
: [
|
|
393
|
+
"🚨 VALIDATION FAILURE: Your function arguments do not conform to the required schema.",
|
|
394
|
+
"",
|
|
395
|
+
"Each error below is computed absolute truth from rigorous type validation.",
|
|
396
|
+
"You must fix ALL errors to achieve 100% schema compliance.",
|
|
397
|
+
"",
|
|
398
|
+
utils_1.LlmJson.stringify(f.validation),
|
|
399
|
+
].join("\n"),
|
|
334
400
|
},
|
|
335
401
|
{
|
|
336
402
|
role: "system",
|
|
337
|
-
content:
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
"Correct it at the next function calling.",
|
|
341
|
-
].join("\n"),
|
|
403
|
+
content: f.kind === "parse"
|
|
404
|
+
? AgenticaSystemPrompt_1.AgenticaSystemPrompt.JSON_PARSE_ERROR.replace("${{FAILURE}}", JSON.stringify(f.failure))
|
|
405
|
+
: AgenticaSystemPrompt_1.AgenticaSystemPrompt.VALIDATE,
|
|
342
406
|
},
|
|
343
407
|
])
|
|
344
408
|
.flat();
|
|
345
409
|
}
|
|
410
|
+
/**
|
|
411
|
+
* Validate that every function to cancel is actually selected right now.
|
|
412
|
+
*
|
|
413
|
+
* `typia` validation only proves that `__IChatFunctionReference.name` is a
|
|
414
|
+
* `string`; it cannot know which functions are currently stacked. Without this
|
|
415
|
+
* check a name that is not selected would be silently dropped by
|
|
416
|
+
* `cancelFunctionFromContext`. The returned errors are fed back to the LLM
|
|
417
|
+
* through `emendMessages`, exactly like a type validation error - with the
|
|
418
|
+
* list of cancellable function names in `expected`.
|
|
419
|
+
*/
|
|
420
|
+
function validateFunctionExistence(ctx, data) {
|
|
421
|
+
const cancellable = ctx.stack.map(s => s.operation.name);
|
|
422
|
+
const expected = cancellable.length === 0
|
|
423
|
+
? "never"
|
|
424
|
+
: cancellable.map(name => JSON.stringify(name)).join(" | ");
|
|
425
|
+
return data.functions.flatMap((reference, i) => cancellable.includes(reference.name)
|
|
426
|
+
? []
|
|
427
|
+
: [{
|
|
428
|
+
path: `$input.functions[${i}].name`,
|
|
429
|
+
expected,
|
|
430
|
+
value: reference.name,
|
|
431
|
+
description: cancellable.length === 0
|
|
432
|
+
? `Function "${reference.name}" cannot be cancelled because no function is currently selected.`
|
|
433
|
+
: `Function "${reference.name}" is not in the current selection, so it cannot be cancelled.`,
|
|
434
|
+
}]);
|
|
435
|
+
}
|
|
346
436
|
//# sourceMappingURL=cancel.js.map
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,wBAoDC;;;AA3FD,wCAA+C;AAC/C,kDAA0B;AAU1B,oEAAiE;AACjE,8EAA2E;AAC3E,4EAAyE;AACzE,oDAA+E;AAC/E,sFAAmF;AACnF,wFAAqF;AACrF,oDAAiD;AAEjD,oFAAiF;AAEjF,MAAM,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAE3B,SAAS,CAAC,CAAC,CAAE,CAAC;AAgBlB,SAAsB,MAAM,CAC1B,GAAoB;;;QAEpB,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC5C,CAAC;QAED,MAAM,MAAM,GACR,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,MAAM,GAAoB,EAAE,CAAC;QACnC,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAO,UAAU,EAAE,CAAC,EAAE,EAAE;YACjD,OAAA,IAAI,iCAEG,GAAG,KACN,KAAK,EAAE,MAAM,CAAC,CAAC,CAAE,EACjB,QAAQ,EAAE,CAAO,CAAC,EAAE,EAAE;oBACpB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC,CAAA,KAEH,UAAU,EACV,CAAC,CACF,CAAA;UAAA,CACF,CACF,CAAC;QAEF,YAAY;QACZ,IACE,CAAC,MAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,SAAS,mCAAI,mCAAgB,CAAC,SAAS,CAAC,KAAK,IAAI;eAC3D,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EACnC,CAAC;YACD,OAAO,IAAI,CACT,GAAG,EACH,MAAM;iBACH,IAAI,EAAE;iBACN,GAAG,CACF,CAAC,CAAC,EAAE,CACF,GAAG,CAAC,UAAU,CAAC,KAAK;iBACjB,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAE;iBACjC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAE,CACrC,EACH,CAAC,CACF,CAAC;QACJ,CAAC;aACI,CAAC;YACJ,MAAM,SAAS,GACX,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;YAC5C,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;iBAC1C,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACb,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC;CAAA;AAED,SAAe,IAAI,CACjB,GAAoB,EACpB,UAA+B,EAC/B,KAAa,EACb,QAAqB;;;QAErB,OAAO;QACP,sBAAsB;QACtB,OAAO;QACP,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;YACzC,QAAQ,EAAE;gBACR,sBAAsB;gBACtB;oBACE,IAAI,EAAE,WAAW;oBACjB,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,UAAU;4BAChB,EAAE,EAAE,iBAAiB;4BACrB,QAAQ,EAAE;gCACR,IAAI,EAAE,iBAAiB;gCACvB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;6BAC9B;yBACF;qBACF;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,YAAY,EAAE,iBAAiB;oBAC/B,OAAO,EAAE,IAAI,CAAC,SAAS,CACrB,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,iBACnB,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,IACjC,CAAC,EAAE,CAAC,QAAQ,KAAK,MAAM;wBACxB,CAAC,CAAC;4BACE,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM;4BAC1B,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;4BACtB,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;yBACvB;wBACH,CAAC,CAAC,EAAE,CAAC,EACP,CAAC,CACJ;iBACF;gBACD,qBAAqB;gBACrB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,yBAAa,CAAC,CAAC,IAAI,EAAE;gBAC1C,aAAa;gBACb;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,oCAAwB,CAAC;iBAC3D;gBACD,gBAAgB;gBAChB;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EACL,MAAA,MAAA,MAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,YAAY,0CAAE,MAAM,mDAAG,GAAG,CAAC,SAAS,CAAC,mCAC9C,2CAAoB,CAAC,MAAM;iBACjC;gBACD,mBAAmB;gBACnB,GAAG,aAAa,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;gBAChC;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,6CAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;iBACjD;aACF;YACD,kBAAkB;YAClB,KAAK,EAAE,CAAC;oBACN,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE;wBACR,IAAI,EAAE,QAAQ,CAAC,IAAI;wBACnB,WAAW,EAAE,QAAQ,CAAC,WAAW;wBACjC;;;2BAGG;wBACH,UAAU,EAAE,QAAQ,CAAC,UAAiC;qBACvD;iBACkC,CAAC;YACtC,WAAW,EAAE,KAAK,KAAK,CAAC;gBACtB,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,UAAU;YACd,6BAA6B;SAC9B,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,CAAC,GAAS,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBAClC,OAAO,MAAM,CAAC,KAAK,CAAC;YACtB,CAAC;YACD,OAAO,2DAA4B,CAAC,KAAK,CAAC,MAAM,uBAAU,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACpF,CAAC,CAAA,CAAC,EAAE,CAAC;QAEL,OAAO;QACP,aAAa;QACb,OAAO;QACP,IAAI,KAAK,EAAE,GAAG,CAAC,MAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,KAAK,mCAAI,mCAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5D,MAAM,QAAQ,GAAe,EAAE,CAAC;YAChC,KAAK,MAAM,MAAM,IAAI,CAAC,MAAA,UAAU,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE,CAAC;gBAChD,KAAK,MAAM,EAAE,IAAI,MAAA,MAAM,CAAC,OAAO,CAAC,UAAU,mCAAI,EAAE,EAAE,CAAC;oBACjD,IAAI,EAAE,CAAC,IAAI,KAAK,UAAU,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;wBACrE,SAAS;oBACX,CAAC;oBAED,uBAAuB;oBACvB,EAAE;oBACF,iEAAiE;oBACjE,qEAAqE;oBACrE,qEAAqE;oBACrE,MAAM,MAAM,GAA8B,QAAQ,CAAC,KAAK,CACtD,EAAE,CAAC,QAAQ,CAAC,SAAS,CACtB,CAAC;oBACF,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;wBAC7B,QAAQ,CAAC,IAAI,CAAC;4BACZ,IAAI,EAAE,OAAO;4BACb,EAAE,EAAE,EAAE,CAAC,EAAE;4BACT,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;4BACtB,OAAO,EAAE,MAAM;yBAChB,CAAC,CAAC;wBACH,SAAS;oBACX,CAAC;oBACD,MAAM,UAAU,GACZ,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAiD,CAAC;oBACnF,IAAI,UAAU,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;wBACjC,QAAQ,CAAC,IAAI,CAAC;4BACZ,IAAI,EAAE,YAAY;4BAClB,EAAE,EAAE,EAAE,CAAC,EAAE;4BACT,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;4BACtB,UAAU;yBACX,CAAC,CAAC;wBACH,SAAS;oBACX,CAAC;oBAED,qBAAqB;oBACrB,EAAE;oBACF,sEAAsE;oBACtE,qEAAqE;oBACrE,mEAAmE;oBACnE,0DAA0D;oBAC1D,MAAM,eAAe,GAAyB,yBAAyB,CACrE,GAAG,EACH,UAAU,CAAC,IAAI,CAChB,CAAC;oBACF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBAC/B,QAAQ,CAAC,IAAI,CAAC;4BACZ,IAAI,EAAE,YAAY;4BAClB,EAAE,EAAE,EAAE,CAAC,EAAE;4BACT,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;4BACtB,UAAU,EAAE;gCACV,OAAO,EAAE,KAAK;gCACd,IAAI,EAAE,UAAU,CAAC,IAAI;gCACrB,MAAM,EAAE,eAAe;6BACxB;yBACF,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;QAED,OAAO;QACP,qBAAqB;QACrB,OAAO;QACP,KAAK,MAAM,MAAM,IAAI,CAAC,MAAA,UAAU,CAAC,OAAO,mCAAI,EAAE,CAAC,EAAE,CAAC;YAChD,MAAM,SAAS,GAAG,yDAA2B,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtE,uBAAuB;YACvB,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;gBACtC,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;oBAC3C,IAAI,EAAE,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBAC3B,SAAS;oBACX,CAAC;yBACI,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;wBAChD,SAAS;oBACX,CAAC;oBAED,kEAAkE;oBAClE,iEAAiE;oBACjE,MAAM,MAAM,GAA8B,QAAQ,CAAC,KAAK,CACtD,EAAE,CAAC,QAAQ,CAAC,SAAS,CACtB,CAAC;oBACF,MAAM,UAAU,GACZ,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAiD,CAAC;oBACnF,IAAI,UAAU,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;wBACjC,SAAS;oBACX,CAAC;oBAED,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;wBAClD,IAAA,qDAAyB,EACvB,GAAG,EACH,SAAS,EACT,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CACpD,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CAAA;AAED,SAAS,aAAa,CAAC,QAAoB;IACzC,OAAO,QAAQ;SACZ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACR;YACE,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,CAAC,CAAC,EAAE;oBACR,QAAQ,EAAE;wBACR,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,SAAS,EAAE,CAAC,CAAC,IAAI,KAAK,OAAO;4BAC3B,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK;4BACjB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;qBACtC;iBACF;aACF;SACmD;QACtD;YACE,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,CAAC,CAAC,EAAE;YAClB,OAAO,EAAE,CAAC,CAAC,IAAI,KAAK,OAAO;gBACzB,CAAC,CAAC,IAAA,cAAM,EAAA;;;;;;;gBAOF,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;;;;;;;gBAOhC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;;aAEjC;gBACH,CAAC,CAAC;oBACE,uFAAuF;oBACvF,EAAE;oBACF,4EAA4E;oBAC5E,4DAA4D;oBAC5D,EAAE;oBACF,eAAO,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;iBAChC,CAAC,IAAI,CAAC,IAAI,CAAC;SAC+B;QACjD;YACE,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC,CAAC,IAAI,KAAK,OAAO;gBACzB,CAAC,CAAC,2CAAoB,CAAC,gBAAgB,CAAC,OAAO,CAC3C,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAC1B;gBACH,CAAC,CAAC,2CAAoB,CAAC,QAAQ;SACgB;KACpD,CAAC;SACD,IAAI,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,yBAAyB,CAChC,GAAoB,EACpB,IAAqC;IAErC,MAAM,WAAW,GAAa,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAW,WAAW,CAAC,MAAM,KAAK,CAAC;QAC/C,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9D,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,EAAwB,EAAE,CACnE,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC;QAClC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC;gBACC,IAAI,EAAE,oBAAoB,CAAC,QAAQ;gBACnC,QAAQ;gBACR,KAAK,EAAE,SAAS,CAAC,IAAI;gBACrB,WAAW,EAAE,WAAW,CAAC,MAAM,KAAK,CAAC;oBACnC,CAAC,CAAC,aAAa,SAAS,CAAC,IAAI,kEAAkE;oBAC/F,CAAC,CAAC,aAAa,SAAS,CAAC,IAAI,+DAA+D;aAC/F,CAAC,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -48,6 +48,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
48
48
|
exports.select = select;
|
|
49
49
|
const __typia_transform__validateReport = __importStar(require("typia/lib/internal/_validateReport"));
|
|
50
50
|
const __typia_transform__llmApplicationFinalize = __importStar(require("typia/lib/internal/_llmApplicationFinalize"));
|
|
51
|
+
const utils_1 = require("@typia/utils");
|
|
51
52
|
const typia_1 = __importDefault(require("typia"));
|
|
52
53
|
const AgenticaConstant_1 = require("../constants/AgenticaConstant");
|
|
53
54
|
const AgenticaDefaultPrompt_1 = require("../constants/AgenticaDefaultPrompt");
|
|
@@ -326,14 +327,49 @@ function step(ctx, operations, retry, failures) {
|
|
|
326
327
|
if (tc.type !== "function" || tc.function.name !== "selectFunctions") {
|
|
327
328
|
continue;
|
|
328
329
|
}
|
|
329
|
-
|
|
330
|
-
|
|
330
|
+
// LENIENT JSON PARSING
|
|
331
|
+
//
|
|
332
|
+
// A malformed JSON string is reported back to the LLM as a parse
|
|
333
|
+
// failure, mirroring `call.ts`. On success the parsed `.data` (never
|
|
334
|
+
// the `IJsonParseResult` wrapper itself) is forwarded to validation.
|
|
335
|
+
const parsed = FUNCTION.parse(tc.function.arguments);
|
|
336
|
+
if (parsed.success === false) {
|
|
337
|
+
failures.push({
|
|
338
|
+
kind: "parse",
|
|
339
|
+
id: tc.id,
|
|
340
|
+
name: tc.function.name,
|
|
341
|
+
failure: parsed,
|
|
342
|
+
});
|
|
343
|
+
continue;
|
|
344
|
+
}
|
|
345
|
+
const validation = FUNCTION.validate(parsed.data);
|
|
331
346
|
if (validation.success === false) {
|
|
332
347
|
failures.push({
|
|
348
|
+
kind: "validation",
|
|
333
349
|
id: tc.id,
|
|
334
350
|
name: tc.function.name,
|
|
335
351
|
validation,
|
|
336
352
|
});
|
|
353
|
+
continue;
|
|
354
|
+
}
|
|
355
|
+
// FUNCTION EXISTENCE
|
|
356
|
+
//
|
|
357
|
+
// `typia` only proves that `name` is a `string`; it cannot know which
|
|
358
|
+
// functions exist at runtime. A hallucinated name would otherwise be
|
|
359
|
+
// silently dropped by `selectFunctionFromContext`, so report it back
|
|
360
|
+
// to the LLM as an `IValidation.IFailure`, just like a type error.
|
|
361
|
+
const referenceErrors = validateFunctionExistence(ctx, operations, validation.data);
|
|
362
|
+
if (referenceErrors.length > 0) {
|
|
363
|
+
failures.push({
|
|
364
|
+
kind: "validation",
|
|
365
|
+
id: tc.id,
|
|
366
|
+
name: tc.function.name,
|
|
367
|
+
validation: {
|
|
368
|
+
success: false,
|
|
369
|
+
data: validation.data,
|
|
370
|
+
errors: referenceErrors,
|
|
371
|
+
},
|
|
372
|
+
});
|
|
337
373
|
}
|
|
338
374
|
}
|
|
339
375
|
}
|
|
@@ -355,11 +391,14 @@ function step(ctx, operations, retry, failures) {
|
|
|
355
391
|
else if (tc.function.name !== "selectFunctions") {
|
|
356
392
|
continue;
|
|
357
393
|
}
|
|
358
|
-
|
|
359
|
-
|
|
394
|
+
// Reuse the lenient parser + validator so that arguments accepted
|
|
395
|
+
// by the VALIDATION retry above are processed consistently here.
|
|
396
|
+
const parsed = FUNCTION.parse(tc.function.arguments);
|
|
397
|
+
const validation = FUNCTION.validate(parsed.data);
|
|
398
|
+
if (validation.success === false) {
|
|
360
399
|
continue;
|
|
361
400
|
}
|
|
362
|
-
for (const reference of
|
|
401
|
+
for (const reference of validation.data.functions) {
|
|
363
402
|
(0, selectFunctionFromContext_1.selectFunctionFromContext)(ctx, reference, assistant === undefined ? undefined : { assistant });
|
|
364
403
|
}
|
|
365
404
|
}
|
|
@@ -378,25 +417,76 @@ function emendMessages(failures) {
|
|
|
378
417
|
id: f.id,
|
|
379
418
|
function: {
|
|
380
419
|
name: f.name,
|
|
381
|
-
arguments:
|
|
420
|
+
arguments: f.kind === "parse"
|
|
421
|
+
? f.failure.input
|
|
422
|
+
: JSON.stringify(f.validation.data),
|
|
382
423
|
},
|
|
383
424
|
},
|
|
384
425
|
],
|
|
385
426
|
},
|
|
386
427
|
{
|
|
387
428
|
role: "tool",
|
|
388
|
-
content: JSON.stringify(f.validation.errors),
|
|
389
429
|
tool_call_id: f.id,
|
|
430
|
+
content: f.kind === "parse"
|
|
431
|
+
? (0, utils_1.dedent) `
|
|
432
|
+
Invalid JSON format.
|
|
433
|
+
|
|
434
|
+
Here is the detailed parsing failure information,
|
|
435
|
+
including error messages and their locations within the input:
|
|
436
|
+
|
|
437
|
+
\`\`\`json
|
|
438
|
+
${JSON.stringify(f.failure.errors)}
|
|
439
|
+
\`\`\`
|
|
440
|
+
|
|
441
|
+
And here is the partially parsed data that was successfully
|
|
442
|
+
extracted before the error occurred:
|
|
443
|
+
|
|
444
|
+
\`\`\`json
|
|
445
|
+
${JSON.stringify(f.failure.data)}
|
|
446
|
+
\`\`\`
|
|
447
|
+
`
|
|
448
|
+
: [
|
|
449
|
+
"🚨 VALIDATION FAILURE: Your function arguments do not conform to the required schema.",
|
|
450
|
+
"",
|
|
451
|
+
"Each error below is computed absolute truth from rigorous type validation.",
|
|
452
|
+
"You must fix ALL errors to achieve 100% schema compliance.",
|
|
453
|
+
"",
|
|
454
|
+
utils_1.LlmJson.stringify(f.validation),
|
|
455
|
+
].join("\n"),
|
|
390
456
|
},
|
|
391
457
|
{
|
|
392
458
|
role: "system",
|
|
393
|
-
content:
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
"Correct it at the next function calling.",
|
|
397
|
-
].join("\n"),
|
|
459
|
+
content: f.kind === "parse"
|
|
460
|
+
? AgenticaSystemPrompt_1.AgenticaSystemPrompt.JSON_PARSE_ERROR.replace("${{FAILURE}}", JSON.stringify(f.failure))
|
|
461
|
+
: AgenticaSystemPrompt_1.AgenticaSystemPrompt.VALIDATE,
|
|
398
462
|
},
|
|
399
463
|
])
|
|
400
464
|
.flat();
|
|
401
465
|
}
|
|
466
|
+
/**
|
|
467
|
+
* Validate that every selected function actually exists.
|
|
468
|
+
*
|
|
469
|
+
* `typia` validation only proves that `__IChatFunctionReference.name` is a
|
|
470
|
+
* `string`; it cannot know which functions exist at runtime. Without this
|
|
471
|
+
* check a hallucinated name would be silently dropped by
|
|
472
|
+
* `selectFunctionFromContext`. The returned errors are fed back to the LLM
|
|
473
|
+
* through `emendMessages`, exactly like a type validation error - with the
|
|
474
|
+
* list of valid function names in `expected`.
|
|
475
|
+
*/
|
|
476
|
+
function validateFunctionExistence(ctx, candidates, data) {
|
|
477
|
+
const expected = candidates
|
|
478
|
+
.map(op => JSON.stringify(op.name))
|
|
479
|
+
.join(" | ");
|
|
480
|
+
return data.functions.flatMap((reference, i) => ctx.operations.flat.has(reference.name)
|
|
481
|
+
? []
|
|
482
|
+
: [{
|
|
483
|
+
path: `$input.functions[${i}].name`,
|
|
484
|
+
expected,
|
|
485
|
+
value: reference.name,
|
|
486
|
+
description: [
|
|
487
|
+
`Function "${reference.name}" does not exist.`,
|
|
488
|
+
"Select only from the functions provided by getApiFunctions().",
|
|
489
|
+
].join(" "),
|
|
490
|
+
}]);
|
|
491
|
+
}
|
|
402
492
|
//# sourceMappingURL=select.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../src/orchestrate/select.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../src/orchestrate/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
import type { ChatCompletion, ChatCompletionChunk, ChatCompletionMessageFunctionToolCall, ChatCompletionMessageToolCall } from "openai/resources";
|
|
2
2
|
declare function transformCompletionChunk(source: string | Uint8Array): ChatCompletionChunk;
|
|
3
3
|
declare function accumulate(origin: ChatCompletion, chunk: ChatCompletionChunk): ChatCompletion;
|
|
4
|
+
declare function mergeChunks(chunks: ChatCompletionChunk[]): ChatCompletion;
|
|
5
|
+
/**
|
|
6
|
+
* Replace any tool call's empty `arguments` with `"{}"`.
|
|
7
|
+
*
|
|
8
|
+
* MUST only be applied to a final, fully streamed completion. Running it while
|
|
9
|
+
* more chunks may still arrive would seed `"{}"` into a not-yet-complete tool
|
|
10
|
+
* call, and the remaining streamed argument chunks would then be appended onto
|
|
11
|
+
* it - corrupting the arguments into `{}{...}`.
|
|
12
|
+
*/
|
|
13
|
+
declare function fixEmptyToolArguments(completion: ChatCompletion): ChatCompletion;
|
|
4
14
|
declare function merge(chunks: ChatCompletionChunk[]): ChatCompletion;
|
|
5
15
|
declare function mergeChoice(acc: ChatCompletion.Choice, cur: ChatCompletionChunk.Choice): ChatCompletion.Choice;
|
|
6
16
|
declare function mergeToolCalls(acc: ChatCompletionMessageFunctionToolCall, cur: ChatCompletionChunk.Choice.Delta.ToolCall): ChatCompletionMessageToolCall;
|
|
@@ -8,6 +18,8 @@ export declare const ChatGptCompletionMessageUtil: {
|
|
|
8
18
|
transformCompletionChunk: typeof transformCompletionChunk;
|
|
9
19
|
accumulate: typeof accumulate;
|
|
10
20
|
merge: typeof merge;
|
|
21
|
+
mergeChunks: typeof mergeChunks;
|
|
22
|
+
fixEmptyToolArguments: typeof fixEmptyToolArguments;
|
|
11
23
|
mergeChoice: typeof mergeChoice;
|
|
12
24
|
mergeToolCalls: typeof mergeToolCalls;
|
|
13
25
|
};
|
|
@@ -73,13 +73,12 @@ function accumulate(origin, chunk) {
|
|
|
73
73
|
return Object.assign(Object.assign({}, origin), { choices,
|
|
74
74
|
usage });
|
|
75
75
|
}
|
|
76
|
-
function
|
|
77
|
-
var _a;
|
|
76
|
+
function mergeChunks(chunks) {
|
|
78
77
|
const firstChunk = chunks[0];
|
|
79
78
|
if (firstChunk === undefined) {
|
|
80
79
|
throw new Error("No chunks received");
|
|
81
80
|
}
|
|
82
|
-
|
|
81
|
+
return chunks.reduce(accumulate, {
|
|
83
82
|
id: firstChunk.id,
|
|
84
83
|
choices: [],
|
|
85
84
|
created: firstChunk.created,
|
|
@@ -89,8 +88,18 @@ function merge(chunks) {
|
|
|
89
88
|
service_tier: firstChunk.service_tier,
|
|
90
89
|
system_fingerprint: firstChunk.system_fingerprint,
|
|
91
90
|
});
|
|
92
|
-
|
|
93
|
-
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Replace any tool call's empty `arguments` with `"{}"`.
|
|
94
|
+
*
|
|
95
|
+
* MUST only be applied to a final, fully streamed completion. Running it while
|
|
96
|
+
* more chunks may still arrive would seed `"{}"` into a not-yet-complete tool
|
|
97
|
+
* call, and the remaining streamed argument chunks would then be appended onto
|
|
98
|
+
* it - corrupting the arguments into `{}{...}`.
|
|
99
|
+
*/
|
|
100
|
+
function fixEmptyToolArguments(completion) {
|
|
101
|
+
var _a;
|
|
102
|
+
(_a = completion.choices) === null || _a === void 0 ? void 0 : _a.forEach((choice) => {
|
|
94
103
|
var _a;
|
|
95
104
|
(_a = choice.message.tool_calls) === null || _a === void 0 ? void 0 : _a.filter(tc => tc.type === "function").forEach((toolCall) => {
|
|
96
105
|
if (toolCall.function.arguments === "") {
|
|
@@ -98,7 +107,10 @@ function merge(chunks) {
|
|
|
98
107
|
}
|
|
99
108
|
});
|
|
100
109
|
});
|
|
101
|
-
return
|
|
110
|
+
return completion;
|
|
111
|
+
}
|
|
112
|
+
function merge(chunks) {
|
|
113
|
+
return fixEmptyToolArguments(mergeChunks(chunks));
|
|
102
114
|
}
|
|
103
115
|
function mergeChoice(acc, cur) {
|
|
104
116
|
var _a;
|
|
@@ -184,6 +196,8 @@ exports.ChatGptCompletionMessageUtil = {
|
|
|
184
196
|
transformCompletionChunk,
|
|
185
197
|
accumulate,
|
|
186
198
|
merge,
|
|
199
|
+
mergeChunks,
|
|
200
|
+
fixEmptyToolArguments,
|
|
187
201
|
mergeChoice,
|
|
188
202
|
mergeToolCalls,
|
|
189
203
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,11 @@ function reduceStreamingWithDispatch(stream, eventProcessor, abortSignal) {
|
|
|
56
56
|
};
|
|
57
57
|
if (acc.object === "chat.completion.chunk") {
|
|
58
58
|
registerContext([acc, chunk].flatMap(v => { var _a; return (_a = v.choices) !== null && _a !== void 0 ? _a : []; }));
|
|
59
|
-
|
|
59
|
+
// Use `mergeChunks`, NOT `merge`: `merge` runs the empty-arguments
|
|
60
|
+
// fixup, which mid-stream seeds a still-incomplete tool call with "{}"
|
|
61
|
+
// so the remaining streamed argument chunks append onto it (`{}{...}`).
|
|
62
|
+
// The fixup is applied once, to the final completion, below.
|
|
63
|
+
return _1.ChatGptCompletionMessageUtil.mergeChunks([acc, chunk]);
|
|
60
64
|
}
|
|
61
65
|
registerContext((_a = chunk.choices) !== null && _a !== void 0 ? _a : []);
|
|
62
66
|
return _1.ChatGptCompletionMessageUtil.accumulate(acc, chunk);
|
|
@@ -81,7 +85,7 @@ function reduceStreamingWithDispatch(stream, eventProcessor, abortSignal) {
|
|
|
81
85
|
});
|
|
82
86
|
return completion;
|
|
83
87
|
}
|
|
84
|
-
return nullableCompletion;
|
|
88
|
+
return _1.ChatGptCompletionMessageUtil.fixEmptyToolArguments(nullableCompletion);
|
|
85
89
|
});
|
|
86
90
|
}
|
|
87
91
|
//# sourceMappingURL=ChatGptCompletionStreamingUtil.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatGptCompletionStreamingUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionStreamingUtil.ts"],"names":[],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ChatGptCompletionStreamingUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionStreamingUtil.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentica/core",
|
|
3
|
-
"version": "0.45.
|
|
3
|
+
"version": "0.45.1",
|
|
4
4
|
"description": "Agentic AI Library specialized in LLM Function Calling",
|
|
5
5
|
"author": "Wrtn Technologies",
|
|
6
6
|
"license": "MIT",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
39
|
"@modelcontextprotocol/sdk": "^1.12.0",
|
|
40
|
-
"openai": "^6.
|
|
40
|
+
"openai": "^6.38.0",
|
|
41
41
|
"typia": "^12.0.1"
|
|
42
42
|
},
|
|
43
43
|
"peerDependenciesMeta": {
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"@typia/unplugin": "^12.0.1",
|
|
62
62
|
"@typia/utils": "^12.0.1",
|
|
63
63
|
"@wrtnlabs/calculator-mcp": "^0.2.1",
|
|
64
|
-
"openai": "^6.
|
|
64
|
+
"openai": "^6.38.0",
|
|
65
65
|
"rimraf": "^6.0.1",
|
|
66
66
|
"rollup": "^4.34.8",
|
|
67
67
|
"ts-node": "^10.9.2",
|