Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

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:",

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
 }

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
+}

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
+}

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:",

public/script.js

@@ -295,7 +295,7 @@ const system_messages = {
         is_user: false,
         is_name: true,
         mes: [
-            '<h2>Welcome to <span id="version_display_welcome">Welcome to </span>!</h2>',
+            '<h2>Welcome to <span id="version_display_welcome">SillyTavern</span>!</h2>',
             '<div id="version_display_welcome"></div>',
             '<h3>Want to Update to the latest version?</h3>',
             "Read the <a href='/notes/update.html' target='_blank'>instructions here</a>. Also located in your installation's base folder",

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;
         }
 

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);