Merge branch 'main' into dev

.replit

@@ -1,6 +1,7 @@
 
 hidden = [".config", "package-lock.json"]
 run = "chmod 755 ./start.sh && ./start.sh"
+entrypoint = "server.js"
 
 [[hints]]
 regex = "Error \\[ERR_REQUIRE_ESM\\]"
@@ -62,7 +63,7 @@ support = true
       cwd = "."
       environment = []
       pauseForSourceMap = false
-      program = "./index.js"
+      program = "./server.js"
       request = "launch"
       sourceMaps = true
       stopOnEntry = false

colab/GPU.ipynb

@@ -34,6 +34,9 @@
       "source": [
         "#@markdown Enables hosting of extensions backend for SillyTavern Extras\n",
         "use_cpu = False #@param {type:\"boolean\"}\n",
+        "#@markdown Allows to run SillyTavern Extras on CPU (use if you're out of daily GPU allowance)\n",
+        "use_sd_cpu = False #@param {type:\"boolean\"}\n",
+        "#@markdown Allows to run Stable Diffusion pipeline on CPU (slow!)\n",
         "extras_enable_captioning = True #@param {type:\"boolean\"}\n",
         "#@markdown Loads the image captioning module\n",
         "Captions_Model = \"Salesforce/blip-image-captioning-large\" #@param [ \"Salesforce/blip-image-captioning-large\", \"Salesforce/blip-image-captioning-base\" ]\n",
@@ -51,8 +54,10 @@
         "#@markdown * Qiliang/bart-large-cnn-samsum-ChatGPT_v3 - summarization model optimized for chats\n",
         "#@markdown * Qiliang/bart-large-cnn-samsum-ElectrifAi_v10 - nice results so far, but still being evaluated\n",
         "#@markdown * distilbart-xsum-12-3 - faster, but pretty basic alternative\n",
-        "extras_enable_tts = True #@param {type:\"boolean\"}\n",
+        "extras_enable_silero_tts = True #@param {type:\"boolean\"}\n",
         "#@markdown Enables Silero text-to-speech module\n",
+        "extras_enable_edge_tts = True #@param {type:\"boolean\"}\n",
+        "#@markdown Enables Microsoft Edge text-to-speech module\n",
         "extras_enable_sd = True #@param {type:\"boolean\"}\n",
         "#@markdown Enables SD picture generation\n",
         "SD_Model = \"ckpt/anything-v4.5-vae-swapped\" #@param [ \"ckpt/anything-v4.5-vae-swapped\", \"hakurei/waifu-diffusion\", \"philz1337/clarity\", \"prompthero/openjourney\", \"ckpt/sd15\", \"stabilityai/stable-diffusion-2-1-base\" ]\n",
@@ -73,6 +78,8 @@
         "params = []\n",
         "if use_cpu:\n",
         "    params.append('--cpu')\n",
+        "if use_sd_cpu:\n",
+        "    params.append('--sd-cpu')\n",
         "params.append('--share')\n",
         "ExtrasModules = []\n",
         "\n",
@@ -84,8 +91,10 @@
         "  ExtrasModules.append('classify')\n",
         "if (extras_enable_sd):\n",
         "  ExtrasModules.append('sd')\n",
-        "if (extras_enable_tts):\n",
-        "  ExtrasModules.append('tts')\n",
+        "if (extras_enable_silero_tts):\n",
+        "  ExtrasModules.append('silero-tts')\n",
+        "if extras_enable_edge_tts:\n",
+        "  ExtrasModules.append('edge-tts')\n",
         "if (extras_enable_chromadb):\n",
         "  ExtrasModules.append('chromadb')\n",
         "\n",

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "sillytavern",
-    "version": "1.6.7",
+    "version": "1.6.8",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "sillytavern",
-            "version": "1.6.7",
+            "version": "1.6.8",
             "license": "AGPL-3.0",
             "dependencies": {
                 "@dqbd/tiktoken": "^1.0.2",

package.json

@@ -48,7 +48,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.6.7",
+    "version": "1.6.8",
     "scripts": {
         "start": "node server.js",
         "pkg": "pkg --compress Gzip --no-bytecode --public ."