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

Copy migrated preset into loaded presets

Browse Source 
Since this only is populated once during page load
This commit is contained in:
maver
2023-08-10 19:56:18 +02:00
parent 7fb896ce2a
commit b1254fa2ab
3 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -542,7 +542,7 @@ this
}; };
// Register configuration migrations // Register configuration migrations
registerPromptManagerMigration(saveSettings); registerPromptManagerMigration();
$(document).ajaxError(function myErrorHandler(_, xhr) { $(document).ajaxError(function myErrorHandler(_, xhr) {
if (xhr.status == 403) { if (xhr.status == 403) {
@ -5089,7 +5089,7 @@ async function getSettings(type) {
$("#your_name").val(name1); $("#your_name").val(name1);
} }
// Allow subscribers to mutate settings before applying any modifiers // Allow subscribers to mutate settings
eventSource.emit(event_types.SETTINGS_LOADED_BEFORE, settings); eventSource.emit(event_types.SETTINGS_LOADED_BEFORE, settings);
//Load KoboldAI settings //Load KoboldAI settings

39
public/scripts/PromptManager.js
View File

@ -5,45 +5,32 @@ import {power_user} from "./power-user.js";
/** /**
* Register migrations for the prompt manager when settings are loaded or an Open AI preset is loaded. * Register migrations for the prompt manager when settings are loaded or an Open AI preset is loaded.
*/ */
const registerPromptManagerMigration = (saveSettingsCallback) => { const registerPromptManagerMigration = () => {
const migrate = (settings, preset) => { const migrate = (settings) => {
// If any of the specified settings exist, run the migration if (settings.main_prompt || settings.nsfw_prompt || settings.jailbreak_prompt) {
console.log('Running prompt manager configuration migration');
if (settings.prompts === undefined || settings.prompts.length === 0) settings.prompts = chatCompletionDefaultPrompts.prompts; if (settings.prompts === undefined || settings.prompts.length === 0) settings.prompts = chatCompletionDefaultPrompts.prompts;
const findPrompt = (identifier) => settings.prompts.find(prompt => identifier === prompt.identifier); const findPrompt = (identifier) => settings.prompts.find(prompt => identifier === prompt.identifier);
if (preset.main_prompt) { if (settings.main_prompt) {
findPrompt('main').content = preset.main_prompt findPrompt('main').content = settings.main_prompt
delete settings.main_prompt; delete settings.main_prompt;
} }
if (preset.nsfw_prompt) { if (settings.nsfw_prompt) {
findPrompt('nsfw').content = preset.nsfw_prompt findPrompt('nsfw').content = settings.nsfw_prompt
delete settings.nsfw_prompt; delete settings.nsfw_prompt;
} }
if (preset.jailbreak_prompt) { if (settings.jailbreak_prompt) {
findPrompt('jailbreak').content = preset.jailbreak_prompt findPrompt('jailbreak').content = settings.jailbreak_prompt
delete settings.jailbreak_prompt; delete settings.jailbreak_prompt;
} }
}
}; };
const migrateSettings = (settings) => { eventSource.on(event_types.SETTINGS_LOADED_BEFORE, settings => migrate(settings));
if (settings.main_prompt || settings.nsfw_prompt || settings.jailbreak_prompt) { eventSource.on(event_types.OAI_PRESET_CHANGED, event => migrate(event.preset));
console.log(`Migrating configuration`);
migrate(settings, settings);
}
}
const migratePreset = (event) => {
if (event.preset.main_prompt || event.preset.nsfw_prompt || event.preset.jailbreak_prompt) {
console.log(`Migrating preset ${event.presetName}`);
migrate(event.settings, event.preset);
event.callback(event.presetName, event.settings, false);
}
}
eventSource.on(event_types.SETTINGS_LOADED_BEFORE, settings => migrateSettings(settings));
eventSource.on(event_types.OAI_PRESET_CHANGED, settings => migratePreset(settings));
} }
/** /**

6
public/scripts/openai.js
View File

@ -2358,6 +2358,10 @@ function onSettingsPresetChange() {
oai_settings.preset_settings_openai = presetName; oai_settings.preset_settings_openai = presetName;
const preset = openai_settings[openai_setting_names[oai_settings.preset_settings_openai]]; const preset = openai_settings[openai_setting_names[oai_settings.preset_settings_openai]];
eventSource.emit(event_types.OAI_PRESET_CHANGED, {preset: preset, settings: oai_settings})
.then(() => saveOpenAIPreset(presetName, preset, false)
.then(() => openai_settings[openai_setting_names[oai_settings.preset_settings_openai]] = preset));
const updateInput = (selector, value) => $(selector).val(value).trigger('input'); const updateInput = (selector, value) => $(selector).val(value).trigger('input');
const updateCheckbox = (selector, value) => $(selector).prop('checked', value).trigger('input'); const updateCheckbox = (selector, value) => $(selector).prop('checked', value).trigger('input');
@ -2413,8 +2417,6 @@ function onSettingsPresetChange() {
$(`#chat_completion_source`).trigger('change'); $(`#chat_completion_source`).trigger('change');
$(`#openai_logit_bias_preset`).trigger('change'); $(`#openai_logit_bias_preset`).trigger('change');
eventSource.emit(event_types.OAI_PRESET_CHANGED, {preset: preset, settings: oai_settings, presetName: presetName, callback: saveOpenAIPreset});
saveSettingsDebounced(); saveSettingsDebounced();
} }