diff --git a/public/index.html b/public/index.html index e7b2fbbc6..16985e0be 100644 --- a/public/index.html +++ b/public/index.html @@ -1317,24 +1317,13 @@

DynaTemp -
+

-
- -
- Min Temp - - -
-
- Max Temp - - + DynaTemp Range + +
diff --git a/public/scripts/kai-settings.js b/public/scripts/kai-settings.js index d2f321005..e77c31fcf 100644 --- a/public/scripts/kai-settings.js +++ b/public/scripts/kai-settings.js @@ -31,9 +31,7 @@ export const kai_settings = { use_default_badwordsids: false, grammar: '', seed: -1, - dynatemp: false, - min_temp: 0.1, - max_temp: 2.0, + dynatemp_range: 0, }; /** @@ -143,9 +141,7 @@ export function getKoboldGenerationData(finalPrompt, settings, maxLength, maxCon use_default_badwordsids: (kai_flags.can_use_default_badwordsids || isHorde) ? kai_settings.use_default_badwordsids : undefined, grammar: (kai_flags.can_use_grammar || isHorde) ? substituteParams(kai_settings.grammar) : undefined, sampler_seed: kai_settings.seed >= 0 ? kai_settings.seed : undefined, - dynatemp: (kai_flags.can_use_dynatemp || isHorde) ? kai_settings.dynatemp : false, - min_temp: (kai_flags.can_use_dynatemp || isHorde) ? kai_settings.min_temp : undefined, - max_temp: (kai_flags.can_use_dynatemp || isHorde) ? kai_settings.max_temp : undefined, + dynatemp_range: (kai_flags.can_use_dynatemp || isHorde) ? kai_settings.dynatemp_range : undefined, api_server, }; return generate_data; @@ -313,19 +309,12 @@ const sliders = [ setValue: (val) => { kai_settings.seed = Number(val); }, }, { - name: 'min_temp', - sliderId: '#min_temp_kobold', - counterId: '#min_temp_counter_kobold', + name: 'dynatemp_range', + sliderId: '#dynatemp_range_kobold', + counterId: '#dynatemp_range_counter_kobold', format: (val) => val, setValue: (val) => { kai_settings.min_temp = Number(val); }, }, - { - name: 'max_temp', - sliderId: '#max_temp_kobold', - counterId: '#max_temp_counter_kobold', - format: (val) => val, - setValue: (val) => { kai_settings.max_temp = Number(val); }, - }, ]; export function setKoboldFlags(koboldUnitedVersion, koboldCppVersion) { diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js index 02c210bbb..2059d2601 100644 --- a/public/scripts/power-user.js +++ b/public/scripts/power-user.js @@ -604,8 +604,7 @@ async function CreateZenSliders(elmnt) { sliderID == 'rep_pen_range') { decimals = 0; } - if (sliderID == 'min_temp_textgenerationwebui' || - sliderID == 'max_temp_textgenerationwebui') { + if (sliderID == 'dynatemp_range_textgenerationwebui') { decimals = 2; } if (sliderID == 'eta_cutoff_textgenerationwebui' || @@ -632,14 +631,13 @@ async function CreateZenSliders(elmnt) { sliderID == 'tfs_textgenerationwebui' || sliderID == 'min_p_textgenerationwebui' || sliderID == 'temp_textgenerationwebui' || - sliderID == 'temp') { + sliderID == 'temp' || + sliderID == 'dynatemp_range_textgenerationwebui') { numSteps = 20; } if (sliderID == 'mirostat_eta_textgenerationwebui' || sliderID == 'penalty_alpha_textgenerationwebui' || - sliderID == 'length_penalty_textgenerationwebui' || - sliderID == 'min_temp_textgenerationwebui' || - sliderID == 'max_temp_textgenerationwebui') { + sliderID == 'length_penalty_textgenerationwebui') { numSteps = 50; } //customize off values diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js index 2ac4ecf82..2105ea6f2 100644 --- a/public/scripts/textgen-settings.js +++ b/public/scripts/textgen-settings.js @@ -79,9 +79,7 @@ const settings = { presence_pen: 0, do_sample: true, early_stopping: false, - dynatemp: false, - min_temp: 0, - max_temp: 2.0, + dynatemp_range: 0, seed: -1, preset: 'Default', add_bos_token: true, @@ -138,9 +136,7 @@ const setting_names = [ 'num_beams', 'length_penalty', 'min_length', - 'dynatemp', - 'min_temp', - 'max_temp', + 'dynatemp_range', 'encoder_rep_pen', 'freq_pen', 'presence_pen', @@ -704,9 +700,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate, 'length_penalty': settings.length_penalty, 'early_stopping': settings.early_stopping, 'add_bos_token': settings.add_bos_token, - 'dynatemp': settings.dynatemp, - 'min_temp': settings.min_temp, - 'max_temp': settings.max_temp, + 'dynatemp_range': settings.dynatemp_range, 'stopping_strings': getStoppingStrings(isImpersonate, isContinue), 'stop': getStoppingStrings(isImpersonate, isContinue), 'truncation_length': max_context, diff --git a/src/ai_horde/index.d.ts b/src/ai_horde/index.d.ts index 9f6c4f756..7b87218a9 100644 --- a/src/ai_horde/index.d.ts +++ b/src/ai_horde/index.d.ts @@ -901,12 +901,8 @@ export interface ModelGenerationInputKobold { min_p?: number; /** Typical sampling value. */ typical?: number; - /** DynaTemp sampling activataion. */ - dynatemp?: boolean; - /** DynaTemp minimum temperature value. */ - min_temp?: number; - /** DynaTemp maximum temperature value. */ - max_temp?: number; + /** DynaTemp sampling range value. */ + dynatemp_range?: number; /** Array of integers representing the sampler order to be used */ sample_order?: number[]; }