Fix ghost messages

01fc5113d74447c734df4e8dd54628abfc2dcbe7

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

public/script.js+8 -6 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 hasToolCalls = ToolManager.hasToolCalls(streamingProcessor.toolCalls);
                 const shouldDeleteMessage = ['', '...'].includes(lastMessage?.mes) && ['', '...'].includes(streamingProcessor?.result);
                                     hasToolCalls && shouldDeleteMessage && await deleteLastMessage();
 +                const invocationResult = await ToolManager.invokeFunctionTools(streamingProcessor.toolCalls);
 +                if (hasToolCalls) {
                     if (!invocationResult.invocations.length && shouldDeleteMessage) {
                         ToolManager.showToolCallError(invocationResult.errors);
                         unblockGeneration(type);

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

public/scripts/tool-calling.js+9 -3 Viewed

 /**
  * @typedef {object} ToolInvocationResult
  * @property {ToolInvocation[]} invocations Successful tool invocations
 - * @property {boolean} hadToolCalls Whether any tool calls were found
  * @property {Error[]} errors Errors that occurred during tool invocation
  */

+    }
     /**
 +     * Checks if the response data contains tool calls.
 +     * @param {object} data Response data
 +     * @returns {boolean} Whether the response data contains tool calls
 +     */
 +    static hasToolCalls(data) {
 +        return Array.isArray(ToolManager.#getToolCallsFromData(data));
 +    }
++
 +    /**
      * Check for function tool calls in the response data and invoke them.
      * @param {any} data Reply data
      * @returns {Promise<ToolInvocationResult>} Successful tool invocations

         /** @type {ToolInvocationResult} */
         const result = {
             invocations: [],
 -            hadToolCalls: false,
             errors: [],
         };
         const toolCalls = ToolManager.#getToolCallsFromData(data);

             const parameters = toolCall.function.arguments;
             const name = toolCall.function.name;
             const displayName = ToolManager.getDisplayName(name);
 -            result.hadToolCalls = true;
             const message = ToolManager.formatToolCallMessage(name, parameters);
             const toast = message && toastr.info(message, 'Tool Calling', { timeOut: 0 });