Proper handle settings presets for TextGen

This commit is contained in:
SillyLossy
2023-03-23 22:47:02 +02:00
parent 9eebe6ce61
commit 339d3c357d
19 changed files with 239 additions and 226 deletions

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.7, "temp": 0.7,
top_p: 0.92, "top_p": 0.92,
top_k: 150, "top_k": 150,
typical_p: 1, "typical_p": 1,
rep_pen: 4.5, "rep_pen": 4.5,
no_repeat_ngram_size: 2, "no_repeat_ngram_size": 2,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 10, "num_beams": 10,
length_penalty: 1.4, "length_penalty": 1.4,
min_length: 200, "min_length": 200,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: true "early_stopping": true
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 1, "temp": 1,
top_p: 1, "top_p": 1,
top_k: 4, "top_k": 4,
typical_p: 1, "typical_p": 1,
rep_pen: 1, "rep_pen": 1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0.6, "penalty_alpha": 0.6,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: false, "do_sample": false,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.7, "temp": 0.7,
top_p: 0.5, "top_p": 0.5,
top_k: 40, "top_k": 40,
typical_p: 1, "typical_p": 1,
rep_pen: 1.2, "rep_pen": 1.2,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 1, "temp": 1,
top_p: 1, "top_p": 1,
top_k: 50, "top_k": 50,
typical_p: 1, "typical_p": 1,
rep_pen: 1, "rep_pen": 1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: false, "do_sample": false,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.7, "temp": 0.7,
top_p: 0.5, "top_p": 0.5,
top_k: 0, "top_k": 0,
typical_p: 0.19, "typical_p": 0.19,
rep_pen: 1.1, "rep_pen": 1.1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.66, "temp": 0.66,
top_p: 1, "top_p": 1,
top_k: 0, "top_k": 0,
typical_p: 0.6, "typical_p": 0.6,
rep_pen: 1.1, "rep_pen": 1.1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.7, "temp": 0.7,
top_p: 0.85, "top_p": 0.85,
top_k: 50, "top_k": 50,
typical_p: 1, "typical_p": 1,
rep_pen: 1, "rep_pen": 1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.8, "temp": 0.8,
top_p: 0.9, "top_p": 0.9,
top_k: 100, "top_k": 100,
typical_p: 1, "typical_p": 1,
rep_pen: 1.15, "rep_pen": 1.15,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 1.99, "temp": 1.99,
top_p: 1, "top_p": 1,
top_k: 100, "top_k": 100,
typical_p: 0.97, "typical_p": 0.97,
rep_pen: 1, "rep_pen": 1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.63, "temp": 0.63,
top_p: 0.98, "top_p": 0.98,
top_k: 0, "top_k": 0,
typical_p: 1, "typical_p": 1,
rep_pen: 1.05, "rep_pen": 1.05,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 1.99, "temp": 1.99,
top_p: 0.85, "top_p": 0.85,
top_k: 12, "top_k": 12,
typical_p: 1, "typical_p": 1,
rep_pen: 1.15, "rep_pen": 1.15,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 1.07, "temp": 1.07,
top_p: 1, "top_p": 1,
top_k: 100, "top_k": 100,
typical_p: 1, "typical_p": 1,
rep_pen: 1.05, "rep_pen": 1.05,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.44, "temp": 0.44,
top_p: 1, "top_p": 1,
top_k: 0, "top_k": 0,
typical_p: 1, "typical_p": 1,
rep_pen: 1.15, "rep_pen": 1.15,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 1.99, "temp": 1.99,
top_p: 0.18, "top_p": 0.18,
top_k: 30, "top_k": 30,
typical_p: 1, "typical_p": 1,
rep_pen: 1.15, "rep_pen": 1.15,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.72, "temp": 0.72,
top_p: 0.73, "top_p": 0.73,
top_k: 0, "top_k": 0,
typical_p: 1, "typical_p": 1,
rep_pen: 1.1, "rep_pen": 1.1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -1,15 +1,15 @@
{ {
temp: 0.5, "temp": 0.5,
top_p: 0.9, "top_p": 0.9,
top_k: 0, "top_k": 0,
typical_p: 1, "typical_p": 1,
rep_pen: 1.1, "rep_pen": 1.1,
no_repeat_ngram_size: 0, "no_repeat_ngram_size": 0,
penalty_alpha: 0, "penalty_alpha": 0,
num_beams: 1, "num_beams": 1,
length_penalty: 1, "length_penalty": 1,
min_length: 0, "min_length": 0,
encoder_rep_pen: 1, "encoder_rep_pen": 1,
do_sample: true, "do_sample": true,
early_stopping: false "early_stopping": false
} }

View File

@@ -2084,7 +2084,7 @@ async function getSettings(type) {
loadNovelSettings(settings); loadNovelSettings(settings);
// TextGen // TextGen
loadTextGenSettings(settings); loadTextGenSettings(data, settings);
// OpenAI // OpenAI
loadOpenAISettings(data, settings); loadOpenAISettings(data, settings);

View File

@@ -46,23 +46,36 @@ const setting_names = [
]; ];
function selectPreset(name) { function selectPreset(name) {
const preset = textgenerationwebui_presets[name]; const preset = textgenerationwebui_presets[textgenerationwebui_preset_names.indexOf(name)];
if (!preset) { if (!preset) {
return; return;
} }
textgenerationwebui_settings.preset = name;
for (const name of setting_names) { for (const name of setting_names) {
const value = preset[name]; const value = preset[name];
setSettingByName(name, value); setSettingByName(name, value, true);
} }
saveSettingsDebounced();
} }
function loadTextGenSettings(settings) { function convertPresets(presets) {
textgenerationwebui_presets = settings.textgenerationwebui_presets ?? []; return Array.isArray(presets) ? presets.map(JSON.parse) : [];
textgenerationwebui_preset_names = settings.textgenerationwebui_preset_names ?? []; }
function loadTextGenSettings(data, settings) {
textgenerationwebui_presets = convertPresets(data.textgenerationwebui_presets);
textgenerationwebui_preset_names = data.textgenerationwebui_preset_names ?? [];
Object.assign(textgenerationwebui_settings, settings.textgenerationwebui_settings ?? {}); Object.assign(textgenerationwebui_settings, settings.textgenerationwebui_settings ?? {});
for (const name of textgenerationwebui_preset_names) {
const option = document.createElement('option');
option.value = name;
option.innerText = name;
$('#settings_preset_textgenerationwebui').append(option);
}
if (textgenerationwebui_settings.preset) { if (textgenerationwebui_settings.preset) {
$('#settings_preset_textgenerationwebui').val(textgenerationwebui_settings.preset); $('#settings_preset_textgenerationwebui').val(textgenerationwebui_settings.preset);
} }
@@ -100,7 +113,7 @@ $(document).ready(function () {
} }
}) })
function setSettingByName(i, value) { function setSettingByName(i, value, trigger) {
if (value === null || value === undefined) { if (value === null || value === undefined) {
return; return;
} }
@@ -115,4 +128,8 @@ function setSettingByName(i, value) {
$(`#${i}_textgenerationwebui`).val(val); $(`#${i}_textgenerationwebui`).val(val);
$(`#${i}_counter_textgenerationwebui`).text(val.toFixed(2)); $(`#${i}_counter_textgenerationwebui`).text(val.toFixed(2));
} }
if (trigger) {
$(`#${i}_textgenerationwebui`).trigger('input');
}
} }

View File

@@ -865,8 +865,8 @@ app.post('/getsettings', jsonParser, (request, response) => { //Wintermute's cod
const novelai_setting_names = []; const novelai_setting_names = [];
const openai_settings = []; const openai_settings = [];
const openai_setting_names = []; const openai_setting_names = [];
const textgenerationwebui_settings = []; const textgenerationwebui_presets = [];
const textgenerationwebui_setting_names = []; const textgenerationwebui_preset_names = [];
const settings = fs.readFileSync('public/settings.json', 'utf8', (err, data) => { const settings = fs.readFileSync('public/settings.json', 'utf8', (err, data) => {
if (err) return response.sendStatus(500); if (err) return response.sendStatus(500);
@@ -952,11 +952,7 @@ app.post('/getsettings', jsonParser, (request, response) => { //Wintermute's cod
// TextGenerationWebUI // TextGenerationWebUI
const textGenFiles = fs const textGenFiles = fs
.readdirSync(directories.textGen_Settings) .readdirSync(directories.textGen_Settings)
.sort( .sort();
(a, b) =>
fs.statSync(path.join(directories.textGen_Settings, a)).mtimeMs -
fs.statSync(path.join(directories.textGen_Settings, b)).mtimeMs
);
textGenFiles.forEach(item => { textGenFiles.forEach(item => {
const file = fs.readFileSync( const file = fs.readFileSync(
@@ -969,8 +965,8 @@ app.post('/getsettings', jsonParser, (request, response) => { //Wintermute's cod
} }
); );
textgenerationwebui_settings.push(file); textgenerationwebui_presets.push(file);
textgenerationwebui_setting_names.push(item.replace(/\.[^/.]+$/, '')); textgenerationwebui_preset_names.push(item.replace(/\.[^/.]+$/, ''));
}); });
response.send({ response.send({
@@ -982,8 +978,8 @@ app.post('/getsettings', jsonParser, (request, response) => { //Wintermute's cod
novelai_setting_names, novelai_setting_names,
openai_settings, openai_settings,
openai_setting_names, openai_setting_names,
textgenerationwebui_settings, textgenerationwebui_presets,
textgenerationwebui_setting_names, textgenerationwebui_preset_names,
enable_extensions: enableExtensions, enable_extensions: enableExtensions,
}); });
}); });