wingbot 3.76.4-alpha.7 → 3.76.4-alpha.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/LLM.js +1 -0
- package/src/LLMSession.js +4 -2
- package/src/LLMType.js +21 -1
package/package.json
CHANGED
package/src/LLM.js
CHANGED
package/src/LLMSession.js
CHANGED
|
@@ -93,6 +93,7 @@ const stateData = require('./utils/stateData');
|
|
|
93
93
|
* @prop {string[]} [enum] - Allowed values for this parameter
|
|
94
94
|
* @prop {number} [minimum] - Minimum value for numeric parameters
|
|
95
95
|
* @prop {number} [maximum] - Maximum value for numeric parameters
|
|
96
|
+
* @prop {string} [format] - JSON Schema string format, e.g. 'date-time', 'email', 'uuid'
|
|
96
97
|
*/
|
|
97
98
|
|
|
98
99
|
/** @typedef {{ [key: string]: JsonSchemaProp }} SimpleJsonSchema */
|
|
@@ -972,12 +973,13 @@ class LLMSession {
|
|
|
972
973
|
* @returns {Promise<LLMMessage<any>>}
|
|
973
974
|
*/
|
|
974
975
|
async _generate (providerOptions = this._preset, logOptions = {}) {
|
|
976
|
+
const { maxToolCallRounds = MAX_TOOL_CALL_ROUNDS } = this._llm.llmOptions(providerOptions);
|
|
975
977
|
let result = await this._llm.generate(this, providerOptions, logOptions);
|
|
976
978
|
|
|
977
979
|
// the model may chain several rounds of tool calls before it produces
|
|
978
980
|
// a final text answer - keep resolving them until it stops (bounded)
|
|
979
981
|
let rounds = 0;
|
|
980
|
-
while (result.toolCalls?.length && rounds <
|
|
982
|
+
while (result.toolCalls?.length && rounds < maxToolCallRounds) {
|
|
981
983
|
rounds += 1;
|
|
982
984
|
const toolCalls = [];
|
|
983
985
|
const results = await Promise.all(
|
|
@@ -1016,7 +1018,7 @@ class LLMSession {
|
|
|
1016
1018
|
// a tool-call message (content === null) to the send pipeline
|
|
1017
1019
|
if (result.toolCalls?.length) {
|
|
1018
1020
|
this._llm.log.error(
|
|
1019
|
-
`LLMSession: reached
|
|
1021
|
+
`LLMSession: reached maxToolCallRounds (${maxToolCallRounds}), `
|
|
1020
1022
|
+ 'dropping pending tool calls and forcing a tool-less final answer',
|
|
1021
1023
|
{ toolCalls: result.toolCalls }
|
|
1022
1024
|
);
|
package/src/LLMType.js
CHANGED
|
@@ -25,6 +25,7 @@ class LLMType {
|
|
|
25
25
|
this._name = name;
|
|
26
26
|
|
|
27
27
|
this._description = null;
|
|
28
|
+
this._format = null;
|
|
28
29
|
this._min = null;
|
|
29
30
|
this._max = null;
|
|
30
31
|
|
|
@@ -155,6 +156,24 @@ class LLMType {
|
|
|
155
156
|
return this;
|
|
156
157
|
}
|
|
157
158
|
|
|
159
|
+
/**
|
|
160
|
+
* Sets the JSON Schema `format` for a string property.
|
|
161
|
+
*
|
|
162
|
+
* Supported values: `'date-time'`, `'time'`, `'date'`, `'duration'`,
|
|
163
|
+
* `'email'`, `'hostname'`, `'ipv4'`, `'ipv6'`, `'uuid'`.
|
|
164
|
+
*
|
|
165
|
+
* @example
|
|
166
|
+
* const createdAt = LLMType.string().format('date-time').description('Creation timestamp');
|
|
167
|
+
*
|
|
168
|
+
* @param {'date-time'|'time'|'date'|'duration'|'email'|
|
|
169
|
+
* 'hostname'|'ipv4'|'ipv6'|'uuid'|string} value
|
|
170
|
+
* @returns {this}
|
|
171
|
+
*/
|
|
172
|
+
format (value) {
|
|
173
|
+
this._format = value;
|
|
174
|
+
return this;
|
|
175
|
+
}
|
|
176
|
+
|
|
158
177
|
/**
|
|
159
178
|
* Sets minimum boundary and maps it to a type-specific JSON Schema keyword.
|
|
160
179
|
*
|
|
@@ -282,7 +301,8 @@ class LLMType {
|
|
|
282
301
|
_baseSchema () {
|
|
283
302
|
return /** @type {object} */ ({
|
|
284
303
|
...(this._description !== null && { description: this._description }),
|
|
285
|
-
...(this._name !== null && { name: this._name })
|
|
304
|
+
...(this._name !== null && { name: this._name }),
|
|
305
|
+
...(this._format !== null && { format: this._format })
|
|
286
306
|
});
|
|
287
307
|
}
|
|
288
308
|
|