Merge pull request #3388 from SillyTavern/autoswipe-fix Autoswipe: Fix endless loop if blacklist empty

a1cacbe904f69a24875a9c7e0881b99fca75959e

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

Signed

Parents: 15a3cfcb8ae2d81643dbcf25d81111f29883de1b c32e0bdde74838ae84b071e380d6fb448cd14be4

public/script.js+5 -55 Viewed

     resetMovableStyles,
     forceCharacterEditorTokenize,
     applyPowerUserSettings,
 +    generatedTextFiltered,
 } from './scripts/power-user.js';
 import {

         unblockGeneration();
         generatedPromptCache = '';
 -        //console.log("Generated text size:", text.length, text)
+-
         const isAborted = this.abortController.signal.aborted;
         if (!isAborted && power_user.auto_swipe && !isAbortedgeneratedTextFiltered(text)) {
 -            function containsBlacklistedWords(str, blacklist, threshold) {
 +            return swipe_right();
 -                const regex = new RegExp(`\\b(${blacklist.join('|')})\\b`, 'gi');
 -                const matches = str.match(regex) || [];
 -                return matches.length >= threshold;
 -            }
+-
 -            const generatedTextFiltered = (text) => {
 -                if (text) {
 -                    if (power_user.auto_swipe_minimum_length) {
 -                        if (text.length < power_user.auto_swipe_minimum_length && text.length !== 0) {
 -                            console.log('Generated text size too small');
 -                            return true;
 -                        }
+        }
 -                    if (power_user.auto_swipe_blacklist_threshold) {
 -                        if (containsBlacklistedWords(text, power_user.auto_swipe_blacklist, power_user.auto_swipe_blacklist_threshold)) {
 -                            console.log('Generated text has blacklisted words');
 -                            return true;
 -                        }
 -                    }
 -                }
 -                return false;
 -            };
 -            if (generatedTextFiltered(text)) {
 -                swipe_right();
 -                return;
 -            }
 -        }
         playMessageSound();
+    }

+        }
         const isAborted = abortController && abortController.signal.aborted;
         if (!isAborted && power_user.auto_swipe && !isAbortedgeneratedTextFiltered(getMessage)) {
 -            console.debug('checking for autoswipeblacklist on non-streaming message');
 -            function containsBlacklistedWords(getMessage, blacklist, threshold) {
 -                console.debug('checking blacklisted words');
 -                const regex = new RegExp(`\\b(${blacklist.join('|')})\\b`, 'gi');
 -                const matches = getMessage.match(regex) || [];
 -                return matches.length >= threshold;
 -            }
+-
 -            const generatedTextFiltered = (getMessage) => {
 -                if (power_user.auto_swipe_blacklist_threshold) {
 -                    if (containsBlacklistedWords(getMessage, power_user.auto_swipe_blacklist, power_user.auto_swipe_blacklist_threshold)) {
 -                        console.debug('Generated text has blacklisted words');
 -                        return true;
 -                    }
 -                }
+-
 -                return false;
 -            };
 -            if (generatedTextFiltered(getMessage)) {
 -                console.debug('swiping right automatically');
             is_send_press = false;
                             return swipe_right();
 -                // TODO: do we want to resolve after an auto-swipe?
 -                return;
 -            }
+        }
         console.debug('/api/chats/save called by /Generate');

public/scripts/power-user.js+40 -0 Viewed

+}
 /**
 + * Checks if the generated text should be filtered based on the auto-swipe settings.
 + * @param {string} text The text to check
 + * @returns {boolean} If the generated text should be filtered
 + */
 +export function generatedTextFiltered(text) {
 +    /**
 +     * Checks if the given text contains any of the blacklisted words.
 +     * @param {string} text The text to check
 +     * @param {string[]} blacklist The list of blacklisted words
 +     * @param {number} threshold The number of blacklisted words that need to be present to trigger the check
 +     * @returns {boolean} Whether the text contains blacklisted words
 +     */
 +    function containsBlacklistedWords(text, blacklist, threshold) {
 +        const regex = new RegExp(`\\b(${blacklist.join('|')})\\b`, 'gi');
 +        const matches = text.match(regex) || [];
 +        return matches.length >= threshold;
 +    }
++
 +    // Make sure a generated text is non-empty
 +    // Otherwise we might get in a loop with a broken API
 +    text = text.trim();
 +    if (text.length > 0) {
 +        if (power_user.auto_swipe_minimum_length) {
 +            if (text.length < power_user.auto_swipe_minimum_length) {
 +                console.log('Generated text size too small');
 +                return true;
 +            }
 +        }
 +        if (power_user.auto_swipe_blacklist.length && power_user.auto_swipe_blacklist_threshold) {
 +            if (containsBlacklistedWords(text, power_user.auto_swipe_blacklist, power_user.auto_swipe_blacklist_threshold)) {
 +                console.log('Generated text has blacklisted words');
 +                return true;
 +            }
 +        }
 +    }
++
 +    return false;
 +}
++
 +/**
  * Gets the custom stopping strings from the power user settings.
  * @param {number | undefined} limit Number of strings to return. If 0 or undefined, returns all strings.
  * @returns {string[]} An array of custom stopping strings