Only delete message if had successful tool calls

447a7fba68298cdae8becd82acb3b2f97dc785fd

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

public/script.js+4 -4 Viewed

+            }
             if (canPerformToolCalls && Array.isArray(streamingProcessor.toolCalls) && streamingProcessor.toolCalls.length) {
 +                const invocationResult = await ToolManager.invokeFunctionTools(streamingProcessor.toolCalls);
 +                if (invocationResult.hadToolCalls) {
                     const lastMessage = chat[chat.length - 1];
                     const shouldDeleteMessage = ['', '...'].includes(lastMessage?.mes) && ['', '...'].includes(streamingProcessor.result);
                     shouldDeleteMessage && await deleteLastMessage();
 -                const invocationResult = await ToolManager.invokeFunctionTools(streamingProcessor.toolCalls);
 -                if (invocationResult.hadToolCalls) {
                     if (!invocationResult.invocations.length && shouldDeleteMessage) {
                         ToolManager.showToolCallError(invocationResult.errors);
                         unblockGeneration(type);

+        }
         if (canPerformToolCalls) {
 -            const shouldDeleteMessage = ['', '...'].includes(getMessage);
 -            shouldDeleteMessage && await deleteLastMessage();
             const invocationResult = await ToolManager.invokeFunctionTools(data);
             if (invocationResult.hadToolCalls) {
 +                const shouldDeleteMessage = ['', '...'].includes(getMessage);
 +                shouldDeleteMessage && await deleteLastMessage();
                 if (!invocationResult.invocations.length && shouldDeleteMessage) {
                     ToolManager.showToolCallError(invocationResult.errors);
                     unblockGeneration(type);