Don't split tool calls and tool results

591f61d35459ec2817ff251aa2392b4f7f7cdeaf

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

public/scripts/openai.js+15 -10 Viewed

             /** @type {import('./tool-calling.js').ToolInvocation[]} */
             const invocations = chatPrompt.invocations;
             const toolCallMessage = new Message(chatMessage.role, undefined, 'toolCall-' + chatMessage.identifier);
 +            const toolResultMessages = invocations.slice().reverse().map((invocation) => new Message('tool', invocation.result || '[No content]', invocation.id));
             toolCallMessage.setToolCalls(invocations);
             if (chatCompletion.canAffordcanAffordAll([toolCallMessage, ...toolResultMessages])) {
 -                chatCompletion.reserveBudget(toolCallMessage);
 +                for (const resultMessage of toolResultMessages) {
 -                for (const invocation of invocations.slice().reverse()) {
 +                    chatCompletion.insertAtStart(resultMessage, 'chatHistory');
 -                    const toolResultMessage = new Message('tool', invocation.result || '[No content]', invocation.id);
 -                    const canAfford = chatCompletion.canAfford(toolResultMessage);
 -                    if (!canAfford) {
 -                        break;
 -                    }
 -                    chatCompletion.insertAtStart(toolResultMessage, 'chatHistory');
+                }
 -                chatCompletion.freeBudget(toolCallMessage);
                 chatCompletion.insertAtStart(toolCallMessage, 'chatHistory');
 +            } else {
 +                break;
+            }
             continue;

+    }
     /**
 +     * Checks if the token budget can afford the tokens of all the specified messages.
 +     * @param {Message[]} messages - The messages to check for affordability.
 +     * @returns {boolean} True if the budget can afford all the messages, false otherwise.
 +     */
 +    canAffordAll(messages) {
 +        return 0 <= this.tokenBudget - messages.reduce((total, message) => total + message.getTokens(), 0);
 +    }
++
 +    /**
      * Checks if a message with the specified identifier exists in the collection.
+     *
      * @param {string} identifier - The identifier to check for existence.