diff --git a/public/instruct/Alpaca.json b/public/instruct/Alpaca.json index 5f643ceab..5c326bdba 100644 --- a/public/instruct/Alpaca.json +++ b/public/instruct/Alpaca.json @@ -1,6 +1,6 @@ { "name": "Alpaca", - "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.", + "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "system_sequence": "", "stop_sequence": "", "input_sequence": "### Instruction:", diff --git a/public/instruct/Koala.json b/public/instruct/Koala.json index c59192b43..48a8abd67 100644 --- a/public/instruct/Koala.json +++ b/public/instruct/Koala.json @@ -1,9 +1,9 @@ { "name": "Koala", - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.", + "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "system_sequence": "BEGINNING OF CONVERSATION:", "stop_sequence": "", "input_sequence": "USER: ", "output_sequence": "GPT: ", - "wrap": true + "wrap": false } \ No newline at end of file diff --git a/public/instruct/Vicuna 1.0.json b/public/instruct/Vicuna 1.0.json new file mode 100644 index 000000000..ce5a11d93 --- /dev/null +++ b/public/instruct/Vicuna 1.0.json @@ -0,0 +1,9 @@ +{ + "name": "Vicuna 1.0", + "system_prompt": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", + "system_sequence": "", + "stop_sequence": "", + "input_sequence": "### Human:", + "output_sequence": "### Assistant:", + "wrap": true +} \ No newline at end of file diff --git a/public/instruct/Vicuna 1.1.json b/public/instruct/Vicuna 1.1.json new file mode 100644 index 000000000..365f0f0ee --- /dev/null +++ b/public/instruct/Vicuna 1.1.json @@ -0,0 +1,9 @@ +{ + "name": "Vicuna 1.1", + "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", + "system_sequence": "BEGINNING OF CONVERSATION:", + "stop_sequence": "", + "input_sequence": "USER: ", + "output_sequence": "ASSISTANT: ", + "wrap": true +} \ No newline at end of file diff --git a/public/instruct/WizardLM.json b/public/instruct/WizardLM.json index 3e247bf82..29fc6dcce 100644 --- a/public/instruct/WizardLM.json +++ b/public/instruct/WizardLM.json @@ -1,6 +1,6 @@ { "name": "WizardLM", - "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.", + "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n", "system_sequence": "", "stop_sequence": "", "input_sequence": "### Instruction:", diff --git a/public/script.js b/public/script.js index c8228dd06..197434e20 100644 --- a/public/script.js +++ b/public/script.js @@ -295,7 +295,7 @@ const system_messages = { is_user: false, is_name: true, mes: [ - '

Welcome to Welcome to !

', + '

Welcome to SillyTavern!

', '
', '

Want to Update to the latest version?

', "Read the instructions here. Also located in your installation's base folder", diff --git a/public/scripts/extensions.js b/public/scripts/extensions.js index bfa67bed5..884e96968 100644 --- a/public/scripts/extensions.js +++ b/public/scripts/extensions.js @@ -95,8 +95,9 @@ async function activateExtensions() { for (let entry of extensions) { const name = entry[0]; const manifest = entry[1]; + const elementExists = document.getElementById(name) !== null; - if (activeExtensions.has(name)) { + if (elementExists || activeExtensions.has(name)) { continue; } diff --git a/server.js b/server.js index 71a8108c9..401f67d36 100644 --- a/server.js +++ b/server.js @@ -2813,7 +2813,7 @@ function migrateSecrets() { if (typeof hordeKey === 'string') { console.log('Migrating Horde key...'); writeSecret(SECRET_KEYS.HORDE, hordeKey); - delete settings.hordeKey; + delete settings.horde_settings.api_key; modified = true; } @@ -2885,6 +2885,7 @@ app.post('/generate_horde', jsonParser, async (request, response) => { } }; + console.log(args.data); try { const data = await postAsync(url, args); return response.send(data);