3812e3bd · permissionBRICK/SillyTavern

default/content/presets/context/Adventure.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": true,
     "name": "Adventure"
+}

default/content/presets/context/Alpaca-Single-Turn.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Alpaca-Single-Turn"
+}

default/content/presets/context/Alpaca.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Alpaca"
+}

default/content/presets/context/ChatML-Names.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "ChatML-Names"
+}

default/content/presets/context/ChatML.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "ChatML"
+}

default/content/presets/context/Command R.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Command R"
+}

default/content/presets/context/Default.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Default"
+}

default/content/presets/context/DreamGen Role-Play V1 ChatML.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": true,
 -    "include_newline": false,
     "single_line": false,
     "name": "DreamGen Role-Play V1 ChatML"
+}

default/content/presets/context/DreamGen Role-Play V1 Llama3.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": false,
     "trim_sentences": true,
 -    "include_newline": false,
     "single_line": false,
     "name": "DreamGen Role-Play V1 Llama3"
+}

default/content/presets/context/Gemma 2.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Gemma 2"
+}

default/content/presets/context/Libra-32B.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Libra-32B"
+}

default/content/presets/context/Lightning 1.1.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Lightning 1.1"
+}

default/content/presets/context/Llama 2 Chat.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Llama 2 Chat"
+}

default/content/presets/context/Llama 3 Instruct.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Llama 3 Instruct"
+}

default/content/presets/context/Llama-3-Instruct-Names.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Llama-3-Instruct-Names"
+}

default/content/presets/context/Minimalist.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Minimalist"
+}

default/content/presets/context/Mistral V1.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Mistral V1"
+}

default/content/presets/context/Mistral V2 & V3.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Mistral V2 & V3"
+}

default/content/presets/context/Mistral V3-Tekken.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Mistral V3-Tekken"
+}

default/content/presets/context/NovelAI.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "NovelAI"
+}

default/content/presets/context/OldDefault.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "OldDefault"
+}

default/content/presets/context/Phi.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Phi"
+}

default/content/presets/context/Pygmalion.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Pygmalion"
+}

default/content/presets/context/Story.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Story"
+}

default/content/presets/context/Synthia.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "Synthia"
+}

default/content/presets/context/simple-proxy-for-tavern.json+0 -1 Viewed

     "allow_jailbreak": false,
     "always_force_name2": true,
     "trim_sentences": false,
 -    "include_newline": false,
     "single_line": false,
     "name": "simple-proxy-for-tavern"
+}

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

         "pin_examples": false,
         "strip_examples": false,
         "trim_sentences": false,
 -        "include_newline": false,
         "always_force_name2": true,
         "user_prompt_bias": "",
         "show_user_prompt_bias": true,

public/index.html+0 -5 Viewed

                                             Trim Incomplete Sentences
                                         </small>
                                     </label>
 -                                    <!-- Add margin since this is a child of above -->
 -                                    <label class="checkbox_label indent20p" for="include_newline_checkbox">
 -                                        <input id="include_newline_checkbox" type="checkbox" />
 -                                        <small data-i18n="Include Newline">Include Newline</small>
 -                                    </label>
                                     <label class="checkbox_label" title="Add Chat Start and Example Separator to a list of stopping strings." data-i18n="[title]Add Chat Start and Example Separator to a list of stopping strings.">
                                         <input id="context_use_stop_strings" type="checkbox" />
                                         <small data-i18n="Separators as Stop Strings">Separators as Stop Strings</small>

public/script.js+1 -1 Viewed

@@ -5485,7 +5485,7 @@ export function cleanUpMessage(getMessage, isImpersonate, isContinue, displayInc
5485	5485	}
5486	5486
5487	5487	if (!displayIncompleteSentences && power_user.trim_sentences) {
5488	5488	getMessage = trimToEndSentence(getMessage, power_user.include_newline);
5489	5489	}
5490	5490
5491	5491	if (power_user.trim_spaces) {

public/scripts/power-user.js+0 -16 Viewed

     pin_examples: false,
     strip_examples: false,
     trim_sentences: false,
 -    include_newline: false,
     always_force_name2: false,
     user_prompt_bias: '',
     show_user_prompt_bias: true,

     // Existing power user settings
     { id: 'always-force-name2-checkbox', property: 'always_force_name2', isCheckbox: true, isGlobalSetting: true, defaultValue: true },
     { id: 'trim_sentences_checkbox', property: 'trim_sentences', isCheckbox: true, isGlobalSetting: true, defaultValue: false },
 -    { id: 'include_newline_checkbox', property: 'include_newline', isCheckbox: true, isGlobalSetting: true, defaultValue: false },
     { id: 'single_line', property: 'single_line', isCheckbox: true, isGlobalSetting: true, defaultValue: false },
 ];

     $('#collapse-newlines-checkbox').prop('checked', power_user.collapse_newlines);
     $('#always-force-name2-checkbox').prop('checked', power_user.always_force_name2);
     $('#trim_sentences_checkbox').prop('checked', power_user.trim_sentences);
 -    $('#include_newline_checkbox').prop('checked', power_user.include_newline);
     $('#render_formulas').prop('checked', power_user.render_formulas);
     $('#disable_group_trimming').prop('checked', power_user.disable_group_trimming);
     $('#markdown_escape_strings').val(power_user.markdown_escape_strings);

     // if trim sentences is unchecked, include newline must be unchecked
     $('#trim_sentences_checkbox').change(function () {
         power_user.trim_sentences = !!$(this).prop('checked');
 -        if (!$(this).prop('checked')) {
 -            $('#include_newline_checkbox').prop('checked', false);
 -            power_user.include_newline = false;
 -        }
 -        saveSettingsDebounced();
 -    });
+-
 -    $('#include_newline_checkbox').change(function () {
 -        power_user.include_newline = !!$(this).prop('checked');
 -        if ($(this).prop('checked')) {
 -            $('#trim_sentences_checkbox').prop('checked', true);
 -            power_user.trim_sentences = true;
 -        }
         saveSettingsDebounced();
     });

public/scripts/utils.js+1 -7 Viewed

 /**
  * Trims a string to the end of a nearest sentence.
  * @param {string} input The string to trim.
 - * @param {boolean} include_newline Whether to include a newline character in the trimmed string.
  * @returns {string} The trimmed string.
  * @example
  * trimToEndSentence('Hello, world! I am from'); // 'Hello, world!'
  */
 export function trimToEndSentence(input, include_newline = false) {
     if (!input) {
         return '';
+    }

@@ -633,11 +632,6 @@ export function trimToEndSentence(input, include_newline = false) {
633	632	}
634	633	break;
635	634	}
636		-
637		- if (include_newline && char === '\n') {
638		- last = i;
639		- break;
640		- }
641	635	}
642	636
643	637	if (last === -1) {

Merge branch 'staging' into sysprompt-divorce