rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Streamline and simply Novel logit bias. Make it a part of preset

Browse Source
This commit is contained in:
Cohee
2023-08-17 13:05:22 +03:00
parent 722801bb50
commit 0b412033ba
6 changed files with 55 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
public/index.html
View File

@@ -901,40 +901,21 @@
<textarea id="nai_banned_tokens" class="text_pole textarea_compact" name="nai_banned_tokens" rows="2" placeholder=""></textarea> <textarea id="nai_banned_tokens" class="text_pole textarea_compact" name="nai_banned_tokens" rows="2" placeholder=""></textarea>
</div> </div>
</div> </div>
<div class="range-block">
<div class="range-block-title openai_restorable" data-i18n="Logit Bias"> <div class="range-block-title title_restorable">
Logit Bias <span data-i18n="Logit Bias">Logit Bias</span>
</div> <div id="novelai_logit_bias_new_entry" class="menu_button menu_button_icon">
<div class="toggle-description justifyLeft" data-i18n="Helps to ban or reenforce the usage of certain words"> <i class="fa-xs fa-solid fa-plus"></i>
Helps to ban or reinforce the usage of certain tokens. <small data-i18n="Add">Add</small>
</div>
<div class="openai_logit_bias_preset_form">
<select id="novelai_logit_bias_preset">
</select>
<i title="New preset" id="novelai_logit_bias_new_preset" class="menu_button fa-solid fa-plus"
data-i18n="[title]New preset"></i>
<i title="Import preset" id="novelai_logit_bias_import_preset" class="menu_button fa-solid fa-upload"
data-i18n="[title]Import preset"></i>
<i title="Export preset" id="novelai_logit_bias_export_preset" class="menu_button fa-solid fa-download"
data-i18n="[title]Export preset"></i>
<i title="Delete preset" id="novelai_logit_bias_delete_preset" class="menu_button fa-solid fa-trash-can"
data-i18n="[title]Delete preset"></i>
<input id="novelai_logit_bias_import_file" type="file" accept=".json" hidden />
</div>
<div class="inline-drawer wide100p">
<div class="inline-drawer-toggle inline-drawer-header">
<b data-i18n="View / Edit bias preset">View / Edit bias preset</b>
<div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
</div>
<div class="inline-drawer-content">
<div id="novelai_logit_bias_new_entry" class="menu_button wide100p flex-container justifyCenter"
data-i18n="Add bias entry">
Add bias entry
</div> </div>
</div>
<div class="toggle-description justifyLeft" data-i18n="Helps to ban or reenforce the usage of certain words">
Helps to ban or reinforce the usage of certain tokens.
</div>
<div class="flex-container flexFlowColumn wide100p">
<div class="novelai_logit_bias_list"></div> <div class="novelai_logit_bias_list"></div>
</div> </div>
</div> </div>
<hr> <hr>
<div class="range-block"> <div class="range-block">
<div class="range-block-title justifyLeft" data-i18n="CFG Scale"> <div class="range-block-title justifyLeft" data-i18n="CFG Scale">
@@ -3827,7 +3808,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="completion_prompt_manager_popup" class="drawer-content" style="display:none;"> <div id="completion_prompt_manager_popup" class="drawer-content" style="display:none;">
<div id="completion_prompt_manager_popup_inspect"> <div id="completion_prompt_manager_popup_inspect">
<h3>Inspect</h3> <h3>Inspect</h3>

2
public/script.js
View File

@@ -2899,7 +2899,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
} }
else if (main_api == 'novel') { else if (main_api == 'novel') {
const this_settings = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]]; const this_settings = novelai_settings[novelai_setting_names[nai_settings.preset_settings_novel]];
generate_data = await getNovelGenerationData(finalPromt, this_settings, this_amount_gen, isImpersonate); generate_data = getNovelGenerationData(finalPromt, this_settings, this_amount_gen, isImpersonate);
} }
else if (main_api == 'openai') { else if (main_api == 'openai') {
let [prompt, counts] = prepareOpenAIMessages({ let [prompt, counts] = prepareOpenAIMessages({

195
public/scripts/nai-settings.js
View File

@@ -1,5 +1,4 @@
import { import {
callPopup,
getRequestHeaders, getRequestHeaders,
getStoppingStrings, getStoppingStrings,
getTextTokens, getTextTokens,
@@ -10,10 +9,9 @@ import {
} from "../script.js"; } from "../script.js";
import { getCfg } from "./extensions/cfg/util.js"; import { getCfg } from "./extensions/cfg/util.js";
import { MAX_CONTEXT_DEFAULT, tokenizers } from "./power-user.js"; import { MAX_CONTEXT_DEFAULT, tokenizers } from "./power-user.js";
import { import {
download, getStringHash,
parseJsonFile, uuidv4
getStringHash
} from "./utils.js"; } from "./utils.js";
export { export {
@@ -32,10 +30,6 @@ const default_presets = {
"clio-v1": "Talker-Chat-Clio", "clio-v1": "Talker-Chat-Clio",
"kayra-v1": "Carefree-Kayra" "kayra-v1": "Carefree-Kayra"
} }
const default_bias = 'Default (none)';
const default_bias_presets = {
[default_bias]: []
};
const nai_settings = { const nai_settings = {
temperature: 1.5, temperature: 1.5,
@@ -58,8 +52,7 @@ const nai_settings = {
cfg_uc: '', cfg_uc: '',
banned_tokens: '', banned_tokens: '',
order: default_order, order: default_order,
bias_preset_selected: default_bias, logit_bias: [],
bias_presets: default_bias_presets,
}; };
const nai_tiers = { const nai_tiers = {
@@ -126,6 +119,7 @@ function loadNovelPreset(preset) {
nai_settings.cfg_uc = preset.cfg_uc || ''; nai_settings.cfg_uc = preset.cfg_uc || '';
nai_settings.banned_tokens = preset.banned_tokens || ''; nai_settings.banned_tokens = preset.banned_tokens || '';
nai_settings.order = preset.order || default_order; nai_settings.order = preset.order || default_order;
nai_settings.logit_bias = preset.logit_bias || [];
loadNovelSettingsUi(nai_settings); loadNovelSettingsUi(nai_settings);
} }
@@ -159,8 +153,7 @@ function loadNovelSettings(settings) {
nai_settings.cfg_uc = settings.cfg_uc || ''; nai_settings.cfg_uc = settings.cfg_uc || '';
nai_settings.banned_tokens = settings.banned_tokens || ''; nai_settings.banned_tokens = settings.banned_tokens || '';
nai_settings.order = settings.order || default_order; nai_settings.order = settings.order || default_order;
nai_settings.bias_preset_selected = settings.bias_preset_selected ?? default_bias; nai_settings.logit_bias = settings.logit_bias || [];
nai_settings.bias_presets = settings.bias_presets ?? default_bias_presets;
loadNovelSettingsUi(nai_settings); loadNovelSettingsUi(nai_settings);
} }
@@ -203,16 +196,7 @@ function loadNovelSettingsUi(ui_settings) {
$("#streaming_novel").prop('checked', ui_settings.streaming_novel); $("#streaming_novel").prop('checked', ui_settings.streaming_novel);
sortItemsByOrder(ui_settings.order); sortItemsByOrder(ui_settings.order);
displayLogitBias(ui_settings.logit_bias);
$('#novelai_logit_bias_preset').empty();
for (const preset of Object.keys(ui_settings.bias_presets)) {
const option = document.createElement('option');
option.innerText = preset;
option.value = preset;
option.selected = preset === ui_settings.bias_preset_selected;
$('#novelai_logit_bias_preset').append(option);
}
$('#novelai_logit_bias_preset').trigger('change');
} }
const sliders = [ const sliders = [
@@ -405,7 +389,7 @@ function getBadWordPermutations(text) {
return result; return result;
} }
export async function getNovelGenerationData(finalPrompt, this_settings, this_amount_gen, isImpersonate) { export function getNovelGenerationData(finalPrompt, this_settings, this_amount_gen, isImpersonate) {
const clio = nai_settings.model_novel.includes('clio'); const clio = nai_settings.model_novel.includes('clio');
const kayra = nai_settings.model_novel.includes('kayra'); const kayra = nai_settings.model_novel.includes('kayra');
@@ -423,11 +407,8 @@ export async function getNovelGenerationData(finalPrompt, this_settings, this_am
const cfgSettings = getCfg(); const cfgSettings = getCfg();
let logitBias = []; let logitBias = [];
if (tokenizerType !== tokenizers.NONE if (tokenizerType !== tokenizers.NONE && Array.isArray(nai_settings.logit_bias) && nai_settings.logit_bias.length) {
&& nai_settings.bias_preset_selected logitBias = biasCache || calculateLogitBias();
&& Array.isArray(nai_settings.bias_presets[nai_settings.bias_preset_selected])
&& nai_settings.bias_presets[nai_settings.bias_preset_selected].length) {
logitBias = biasCache || await calculateLogitBias();
biasCache = logitBias; biasCache = logitBias;
} }
@@ -451,7 +432,7 @@ export async function getNovelGenerationData(finalPrompt, this_settings, this_am
"mirostat_lr": parseFloat(nai_settings.mirostat_lr), "mirostat_lr": parseFloat(nai_settings.mirostat_lr),
"mirostat_tau": parseFloat(nai_settings.mirostat_tau), "mirostat_tau": parseFloat(nai_settings.mirostat_tau),
"cfg_scale": cfgSettings?.guidanceScale ?? parseFloat(nai_settings.cfg_scale), "cfg_scale": cfgSettings?.guidanceScale ?? parseFloat(nai_settings.cfg_scale),
"cfg_uc": cfgSettings?.negativePrompt ?? nai_settings.cfg_uc ?? "", "cfg_uc": cfgSettings?.negativePrompt ?? nai_settings.cfg_uc ?? "",
"phrase_rep_pen": nai_settings.phrase_rep_pen, "phrase_rep_pen": nai_settings.phrase_rep_pen,
"stop_sequences": stopSequences, "stop_sequences": stopSequences,
"bad_words_ids": badWordIds, "bad_words_ids": badWordIds,
@@ -521,176 +502,74 @@ function saveSamplingOrder() {
saveSettingsDebounced(); saveSettingsDebounced();
} }
function onLogitBiasPresetChange() { function displayLogitBias(logit_bias) {
const value = $('#novelai_logit_bias_preset').find(':selected').val(); if (!Array.isArray(logit_bias)) {
const preset = nai_settings.bias_presets[value]; console.log('Logit bias set not found');
if (!Array.isArray(preset)) {
console.error('Preset not found');
return; return;
} }
nai_settings.bias_preset_selected = value;
$('.novelai_logit_bias_list').empty(); $('.novelai_logit_bias_list').empty();
for (const entry of preset) { for (const entry of logit_bias) {
if (entry) { if (entry) {
createLogitBiasListItem(entry); createLogitBiasListItem(entry);
} }
} }
biasCache = undefined; biasCache = undefined;
saveSettingsDebounced();
} }
function createNewLogitBiasEntry() { function createNewLogitBiasEntry() {
const entry = { text: '', value: 0 }; const entry = { id: uuidv4(), text: '', value: 0 };
nai_settings.bias_presets[nai_settings.bias_preset_selected].push(entry); nai_settings.logit_bias.push(entry);
biasCache = undefined; biasCache = undefined;
createLogitBiasListItem(entry); createLogitBiasListItem(entry);
saveSettingsDebounced(); saveSettingsDebounced();
} }
function createLogitBiasListItem(entry) { function createLogitBiasListItem(entry) {
const id = nai_settings.bias_presets[nai_settings.bias_preset_selected].indexOf(entry); const id = entry.id;
const template = $('#novelai_logit_bias_template .novelai_logit_bias_form').clone(); const template = $('#novelai_logit_bias_template .novelai_logit_bias_form').clone();
template.data('id', id); template.data('id', id);
template.find('.novelai_logit_bias_text').val(entry.text).on('input', function () { template.find('.novelai_logit_bias_text').val(entry.text).on('input', function () {
nai_settings.bias_presets[nai_settings.bias_preset_selected][id].text = $(this).val(); entry.text = $(this).val();
biasCache = undefined; biasCache = undefined;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
template.find('.novelai_logit_bias_value').val(entry.value).on('input', function () { template.find('.novelai_logit_bias_value').val(entry.value).on('input', function () {
nai_settings.bias_presets[nai_settings.bias_preset_selected][id].value = Number($(this).val()); entry.value = Number($(this).val());
biasCache = undefined; biasCache = undefined;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
template.find('.novelai_logit_bias_remove').on('click', function () { template.find('.novelai_logit_bias_remove').on('click', function () {
$(this).closest('.novelai_logit_bias_form').remove(); $(this).closest('.novelai_logit_bias_form').remove();
nai_settings.bias_presets[nai_settings.bias_preset_selected].splice(id, 1); const index = nai_settings.logit_bias.indexOf(entry);
if (index > -1) {
nai_settings.logit_bias.splice(index, 1);
}
biasCache = undefined; biasCache = undefined;
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('.novelai_logit_bias_list').prepend(template); $('.novelai_logit_bias_list').prepend(template);
} }
async function createNewLogitBiasPreset() { function calculateLogitBias() {
const name = await callPopup('Preset name:', 'input'); const bias_preset = nai_settings.logit_bias;
if (!name) { if (!Array.isArray(bias_preset) || bias_preset.length === 0) {
return; return [];
} }
if (name in nai_settings.bias_presets) {
toastr.error('Preset name should be unique.');
return;
}
nai_settings.bias_preset_selected = name;
nai_settings.bias_presets[name] = [];
addLogitBiasPresetOption(name);
saveSettingsDebounced();
}
function addLogitBiasPresetOption(name) {
const option = document.createElement('option');
option.innerText = name;
option.value = name;
option.selected = true;
$('#novelai_logit_bias_preset').append(option);
$('#novelai_logit_bias_preset').trigger('change');
}
async function onLogitBiasPresetDeleteClick() {
const value = await callPopup('Delete the preset?', 'confirm');
if (!value) {
return;
}
$(`#novelai_logit_bias_preset option[value="${nai_settings.bias_preset_selected}"]`).remove();
delete nai_settings.bias_presets[nai_settings.bias_preset_selected];
nai_settings.bias_preset_selected = null;
if (Object.keys(nai_settings.bias_presets).length) {
nai_settings.bias_preset_selected = Object.keys(nai_settings.bias_presets)[0];
$(`#novelai_logit_bias_preset option[value="${nai_settings.bias_preset_selected}"]`).attr('selected', true);
$('#novelai_logit_bias_preset').trigger('change');
}
biasCache = undefined;
saveSettingsDebounced();
}
async function onLogitBiasPresetImportFileChange(e) {
const file = e.target.files[0];
if (!file || file.type !== "application/json") {
return;
}
const name = file.name.replace(/\.[^/.]+$/, "");
const importedFile = await parseJsonFile(file);
e.target.value = '';
if (name in nai_settings.bias_presets) {
toastr.error('Preset name should be unique.');
return;
}
if (!Array.isArray(importedFile)) {
toastr.error('Invalid logit bias preset file.');
return;
}
for (const entry of importedFile) {
if (typeof entry == 'object') {
if (entry.hasOwnProperty('text') && entry.hasOwnProperty('value')) {
continue;
}
}
callPopup('Invalid logit bias preset file.', 'text');
return;
}
nai_settings.bias_presets[name] = importedFile;
nai_settings.bias_preset_selected = name;
addLogitBiasPresetOption(name);
saveSettingsDebounced();
}
function onLogitBiasPresetImportClick() {
$('#novelai_logit_bias_import_file').trigger('click');
}
function onLogitBiasPresetExportClick() {
if (!nai_settings.bias_preset_selected || Object.keys(nai_settings.bias_presets).length === 0) {
return;
}
const presetJsonString = JSON.stringify(nai_settings.bias_presets[nai_settings.bias_preset_selected], null, 4);
download(presetJsonString, nai_settings.bias_preset_selected, 'application/json');
}
async function calculateLogitBias() {
const bias_preset = nai_settings.bias_presets[nai_settings.bias_preset_selected];
const clio = nai_settings.model_novel.includes('clio'); const clio = nai_settings.model_novel.includes('clio');
const kayra = nai_settings.model_novel.includes('kayra'); const kayra = nai_settings.model_novel.includes('kayra');
const tokenizerType = kayra ? tokenizers.NERD2 : (clio ? tokenizers.NERD : tokenizers.NONE); const tokenizerType = kayra ? tokenizers.NERD2 : (clio ? tokenizers.NERD : tokenizers.NONE);
return bias_preset.map(bias => { return bias_preset.filter(b => b.text?.length > 0).map(bias => ({
return { bias: bias.value,
bias: bias.value, ensure_sequence_finish: false,
ensure_sequence_finish: false, generate_once: false,
generate_once: false, sequence: getTextTokens(tokenizerType, bias.text)
sequence: getTextTokens(tokenizerType, bias.text) }));
}
});
} }
export async function generateNovelWithStreaming(generate_data, signal) { export async function generateNovelWithStreaming(generate_data, signal) {
@@ -797,11 +676,5 @@ $(document).ready(function () {
saveSamplingOrder(); saveSamplingOrder();
}); });
$("#novelai_logit_bias_preset").on("change", onLogitBiasPresetChange);
$("#novelai_logit_bias_new_preset").on("click", createNewLogitBiasPreset);
$("#novelai_logit_bias_new_entry").on("click", createNewLogitBiasEntry); $("#novelai_logit_bias_new_entry").on("click", createNewLogitBiasEntry);
$("#novelai_logit_bias_import_file").on("input", onLogitBiasPresetImportFileChange);
$("#novelai_logit_bias_import_preset").on("click", onLogitBiasPresetImportClick);
$("#novelai_logit_bias_export_preset").on("click", onLogitBiasPresetExportClick);
$("#novelai_logit_bias_delete_preset").on("click", onLogitBiasPresetDeleteClick);
}); });

2
public/scripts/openai.js
View File

@@ -2179,7 +2179,7 @@ function createLogitBiasListItem(entry) {
}); });
template.find('.openai_logit_bias_remove').on('click', function () { template.find('.openai_logit_bias_remove').on('click', function () {
$(this).closest('.openai_logit_bias_form').remove(); $(this).closest('.openai_logit_bias_form').remove();
oai_settings.bias_presets[oai_settings.bias_preset_selected].splice(id, 1); oai_settings.bias_presets[oai_settings.bias_preset_selected][id] = undefined;
biasCache = undefined; biasCache = undefined;
saveSettingsDebounced(); saveSettingsDebounced();
}); });

2
public/style.css
View File

@@ -4622,7 +4622,7 @@ toolcool-color-picker {
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.8; opacity: 0.8;
min-height: 3rem; min-height: 2.5rem;
} }
/*used to fix smallness of certain FontAwesome glyph which break button squareness*/ /*used to fix smallness of certain FontAwesome glyph which break button squareness*/

10
server.js
View File

@@ -1853,7 +1853,7 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
const novelai = require('./src/novelai'); const novelai = require('./src/novelai');
const isNewModel = (request.body.model.includes('clio') || request.body.model.includes('kayra')); const isNewModel = (request.body.model.includes('clio') || request.body.model.includes('kayra'));
const isKrake = request.body.model.includes('krake'); const isKrake = request.body.model.includes('krake');
const badWordsList = isNewModel ? novelai.badWordsList : (isKrake ? novelai.krakeBadWordsList : novelai.euterpeBadWordsList); const badWordsList = (isNewModel ? novelai.badWordsList : (isKrake ? novelai.krakeBadWordsList : novelai.euterpeBadWordsList)).slice();
// Add customized bad words for Clio and Kayra // Add customized bad words for Clio and Kayra
if (isNewModel && Array.isArray(request.body.bad_words_ids)) { if (isNewModel && Array.isArray(request.body.bad_words_ids)) {
@@ -1865,9 +1865,11 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
} }
// Add default biases for dinkus and asterism // Add default biases for dinkus and asterism
const logit_bias_exp = isNewModel const logit_bias_exp = isNewModel ? novelai.logitBiasExp.slice() : null;
? request.body.logit_bias_exp.concat(novelai.logitBiasExp)
: null; if (Array.isArray(logit_bias_exp) && Array.isArray(request.body.logit_bias_exp)) {
logit_bias_exp.push(...request.body.logit_bias_exp);
}
const data = { const data = {
"input": request.body.input, "input": request.body.input,