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

Don't use talkinghead with local classification model

This commit is contained in:
Cohee 2023-09-11 13:01:45 +03:00
parent c9a9dab523
commit 7f55d108cf
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,7 +449,7 @@ function handleImageChange() {
return; return;
} }
if (extension_settings.expressions.talkinghead) { if (extension_settings.expressions.talkinghead && !extension_settings.expressions.local) {
// Method get IP of endpoint // Method get IP of endpoint
const talkingheadResultFeedSrc = `${getApiUrl()}/api/talkinghead/result_feed`; const talkingheadResultFeedSrc = `${getApiUrl()}/api/talkinghead/result_feed`;
$('#expression-holder').css({ display: '' }); $('#expression-holder').css({ display: '' });
@ -479,6 +479,14 @@ function handleImageChange() {
async function moduleWorker() { async function moduleWorker() {
const context = getContext(); const context = getContext();
// Hide and disable talkinghead while in local mode
$('#image_type_block').toggle(!extension_settings.expressions.local);
if (extension_settings.expressions.local && extension_settings.expressions.talkinghead) {
$('#image_type_toggle').prop('checked', false);
setTalkingHeadState(false);
}
// non-characters not supported // non-characters not supported
if (!context.groupId && (context.characterId === undefined || context.characterId === 'invalid-safety-id')) { if (!context.groupId && (context.characterId === undefined || context.characterId === 'invalid-safety-id')) {
removeExpression(); removeExpression();
@ -648,6 +656,10 @@ function setTalkingHeadState(switch_var) {
extension_settings.expressions.talkinghead = switch_var; // Store setting extension_settings.expressions.talkinghead = switch_var; // Store setting
saveSettingsDebounced(); saveSettingsDebounced();
if (extension_settings.expressions.local) {
return;
}
talkingHeadCheck().then(result => { talkingHeadCheck().then(result => {
if (result) { if (result) {
//console.log("talkinghead exists!"); //console.log("talkinghead exists!");
@ -929,7 +941,7 @@ async function getExpressionsList() {
} }
async function setExpression(character, expression, force) { async function setExpression(character, expression, force) {
if (!extension_settings.expressions.talkinghead) { if (extension_settings.expressions.local || !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');
@ -1305,6 +1317,7 @@ function setExpressionOverrideHtml(forceClear = false) {
$('#expressions_show_default').prop('checked', extension_settings.expressions.showDefault).trigger('input'); $('#expressions_show_default').prop('checked', extension_settings.expressions.showDefault).trigger('input');
$('#expression_local').prop('checked', extension_settings.expressions.local).on('input', function () { $('#expression_local').prop('checked', extension_settings.expressions.local).on('input', function () {
extension_settings.expressions.local = !!$(this).prop('checked'); extension_settings.expressions.local = !!$(this).prop('checked');
moduleWorker();
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#expression_override_cleanup_button').on('click', onClickExpressionOverrideRemoveAllButton); $('#expression_override_cleanup_button').on('click', onClickExpressionOverrideRemoveAllButton);

2
public/scripts/extensions/expressions/settings.html
View File

@ -10,7 +10,7 @@
<input id="expression_local" type="checkbox" /> <input id="expression_local" type="checkbox" />
<span data-i18n="Local server classification">Local server classification</span> <span data-i18n="Local server classification">Local server classification</span>
</label> </label>
<label class="checkbox_label" for="image_type_toggle"> <label id="image_type_block" class="checkbox_label" for="image_type_toggle">
<input id="image_type_toggle" type="checkbox"> <input id="image_type_toggle" type="checkbox">
<span>Image Type - talkinghead (extras)</span> <span>Image Type - talkinghead (extras)</span>
</label> </label>