Merge pull request #1596 from DonMoralez/staging

added exclude prefixes, modified sequence checker

public/index.html

@@ -1551,13 +1551,23 @@
                                         </div>
                                     </div>
                                     <div data-newbie-hidden class="range-block" data-source="claude">
+                                        <label for="claude_exclude_prefixes" title="Exclude Human/Assistant prefixes" class="checkbox_label widthFreeExpand">
+                                            <input id="claude_exclude_prefixes" type="checkbox" />
+                                            <span data-i18n="Exclude Human/Assistant prefixes">Exclude Human/Assistant prefixes</span>
+                                        </label>
+                                        <div class="toggle-description justifyLeft marginBot5">
+                                            <span data-i18n="Exclude Human/Assistant prefixes from being added to the prompt.">
+                                                Exclude Human/Assistant prefixes from being added to the prompt, except very first/last message, system prompt Human message and Assistant suffix.
+                                                Requires 'Add character names' checked.
+                                            </span>
+                                        </div>
                                         <label for="exclude_assistant" title="Exclude Assistant suffix" class="checkbox_label widthFreeExpand">
                                             <input id="exclude_assistant" type="checkbox" />
                                             <span data-i18n="Exclude Assistant suffix">Exclude Assistant suffix</span>
                                         </label>
-                                        <div class="toggle-description justifyLeft">
+                                        <div class="toggle-description justifyLeft marginBot5">
                                             <span data-i18n="Exclude the assistant suffix from being added to the end of prompt.">
-                                                Exclude the assistant suffix from being added to the end of prompt (Requires jailbreak with 'Assistant:' in it).
+                                                Exclude the assistant suffix from being added to the end of prompt. Requires jailbreak with 'Assistant:' in it.
                                             </span>
                                         </div>
                                         <div id="claude_assistant_prefill_block" class="wide100p">
@@ -1570,7 +1580,7 @@
                                                 Use system prompt (Claude 2.1+ only)
                                             </span>
                                         </label>
-                                        <div class="toggle-description justifyLeft">
+                                        <div class="toggle-description justifyLeft marginBot5">
                                             <span data-i18n="Exclude the 'Human: ' prefix from being added to the beginning of the prompt.">
                                                 Exclude the 'Human: ' prefix from being added to the beginning of the prompt.
                                                 Instead, place it between the system prompt and the first message with the role 'assistant' (right before 'Chat History' by default).

public/scripts/openai.js

@@ -235,6 +235,7 @@ const default_settings = {
     use_google_tokenizer: false,
     exclude_assistant: false,
     claude_use_sysprompt: false,
+    claude_exclude_prefixes: false,
     use_alt_scale: false,
     squash_system_messages: false,
     image_inlining: false,
@@ -299,6 +300,7 @@ const oai_settings = {
     use_google_tokenizer: false,
     exclude_assistant: false,
     claude_use_sysprompt: false,
+    claude_exclude_prefixes: false,
     use_alt_scale: false,
     squash_system_messages: false,
     image_inlining: false,
@@ -1573,6 +1575,7 @@ async function sendOpenAIRequest(type, messages, signal) {
         generate_data['top_k'] = Number(oai_settings.top_k_openai);
         generate_data['exclude_assistant'] = oai_settings.exclude_assistant;
         generate_data['claude_use_sysprompt'] = oai_settings.claude_use_sysprompt;
+        generate_data['claude_exclude_prefixes'] = oai_settings.claude_exclude_prefixes;
         generate_data['stop'] = getCustomStoppingStrings(); // Claude shouldn't have limits on stop strings.
         generate_data['human_sysprompt_message'] = substituteParams(oai_settings.human_sysprompt_message);
         // Don't add a prefill on quiet gens (summarization)
@@ -2396,6 +2399,7 @@ function loadOpenAISettings(data, settings) {
     if (settings.use_google_tokenizer !== undefined) oai_settings.use_google_tokenizer = !!settings.use_google_tokenizer;
     if (settings.exclude_assistant !== undefined) oai_settings.exclude_assistant = !!settings.exclude_assistant;
     if (settings.claude_use_sysprompt !== undefined) oai_settings.claude_use_sysprompt = !!settings.claude_use_sysprompt;
+    if (settings.claude_exclude_prefixes !== undefined) oai_settings.claude_exclude_prefixes = !!settings.claude_exclude_prefixes;
     if (settings.use_alt_scale !== undefined) { oai_settings.use_alt_scale = !!settings.use_alt_scale; updateScaleForm(); }
     $('#stream_toggle').prop('checked', oai_settings.stream_openai);
     $('#api_url_scale').val(oai_settings.api_url_scale);
@@ -2435,6 +2439,7 @@ function loadOpenAISettings(data, settings) {
     $('#use_google_tokenizer').prop('checked', oai_settings.use_google_tokenizer);
     $('#exclude_assistant').prop('checked', oai_settings.exclude_assistant);
     $('#claude_use_sysprompt').prop('checked', oai_settings.claude_use_sysprompt);
+    $('#claude_exclude_prefixes').prop('checked', oai_settings.claude_exclude_prefixes);
     $('#scale-alt').prop('checked', oai_settings.use_alt_scale);
     $('#openrouter_use_fallback').prop('checked', oai_settings.openrouter_use_fallback);
     $('#openrouter_force_instruct').prop('checked', oai_settings.openrouter_force_instruct);
@@ -2648,6 +2653,7 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
         use_google_tokenizer: settings.use_google_tokenizer,
         exclude_assistant: settings.exclude_assistant,
         claude_use_sysprompt: settings.claude_use_sysprompt,
+        claude_exclude_prefixes: settings.claude_exclude_prefixes,
         use_alt_scale: settings.use_alt_scale,
         squash_system_messages: settings.squash_system_messages,
         image_inlining: settings.image_inlining,
@@ -3020,6 +3026,7 @@ function onSettingsPresetChange() {
         use_google_tokenizer: ['#use_google_tokenizer', 'use_google_tokenizer', true],
         exclude_assistant: ['#exclude_assistant', 'exclude_assistant', true],
         claude_use_sysprompt: ['#claude_use_sysprompt', 'claude_use_sysprompt', true],
+        claude_exclude_prefixes: ['#claude_exclude_prefixes', 'claude_exclude_prefixes', true],
         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],
@@ -3747,6 +3754,11 @@ $(document).ready(async function () {
         saveSettingsDebounced();
     });
 
+    $('#claude_exclude_prefixes').on('change', function () {
+        oai_settings.claude_exclude_prefixes = !!$('#claude_exclude_prefixes').prop('checked');
+        saveSettingsDebounced();
+    });
+
     $('#names_in_completion').on('change', function () {
         oai_settings.names_in_completion = !!$('#names_in_completion').prop('checked');
         saveSettingsDebounced();

src/endpoints/backends/chat-completions.js

@@ -36,9 +36,10 @@ async function sendClaudeRequest(request, response) {
         });
 
         const isSysPromptSupported = request.body.model === 'claude-2' || request.body.model === 'claude-2.1';
-        const requestPrompt = convertClaudePrompt(request.body.messages, !request.body.exclude_assistant, request.body.assistant_prefill, isSysPromptSupported, request.body.claude_use_sysprompt, request.body.human_sysprompt_message);
+        const requestPrompt = convertClaudePrompt(request.body.messages, !request.body.exclude_assistant, request.body.assistant_prefill, isSysPromptSupported, request.body.claude_use_sysprompt, request.body.human_sysprompt_message, request.body.claude_exclude_prefixes);
 
         // Check Claude messages sequence and prefixes presence.
+        let sequenceError = [];
         const sequence = requestPrompt.split('\n').filter(x => x.startsWith('Human:') || x.startsWith('Assistant:'));
         const humanFound = sequence.some(line => line.startsWith('Human:'));
         const assistantFound = sequence.some(line => line.startsWith('Assistant:'));
@@ -56,20 +57,20 @@ async function sendClaudeRequest(request, response) {
         }
 
         if (!humanFound) {
-            console.log(color.red(`${divider}\nWarning: No 'Human:' prefix found in the prompt.\n${divider}`));
+            sequenceError.push(`${divider}\nWarning: No 'Human:' prefix found in the prompt.\n${divider}`);
         }
         if (!assistantFound) {
-            console.log(color.red(`${divider}\nWarning: No 'Assistant: ' prefix found in the prompt.\n${divider}`));
+            sequenceError.push(`${divider}\nWarning: No 'Assistant: ' prefix found in the prompt.\n${divider}`);
         }
-        if (!sequence[0].startsWith('Human:')) {
+        if (sequence[0] && !sequence[0].startsWith('Human:')) {
-            console.log(color.red(`${divider}\nWarning: The messages sequence should start with 'Human:' prefix.\nMake sure you have 'Human:' prefix at the very beggining of the prompt, or after the system prompt.\n${divider}`));
+            sequenceError.push(`${divider}\nWarning: The messages sequence should start with 'Human:' prefix.\nMake sure you have '\\n\\nHuman:' prefix at the very beggining of the prompt, or after the system prompt.\n${divider}`);
         }
         if (humanErrorCount > 0 || assistantErrorCount > 0) {
-            console.log(color.red(`${divider}\nWarning: Detected incorrect Prefix sequence(s).`));
+            sequenceError.push(`${divider}\nWarning: Detected incorrect Prefix sequence(s).`);
-            console.log(color.red(`Incorrect "Human:" prefix(es): ${humanErrorCount}.\nIncorrect "Assistant: " prefix(es): ${assistantErrorCount}.`));
+            sequenceError.push(`Incorrect "Human:" prefix(es): ${humanErrorCount}.\nIncorrect "Assistant: " prefix(es): ${assistantErrorCount}.`);
-            console.log(color.red('Check the prompt above and fix it in the SillyTavern.'));
+            sequenceError.push('Check the prompt above and fix it in the SillyTavern.');
-            console.log(color.red('\nThe correct sequence should look like this:\nSystem prompt  <-(for the sysprompt format only, else have 2 empty lines above the first human\'s  message.)'));
+            sequenceError.push('\nThe correct sequence in the console should look like this:\n(System prompt msg) <-(for the sysprompt format only, else have \\n\\n above the first human\'s  message.)');
-            console.log(color.red(`       <-----(Each message beginning with the "Assistant:/Human:" prefix must have one empty line above.)\nHuman:\n\nAssistant:\n...\n\nHuman:\n\nAssistant:\n${divider}`));
+            sequenceError.push(`\\n +      <-----(Each message beginning with the "Assistant:/Human:" prefix must have \\n\\n before it.)\n\\n +\nHuman: \\n +\n\\n +\nAssistant: \\n +\n...\n\\n +\nHuman: \\n +\n\\n +\nAssistant: \n${divider}`);
         }
 
         // Add custom stop sequences
@@ -91,6 +92,10 @@ async function sendClaudeRequest(request, response) {
 
         console.log('Claude request:', requestBody);
 
+        sequenceError.forEach(sequenceError => {
+            console.log(color.red(sequenceError));
+        });
+
         const generateResponse = await fetch(apiUrl + '/complete', {
             method: 'POST',
             signal: controller.signal,

src/endpoints/prompt-converters.js

@@ -5,15 +5,21 @@
  * @param {string}   addAssistantPrefill Add Assistant prefill after the assistant postfix.
  * @param {boolean}  withSysPromptSupport Indicates if the Claude model supports the system prompt format.
  * @param {boolean}  useSystemPrompt Indicates if the system prompt format should be used.
+ * @param {boolean}  excludePrefixes Exlude Human/Assistant prefixes.
  * @param {string}   addSysHumanMsg Add Human message between system prompt and assistant.
  * @returns {string} Prompt for Claude
  * @copyright Prompt Conversion script taken from RisuAI by kwaroran (GPLv3).
  */
-function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill, withSysPromptSupport, useSystemPrompt, addSysHumanMsg) {
+function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill, withSysPromptSupport, useSystemPrompt, addSysHumanMsg, excludePrefixes) {
 
     //Prepare messages for claude.
+    //When 'Exclude Human/Assistant prefixes' checked, setting messages role to the 'system'(last message is exception).
     if (messages.length > 0) {
-        messages[0].role = 'system';
+        if (excludePrefixes) {
+            messages.slice(0, -1).forEach(message => message.role = 'system');
+        } else {
+            messages[0].role = 'system';
+        }
         //Add the assistant's message to the end of messages.
         if (addAssistantPostfix) {
             messages.push({
@@ -29,7 +35,7 @@ function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill,
             }
             return message.role === 'assistant' && i > 0;
         });
-        // When 2.1+ and 'Use system prompt" checked, switches to the system prompt format by setting the first message's role to the 'system'.
+        // When 2.1+ and 'Use system prompt' checked, switches to the system prompt format by setting the first message's role to the 'system'.
         // Inserts the human's message before the first the assistant one, if there are no such message or prefix found.
         if (withSysPromptSupport && useSystemPrompt) {
             messages[0].role = 'system';
@@ -43,7 +49,7 @@ function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill,
             // Otherwise, use the default message format by setting the first message's role to 'user'(compatible with all claude models including 2.1.)
             messages[0].role = 'user';
             // Fix messages order for default message format when(messages > Context Size) by merging two messages with "\n\nHuman: " prefixes into one, before the first Assistant's message.
-            if (firstAssistantIndex > 0) {
+            if (firstAssistantIndex > 0 && !excludePrefixes) {
                 messages[firstAssistantIndex - 1].role = firstAssistantIndex - 1 !== 0 && messages[firstAssistantIndex - 1].role === 'user' ? 'FixHumMsg' : messages[firstAssistantIndex - 1].role;
             }
         }
@@ -51,11 +57,11 @@ function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill,
 
     // Convert messages to the prompt.
     let requestPrompt = messages.map((v, i) => {
-        // Set prefix according to the role.
+        // Set prefix according to the role. Also, when "Exclude Human/Assistant prefixes" is checked, names are added via the system prefix.
         let prefix = {
             'assistant': '\n\nAssistant: ',
             'user': '\n\nHuman: ',
-            'system': i === 0 ? '' : v.name === 'example_assistant' ? '\n\nA: ' : v.name === 'example_user' ? '\n\nH: ' : '\n\n',
+            'system': i === 0 ? '' : v.name === 'example_assistant' ? '\n\nA: ' : v.name === 'example_user' ? '\n\nH: ' : excludePrefixes && v.name ? `\n\n${v.name}: ` : '\n\n',
             'FixHumMsg': '\n\nFirst message: ',
         }[v.role] ?? '';
         // Claude doesn't support message names, so we'll just add them to the message content.