rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-06 04:38:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2138 from Wolfsblvt/fix-expression-list-resolve

Browse Source 
Fix expression list resolve
This commit is contained in:
Cohee 2024-04-25 11:00:34 +03:00 committed by GitHub
commit 62cf611fdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1270,13 +1270,10 @@ async function getExpressionsList() {
* @returns {Promise<string[]>} * @returns {Promise<string[]>}
*/ */
async function resolveExpressionsList() { async function resolveExpressionsList() {
// get something for offline mode (default images) // See if we can retrieve a specific expression list from the API
if (!modules.includes('classify') && extension_settings.expressions.api == EXPRESSION_API.extras) {
return DEFAULT_EXPRESSIONS;
}
try { try {
if (extension_settings.expressions.api == EXPRESSION_API.extras) { // Check Extras api first, if enabled and that module active
if (extension_settings.expressions.api == EXPRESSION_API.extras && modules.includes('classify')) {
const url = new URL(getApiUrl()); const url = new URL(getApiUrl());
url.pathname = '/api/classify/labels'; url.pathname = '/api/classify/labels';
@ -1291,7 +1288,10 @@ async function getExpressionsList() {
expressionsList = data.labels; expressionsList = data.labels;
return expressionsList; return expressionsList;
} }
} else { }
// If running the local classify model (not using the LLM), we ask that one
if (extension_settings.expressions.api == EXPRESSION_API.local) {
const apiResult = await fetch('/api/extra/classify/labels', { const apiResult = await fetch('/api/extra/classify/labels', {
method: 'POST', method: 'POST',
headers: getRequestHeaders(), headers: getRequestHeaders(),
@ -1303,11 +1303,12 @@ async function getExpressionsList() {
return expressionsList; return expressionsList;
} }
} }
} } catch (error) {
catch (error) {
console.log(error); console.log(error);
return [];
} }
// If there was no specific list, or an error, just return the default expressions
return DEFAULT_EXPRESSIONS;
} }
const result = await resolveExpressionsList(); const result = await resolveExpressionsList();