Limit tool calls recursion

7db85e7ed869023dacdb5127ec713ecbe38d5b65

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/script.js+7 -5 Viewed

  * @param {GenerateOptions} options Generation options
  * @param {boolean} dryRun Whether to actually generate a message or just assemble the prompt
  * @returns {Promise<any>} Returns a promise that resolves when the text is done generating.
  * @typedef {{automatic_trigger?: boolean, force_name2?: boolean, quiet_prompt?: string, quietToLoud?: boolean, skipWIAN?: boolean, force_chid?: number, signal?: AbortSignal, quietImage?: string, quietName?: string, depth?: number }} GenerateOptions
  */
 export async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage, quietName, depth = 0 } = {}, dryRun = false) {
     console.log('Generate entered');
     setGenerationProgress(0);
     generation_started = new Date();

     // Collect messages with usable content
     const canUseTools = ToolManager.isToolCallingSupported();
     const canPerformToolCalls = !dryRun && ToolManager.canPerformToolCalls(type) && depth < ToolManager.RECURSE_LIMIT;
     let coreChat = chat.filter(x => !x.is_system || (canUseTools && Array.isArray(x.extra?.tool_invocations)));
     if (type === 'swipe') {
         coreChat.pop();

@@ -4485,8 +4485,9 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4485	4485	}
4486	4486
4487	4487	streamingProcessor = null;
	4488	+ depth = depth + 1;
4488	4489	await ToolManager.saveFunctionToolInvocations(invocationResult.invocations);
4489	4490	return Generate('normal', { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage, quietName, depth }, dryRun);
4490	4491	}
4491	4492	}
4492	4493

@@ -4577,8 +4578,9 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4577	4578	return;
4578	4579	}
4579	4580
	4581	+ depth = depth + 1;
4580	4582	await ToolManager.saveFunctionToolInvocations(invocationResult.invocations);
4581	4583	return Generate('normal', { automatic_trigger, force_name2, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage, quietName, depth }, dryRun);
4582	4584	}
4583	4585	}
4584	4586

public/scripts/tool-calling.js+6 -0 Viewed

     static #INPUT_DELTA_KEY = '__input_json_delta';
     /**
 +     * The maximum number of times to recurse when parsing tool calls.
 +     * @type {number}
 +     */
 +    static RECURSE_LIMIT = 5;
++
 +    /**
      * Returns an Array of all tools that have been registered.
      * @type {ToolDefinition[]}
      */