Replace macros in DRY sequence breakers

9215dfd0c6d74e2b15cba11e5a64796c42e34146

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

public/scripts/textgen-settings.js+29 -1 Viewed

     return 10;
+}
 +/**
 + * Replaces {{macro}} in a comma-separated or serialized JSON array string.
 + * @param {string} str Input string
 + * @returns {string} Output string
 + */
 +function replaceMacrosInList(str) {
 +    if (!str || typeof str !== 'string') {
 +        return str;
 +    }
++
 +    try {
 +        const array = JSON.parse(str);
 +        if (!Array.isArray(array)) {
 +            throw new Error('Not an array');
 +        }
 +        for (let i = 0; i < array.length; i++) {
 +            array[i] = substituteParams(array[i]);
 +        }
 +        return JSON.stringify(array);
 +    } catch {
 +        const array = str.split(',');
 +        for (let i = 0; i < array.length; i++) {
 +            array[i] = substituteParams(array[i]);
 +        }
 +        return array.join(',');
 +    }
 +}
++
 export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate, isContinue, cfgValues, type) {
     const canMultiSwipe = !isContinue && !isImpersonate && type !== 'quiet';
     const dynatemp = isDynamicTemperatureSupported();

         'dry_allowed_length': settings.dry_allowed_length,
         'dry_multiplier': settings.dry_multiplier,
         'dry_base': settings.dry_base,
         'dry_sequence_breakers': replaceMacrosInList(settings.dry_sequence_breakers),
         'dry_penalty_last_n': settings.dry_penalty_last_n,
         'max_tokens_second': settings.max_tokens_second,
         'sampler_priority': settings.type === OOBA ? settings.sampler_priority : undefined,