rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into sysprompt-divorce

This commit is contained in:
Cohee 2024-09-22 19:56:29 +03:00
parent bcc4914467 a18dae8f69
commit 3812e3bdcb
31 changed files with 18 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default/content/presets/context/Adventure.json
View File

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

3
default/content/presets/context/Alpaca-Single-Turn.json
View File

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

1
default/content/presets/context/Alpaca.json
View File

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

1
default/content/presets/context/ChatML-Names.json
View File

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

1
default/content/presets/context/ChatML.json
View File

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

3
default/content/presets/context/Command R.json
View File

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

3
default/content/presets/context/Default.json
View File

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

3
default/content/presets/context/DreamGen Role-Play V1 ChatML.json
View File

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

3
default/content/presets/context/DreamGen Role-Play V1 Llama3.json
View File

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

3
default/content/presets/context/Gemma 2.json
View File

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

1
default/content/presets/context/Libra-32B.json
View File

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

3
default/content/presets/context/Lightning 1.1.json
View File

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

1
default/content/presets/context/Llama 2 Chat.json
View File

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

3
default/content/presets/context/Llama 3 Instruct.json
View File

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

1
default/content/presets/context/Llama-3-Instruct-Names.json
View File

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

3
default/content/presets/context/Minimalist.json
View File

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

1
default/content/presets/context/Mistral V1.json
View File

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

1
default/content/presets/context/Mistral V2 & V3.json
View File

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

1
default/content/presets/context/Mistral V3-Tekken.json
View File

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

3
default/content/presets/context/NovelAI.json
View File

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

3
default/content/presets/context/OldDefault.json
View File

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

3
default/content/presets/context/Phi.json
View File

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

3
default/content/presets/context/Pygmalion.json
View File

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

3
default/content/presets/context/Story.json
View File

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

1
default/content/presets/context/Synthia.json
View File

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

3
default/content/presets/context/simple-proxy-for-tavern.json
View File

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

1
default/content/settings.json
View File

@ -90,7 +90,6 @@
"pin_examples": false,
"strip_examples": false,
"trim_sentences": false,
"include_newline": false,
"always_force_name2": true,
"user_prompt_bias": "",
"show_user_prompt_bias": true,

5
public/index.html
View File

@ -3260,11 +3260,6 @@
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>

2
public/script.js
View File

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

16
public/scripts/power-user.js
View File

@ -115,7 +115,6 @@ let power_user = {
pin_examples: false,
strip_examples: false,
trim_sentences: false,
include_newline: false,
always_force_name2: false,
user_prompt_bias: '',
show_user_prompt_bias: true,
@ -321,7 +320,6 @@ const contextControls = [
// 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 },
];
@ -1491,7 +1489,6 @@ async function loadPowerUserSettings(settings, data) {
$('#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);
@ -3053,19 +3050,6 @@ $(document).ready(() => {
// 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();
});

8
public/scripts/utils.js
View File

@ -607,12 +607,11 @@ export function sortByCssOrder(a, b) {
/**
* 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) {
export function trimToEndSentence(input) {
if (!input) {
return '';
}
@ -633,11 +632,6 @@ export function trimToEndSentence(input, include_newline = false) {
}
break;
}
if (include_newline && char === '\n') {
last = i;
break;
}
}
if (last === -1) {