setup Aphrodite-specific API flag handling

public/index.html

@@ -1142,17 +1142,17 @@
                                         <input class="neo-range-slider" type="range" id="eta_cutoff_textgenerationwebui" name="volume" min="0" max="20" step="0.01">
                                         <input class="neo-range-input" type="number" min="0" max="20" step="0.01" data-for="eta_cutoff_textgenerationwebui" id="eta_cutoff_counter_textgenerationwebui">
                                     </div>
-                                    <div class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0" >
+                                    <div class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                         <small data-i18n="rep.pen">Repetition Penalty</small>
                                         <input class="neo-range-slider" type="range" id="rep_pen_textgenerationwebui" name="volume" min="1" max="1.5" step="0.01">
                                         <input class="neo-range-input" type="number" min="1" max="1.5" step="0.01" data-for="rep_pen_textgenerationwebui" id="rep_pen_counter_textgenerationwebui">
                                     </div>
-                                    <div class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                    <div data-forAphro=False class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                         <small data-i18n="rep.pen range">Repetition Penalty Range</small>
                                         <input class="neo-range-slider" type="range" id="rep_pen_range_textgenerationwebui" name="volume" min="0" max="4096" step="1">
                                         <input class="neo-range-input" type="number" min="0" max="4096" step="1" data-for="rep_pen_range_textgenerationwebui" id="rep_pen_range_counter_textgenerationwebui">
                                     </div>
-                                    <div data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                    <div data-forAphro=False data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                         <small data-i18n="Encoder Rep. Pen.">Encoder Penalty</small>
                                         <input class="neo-range-slider" type="range" id="encoder_rep_pen_textgenerationwebui" name="volume" min="0.8" max="1.5" step="0.01" />
                                         <input class="neo-range-input" type="number" min="0.8" max="1.5" step="0.01" data-for="encoder_rep_pen_textgenerationwebui" id="encoder_rep_pen_counter_textgenerationwebui">
@@ -1167,7 +1167,7 @@
                                         <input class="neo-range-slider" type="range" id="presence_pen_textgenerationwebui" name="volume" min="-2" max="2" step="0.01" />
                                         <input class="neo-range-input" type="number" min="-2" max="2" step="0.01" data-for="presence_pen_textgenerationwebui" id="presence_pen_counter_textgenerationwebui">
                                     </div>
-                                    <div data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                    <div data-forAphro=False data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                         <small data-i18n="No Repeat Ngram Size">No Repeat Ngram Size</small>
                                         <input class="neo-range-slider" type="range" id="no_repeat_ngram_size_textgenerationwebui" name="volume" min="0" max="20" step="1">
                                         <input class="neo-range-input" type="number" min="0" max="20" step="1" data-for="no_repeat_ngram_size_textgenerationwebui" id="no_repeat_ngram_size_counter_textgenerationwebui">
@@ -1178,22 +1178,22 @@
                                         <input class="neo-range-input" type="number" min="0" max="2000" step="1" data-for="min_length_textgenerationwebui" id="min_length_counter_textgenerationwebui">
                                     </div>
                                     <!--
-                                        <div data-forAphro=True class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0" data-i18n="Responses">
+                                        <div data-tg-type="aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0" data-i18n="Responses">
                                             <small>Responses</small>
                                             <input class="neo-range-slider" type="range" id="n_aphrodite_textgenerationwebui" name="volume" min="1" max="5" step="1">
                                             <input class="neo-range-input" type="number" min="1" max="5" step="1" data-for="n_aphrodite" id="n_aphrodite_counter_textgenerationwebui">
                                         </div>
-                                        <div data-forAphro=True class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0 displayNone" data-i18n="Keep # Best Responses">
+                                        <div data-tg-type="aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0 displayNone" data-i18n="Keep # Best Responses">
                                             <small>Keep # Best Responses</small>
                                             <input class="neo-range-slider" type="range" id="best_of_aphrodite_textgenerationwebui" name="volume" min="1" max="5" step="1">
                                             <input class="neo-range-input" type="number" min="1" max="5" step="1" data-for="best_of_aphrodite" id="best_of_aphrodite_counter_textgenerationwebui">
                                         </div>
-                                        <div data-forAphro=True class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0 displayNone" data-i18n="Logit Probabilities">
+                                        <div data-tg-type="aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0 displayNone" data-i18n="Logit Probabilities">
                                             <small>Logit Probabilities</small>
                                             <input class="neo-range-slider" type="range" id="log_probs_aphrodite_textgenerationwebui" name="volume" min="0" max="5" step="1">
                                             <input class="neo-range-input" type="number" min="0" max="5" step="1" data-for="log_probs_aphrodite" id="log_probs_aphrodite_counter_textgenerationwebui">
                                         </div>
-                                        <div data-forAphro=True class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0 displayNone" data-i18n="Prompt Logit Probabilities">
+                                        <div data-tg-type="aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0 displayNone" data-i18n="Prompt Logit Probabilities">
                                             <small>Prompt Logit Probabilities</small>
                                             <input class="neo-range-slider" type="range" id="prompt_log_probs_aphrodite_textgenerationwebui" name="volume" min="0" max="5" step="1">
                                             <input class="neo-range-input" type="number" min="0" max="5" step="1" data-for="prompt_log_probs_aphrodite" id="prompt_log_probs_aphrodite_counter_textgenerationwebui">
@@ -1244,7 +1244,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div data-newbie-hidden name="contrastiveSearchBlock" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                    <div data-forAphro=False data-newbie-hidden name="contrastiveSearchBlock" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                         <h4 class="textAlignCenter" data-i18n="Contrastive search">Contrast Search
                                             <div class=" fa-solid fa-circle-info opacity50p " title="Helpful tip coming soon."></div>
                                         </h4>
@@ -1272,14 +1272,14 @@
                                                     <div class="fa-solid fa-circle-info opacity50p " data-i18n="Ban the eos_token. This forces the model to never end the generation prematurely" title="Ban the eos_token. This forces the model to never end the generation prematurely."></div>
                                                 </small>
                                             </label>
-                                            <!--
+
-                                                <label data-forAphro=True class="checkbox_label" for="ignore_eos_token_aphrodite_textgenerationwebui">
+                                            <label data-tg-type="aphrodite" class="checkbox_label" for="ignore_eos_token_aphrodite_textgenerationwebui">
-                                                    <input type="checkbox" id="ignore_eos_token_aphrodite_textgenerationwebui" />
+                                                <input type="checkbox" id="ignore_eos_token_aphrodite_textgenerationwebui" />
-                                                    <small data-i18n="Ignore EOS Token">Ignore EOS Token
+                                                <small data-i18n="Ignore EOS Token">Ignore EOS Token
-                                                        <div class="fa-solid fa-circle-info opacity50p " data-i18n="Ignore the EOS Token even if it generates." title="Ignore the EOS Token even if it generates."></div>
+                                                    <div class="fa-solid fa-circle-info opacity50p " data-i18n="Ignore the EOS Token even if it generates." title="Ignore the EOS Token even if it generates."></div>
-                                                    </small>
+                                                </small>
-                                                </label>
+                                            </label>
-                                                -->
+
                                             <label class="checkbox_label  flexGrow flexShrink" for="skip_special_tokens_textgenerationwebui">
                                                 <input type="checkbox" id="skip_special_tokens_textgenerationwebui" />
                                                 <small data-i18n="Skip Special Tokens">Skip Special Tokens</small>
@@ -1290,15 +1290,15 @@
                                                     <div class="fa-solid fa-circle-info opacity50p " data-i18n="Use the temperature sampler last." title="Use the temperature sampler last."></div>
                                                 </small>
                                             </label>
-                                            <!--
+
-                                                <label data-forAphro=True class="checkbox_label" for="spaces_between_special_tokens_aphrodite_textgenerationwebui">
+                                            <label data-tg-type="aphrodite" class="checkbox_label" for="spaces_between_special_tokens_aphrodite_textgenerationwebui">
-                                                    <input type="checkbox" id="spaces_between_special_tokens_aphrodite_textgenerationwebui" />
+                                                <input type="checkbox" id="spaces_between_special_tokens_aphrodite_textgenerationwebui" />
-                                                    <small data-i18n="Spaces Between Special Tokens">Spaces Between Special Tokens</small>
+                                                <small data-i18n="Spaces Between Special Tokens">Spaces Between Special Tokens</small>
-                                                </label>
+                                            </label>
-                                                -->
+
                                         </div>
                                     </div>
-                                    <div data-newbie-hidden class="flex-container flexFlowColumn alignitemscenter flexBasis48p flexGrow flexShrink gap0">
+                                    <div data-forAphro=False data-newbie-hidden class="flex-container flexFlowColumn alignitemscenter flexBasis48p flexGrow flexShrink gap0">
                                         <small data-i18n="Seed" class="textAlignCenter">Seed</small>
                                         <input type="number" id="seed_textgenerationwebui" class="text_pole textAlignCenter" min="-1" value="-1" maxlength="100" />
                                     </div>
@@ -1312,17 +1312,17 @@
                                             <textarea id="banned_tokens_textgenerationwebui" class="text_pole textarea_compact" name="banned_tokens_textgenerationwebui" rows="3" placeholder="Example:&#10;some text&#10;[42, 69, 1337]"></textarea>
                                         </div>
                                     </div>
-                                    <div class="wide100p">
+                                    <div data-forAphro=False class="wide100p">
                                         <hr data-newbie-hidden class="width100p">
                                         <h4 data-i18n="CFG" class="textAlignCenter">CFG
                                             <div class="margin5 fa-solid fa-circle-info opacity50p " title="Helpful tip coming soon."></div>
                                         </h4>
-                                        <div data-newbie-hidden data-forAphro=False class="alignitemscenter flex-container flexFlowColumn flexShrink gap0">
+                                        <div data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexShrink gap0">
                                             <small>Scale</small>
                                             <input class="neo-range-slider" type="range" id="guidance_scale_textgenerationwebui" name="volume" min="0.1" max="4" step="0.05">
                                             <input class="neo-range-input" type="number" min="0.1" max="4" step="0.05" data-for="guidance_scale_textgenerationwebui" id="guidance_scale_counter_textgenerationwebui">
                                         </div>
-                                        <div data-newbie-hidden data-forAphro=False class="range-block">
+                                        <div data-newbie-hidden class="range-block">
                                             <div class="range-block-title justifyLeft">
                                                 <span data-i18n="Negative Prompt">Negative Prompt</span>
                                                 <small>
@@ -1849,7 +1849,7 @@
                                         </div>
                                         <div class="marginTopBot5">
                                             <label for="openrouter_group_models" class="checkbox_label">
-                                                <input id="openrouter_group_models" type="checkbox"/>
+                                                <input id="openrouter_group_models" type="checkbox" />
                                                 <span data-i18n="Group by vendors">Group by vendors</span>
                                             </label>
                                             <div class="toggle-description justifyLeft wide100p">
@@ -4707,4 +4707,4 @@
     </script>
 </body>
 
-</html>
+</html>

public/scripts/textgen-settings.js

@@ -71,8 +71,8 @@ const textgenerationwebui_settings = {
     banned_tokens: '',
     //n_aphrodite: 1,
     //best_of_aphrodite: 1,
-    //ignore_eos_token_aphrodite: false,
+    ignore_eos_token_aphrodite: false,
-    //spaces_between_special_tokens_aphrodite: true,
+    spaces_between_special_tokens_aphrodite: true,
     //logits_processors_aphrodite: [],
     //log_probs_aphrodite: 0,
     //prompt_log_probs_aphrodite: 0,
@@ -124,8 +124,8 @@ const setting_names = [
     "legacy_api",
     //'n_aphrodite',
     //'best_of_aphrodite',
-    //'ignore_eos_token_aphrodite',
+    'ignore_eos_token_aphrodite',
-    //'spaces_between_special_tokens_aphrodite',
+    'spaces_between_special_tokens_aphrodite',
     //'logits_processors_aphrodite',
     //'log_probs_aphrodite',
     //'prompt_log_probs_aphrodite'
@@ -249,6 +249,16 @@ function loadTextGenSettings(data, settings) {
 
     $('#textgen_type').val(textgenerationwebui_settings.type);
     showTypeSpecificControls(textgenerationwebui_settings.type);
+    //this is needed because showTypeSpecificControls() does not handle NOT declarations
+    if (isAphrodite()) {
+        $('[data-forAphro=False]').each(function () {
+            $(this).hide()
+        })
+    } else {
+        $('[data-forAphro=False]').each(function () {
+            $(this).show()
+        })
+    }
 }
 
 export function isMancer() {
@@ -277,25 +287,33 @@ jQuery(function () {
         const type = String($(this).val());
         textgenerationwebui_settings.type = type;
 
-        /*         if (type === 'aphrodite') {
+        if (isAphrodite()) {
-                    $('[data-forAphro=False]').each(function () {
+            //this is needed because showTypeSpecificControls() does not handle NOT declarations
-                        $(this).hide()
+            $('[data-forAphro=False]').each(function () {
-                    })
+                $(this).hide()
-                    $('[data-forAphro=True]').each(function () {
+            })
-                        $(this).show()
+            $('#mirostat_mode_textgenerationwebui').attr('step', 2) //Aphro disallows mode 1
-                    })
+            $("#do_sample_textgenerationwebui").prop('checked', true) //Aphro should always do sample; 'otherwise set temp to 0 to mimic no sample'
-                    $('#mirostat_mode_textgenerationwebui').attr('step', 2) //Aphro disallows mode 1
+            $("#ban_eos_token_textgenerationwebui").prop('checked', false) //Aphro should not ban EOS, just ignore it; 'add token '2' to ban list do to this'
-                    $("#do_sample_textgenerationwebui").prop('checked', true) //Aphro should always do sample; 'otherwise set temp to 0 to mimic no sample'
+            //special handling for Aphrodite topK -1 disable state
-                    $("#ban_eos_token_textgenerationwebui").prop('checked', false) //Aphro should not ban EOS, just ignore it; 'add token '2' to ban list do to this'
+            $('#top_k_textgenerationwebui').attr('min', -1)
-                } else {
+            if ($('#top_k_textgenerationwebui').val() === '0' || textgenerationwebui_settings['top_k'] === 0) {
-                    $('[data-forAphro=False]').each(function () {
+                textgenerationwebui_settings['top_k'] = -1
-                        $(this).show()
+                $('#top_k_textgenerationwebui').val('-1').trigger('input')
-                    })
+            }
-                    $('[data-forAphro=True]').each(function () {
+        } else {
-                        $(this).hide()
+            //this is needed because showTypeSpecificControls() does not handle NOT declarations
-                    })
+            $('[data-forAphro=False]').each(function () {
-                    $('#mirostat_mode_textgenerationwebui').attr('step', 1)
+                $(this).show()
-                } */
+            })
+            $('#mirostat_mode_textgenerationwebui').attr('step', 1)
+            //undo special Aphrodite setup for topK
+            $('#top_k_textgenerationwebui').attr('min', 0)
+            if ($('#top_k_textgenerationwebui').val() === '-1' || textgenerationwebui_settings['top_k'] === -1) {
+                textgenerationwebui_settings['top_k'] = 0
+                $('#top_k_textgenerationwebui').val('0').trigger('input')
+            }
+        }
 
         showTypeSpecificControls(type);
         setOnlineStatus('no_connection');
@@ -330,8 +348,12 @@ jQuery(function () {
                 const value = Number($(this).val());
                 $(`#${id}_counter_textgenerationwebui`).val(value);
                 textgenerationwebui_settings[id] = value;
+                //special handling for aphrodite using -1 as disabled instead of 0
+                if ($(this).attr('id') === 'top_k_textgenerationwebui' && isAphrodite() && value === 0) {
+                    textgenerationwebui_settings[id] = -1
+                    $(this).val(-1)
+                }
             }
-
             saveSettingsDebounced();
         });
     }
@@ -481,33 +503,24 @@ function getModel() {
 }
 
 export function getTextGenGenerationData(finalPrompt, this_amount_gen, isImpersonate, cfgValues) {
-    return {
+    let APIflags = {
         'prompt': finalPrompt,
         'model': getModel(),
         'max_new_tokens': this_amount_gen,
         'max_tokens': this_amount_gen,
-        'do_sample': textgenerationwebui_settings.do_sample,
         'temperature': textgenerationwebui_settings.temp,
-        'temperature_last': textgenerationwebui_settings.temperature_last,
         'top_p': textgenerationwebui_settings.top_p,
         'typical_p': textgenerationwebui_settings.typical_p,
         'min_p': textgenerationwebui_settings.min_p,
         'repetition_penalty': textgenerationwebui_settings.rep_pen,
-        'repetition_penalty_range': textgenerationwebui_settings.rep_pen_range,
-        'encoder_repetition_penalty': textgenerationwebui_settings.encoder_rep_pen,
         'frequency_penalty': textgenerationwebui_settings.freq_pen,
         'presence_penalty': textgenerationwebui_settings.presence_pen,
         'top_k': textgenerationwebui_settings.top_k,
         'min_length': textgenerationwebui_settings.min_length,
         'min_tokens': textgenerationwebui_settings.min_length,
-        'no_repeat_ngram_size': textgenerationwebui_settings.no_repeat_ngram_size,
         'num_beams': textgenerationwebui_settings.num_beams,
-        'penalty_alpha': textgenerationwebui_settings.penalty_alpha,
         'length_penalty': textgenerationwebui_settings.length_penalty,
         'early_stopping': textgenerationwebui_settings.early_stopping,
-        'guidance_scale': cfgValues?.guidanceScale?.value ?? textgenerationwebui_settings.guidance_scale ?? 1,
-        'negative_prompt': cfgValues?.negativePrompt ?? textgenerationwebui_settings.negative_prompt ?? '',
-        'seed': textgenerationwebui_settings.seed,
         'add_bos_token': textgenerationwebui_settings.add_bos_token,
         'stopping_strings': getStoppingStrings(isImpersonate),
         'stop': getStoppingStrings(isImpersonate),
@@ -521,20 +534,40 @@ export function getTextGenGenerationData(finalPrompt, this_amount_gen, isImperso
         'mirostat_mode': textgenerationwebui_settings.mirostat_mode,
         'mirostat_tau': textgenerationwebui_settings.mirostat_tau,
         'mirostat_eta': textgenerationwebui_settings.mirostat_eta,
-        'grammar_string': textgenerationwebui_settings.grammar_string,
         'custom_token_bans': isAphrodite() ? toIntArray(getCustomTokenBans()) : getCustomTokenBans(),
         'use_mancer': isMancer(),
         'use_aphrodite': isAphrodite(),
         'use_ooba': isOoba(),
         'api_server': isMancer() ? MANCER_SERVER : api_server_textgenerationwebui,
         'legacy_api': textgenerationwebui_settings.legacy_api && !isMancer(),
+    };
+    let aphroditeExclusionFlags = {
+        'repetition_penalty_range': textgenerationwebui_settings.rep_pen_range,
+        'encoder_repetition_penalty': textgenerationwebui_settings.encoder_rep_pen,
+        'no_repeat_ngram_size': textgenerationwebui_settings.no_repeat_ngram_size,
+        'penalty_alpha': textgenerationwebui_settings.penalty_alpha,
+        'temperature_last': textgenerationwebui_settings.temperature_last,
+        'do_sample': textgenerationwebui_settings.do_sample,
+        'seed': textgenerationwebui_settings.seed,
+        'guidance_scale': cfgValues?.guidanceScale?.value ?? textgenerationwebui_settings.guidance_scale ?? 1,
+        'negative_prompt': cfgValues?.negativePrompt ?? textgenerationwebui_settings.negative_prompt ?? '',
+        'grammar_string': textgenerationwebui_settings.grammar_string,
+    }
+    let aphroditeFlags = {
         //'n': textgenerationwebui_settings.n_aphrodite,
         //'best_of': textgenerationwebui_settings.n_aphrodite, //n must always == best_of and vice versa
-        //'ignore_eos': textgenerationwebui_settings.ignore_eos_token_aphrodite,
+        'ignore_eos': textgenerationwebui_settings.ignore_eos_token_aphrodite,
-        //'spaces_between_special_tokens': textgenerationwebui_settings.spaces_between_special_tokens_aphrodite,
+        'spaces_between_special_tokens': textgenerationwebui_settings.spaces_between_special_tokens_aphrodite,
-        // 'logits_processors': textgenerationwebui_settings.logits_processors_aphrodite,
+        //'logits_processors': textgenerationwebui_settings.logits_processors_aphrodite,
         //'logprobs': textgenerationwebui_settings.log_probs_aphrodite,
         //'prompt_logprobs': textgenerationwebui_settings.prompt_log_probs_aphrodite,
-    };
+    }
+    if (isAphrodite()) {
+        APIflags = Object.assign(APIflags, aphroditeFlags);
+    } else {
+        APIflags = Object.assign(APIflags, aphroditeExclusionFlags);
+    }
+
+    return APIflags
 }