rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework single-line mode, add section for Context Formatting settings

Browse Source
This commit is contained in:
Cohee
2023-10-27 21:02:03 +03:00
parent a2d8a2a447
commit 52ecad1cdf
7 changed files with 107 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/kai-settings.js
View File

@@ -20,7 +20,6 @@ export const kai_settings = {
typical: 1,
tfs: 1,
rep_pen_slope: 0.9,
single_line: false,
streaming_kobold: false,
sampler_order: [0, 1, 2, 3, 4, 5, 6],
mirostat: 0,
@@ -76,11 +75,6 @@ export function loadKoboldSettings(preset) {
$(slider.counterId).val(formattedValue);
}
// TODO: refactor checkboxes (if adding any more)
if (preset.hasOwnProperty('single_line')) {
kai_settings.single_line = preset.single_line;
$('#single_line').prop('checked', kai_settings.single_line);
}
if (preset.hasOwnProperty('streaming_kobold')) {
kai_settings.streaming_kobold = preset.streaming_kobold;
$('#streaming_kobold').prop('checked', kai_settings.streaming_kobold);
@@ -128,7 +122,7 @@ export function getKoboldGenerationData(finalPrompt, settings, maxLength, maxCon
s6: sampler_order[5],
s7: sampler_order[6],
use_world_info: false,
singleline: kai_settings.single_line,
singleline: false,
stop_sequence: (kai_flags.can_use_stop_sequence || isHorde) ? getStoppingStrings(isImpersonate) : undefined,
streaming: kai_settings.streaming_kobold && kai_flags.can_use_streaming && type !== 'quiet',
can_abort: kai_flags.can_use_streaming,
@@ -389,12 +383,6 @@ jQuery(function () {
});
});
$('#single_line').on("input", function () {
const value = !!$(this).prop('checked');
kai_settings.single_line = value;
saveSettingsDebounced();
});
$('#streaming_kobold').on("input", function () {
const value = !!$(this).prop('checked');
kai_settings.streaming_kobold = value;

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

@@ -170,6 +170,7 @@ let power_user = {
relaxed_api_urls: false,
world_import_dialog: true,
disable_group_trimming: false,
single_line: false,
default_instruct: '',
instruct: {
@@ -259,11 +260,10 @@ const contextControls = [
{ id: "context_chat_start", property: "chat_start", isCheckbox: false, isGlobalSetting: false },
// Existing power user settings
{ id: "always-force-name2-checkbox", property: "always_force_name2", isCheckbox: true, isGlobalSetting: true },
{ id: "trim_sentences_checkbox", property: "trim_sentences", isCheckbox: true, isGlobalSetting: true },
{ id: "include_newline_checkbox", property: "include_newline", isCheckbox: true, isGlobalSetting: true },
{ id: "custom_stopping_strings", property: "custom_stopping_strings", isCheckbox: false, isGlobalSetting: true },
{ id: "custom_stopping_strings_macro", property: "custom_stopping_strings_macro", isCheckbox: true, isGlobalSetting: true }
{ 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 },
];
let browser_has_focus = true;
@@ -924,6 +924,7 @@ function loadPowerUserSettings(settings, data) {
power_user.tokenizer = tokenizers.GPT2;
}
$('#single_line').prop("checked", power_user.single_line);
$('#relaxed_api_urls').prop("checked", power_user.relaxed_api_urls);
$('#world_import_dialog').prop("checked", power_user.world_import_dialog);
$('#trim_spaces').prop("checked", power_user.trim_spaces);
@@ -1173,11 +1174,13 @@ function loadContextSettings() {
power_user.context.preset = name;
contextControls.forEach(control => {
if (preset[control.property] !== undefined) {
const presetValue = preset[control.property] ?? control.defaultValue;
if (presetValue !== undefined) {
if (control.isGlobalSetting) {
power_user[control.property] = preset[control.property];
power_user[control.property] = presetValue;
} else {
power_user.context[control.property] = preset[control.property];
power_user.context[control.property] = presetValue;
}
const $element = $(`#${control.id}`);
@@ -1938,6 +1941,12 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$('#single_line').on("input", function () {
const value = !!$(this).prop('checked');
power_user.single_line = value;
saveSettingsDebounced();
});
$("#always-force-name2-checkbox").change(function () {
power_user.always_force_name2 = !!$(this).prop("checked");
saveSettingsDebounced();
@@ -2115,7 +2124,6 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$("#user-mes-blur-tint-color-picker").on('change', (evt) => {
power_user.user_mes_blur_tint_color = evt.detail.rgba;
applyThemeColor('userMesBlurTint');
@@ -2153,7 +2161,6 @@ $(document).ready(() => {
power_user.movingUIPreset = movingUIPresetSelected;
applyMovingUIPreset(movingUIPresetSelected);
saveSettingsDebounced();
});
$("#ui-preset-save-button").on('click', saveTheme);