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

Remove the concept of default context and instruct. Swap columns

Browse Source
This commit is contained in:
Cohee
2024-09-21 22:37:15 +03:00
parent e469c82c97
commit bf5b6090eb
6 changed files with 137 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
public/scripts/instruct-mode.js
View File

@ -136,12 +136,6 @@ export async function loadInstructMode(data) {
option.selected = name === power_user.instruct.preset;
$('#instruct_presets').append(option);
});
highlightDefaultPreset();
}
function highlightDefaultPreset() {
$('#instruct_set_default').toggleClass('default', power_user.default_instruct === power_user.instruct.preset);
}
/**
@ -158,13 +152,6 @@ export function selectContextPreset(preset, { quiet = false, isAuto = false } =
!quiet && toastr.info(`Context Template: "${preset}" ${isAuto ? 'auto-' : ''}selected`);
}
// If instruct mode is disabled, enable it, except for default context template
if (!power_user.instruct.enabled && preset !== power_user.default_context) {
power_user.instruct.enabled = true;
$('#instruct_enabled').prop('checked', true).trigger('change');
!quiet && toastr.info('Instruct Mode enabled');
}
saveSettingsDebounced();
}
@ -234,13 +221,6 @@ export function autoSelectInstructPreset(modelId) {
}
}
}
if (power_user.instruct.bind_to_context && power_user.default_instruct && power_user.instruct.preset !== power_user.default_instruct) {
if (instruct_presets.some(p => p.name === power_user.default_instruct)) {
console.log(`Instruct mode: default preset "${power_user.default_instruct}" selected`);
$('#instruct_presets').val(power_user.default_instruct).trigger('change');
}
}
}
return false;
@ -579,10 +559,6 @@ function selectMatchingContextTemplate(name) {
break;
}
}
if (!foundMatch) {
// If no match was found, select default context preset
selectContextPreset(power_user.default_context, { isAuto: true });
}
}
/**
@ -637,20 +613,6 @@ export function replaceInstructMacros(input, env) {
}
jQuery(() => {
$('#instruct_set_default').on('click', function () {
if (power_user.instruct.preset === power_user.default_instruct) {
power_user.default_instruct = null;
$(this).removeClass('default');
toastr.info('Default instruct template cleared');
} else {
power_user.default_instruct = power_user.instruct.preset;
$(this).addClass('default');
toastr.info(`Default instruct template set to ${power_user.default_instruct}`);
}
saveSettingsDebounced();
});
$('#instruct_system_same_as_user').on('input', function () {
const state = !!$(this).prop('checked');
if (state) {
@ -679,9 +641,6 @@ jQuery(() => {
// When instruct mode gets enabled, select context template matching selected instruct preset
if (power_user.instruct.enabled) {
selectMatchingContextTemplate(power_user.instruct.preset);
} else {
// When instruct mode gets disabled, select default context preset
selectContextPreset(power_user.default_context);
}
});
@ -722,7 +681,5 @@ jQuery(() => {
// Select matching context template
selectMatchingContextTemplate(name);
}
highlightDefaultPreset();
});
});