Min Length
diff --git a/public/scripts/nai-settings.js b/public/scripts/nai-settings.js
index 72b47d47d..2c5bce87f 100644
--- a/public/scripts/nai-settings.js
+++ b/public/scripts/nai-settings.js
@@ -62,6 +62,8 @@ function loadNovelPreset(preset) {
nai_settings.top_a = preset.top_a;
nai_settings.typical_p = preset.typical_p;
nai_settings.min_length = preset.min_length;
+ nai_settings.cfg_scale = preset.cfg_scale;
+ nai_settings.phrase_rep_pen = preset.phrase_rep_pen;
loadNovelSettingsUi(nai_settings);
}
@@ -84,6 +86,8 @@ function loadNovelSettings(settings) {
nai_settings.top_a = settings.top_a;
nai_settings.typical_p = settings.typical_p;
nai_settings.min_length = settings.min_length;
+ nai_settings.phrase_rep_pen = settings.phrase_rep_pen;
+ nai_settings.cfg_scale = settings.cfg_scale;
nai_settings.streaming_novel = !!settings.streaming_novel;
loadNovelSettingsUi(nai_settings);
@@ -95,6 +99,39 @@ function loadNovelSettings(settings) {
}
}
+const phraseRepPenStrings = [
+ null,
+ "very_light",
+ "light",
+ "medium",
+ "aggressive",
+ "very_aggressive"
+]
+
+function getPhraseRepPenString(phraseRepPenCounter) {
+ if (phraseRepPenCounter < 1 || phraseRepPenCounter > F5) {
+ return null;
+ } else {
+ return phraseRepPenStrings[phraseRepPenCounter];
+ }
+}
+
+function getPhraseRepPenCounter(phraseRepPenString) {
+ if (phraseRepPenString === phraseRepPenStrings[1]) {
+ return 1;
+ } else if (phraseRepPenString === phraseRepPenStrings[2]) {
+ return 2;
+ } else if (phraseRepPenString === phraseRepPenStrings[3]) {
+ return 3;
+ } else if (phraseRepPenString === phraseRepPenStrings[4]) {
+ return 4;
+ } else if (phraseRepPenString === phraseRepPenStrings[5]) {
+ return 5;
+ } else {
+ return 0;
+ }
+}
+
function loadNovelSettingsUi(ui_settings) {
$("#temp_novel").val(ui_settings.temperature);
$("#temp_counter_novel").text(Number(ui_settings.temperature).toFixed(2));
@@ -118,6 +155,10 @@ function loadNovelSettingsUi(ui_settings) {
$("#top_a_counter_novel").text(Number(ui_settings.top_a).toFixed(2));
$("#typical_p_novel").val(ui_settings.typical_p);
$("#typical_p_counter_novel").text(Number(ui_settings.typical_p).toFixed(2));
+ $("#cfg_scale_novel").val(ui_settings.cfg_scale);
+ $("#cfg_scale_counter_novel").text(Number(ui_settings.cfg_scale).toFixed(2));
+ $("#phrase_rep_pen_novel").val(getPhraseRepPenCounter(ui_settings.phrase_rep_pen));
+ $("#phrase_rep_pen_counter_novel").text(getPhraseRepPenCounter(ui_settings.phrase_rep_pen));
$("#min_length_novel").val(ui_settings.min_length);
$("#min_length_counter_novel").text(Number(ui_settings.min_length).toFixed(0));
@@ -191,6 +232,18 @@ const sliders = [
format: (val) => Number(val).toFixed(2),
setValue: (val) => { nai_settings.typical_p = Number(val).toFixed(2); },
},
+ {
+ sliderId: "#cfg_scale_novel",
+ counterId: "#cfg_scale_counter_novel",
+ format: (val) => `${val}`,
+ setValue: (val) => { nai_settings.cfg_scale = Number(val).toFixed(2); },
+ },
+ {
+ sliderId: "#phrase_rep_pen_novel",
+ counterId: "#phrase_rep_pen_counter_novel",
+ format: (val) => `${val}`,
+ setValue: (val) => { nai_settings.phrase_rep_pen = getPhraseRepPenString(Number(val).toFixed(0)); },
+ },
{
sliderId: "#min_length_novel",
counterId: "#min_length_counter_novel",
@@ -217,6 +270,9 @@ export function getNovelGenerationData(finalPromt, this_settings, this_amount_ge
"top_p": parseFloat(nai_settings.top_p),
"top_k": parseInt(nai_settings.top_k),
"typical_p": parseFloat(nai_settings.typical_p),
+ "cfg_scale": parseFloat(nai_settings.cfg_scale),
+ "cfg_uc": "",
+ "phrase_rep_pen": nai_settings.phrase_rep_pen,
//"stop_sequences": {{187}},
//bad_words_ids = {{50256}, {0}, {1}};
"generate_until_sentence": true,
diff --git a/server.js b/server.js
index 5497e3a5d..9c4facd23 100644
--- a/server.js
+++ b/server.js
@@ -1786,7 +1786,7 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
console.log(request.body);
const bw = require('./src/bad-words');
- const bad_words_ids = request.body.model.includes('clio') ? bw.clioBadWordsId : bw.badWordIds;
+ const bad_words_ids = (request.body.model.includes('clio') || request.body.model.includes('kayra')) ? bw.clioBadWordsId : bw.badWordIds;
const data = {
"input": request.body.input,
"model": request.body.model,
@@ -1805,6 +1805,9 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene
"top_p": request.body.top_p,
"top_k": request.body.top_k,
"typical_p": request.body.typical_p,
+ "cfg_scale": request.body.cfg_scale,
+ "cfg_uc": request.body.cfg_uc,
+ "phrase_rep_pen": request.body.phrase_rep_pen,
//"stop_sequences": {{187}},
"bad_words_ids": bad_words_ids,
//generate_until_sentence = true;