(CC) Move continue nudge at the end of completion (#3611) * Move continue nudge at the end of completion Closes #3607 * Move continue message together with nudge

070de9df2dabb722a4194f7643c631716f202f87

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

Signed

default/content/presets/openai/Default.json+1 -1 Viewed

     "new_chat_prompt": "[Start a new Chat]",
     "new_group_chat_prompt": "[Start a new group chat. Group members: {{group}}]",
     "new_example_chat_prompt": "[Example Chat]",
 -    "continue_nudge_prompt": "[Continue the following message. Do not include ANY parts of the original message. Use capitalization and punctuation as if your reply is a part of the original message: {{lastChatMessage}}]",
 +    "continue_nudge_prompt": "[Continue your last message without repeating its original content.]",
     "bias_preset_selected": "Default (none)",
     "reverse_proxy": "",
     "proxy_password": "",

default/content/settings.json+1 -1 Viewed

         "new_chat_prompt": "[Start a new Chat]",
         "new_group_chat_prompt": "[Start a new group chat. Group members: {{group}}]",
         "new_example_chat_prompt": "[Example Chat]",
 -        "continue_nudge_prompt": "[Continue the following message. Do not include ANY parts of the original message. Use capitalization and punctuation as if your reply is a part of the original message: {{lastChatMessage}}]",
 +        "continue_nudge_prompt": "[Continue your last message without repeating its original content.]",
         "bias_preset_selected": "Default (none)",
         "bias_presets": {
             "Default (none)": [],

public/scripts/openai.js+21 -12 Viewed

 const default_new_chat_prompt = '[Start a new Chat]';
 const default_new_group_chat_prompt = '[Start a new group chat. Group members: {{group}}]';
 const default_new_example_chat_prompt = '[Example Chat]';
 -const default_continue_nudge_prompt = '[Continue the following message. Do not include ANY parts of the original message. Use capitalization and punctuation as if your reply is a part of the original message: {{lastChatMessage}}]';
 +const default_continue_nudge_prompt = '[Continue your last message without repeating its original content.]';
 const default_bias = 'Default (none)';
 const default_personality_format = '{{personality}}';
 const default_scenario_format = '{{scenario}}';

+    }
     // Reserve budget for continue nudge
     let continueMessagecontinueMessageCollection = null;
     if (type === 'continue' && cyclePrompt && !oai_settings.continue_prefill) {
         const promptObject = {
             identifier: 'continueNudge',

             content: substituteParamsExtended(oai_settings.continue_nudge_prompt, { lastChatMessage: String(cyclePrompt).trim() }),
             system_prompt: true,
         };
         const continuePromptcontinueMessageCollection = new PromptMessageCollection(promptObject'continueNudge');
         const preparedPromptcontinueMessageIndex = promptManagermessages.preparePromptfindLastIndex(continuePromptx => !x.injected);
 -        continueMessage = await Message.fromPromptAsync(preparedPrompt);
 +        if (continueMessageIndex >= 0) {
 -        chatCompletion.reserveBudget(continueMessage);
 +            const continueMessage = messages.splice(continueMessageIndex, 1)[0];
 +            const prompt = new Prompt(continueMessage);
 +            const chatMessage = await Message.fromPromptAsync(promptManager.preparePrompt(prompt));
 +            continueMessageCollection.add(chatMessage);
 +        }
 +        const continueNudgePrompt = new Prompt(promptObject);
 +        const preparedNudgePrompt = promptManager.preparePrompt(continueNudgePrompt);
 +        const continueNudgeMessage = await Message.fromPromptAsync(preparedNudgePrompt);
 +        continueMessageCollection.add(continueNudgeMessage);
 +        chatCompletion.reserveBudget(continueMessageCollection);
+    }
     const lastChatPrompt = messages[messages.length - 1];

@@ -887,9 +896,9 @@ async function populateChatHistory(messages, prompts, chatCompletion, type = nul
887	896	}
888	897
889	898	// Insert and free continue nudge
890	899	if (type === 'continue' && continueMessagecontinueMessageCollection) {
891	900	chatCompletion.freeBudget(continueMessagecontinueMessageCollection);
892	901	chatCompletion.insertAtEndadd(continueMessagecontinueMessageCollection, 'chatHistory'-1);
893	902	}
894	903	}
895	904

     /**
      * Checks if the token budget can afford the tokens of the specified message.
+     *
      * @param {Message|MessageCollection} message - The message to check for affordability.
      * @returns {boolean} True if the budget can afford the message, false otherwise.
      */
     canAfford(message) {

      * Validates if the given argument is an instance of MessageCollection.
      * Throws an error if the validation fails.
+     *
      * @param {MessageCollection|Message} collection - The collection to validate.
      */
     validateMessageCollection(collection) {
         if (!(collection instanceof MessageCollection)) {

      * Checks if the token budget can afford the tokens of the given message.
      * Throws an error if the budget can't afford the message.
+     *
      * @param {Message|MessageCollection} message - The message to check.
      * @param {string} identifier - The identifier of the message.
      */
     checkTokenBudget(message, identifier) {