@agentica/core 0.41.2 → 0.41.3
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 +70 -12
- package/lib/index.mjs.map +1 -1
- package/lib/orchestrate/call.js +2 -2
- package/lib/orchestrate/call.js.map +1 -1
- package/lib/utils/JsonUtil.d.ts +2 -2
- package/lib/utils/JsonUtil.js +100 -28
- package/lib/utils/JsonUtil.js.map +1 -1
- package/package.json +1 -1
- package/src/orchestrate/call.ts +2 -2
- package/src/utils/JsonUtil.ts +140 -35
package/lib/orchestrate/call.js
CHANGED
|
@@ -200,7 +200,7 @@ function correctTypeError(ctx, callEvent, validateEvent, previousValidationError
|
|
|
200
200
|
"",
|
|
201
201
|
"You must fix ALL errors to achieve 100% schema compliance.",
|
|
202
202
|
"",
|
|
203
|
-
JsonUtil_1.JsonUtil.
|
|
203
|
+
JsonUtil_1.JsonUtil.stringifyValidationFailure(validateEvent.result),
|
|
204
204
|
].join("\n"),
|
|
205
205
|
},
|
|
206
206
|
systemPrompt: (_d = (_c = (_b = (_a = ctx.config) === null || _a === void 0 ? void 0 : _a.systemPrompt) === null || _b === void 0 ? void 0 : _b.validate) === null || _c === void 0 ? void 0 : _c.call(_b, previousValidationErrors.slice(0, -1))) !== null && _d !== void 0 ? _d : [
|
|
@@ -213,7 +213,7 @@ function correctTypeError(ctx, callEvent, validateEvent, previousValidationError
|
|
|
213
213
|
.map((ve, i) => [
|
|
214
214
|
`### ${i + 1}. Previous Validation Error`,
|
|
215
215
|
"",
|
|
216
|
-
JsonUtil_1.JsonUtil.
|
|
216
|
+
JsonUtil_1.JsonUtil.stringifyValidationFailure(ve.result),
|
|
217
217
|
].join("\n"))
|
|
218
218
|
.join("\n\n")),
|
|
219
219
|
]
|
|
@@ -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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"}
|
package/lib/utils/JsonUtil.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { IValidation } from "@samchon/openapi";
|
|
2
2
|
export declare const JsonUtil: {
|
|
3
3
|
parse: typeof parse;
|
|
4
|
-
|
|
4
|
+
stringifyValidationFailure: typeof stringifyValidationFailure;
|
|
5
5
|
};
|
|
6
6
|
declare function parse(str: string): any;
|
|
7
|
-
declare function
|
|
7
|
+
declare function stringifyValidationFailure(failure: IValidation.IFailure): string;
|
|
8
8
|
export {};
|
package/lib/utils/JsonUtil.js
CHANGED
|
@@ -6,14 +6,14 @@ const jsonrepair_1 = require("jsonrepair");
|
|
|
6
6
|
const Escaper_1 = require("typia/lib/utils/Escaper");
|
|
7
7
|
exports.JsonUtil = {
|
|
8
8
|
parse,
|
|
9
|
-
|
|
9
|
+
stringifyValidationFailure,
|
|
10
10
|
};
|
|
11
11
|
const pipe = (...fns) => (str) => fns.reduce((acc, fn) => fn(acc), str);
|
|
12
12
|
function parse(str) {
|
|
13
13
|
str = pipe(es_jsonkit_1.removeEmptyObjectPrefix, es_jsonkit_1.addMissingBraces, es_jsonkit_1.removeTrailingCommas, jsonrepair_1.jsonrepair)(str);
|
|
14
14
|
return JSON.parse(str);
|
|
15
15
|
}
|
|
16
|
-
function
|
|
16
|
+
function stringifyValidationFailure(failure) {
|
|
17
17
|
const usedErrors = new Set();
|
|
18
18
|
const jsonOutput = stringify({
|
|
19
19
|
value: failure.data,
|
|
@@ -43,13 +43,32 @@ function stringify(props) {
|
|
|
43
43
|
}
|
|
44
44
|
// Array
|
|
45
45
|
if (Array.isArray(value)) {
|
|
46
|
+
// Check for missing array element errors (path[])
|
|
47
|
+
const missingElementErrors = getMissingArrayElementErrors(path, errors, usedErrors);
|
|
48
|
+
const hasMissingElements = missingElementErrors.length > 0;
|
|
46
49
|
if (value.length === 0) {
|
|
50
|
+
// Empty array but has missing element errors - show placeholders
|
|
51
|
+
if (hasMissingElements) {
|
|
52
|
+
const innerIndent = " ".repeat(tab + 1);
|
|
53
|
+
const lines = [];
|
|
54
|
+
lines.push(`${indent}[${errorComment}`);
|
|
55
|
+
missingElementErrors.forEach((e, idx) => {
|
|
56
|
+
const errComment = ` // ❌ ${JSON.stringify([{ path: e.path, expected: e.expected, description: e.description }])}`;
|
|
57
|
+
const comma = idx < missingElementErrors.length - 1 ? "," : "";
|
|
58
|
+
lines.push(`${innerIndent}undefined${comma}${errComment}`);
|
|
59
|
+
});
|
|
60
|
+
lines.push(`${indent}]`);
|
|
61
|
+
return lines.join("\n");
|
|
62
|
+
}
|
|
47
63
|
return `${indent}[]${errorComment}`;
|
|
48
64
|
}
|
|
49
65
|
const lines = [];
|
|
50
66
|
lines.push(`${indent}[${errorComment}`);
|
|
51
67
|
value.forEach((item, index) => {
|
|
52
68
|
const itemPath = `${path}[${index}]`;
|
|
69
|
+
const isLastElement = index === value.length - 1;
|
|
70
|
+
// If there are missing element errors, this is not truly the last line
|
|
71
|
+
const needsComma = !isLastElement || hasMissingElements;
|
|
53
72
|
let itemStr = stringify({
|
|
54
73
|
value: item,
|
|
55
74
|
errors,
|
|
@@ -60,13 +79,12 @@ function stringify(props) {
|
|
|
60
79
|
usedErrors,
|
|
61
80
|
});
|
|
62
81
|
// Add comma before the error comment if not the last element
|
|
63
|
-
if (
|
|
82
|
+
if (needsComma) {
|
|
64
83
|
const itemLines = itemStr.split("\n");
|
|
65
84
|
const lastLine = itemLines[itemLines.length - 1];
|
|
66
85
|
const commentIndex = lastLine.indexOf(" //");
|
|
67
86
|
if (commentIndex !== -1) {
|
|
68
|
-
itemLines[itemLines.length - 1]
|
|
69
|
-
= `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
|
|
87
|
+
itemLines[itemLines.length - 1] = `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
|
|
70
88
|
}
|
|
71
89
|
else {
|
|
72
90
|
itemLines[itemLines.length - 1] += ",";
|
|
@@ -75,6 +93,15 @@ function stringify(props) {
|
|
|
75
93
|
}
|
|
76
94
|
lines.push(itemStr);
|
|
77
95
|
});
|
|
96
|
+
// Add missing element placeholders at the end for each [] error
|
|
97
|
+
if (hasMissingElements) {
|
|
98
|
+
const innerIndent = " ".repeat(tab + 1);
|
|
99
|
+
missingElementErrors.forEach((e, idx) => {
|
|
100
|
+
const errComment = ` // ❌ ${JSON.stringify([{ path: e.path, expected: e.expected, description: e.description }])}`;
|
|
101
|
+
const comma = idx < missingElementErrors.length - 1 ? "," : "";
|
|
102
|
+
lines.push(`${innerIndent}undefined${comma}${errComment}`);
|
|
103
|
+
});
|
|
104
|
+
}
|
|
78
105
|
lines.push(`${indent}]`);
|
|
79
106
|
return lines.join("\n");
|
|
80
107
|
}
|
|
@@ -93,13 +120,23 @@ function stringify(props) {
|
|
|
93
120
|
usedErrors,
|
|
94
121
|
});
|
|
95
122
|
}
|
|
96
|
-
// Get
|
|
97
|
-
const
|
|
98
|
-
//
|
|
123
|
+
// Get all entries from the object (including undefined values that have errors)
|
|
124
|
+
const allEntries = Object.entries(value);
|
|
125
|
+
// Split into defined and undefined entries
|
|
126
|
+
const definedEntries = allEntries.filter(([_, val]) => val !== undefined);
|
|
127
|
+
const undefinedEntryKeys = new Set(allEntries.filter(([_, val]) => val === undefined).map(([key]) => key));
|
|
128
|
+
// Find missing properties that have validation errors (not in object at all)
|
|
99
129
|
const missingKeys = getMissingProperties(path, value, errors);
|
|
100
|
-
// Combine
|
|
130
|
+
// Combine: defined entries + undefined entries with errors + missing properties
|
|
131
|
+
const undefinedKeysWithErrors = Array.from(undefinedEntryKeys).filter((key) => {
|
|
132
|
+
const propPath = Escaper_1.Escaper.variable(key)
|
|
133
|
+
? `${path}.${key}`
|
|
134
|
+
: `${path}[${JSON.stringify(key)}]`;
|
|
135
|
+
return errors.some(e => e.path.startsWith(propPath));
|
|
136
|
+
});
|
|
101
137
|
const allKeys = [
|
|
102
|
-
...
|
|
138
|
+
...definedEntries.map(([key]) => key),
|
|
139
|
+
...undefinedKeysWithErrors,
|
|
103
140
|
...missingKeys,
|
|
104
141
|
];
|
|
105
142
|
if (allKeys.length === 0) {
|
|
@@ -112,8 +149,10 @@ function stringify(props) {
|
|
|
112
149
|
? `${path}.${key}`
|
|
113
150
|
: `${path}[${JSON.stringify(key)}]`;
|
|
114
151
|
const propIndent = " ".repeat(tab + 1);
|
|
115
|
-
// Get the value (undefined for missing properties)
|
|
116
|
-
const val = missingKeys.includes(key)
|
|
152
|
+
// Get the value (undefined for missing properties or undefined entries)
|
|
153
|
+
const val = missingKeys.includes(key) || undefinedKeysWithErrors.includes(key)
|
|
154
|
+
? undefined
|
|
155
|
+
: value[key];
|
|
117
156
|
// Primitive property value (including undefined for missing properties)
|
|
118
157
|
if (val === undefined
|
|
119
158
|
|| val === null
|
|
@@ -121,16 +160,17 @@ function stringify(props) {
|
|
|
121
160
|
|| typeof val === "number"
|
|
122
161
|
|| typeof val === "string") {
|
|
123
162
|
const propErrorComment = getErrorComment(propPath, errors, usedErrors);
|
|
163
|
+
const keyStr = JSON.stringify(key);
|
|
124
164
|
const valueStr = val === undefined
|
|
125
|
-
? `${propIndent}
|
|
126
|
-
: `${propIndent}
|
|
165
|
+
? `${propIndent}${keyStr}: undefined`
|
|
166
|
+
: `${propIndent}${keyStr}: ${JSON.stringify(val)}`;
|
|
127
167
|
const withComma = index < array.length - 1 ? `${valueStr},` : valueStr;
|
|
128
168
|
const line = withComma + propErrorComment;
|
|
129
169
|
lines.push(line);
|
|
130
170
|
}
|
|
131
171
|
// Complex property value (object or array)
|
|
132
172
|
else {
|
|
133
|
-
const keyLine = `${propIndent}
|
|
173
|
+
const keyLine = `${propIndent}${JSON.stringify(key)}: `;
|
|
134
174
|
let valStr = stringify({
|
|
135
175
|
value: val,
|
|
136
176
|
errors,
|
|
@@ -147,8 +187,7 @@ function stringify(props) {
|
|
|
147
187
|
const lastLine = valLines[valLines.length - 1];
|
|
148
188
|
const commentIndex = lastLine.indexOf(" //");
|
|
149
189
|
if (commentIndex !== -1) {
|
|
150
|
-
valLines[valLines.length - 1]
|
|
151
|
-
= `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
|
|
190
|
+
valLines[valLines.length - 1] = `${lastLine.slice(0, commentIndex)},${lastLine.slice(commentIndex)}`;
|
|
152
191
|
}
|
|
153
192
|
else {
|
|
154
193
|
valLines[valLines.length - 1] += ",";
|
|
@@ -186,8 +225,19 @@ function getErrorComment(path, errors, usedErrors) {
|
|
|
186
225
|
})))}`;
|
|
187
226
|
}
|
|
188
227
|
/**
|
|
189
|
-
*
|
|
190
|
-
*
|
|
228
|
+
* Check if there are missing array element errors (path ending with []) Returns
|
|
229
|
+
* an array of error objects, one per missing element
|
|
230
|
+
*/
|
|
231
|
+
function getMissingArrayElementErrors(path, errors, usedErrors) {
|
|
232
|
+
const wildcardPath = `${path}[]`;
|
|
233
|
+
const missingErrors = errors.filter(e => e.path === wildcardPath);
|
|
234
|
+
// Mark these errors as used
|
|
235
|
+
missingErrors.forEach(e => usedErrors.add(e));
|
|
236
|
+
return missingErrors;
|
|
237
|
+
}
|
|
238
|
+
/**
|
|
239
|
+
* Find missing properties that have validation errors but don't exist in the
|
|
240
|
+
* data Returns array of property keys that should be displayed as undefined
|
|
191
241
|
*/
|
|
192
242
|
function getMissingProperties(path, value, errors) {
|
|
193
243
|
const missingKeys = new Set();
|
|
@@ -204,23 +254,45 @@ function getMissingProperties(path, value, errors) {
|
|
|
204
254
|
return Array.from(missingKeys);
|
|
205
255
|
}
|
|
206
256
|
/**
|
|
207
|
-
* Extract direct child property key if errorPath is a direct child of
|
|
208
|
-
* Returns null if not a direct child
|
|
257
|
+
* Extract direct child property key if errorPath is a direct child of
|
|
258
|
+
* parentPath Returns null if not a direct child
|
|
209
259
|
*
|
|
210
260
|
* Examples:
|
|
211
|
-
*
|
|
212
|
-
* -
|
|
213
|
-
* -
|
|
214
|
-
* -
|
|
261
|
+
*
|
|
262
|
+
* - ExtractDirectChildKey("$input", "$input.email") => "email"
|
|
263
|
+
* - ExtractDirectChildKey("$input", "$input.user.email") => null (grandchild)
|
|
264
|
+
* - ExtractDirectChildKey("$input.user", "$input.user.email") => "email"
|
|
265
|
+
* - ExtractDirectChildKey("$input", "$input[0]") => null (array index, not object
|
|
266
|
+
* property)
|
|
267
|
+
* - ExtractDirectChildKey("$input", "$input["foo-bar"]") => "foo-bar"
|
|
268
|
+
* - ExtractDirectChildKey("$input", "$input["foo"]["bar"]") => null (grandchild)
|
|
215
269
|
*/
|
|
216
270
|
function extractDirectChildKey(parentPath, errorPath) {
|
|
217
271
|
if (!errorPath.startsWith(parentPath)) {
|
|
218
272
|
return null;
|
|
219
273
|
}
|
|
220
274
|
const suffix = errorPath.slice(parentPath.length);
|
|
221
|
-
// Match ".propertyName" pattern (direct child property)
|
|
275
|
+
// Match ".propertyName" pattern (direct child property with dot notation)
|
|
222
276
|
// Should not contain additional dots or brackets after the property name
|
|
223
|
-
const
|
|
224
|
-
|
|
277
|
+
const dotMatch = suffix.match(/^\.([^.[\]]+)$/);
|
|
278
|
+
if (dotMatch !== null) {
|
|
279
|
+
return dotMatch[1];
|
|
280
|
+
}
|
|
281
|
+
// Match '["key"]' pattern (direct child property with bracket notation)
|
|
282
|
+
// The key is a JSON-encoded string
|
|
283
|
+
const bracketMatch = suffix.match(/^\[("[^"\\]*(?:\\.[^"\\]*)*")\]$/);
|
|
284
|
+
if (bracketMatch !== null) {
|
|
285
|
+
try {
|
|
286
|
+
const parsed = JSON.parse(bracketMatch[1]);
|
|
287
|
+
// Ensure it's a string key, not a number (array index)
|
|
288
|
+
if (typeof parsed === "string") {
|
|
289
|
+
return parsed;
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
catch (_a) {
|
|
293
|
+
// Invalid JSON, ignore
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
return null;
|
|
225
297
|
}
|
|
226
298
|
//# sourceMappingURL=JsonUtil.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonUtil.js","sourceRoot":"","sources":["../../src/utils/JsonUtil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"JsonUtil.js","sourceRoot":"","sources":["../../src/utils/JsonUtil.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/orchestrate/call.ts
CHANGED
|
@@ -249,7 +249,7 @@ async function correctTypeError(
|
|
|
249
249
|
"",
|
|
250
250
|
"You must fix ALL errors to achieve 100% schema compliance.",
|
|
251
251
|
"",
|
|
252
|
-
JsonUtil.
|
|
252
|
+
JsonUtil.stringifyValidationFailure(validateEvent.result),
|
|
253
253
|
].join("\n"),
|
|
254
254
|
},
|
|
255
255
|
systemPrompt: ctx.config?.systemPrompt?.validate?.(previousValidationErrors.slice(0, -1))
|
|
@@ -265,7 +265,7 @@ async function correctTypeError(
|
|
|
265
265
|
.map((ve, i) => [
|
|
266
266
|
`### ${i + 1}. Previous Validation Error`,
|
|
267
267
|
"",
|
|
268
|
-
JsonUtil.
|
|
268
|
+
JsonUtil.stringifyValidationFailure(ve.result),
|
|
269
269
|
].join("\n"))
|
|
270
270
|
.join("\n\n"),
|
|
271
271
|
// JSON.stringify(previousValidationErrors.slice(0, -1).map(e => e.result.errors)),
|