Better customized sysprompt migration

ade6ef8af8e01173aa184b5edb15512832998fd0

Cohee <18619528+Cohee1207@users.noreply.github.com>

2 files changed, +14 -7Showing whitespace changes
public/script.js+1 -1
@@ -934,6 +934,7 @@ async function firstLoadInit() {
934934 initDefaultSlashCommands();
935935 initTextGenModels();
936936 initSystemPrompts();
937+ await initPresetManager();
937938 await getSystemMessages();
938939 sendSystemMessage(system_message_types.WELCOME);
939940 sendSystemMessage(system_message_types.WELCOME_PROMPT);
@@ -947,7 +948,6 @@ async function firstLoadInit() {
947948 await getCharacters();
948949 await getBackgrounds();
949950 await initTokenizers();
950- await initPresetManager();
951951 initBackgrounds();
952952 initAuthorsNote();
953953 initPersonas();
public/scripts/sysprompt.js+13 -6
@@ -17,14 +17,21 @@ const $select = $('#sysprompt_select');
1717const $content = $('#sysprompt_content');
1818const $contentBlock = $('#SystemPromptBlock');
1919
2020async function migrateSystemPromptFromInstructMode() {
2121 if ('system_prompt' in power_user.instruct) {
2222 power_user.sysprompt.enabledconst prompt = String(power_user.instruct.enabledsystem_prompt);
23- power_user.sysprompt.content = String(power_user.instruct.system_prompt);
2423 delete power_user.instruct.system_prompt;
24+ power_user.sysprompt.enabled = power_user.instruct.enabled;
25+ power_user.sysprompt.content = prompt;
2526
2627 ifconst (existingPromptName = system_prompts.somefind(x => x.namecontent === power_user.instruct.preset)prompt) {?.name;
27- power_user.sysprompt.name = power_user.instruct.preset;
28+
29+ if (existingPromptName) {
30+ power_user.sysprompt.name = existingPromptName;
31+ } else {
32+ const data = { name: `${power_user.instruct.preset} (Migrated)`, content: prompt };
33+ await getPresetManager('sysprompt')?.savePreset(data.name, data);
34+ power_user.sysprompt.name = data.name;
2835 }
2936
3037 saveSettingsDebounced();
@@ -41,7 +48,7 @@ export async function loadSystemPrompts(data) {
4148 system_prompts = data.sysprompt;
4249 }
4350
4451 await migrateSystemPromptFromInstructMode();
4552 toggleSystemPromptDisabledControls();
4653
4754 for (const prompt of system_prompts) {