rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
SillyLossy
2023-05-27 19:55:03 +03:00
parent 0ab097711b d65a99448a
commit 387b1e6d4a
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
colab/GPU.ipynb
View File

@ -62,6 +62,8 @@
"#@markdown * prompthero/openjourney - midjourney style model\n", "#@markdown * prompthero/openjourney - midjourney style model\n",
"#@markdown * ckpt/sd15 - base SD 1.5\n", "#@markdown * ckpt/sd15 - base SD 1.5\n",
"#@markdown * stabilityai/stable-diffusion-2-1-base - base SD 2.1\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", "\n",
"import subprocess\n", "import subprocess\n",
"\n", "\n",
@ -84,6 +86,8 @@
" ExtrasModules.append('sd')\n", " ExtrasModules.append('sd')\n",
"if (extras_enable_tts):\n", "if (extras_enable_tts):\n",
" ExtrasModules.append('tts')\n", " ExtrasModules.append('tts')\n",
"if (extras_enable_chromadb):\n",
" ExtrasModules.append('chromadb')\n",
"\n", "\n",
"params.append(f'--classification-model={Emotions_Model}')\n", "params.append(f'--classification-model={Emotions_Model}')\n",
"params.append(f'--summarization-model={Memory_Model}')\n", "params.append(f'--summarization-model={Memory_Model}')\n",
@ -99,6 +103,8 @@
"!npm install -g localtunnel\n", "!npm install -g localtunnel\n",
"!pip install -r requirements-complete.txt\n", "!pip install -r requirements-complete.txt\n",
"!pip install tensorflow==2.12\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",
"\n", "\n",
"cmd = f\"python server.py {' '.join(params)}\"\n", "cmd = f\"python server.py {' '.join(params)}\"\n",

18
public/scripts/extensions/tts/index.js
View File

@ -151,7 +151,7 @@ function resetTtsPlayback() {
function isTtsProcessing() { function isTtsProcessing() {
let processing = false let processing = false
// Check job queues // Check job queues
if (ttsJobQueue.length > 0 || audioJobQueue > 0) { if (ttsJobQueue.length > 0 || audioJobQueue > 0) {
processing = true processing = true
} }
@ -232,7 +232,7 @@ async function onTtsVoicesClick() {
popupText += ` popupText += `
<div class="voice_preview"> <div class="voice_preview">
<span class="voice_lang">${voice.lang || ''}</span> <span class="voice_lang">${voice.lang || ''}</span>
<b class="voice_name">${voice.name}</b> <b class="voice_name">${voice.name}</b>
<i onclick="tts_preview('${voice.voice_id}')" class="fa-solid fa-play"></i> <i onclick="tts_preview('${voice.voice_id}')" class="fa-solid fa-play"></i>
</div>` </div>`
popupText += `<audio id="${voice.voice_id}" src="${voice.preview_url}" data-disabled="${voice.preview_url == false}"></audio>` popupText += `<audio id="${voice.voice_id}" src="${voice.preview_url}" data-disabled="${voice.preview_url == false}"></audio>`
@ -275,7 +275,7 @@ function onAudioControlClicked() {
function addAudioControl() { function addAudioControl() {
$('#extensionsMenu').prepend(` $('#extensionsMenu').prepend(`
<div id="ttsExtensionMenuItem" class="list-group-item flex-container flexGap5"> <div id="ttsExtensionMenuItem" class="list-group-item flex-container flexGap5">
<div id="tts_media_control" class="extensionsMenuExtensionButton "/></div> <div id="tts_media_control" class="extensionsMenuExtensionButton "/></div>
TTS Playback TTS Playback
</div>`) </div>`)
@ -483,15 +483,15 @@ function onApplyClick() {
Promise.all([ Promise.all([
ttsProvider.onApplyClick(), ttsProvider.onApplyClick(),
updateVoiceMap() updateVoiceMap()
]).catch(error => { ]).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) console.error(error)
setTtsStatus(error, false) setTtsStatus(error, false)
}) })
extension_settings.tts[ttsProviderName] = ttsProvider.settings
saveSettingsDebounced()
setTtsStatus('Successfully applied settings', true)
console.info(`Saved settings ${ttsProviderName} ${JSON.stringify(ttsProvider.settings)}`)
} }
function onEnableClick() { function onEnableClick() {