Alternative continue method for chat completions

public/index.html

@@ -1495,7 +1495,18 @@
                                             <input id="names_in_completion" type="checkbox" /><span data-i18n="Add character names">Add character names</span>
                                         </label>
                                         <div class="toggle-description justifyLeft">
-                                            <span data-i18n="Send names in the ChatML objects.">Send names in the ChatML objects. Helps the model to associate messages with characters.</span>
+                                            <span data-i18n="Send names in the message objects.">Send names in the message objects. Helps the model to associate messages with characters.</span>
+                                        </div>
+                                    </div>
+                                    <div class="range-block">
+                                        <label for="continue_prefill" class="checkbox_label widthFreeExpand">
+                                            <input id="continue_prefill" type="checkbox" />
+                                            <span data-i18n="Continue prefill">Continue prefill</span>
+                                        </label>
+                                        <div class="toggle-description justifyLeft">
+                                            <span data-i18n="Continue sends the last message.">
+                                                Continue sends the last message as assistant role instead of system message with instruction.
+                                            </span>
                                         </div>
                                     </div>
                                     <div class="range-block">

public/scripts/openai.js

@@ -239,6 +239,7 @@ const default_settings = {
     squash_system_messages: false,
     image_inlining: false,
     bypass_status_check: false,
+    continue_prefill: false,
     seed: -1,
 };
 
@@ -302,6 +303,7 @@ const oai_settings = {
     squash_system_messages: false,
     image_inlining: false,
     bypass_status_check: false,
+    continue_prefill: false,
     seed: -1,
 };
 
@@ -660,12 +662,20 @@ async function populateChatHistory(messages, prompts, chatCompletion, type = nul
     let continueMessage = null;
     const instruct = isOpenRouterWithInstruct();
     if (type === 'continue' && cyclePrompt && !instruct) {
-        const continuePrompt = new Prompt({
+        const promptObject = oai_settings.continue_prefill ?
-            identifier: 'continueNudge',
+            {
-            role: 'system',
+                identifier: 'continueNudge',
-            content: oai_settings.continue_nudge_prompt.replace('{{lastChatMessage}}', cyclePrompt),
+                role: 'assistant',
-            system_prompt: true,
+                content: cyclePrompt,
-        });
+                system_prompt: true,
+            } :
+            {
+                identifier: 'continueNudge',
+                role: 'system',
+                content: oai_settings.continue_nudge_prompt.replace('{{lastChatMessage}}', cyclePrompt),
+                system_prompt: true,
+            };
+        const continuePrompt = new Prompt(promptObject);
         const preparedPrompt = promptManager.preparePrompt(continuePrompt);
         continueMessage = Message.fromPrompt(preparedPrompt);
         chatCompletion.reserveBudget(continueMessage);
@@ -2376,6 +2386,7 @@ function loadOpenAISettings(data, settings) {
     oai_settings.new_example_chat_prompt = settings.new_example_chat_prompt ?? default_settings.new_example_chat_prompt;
     oai_settings.continue_nudge_prompt = settings.continue_nudge_prompt ?? default_settings.continue_nudge_prompt;
     oai_settings.squash_system_messages = settings.squash_system_messages ?? default_settings.squash_system_messages;
+    oai_settings.continue_prefill = settings.continue_prefill ?? default_settings.continue_prefill;
 
     if (settings.wrap_in_quotes !== undefined) oai_settings.wrap_in_quotes = !!settings.wrap_in_quotes;
     if (settings.names_in_completion !== undefined) oai_settings.names_in_completion = !!settings.names_in_completion;
@@ -2428,6 +2439,7 @@ function loadOpenAISettings(data, settings) {
     $('#openrouter_force_instruct').prop('checked', oai_settings.openrouter_force_instruct);
     $('#openrouter_group_models').prop('checked', oai_settings.openrouter_group_models);
     $('#squash_system_messages').prop('checked', oai_settings.squash_system_messages);
+    $('#continue_prefill').prop('checked', oai_settings.continue_prefill);
     if (settings.impersonation_prompt !== undefined) oai_settings.impersonation_prompt = settings.impersonation_prompt;
 
     $('#impersonation_prompt_textarea').val(oai_settings.impersonation_prompt);
@@ -2593,6 +2605,10 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
         ai21_model: settings.ai21_model,
         mistralai_model: settings.mistralai_model,
         custom_model: settings.custom_model,
+        custom_url: settings.custom_url,
+        custom_include_body: settings.custom_include_body,
+        custom_exclude_body: settings.custom_exclude_body,
+        custom_include_headers: settings.custom_include_headers,
         google_model: settings.google_model,
         temperature: settings.temp_openai,
         frequency_penalty: settings.freq_pen_openai,
@@ -2634,6 +2650,8 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
         use_alt_scale: settings.use_alt_scale,
         squash_system_messages: settings.squash_system_messages,
         image_inlining: settings.image_inlining,
+        bypass_status_check: settings.bypass_status_check,
+        continue_prefill: settings.continue_prefill,
         seed: settings.seed,
     };
 
@@ -3004,6 +3022,7 @@ function onSettingsPresetChange() {
         use_alt_scale: ['#use_alt_scale', 'use_alt_scale', true],
         squash_system_messages: ['#squash_system_messages', 'squash_system_messages', true],
         image_inlining: ['#openai_image_inlining', 'image_inlining', true],
+        continue_prefill: ['#continue_prefill', 'continue_prefill', true],
         seed: ['#seed_openai', 'seed', false],
     };
 
@@ -3584,17 +3603,17 @@ function onCustomizeParametersClick() {
         </div>
     </div>`);
 
-    template.find('#custom_include_body').val(oai_settings.custom_include_body).on('input', function() {
+    template.find('#custom_include_body').val(oai_settings.custom_include_body).on('input', function () {
         oai_settings.custom_include_body = String($(this).val());
         saveSettingsDebounced();
     });
 
-    template.find('#custom_exclude_body').val(oai_settings.custom_exclude_body).on('input', function() {
+    template.find('#custom_exclude_body').val(oai_settings.custom_exclude_body).on('input', function () {
         oai_settings.custom_exclude_body = String($(this).val());
         saveSettingsDebounced();
     });
 
-    template.find('#custom_include_headers').val(oai_settings.custom_include_headers).on('input', function() {
+    template.find('#custom_include_headers').val(oai_settings.custom_include_headers).on('input', function () {
         oai_settings.custom_include_headers = String($(this).val());
         saveSettingsDebounced();
     });
@@ -3928,6 +3947,11 @@ $(document).ready(async function () {
         saveSettingsDebounced();
     });
 
+    $('#continue_prefill').on('input', function () {
+        oai_settings.continue_prefill = !!$(this).prop('checked');
+        saveSettingsDebounced();
+    });
+
     $('#seed_openai').on('input', function () {
         oai_settings.seed = Number($(this).val());
         saveSettingsDebounced();