rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #916 from pyrater/staging

This commit is contained in:
Cohee 2023-08-11 09:50:04 +03:00 committed by GitHub
parent d18bd20d75 9fec82bd31
commit 166404d8f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
public/scripts/extensions/expressions/index.js
View File

@ -9,7 +9,7 @@ const MODULE_NAME = 'expressions';
const UPDATE_INTERVAL = 2000; const UPDATE_INTERVAL = 2000;
const FALLBACK_EXPRESSION = 'joy'; const FALLBACK_EXPRESSION = 'joy';
const DEFAULT_EXPRESSIONS = [ const DEFAULT_EXPRESSIONS = [
"live2d", "talkinghead",
"admiration", "admiration",
"amusement", "amusement",
"anger", "anger",
@ -396,7 +396,7 @@ function onExpressionsShowDefaultInput() {
async function unloadLiveChar() { async function unloadLiveChar() {
try { try {
const url = new URL(getApiUrl()); const url = new URL(getApiUrl());
url.pathname = '/api/live2d/unload'; url.pathname = '/api/talkinghead/unload';
const loadResponse = await doExtrasFetch(url); const loadResponse = await doExtrasFetch(url);
if (!loadResponse.ok) { if (!loadResponse.ok) {
throw new Error(loadResponse.statusText); throw new Error(loadResponse.statusText);
@ -409,8 +409,8 @@ async function unloadLiveChar() {
} }
async function loadLiveChar() { async function loadLiveChar() {
if (!modules.includes('live2d')) { if (!modules.includes('talkinghead')) {
console.debug('live2d module is disabled'); console.debug('talkinghead module is disabled');
return; return;
} }
@ -426,22 +426,22 @@ async function loadLiveChar() {
spriteFolderName = expressionOverride.path; spriteFolderName = expressionOverride.path;
} }
const live2dPath = `/characters/${encodeURIComponent(spriteFolderName)}/live2d.png`; const talkingheadPath = `/characters/${encodeURIComponent(spriteFolderName)}/talkinghead.png`;
try { try {
const spriteResponse = await fetch(live2dPath); const spriteResponse = await fetch(talkingheadPath);
if (!spriteResponse.ok) { if (!spriteResponse.ok) {
throw new Error(spriteResponse.statusText); throw new Error(spriteResponse.statusText);
} }
const spriteBlob = await spriteResponse.blob(); const spriteBlob = await spriteResponse.blob();
const spriteFile = new File([spriteBlob], 'live2d.png', { type: 'image/png' }); const spriteFile = new File([spriteBlob], 'talkinghead.png', { type: 'image/png' });
const formData = new FormData(); const formData = new FormData();
formData.append('file', spriteFile); formData.append('file', spriteFile);
const url = new URL(getApiUrl()); const url = new URL(getApiUrl());
url.pathname = '/api/live2d/load'; url.pathname = '/api/talkinghead/load';
const loadResponse = await doExtrasFetch(url, { const loadResponse = await doExtrasFetch(url, {
method: 'POST', method: 'POST',
@ -453,10 +453,10 @@ async function loadLiveChar() {
} }
const loadResponseText = await loadResponse.text(); const loadResponseText = await loadResponse.text();
console.log(`Load live2d response: ${loadResponseText}`); console.log(`Load talkinghead response: ${loadResponseText}`);
} catch (error) { } catch (error) {
console.error(`Error loading live2d image: ${live2dPath} - ${error}`); console.error(`Error loading talkinghead image: ${talkingheadPath} - ${error}`);
} }
} }
@ -468,11 +468,11 @@ function handleImageChange() {
return; return;
} }
if (extension_settings.expressions.live2d) { if (extension_settings.expressions.talkinghead) {
// Method get IP of endpoint // Method get IP of endpoint
const live2dResultFeedSrc = `${getApiUrl()}/api/live2d/result_feed`; const talkingheadResultFeedSrc = `${getApiUrl()}/api/talkinghead/result_feed`;
$('#expression-holder').css({ display: '' }); $('#expression-holder').css({ display: '' });
if (imgElement.src !== live2dResultFeedSrc) { if (imgElement.src !== talkingheadResultFeedSrc) {
const expressionImageElement = document.querySelector('.expression_list_image'); const expressionImageElement = document.querySelector('.expression_list_image');
if (expressionImageElement) { if (expressionImageElement) {
@ -481,7 +481,7 @@ function handleImageChange() {
}) })
.then(response => { .then(response => {
if (response.ok) { if (response.ok) {
imgElement.src = live2dResultFeedSrc; imgElement.src = talkingheadResultFeedSrc;
} }
}) })
.catch(error => { .catch(error => {
@ -514,9 +514,9 @@ async function moduleWorker() {
imgElement.src = ""; imgElement.src = "";
//set checkbox to global var //set checkbox to global var
$('#image_type_toggle').prop('checked', extension_settings.expressions.live2d); $('#image_type_toggle').prop('checked', extension_settings.expressions.talkinghead);
if (extension_settings.expressions.live2d) { if (extension_settings.expressions.talkinghead) {
setLive2dState(extension_settings.expressions.live2d); settalkingheadState(extension_settings.expressions.talkinghead);
} }
} }
@ -622,7 +622,7 @@ async function moduleWorker() {
} }
} }
async function live2dcheck() { async function talkingheadcheck() {
const context = getContext(); const context = getContext();
let spriteFolderName = context.name2; let spriteFolderName = context.name2;
const message = getLastCharacterMessage(); const message = getLastCharacterMessage();
@ -638,14 +638,14 @@ async function live2dcheck() {
try { try {
await validateImages(spriteFolderName); await validateImages(spriteFolderName);
let live2dObj = spriteCache[spriteFolderName].find(obj => obj.label === 'live2d'); let talkingheadObj = spriteCache[spriteFolderName].find(obj => obj.label === 'talkinghead');
let live2dPath_f = live2dObj ? live2dObj.path : null; let talkingheadPath_f = talkingheadObj ? talkingheadObj.path : null;
if (live2dPath_f != null) { if (talkingheadPath_f != null) {
//console.log("live2dPath_f " + live2dPath_f); //console.log("talkingheadPath_f " + talkingheadPath_f);
return true; return true;
} else { } else {
//console.log("live2dPath_f is null"); //console.log("talkingheadPath_f is null");
unloadLiveChar(); unloadLiveChar();
return false; return false;
} }
@ -654,15 +654,15 @@ async function live2dcheck() {
} }
} }
function setLive2dState(switch_var) { function settalkingheadState(switch_var) {
extension_settings.expressions.live2d = switch_var; // Store setting extension_settings.expressions.talkinghead = switch_var; // Store setting
saveSettingsDebounced(); saveSettingsDebounced();
live2dcheck().then(result => { talkingheadcheck().then(result => {
if (result) { if (result) {
//console.log("Live2d exists!"); //console.log("talkinghead exists!");
if (extension_settings.expressions.live2d) { if (extension_settings.expressions.talkinghead) {
loadLiveChar(); loadLiveChar();
} else { } else {
unloadLiveChar(); unloadLiveChar();
@ -671,7 +671,7 @@ function setLive2dState(switch_var) {
} else { } else {
//console.log("Live2d does not exist."); //console.log("talkinghead does not exist.");
} }
}); });
} }
@ -863,7 +863,7 @@ async function getExpressionsList() {
} }
async function setExpression(character, expression, force) { async function setExpression(character, expression, force) {
if (!extension_settings.expressions.live2d) { if (!extension_settings.expressions.talkinghead) {
console.debug('entered setExpressions'); console.debug('entered setExpressions');
await validateImages(character); await validateImages(character);
const img = $('img.expression'); const img = $('img.expression');
@ -976,14 +976,14 @@ async function setExpression(character, expression, force) {
} else { } else {
live2dcheck().then(result => { talkingheadcheck().then(result => {
if (result) { if (result) {
// Find the <img> element with id="expression-image" and class="expression" // Find the <img> element with id="expression-image" and class="expression"
const imgElement = document.querySelector('img#expression-image.expression'); const imgElement = document.querySelector('img#expression-image.expression');
//console.log("searching"); //console.log("searching");
if (imgElement) { if (imgElement) {
//console.log("setting value"); //console.log("setting value");
imgElement.src = getApiUrl() + '/api/live2d/result_feed'; imgElement.src = getApiUrl() + '/api/talkinghead/result_feed';
} }
} else { } else {
@ -1255,7 +1255,7 @@ function setExpressionOverrideHtml(forceClear = false) {
<label class="switch"> <label class="switch">
<input id="image_type_toggle" type="checkbox"> <input id="image_type_toggle" type="checkbox">
<span class="slider round"></span> <span class="slider round"></span>
<label for="image_type_toggle">Image Type - Live2d (extras)</label> <label for="image_type_toggle">Image Type - talkinghead (extras)</label>
</label> </label>
</div> </div>
<div class="offline_mode"> <div class="offline_mode">
@ -1305,7 +1305,7 @@ function setExpressionOverrideHtml(forceClear = false) {
$('.expression_settings').hide(); $('.expression_settings').hide();
$('#image_type_toggle').on('click', function () { $('#image_type_toggle').on('click', function () {
setLive2dState(this.checked); settalkingheadState(this.checked);
}); });
} }

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

@ -9,6 +9,7 @@ import { SystemTtsProvider } from './system.js'
import { NovelTtsProvider } from './novel.js' import { NovelTtsProvider } from './novel.js'
import { power_user } from '../../power-user.js' import { power_user } from '../../power-user.js'
import { rvcVoiceConversion } from "../rvc/index.js" import { rvcVoiceConversion } from "../rvc/index.js"
export { talkingAnimation };
const UPDATE_INTERVAL = 1000 const UPDATE_INTERVAL = 1000
@ -171,12 +172,13 @@ function talkingAnimation(switchValue) {
if (switchValue !== storedvalue) { if (switchValue !== storedvalue) {
try { try {
console.log(animationType + " Talking Animation"); console.log(animationType + " Talking Animation");
doExtrasFetch(`${apiUrl}/api/live2d/${animationType}_talking`); doExtrasFetch(`${apiUrl}/api/talkinghead/${animationType}_talking`);
storedvalue = switchValue; // Update the storedvalue to the current switchValue storedvalue = switchValue; // Update the storedvalue to the current switchValue
} catch (error) { } catch (error) {
// Handle the error here or simply ignore it to prevent logging // Handle the error here or simply ignore it to prevent logging
} }
} }
updateUiAudioPlayState()
} }
function resetTtsPlayback() { function resetTtsPlayback() {
@ -305,10 +307,8 @@ function updateUiAudioPlayState() {
// Give user feedback that TTS is active by setting the stop icon if processing or playing // Give user feedback that TTS is active by setting the stop icon if processing or playing
if (!audioElement.paused || isTtsProcessing()) { if (!audioElement.paused || isTtsProcessing()) {
img = 'fa-solid fa-stop-circle extensionsMenuExtensionButton' img = 'fa-solid fa-stop-circle extensionsMenuExtensionButton'
talkingAnimation(true)
} else { } else {
img = 'fa-solid fa-circle-play extensionsMenuExtensionButton' img = 'fa-solid fa-circle-play extensionsMenuExtensionButton'
talkingAnimation(false)
} }
$('#tts_media_control').attr('class', img); $('#tts_media_control').attr('class', img);
} else { } else {
@ -345,6 +345,7 @@ function completeCurrentAudioJob() {
audioQueueProcessorReady = true audioQueueProcessorReady = true
currentAudioJob = null currentAudioJob = null
lastAudioPosition = 0 lastAudioPosition = 0
talkingAnimation(false) //stop lip animation
// updateUiPlayState(); // updateUiPlayState();
} }

3
public/scripts/extensions/tts/system.js
View File

@ -1,5 +1,6 @@
import { isMobile } from "../../RossAscends-mods.js"; import { isMobile } from "../../RossAscends-mods.js";
import { getPreviewString } from "./index.js"; import { getPreviewString } from "./index.js";
import { talkingAnimation } from './index.js';
export { SystemTtsProvider } export { SystemTtsProvider }
@ -69,6 +70,7 @@ var speechUtteranceChunker = function (utt, settings, callback) {
//placing the speak invocation inside a callback fixes ordering and onend issues. //placing the speak invocation inside a callback fixes ordering and onend issues.
setTimeout(function () { setTimeout(function () {
speechSynthesis.speak(newUtt); speechSynthesis.speak(newUtt);
talkingAnimation(true);
}, 0); }, 0);
}; };
@ -221,6 +223,7 @@ class SystemTtsProvider {
//some code to execute when done //some code to execute when done
resolve(silence); resolve(silence);
console.log('System TTS done'); console.log('System TTS done');
talkingAnimation(false);
}); });
}); });
} }