Merge pull request #3760 from SillyTavern/feat/expressions-none-default-option Add 'none' expression classifier API option and set as default

f4eb32c71c78bcdc0ee87bbbd91a67c9990bff29

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/extensions/expressions/index.js+18 -3 Viewed

     extras: 1,
     llm: 2,
     webllm: 3,
+    none: 99,
 };
 let expressionsList = null;

     const expressionApi = EXPRESSION_API[api] || extension_settings.expressions.api;
     const filterAvailable = !isFalseBoolean(filter);
+    if (expressionApi === EXPRESSION_API.none) {
+        toastr.warning('No classifier API selected');
+        return '';
+    }
     if (!modules.includes('classify') && expressionApi == EXPRESSION_API.extras) {
         toastr.warning('Text classification is disabled or not available');
         return '';

                 return parseLlmResponse(emotionResponse, expressionsList);
+            }
             // Extras
-            default: {
+            case EXPRESSION_API.extras: {
                 const url = new URL(getApiUrl());
                 url.pathname = '/api/classify';

                     return data.classification[0].label;
+                }
             } break;
+            // None
+            case EXPRESSION_API.none: {
+                // Return empty, the fallback expression will be used
+                return '';
+            }
+            default: {
+                toastr.error('Invalid API selected');
+                return '';
+            }
+        }
     } catch (error) {
         toastr.error('Could not classify expression. Check the console or your backend for more information.');

 function migrateSettings() {
     if (extension_settings.expressions.api === undefined) {
-        extension_settings.expressions.api = EXPRESSION_API.local;
+        extension_settings.expressions.api = EXPRESSION_API.none;
         saveSettingsDebounced();
+    }

         $('#open_chat_expressions').hide();
         await renderAdditionalExpressionSettings();
-        $('#expression_api').val(extension_settings.expressions.api ?? EXPRESSION_API.extras);
+        $('#expression_api').val(extension_settings.expressions.api ?? EXPRESSION_API.none);
         $('.expression_llm_prompt_block').toggle([EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(extension_settings.expressions.api));
         $('#expression_llm_prompt').val(extension_settings.expressions.llmPrompt ?? '');
         $('#expression_llm_prompt').on('input', function () {

public/scripts/extensions/expressions/settings.html+1 -0 Viewed

                 <label for="expression_api" data-i18n="Classifier API">Classifier API</label>
                 <small data-i18n="Select the API for classifying expressions.">Select the API for classifying expressions.</small>
                 <select id="expression_api" class="flex1 margin0">
+                    <option value="99" data-i18n="[ None ]">[ None ]</option>
                     <option value="0" data-i18n="Local">Local</option>
                     <option value="1" data-i18n="Extras">Extras (deprecated)</option>
                     <option value="2" data-i18n="Main API">Main API</option>