Instruct: Add Sequences as Stop Strings control (#4355) * Instruct: Add Sequences as Stop Strings control * lint fix

25e965f717c942c17e72ca50bc54993a7f0227bb

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

Signed

public/index.html+4 -0 Viewed

                                     <input id="instruct_macro" type="checkbox" />
                                     <small data-i18n="Replace Macro in Sequences">Replace Macro in Sequences</small>
                                 </label>
+                                <label for="instruct_sequences_as_stop_strings" class="checkbox_label">
+                                    <input id="instruct_sequences_as_stop_strings" type="checkbox" />
+                                    <small data-i18n="Sequences as Stop Strings">Sequences as Stop Strings</small>
+                                </label>
                                 <label for="instruct_skip_examples" class="checkbox_label">
                                     <input id="instruct_skip_examples" type="checkbox" />
                                     <small data-i18n="Skip Example Dialogues Formatting">Skip Example Dialogues Formatting</small>

public/scripts/instruct-mode.js+17 -10 Viewed

     power_user,
     context_presets,
 } from './power-user.js';
-import { regexFromString, resetScrollHeight } from './utils.js';
+import { onlyUnique, regexFromString, resetScrollHeight } from './utils.js';
 /**
  * @type {any[]} Instruct mode presets.

     { id: 'instruct_skip_examples', property: 'skip_examples', isCheckbox: true },
     { id: 'instruct_names_behavior', property: 'names_behavior', isCheckbox: false },
     { id: 'instruct_system_same_as_user', property: 'system_same_as_user', isCheckbox: true, trigger: true },
+    { id: 'instruct_sequences_as_stop_strings', property: 'sequences_as_stop_strings', isCheckbox: true },
 ];
 /**

         skip_examples: false,
         system_same_as_user: false,
         names_behavior: names_behavior_types.FORCE,
+        sequences_as_stop_strings: true,
     };
     for (let key in defaults) {

         const combined_sequence = [
             stop_sequence,
-            input_sequence,
+        ];
-            output_sequence,
-            first_output_sequence,
+        if (instruct.sequences_as_stop_strings) {
-            last_output_sequence,
+            combined_sequence.push(
-            system_sequence,
+                input_sequence,
-            last_system_sequence,
+                output_sequence,
-        ].join('\n');
+                first_output_sequence,
+                last_output_sequence,
-        combined_sequence.split('\n').filter((line, index, self) => self.indexOf(line) === index).forEach(addInstructSequence);
+                system_sequence,
+                last_system_sequence,
+            );
+        }
+        combined_sequence.join('\n').split('\n').filter(onlyUnique).forEach(addInstructSequence);
+    }
     if (useStopStrings ?? power_user.context.use_stop_strings) {

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

         system_same_as_user: false,
         /** @deprecated Use output_suffix instead */
         separator_sequence: '',
+        sequences_as_stop_strings: true,
     },
     context: {