Merge branch 'main' into dev

colab/GPU.ipynb

@@ -62,6 +62,8 @@
         "#@markdown * prompthero/openjourney - midjourney style model\n",
         "#@markdown * ckpt/sd15 - base SD 1.5\n",
         "#@markdown * stabilityai/stable-diffusion-2-1-base - base SD 2.1\n",
+        "extras_enable_chromadb = True #@param {type:\"boolean\"}\n",
+        "#@markdown Enables ChromaDB for Infinity Context plugin\n",
         "\n",
         "import subprocess\n",
         "\n",
@@ -84,6 +86,8 @@
         "  ExtrasModules.append('sd')\n",
         "if (extras_enable_tts):\n",
         "  ExtrasModules.append('tts')\n",
+        "if (extras_enable_chromadb):\n",
+        "  ExtrasModules.append('chromadb')\n",
         "\n",
         "params.append(f'--classification-model={Emotions_Model}')\n",
         "params.append(f'--summarization-model={Memory_Model}')\n",
@@ -99,6 +103,8 @@
         "!npm install -g localtunnel\n",
         "!pip install -r requirements-complete.txt\n",
         "!pip install tensorflow==2.12\n",
+        "!wget https://github.com/cloudflare/cloudflared/releases/download/2023.5.0/cloudflared-linux-amd64 -O /tmp/cloudflared-linux-amd64\n",
+        "!chmod +x /tmp/cloudflared-linux-amd64\n",
         "\n",
         "\n",
         "cmd = f\"python server.py {' '.join(params)}\"\n",

public/scripts/extensions/tts/index.js

@@ -483,15 +483,15 @@ function onApplyClick() {
     Promise.all([
         ttsProvider.onApplyClick(),
         updateVoiceMap()
-    ]).catch(error => {
-        console.error(error)
-        setTtsStatus(error, false)
-    })
-
+    ]).then(() => {
         extension_settings.tts[ttsProviderName] = ttsProvider.settings
         saveSettingsDebounced()
         setTtsStatus('Successfully applied settings', true)
         console.info(`Saved settings ${ttsProviderName} ${JSON.stringify(ttsProvider.settings)}`)
+    }).catch(error => {
+        console.error(error)
+        setTtsStatus(error, false)
+    })
 }
 
 function onEnableClick() {