Merge ebbd9a816d into d5869e3f90

add import tags in list of more opt

public/index.html

@@ -1267,6 +1267,37 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div data-newbie-hidden data-tg-type="mancer, ooba, koboldcpp, aphrodite, tabby" name="dryBlock" class="wide100p">
+                                        <h4 class="wide100p textAlignCenter">
+                                            <label data-i18n="DRY Sampling">DRY Sampling</label>
+                                            <div class=" fa-solid fa-circle-info opacity50p " data-i18n="[title]DRY Sampling" title="Allows you to apply the DRY repetition penalty as outlined in https://github.com/oobabooga/text-generation-webui/pull/5677. Set multiplier to 0 to disable"></div>
+                                        </h4>
+                                        <div data-tg-type="mancer, ooba, koboldcpp, aphrodite, tabby" class="flex-container flexFlowRow gap10px flexShrink">
+                                            <div data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                                <small data-i18n="Allowed Length">Allowed Length</small>
+                                                <input class="neo-range-slider" type="range" id="dry_allowed_length_textgenerationwebui" name="volume" min="1" max="20" step="1" />
+                                                <input class="neo-range-input" type="number" min="1" max="20" step="1" data-for="dry_allowed_length_textgenerationwebui" id="dry_allowed_length_counter_textgenerationwebui">
+                                            </div>
+                                            <div data-tg-type="mancer, ooba, koboldcpp, aphrodite" data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                                <small data-i18n="Multiplier">Multiplier</small>
+                                                <input class="neo-range-slider" type="range" id="dry_multiplier_textgenerationwebui" name="volume" min="0" max="10" step="0.01" />
+                                                <input class="neo-range-input" type="number" min="0" max="5" step="0.01" data-for="dry_multiplier_textgenerationwebui" id="dry_multiplier_counter_textgenerationwebui">
+                                            </div>
+                                            <div data-tg-type="mancer, ooba, koboldcpp, aphrodite" data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                                <small data-i18n="Base">Base</small>
+                                                <input class="neo-range-slider" type="range" id="dry_base_textgenerationwebui" name="volume" min="1" max="4" step="0.01" />
+                                                <input class="neo-range-input" type="number" min="1" max="4" step="0.01" data-for="dry_base_textgenerationwebui" id="dry_base_counter_textgenerationwebui">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="range-block">
+                                        <div class="range-block-title justifyLeft">
+                                            <span data-i18n="DRY Sequence Breakers">DRY Sequence Breakers</span>
+                                        </div>
+                                        <div class="wide100p">
+                                            <textarea id="dry_sequence_breakers_textgenerationwebui" class="text_pole textarea_compact" name="sequence_breakers" rows="3" data-i18n="[placeholder]Sequence breakers for DRY sampling can be added here as a comma separated list enclosed in brackets, where each element is enclosed in double quotation marks" placeholder="Sequence breakers for DRY sampling can be added here as a comma separated list enclosed in brackets, where each element is enclosed in double quotation marks."></textarea>
+                                        </div>
+                                    </div>																																																											 
                                     <div data-newbie-hidden data-tg-type="ooba, mancer, koboldcpp, tabby, llamacpp, aphrodite" name="dynaTempBlock" class="wide100p">
                                         <h4 class="wide100p textAlignCenter" data-i18n="DynaTemp">
                                             <div class="flex-container alignitemscenter" style="justify-content: center;">
@@ -4493,6 +4524,9 @@
                                                 <option id="replace_update" data-i18n="Replace / Update">
                                                     Replace / Update
                                                 </option>
+                                                <option id="import_tags" data-i18n="Import Tags">
+                                                    Import Tags
+                                                </option>
                                                 <!--<option id="dupe_button">
                                                         Duplicate
                                                     </option>
@@ -6338,6 +6372,9 @@
     <script type="module" src="lib/swiped-events.js"></script>
     <script type="module" src="lib/eventemitter.js"></script>
     <script type="module" src="scripts/i18n.js"></script>
+    <script type="module" src="scripts/bulk-edit.js"></script>
+    <script type="module" src="scripts/setting-search.js"></script>
+    <script type="module" src="scripts/server-history.js"></script>
     <script type="module" src="script.js"></script>
     <script>
         // Configure toast library:

public/script.js

@@ -10294,6 +10294,9 @@ jQuery(async function () {
                     $('#character_replace_file').off('change').on('change', uploadReplacementCard).trigger('click');
                 }
             } break;
+            case 'import_tags':{
+                await importTags(characters[this_chid]);
+            } break;
             /*case 'delete_button':
                 popup_type = "del_ch";
                 callPopup(`

public/scripts/power-user.js

@@ -675,6 +675,7 @@ async function CreateZenSliders(elmnt) {
         sliderID == 'top_k' ||
         sliderID == 'mirostat_mode_kobold' ||
         sliderID == 'rep_pen_range' ||
+		sliderID == 'dry_allowed_length_textgenerationwebui' ||
         sliderID == 'max_tokens_second_textgenerationwebui') {
         decimals = 0;
     }
@@ -683,6 +684,8 @@ async function CreateZenSliders(elmnt) {
         sliderID == 'dynatemp_exponent_textgenerationwebui' ||
         sliderID == 'smoothing_curve_textgenerationwebui' ||
         sliderID == 'smoothing_factor_textgenerationwebui') {
+		sliderID == 'dry_multiplier_textgenerationwebui' ||
+        sliderID == 'dry_base_textgenerationwebui') {
         decimals = 2;
     }
     if (sliderID == 'eta_cutoff_textgenerationwebui' ||
@@ -743,6 +746,7 @@ async function CreateZenSliders(elmnt) {
         sliderID == 'rep_pen_slope' ||
         sliderID == 'smoothing_factor_textgenerationwebui' ||
         sliderID == 'smoothing_curve_textgenerationwebui' ||
+		sliderID == 'dry_multiplier_textgenerationwebui' ||											 
         sliderID == 'min_length_textgenerationwebui') {
         offVal = 0;
     }

public/scripts/textgen-settings.js

@@ -116,6 +116,10 @@ const settings = {
     dynatemp_exponent: 1.0,
     smoothing_factor: 0.0,
     smoothing_curve: 1.0,
+	dry_allowed_length: 2,				   
+	dry_multiplier: 0.0,				 
+	dry_base: 1.75,			
+	dry_sequence_breakers: '',
     max_tokens_second: 0,
     seed: -1,
     preset: 'Default',
@@ -190,6 +194,10 @@ const setting_names = [
     'dynatemp_exponent',
     'smoothing_factor',
     'smoothing_curve',
+	'dry_allowed_length',
+	'dry_multiplier',
+	'dry_base',
+	'dry_sequence_breakers',
     'max_tokens_second',
     'encoder_rep_pen',
     'freq_pen',
@@ -665,6 +673,9 @@ jQuery(function () {
             'guidance_scale_textgenerationwebui': 1,
             'smoothing_factor_textgenerationwebui': 0,
             'smoothing_curve_textgenerationwebui': 1,
+			'dry_allowed_length_textgenerationwebui': 2,
+			'dry_multiplier_textgenerationwebui': 0,
+			'dry_base_textgenerationwebui': 1.75,
         };
 
         for (const [id, value] of Object.entries(inputs)) {
@@ -1028,6 +1039,10 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
         'dynatemp_exponent': settings.dynatemp ? settings.dynatemp_exponent : undefined,
         'smoothing_factor': settings.smoothing_factor,
         'smoothing_curve': settings.smoothing_curve,
+		'dry_allowed_length': settings.dry_allowed_length,
+		'dry_multiplier': settings.dry_multiplier,
+		'dry_base': settings.dry_base,
+		'dry_sequence_breakers': settings.dry_sequence_breakers,
         'max_tokens_second': settings.max_tokens_second,
         'sampler_priority': settings.type === OOBA ? settings.sampler_priority : undefined,
         'samplers': settings.type === LLAMACPP ? settings.samplers : undefined,