From c4f9fdd1eee1ac0def1485f5117b480bbf3e5152 Mon Sep 17 00:00:00 2001 From: itzraf-lab <134476692+itzraf-lab@users.noreply.github.com> Date: Fri, 9 Jun 2023 17:46:01 +0800 Subject: [PATCH 1/5] Update .replit Added the ability to run Silly Tavern on replit with the Run button and don't have to manually go to Shell to start it --- .replit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.replit b/.replit index 69a31064b..3d9cd541f 100644 --- a/.replit +++ b/.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 From e9fe58d514896cf51026d0ee83ae038cdb470f60 Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 9 Jun 2023 20:03:45 +0300 Subject: [PATCH 2/5] Add Edge TTS and SD CPU to colab --- colab/GPU.ipynb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/colab/GPU.ipynb b/colab/GPU.ipynb index ba46cf0d3..e624851de 100644 --- a/colab/GPU.ipynb +++ b/colab/GPU.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "source": [ "**Links**
\n", - "Extensions API GitHub: https://github.com/Cohee1207/SillyTavern-extras/
\n", + "Extensions API GitHub: https://github.com/SillyTavern/SillyTavern-extras/
\n", "SillyTavern community Discord (support and discussion): https://discord.gg/RZdyAEUPvj" ] }, @@ -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 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", From 53540864385f28f5ad5178500269286eef786625 Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 9 Jun 2023 20:05:04 +0300 Subject: [PATCH 3/5] Fix comment --- colab/GPU.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colab/GPU.ipynb b/colab/GPU.ipynb index e624851de..0059377bf 100644 --- a/colab/GPU.ipynb +++ b/colab/GPU.ipynb @@ -36,7 +36,7 @@ "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 on CPU (slow!)\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", From d4d903323eece4dd66484e94749de8f12fa584e9 Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 9 Jun 2023 22:33:54 +0300 Subject: [PATCH 4/5] Poe fixed --- poe-client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poe-client.js b/poe-client.js index a3d3e70bb..666f88acb 100644 --- a/poe-client.js +++ b/poe-client.js @@ -315,7 +315,7 @@ class Client { async get_bots() { const viewer = this.next_data.props.pageProps.payload.viewer; - if (!viewer.availableBots) { + if (!viewer.availableBotsConnection) { throw new Error('Invalid token.'); } const botList = viewer.availableBotsConnection.edges.map(x => x.node); From 6541d3e741f78cffec94b8a4f01d98339fa46316 Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 9 Jun 2023 22:35:17 +0300 Subject: [PATCH 5/5] Bump package version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 564f14bd8..dd4e991ea 100644 --- a/package-lock.json +++ b/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", diff --git a/package.json b/package.json index 25881d36c..68d5e9f5f 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "type": "git", "url": "https://github.com/Cohee1207/SillyTavern.git" }, - "version": "1.6.7", + "version": "1.6.8", "scripts": { "start": "node server.js", "pkg": "pkg --compress Gzip --no-bytecode --public ."