diff --git a/public/NovelAI Settings/Classic-Euterpe.settings b/public/NovelAI Settings/Classic-Euterpe.settings index e8fe154b4..94fc96d71 100644 --- a/public/NovelAI Settings/Classic-Euterpe.settings +++ b/public/NovelAI Settings/Classic-Euterpe.settings @@ -1,13 +1,17 @@ { - "order": [3, 0], - "temperature": 1.11, + "order": [2, 1, 3, 0], + "temperature": 0.63, "max_length": 90, "min_length": 1, - "tail_free_sampling": 0.68, - "repetition_penalty": 1.11, - "repetition_penalty_range": 320, + "tail_free_sampling": 0.975, + "repetition_penalty": 1.148125, + "repetition_penalty_range": 2048, "repetition_penalty_frequency": 0, "repetition_penalty_presence": 0, - "repetition_penalty_slope": 0, - "max_context":2048 -} \ No newline at end of file + "repetition_penalty_slope": 0.09, + "max_context":2048, + "top_p": 0.975, + "top_k": 0, + "top_a": 1, + "typical_p": 1 +} diff --git a/public/NovelAI Settings/Classic-Krake.settings b/public/NovelAI Settings/Classic-Krake.settings index 1233f92b4..4fc586dbc 100644 --- a/public/NovelAI Settings/Classic-Krake.settings +++ b/public/NovelAI Settings/Classic-Krake.settings @@ -1,13 +1,17 @@ { - "order": [3, 0], - "temperature": 1.7, + "order": [3, 4, 5, 2, 0], + "temperature": 1.33, "max_length": 90, "min_length": 1, - "tail_free_sampling": 0.66, - "repetition_penalty": 1.06, - "repetition_penalty_range": 340, + "tail_free_sampling": 0.937, + "repetition_penalty": 1.05, + "repetition_penalty_range": 560, "repetition_penalty_frequency": 0, "repetition_penalty_presence": 0, - "repetition_penalty_slope": 0, - "max_context": 2048 -} \ No newline at end of file + "repetition_penalty_slope": 0.18, + "max_context": 2048, + "top_p": 0.88, + "top_k": 0, + "top_a": 0.085, + "typical_p": 0.985 +} diff --git a/public/scripts/nai-settings.js b/public/scripts/nai-settings.js index 1640a28ed..9cef66ab7 100644 --- a/public/scripts/nai-settings.js +++ b/public/scripts/nai-settings.js @@ -154,9 +154,9 @@ export function getNovelGenerationData(finalPromt, this_settings, this_amount_ge "typical_p": this_settings.typical_p, //"stop_sequences": {{187}}, //bad_words_ids = {{50256}, {0}, {1}}; - //generate_until_sentence = true; + "generate_until_sentence": true, "use_cache": false, - //use_string = true; + "use_string": true, "return_full_text": false, "prefix": "vanilla", "order": this_settings.order, diff --git a/server.js b/server.js index 4a1902be4..02810d50a 100644 --- a/server.js +++ b/server.js @@ -1450,6 +1450,8 @@ 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 data = { "input": request.body.input, "model": request.body.model, @@ -1469,10 +1471,10 @@ app.post("/generate_novelai", jsonParser, async function (request, response_gene "top_k": request.body.top_k, "typical_p": request.body.typical_p, //"stop_sequences": {{187}}, - //bad_words_ids = {{50256}, {0}, {1}}; + "bad_words_ids": bad_words_ids, //generate_until_sentence = true; "use_cache": request.body.use_cache, - //use_string = true; + "use_string": true, "return_full_text": request.body.return_full_text, "prefix": request.body.prefix, "order": request.body.order diff --git a/src/bad-words.js b/src/bad-words.js new file mode 100644 index 000000000..9bc15a52c --- /dev/null +++ b/src/bad-words.js @@ -0,0 +1,326 @@ +const badWordIds = [ + [60], + [62], + [544], + [683], + [696], + [880], + [905], + [1008], + [1019], + [1084], + [1092], + [1181], + [1184], + [1254], + [1447], + [1570], + [1656], + [2194], + [2470], + [2479], + [2498], + [2947], + [3138], + [3291], + [3455], + [3725], + [3851], + [3891], + [3921], + [3951], + [4207], + [4299], + [4622], + [4681], + [5013], + [5032], + [5180], + [5218], + [5290], + [5413], + [5456], + [5709], + [5749], + [5774], + [6038], + [6257], + [6334], + [6660], + [6904], + [7082], + [7086], + [7254], + [7444], + [7748], + [8001], + [8088], + [8168], + [8562], + [8605], + [8795], + [8850], + [9014], + [9102], + [9259], + [9318], + [9336], + [9502], + [9686], + [9793], + [9855], + [9899], + [9955], + [10148], + [10174], + [10943], + [11326], + [11337], + [11661], + [12004], + [12084], + [12159], + [12520], + [12977], + [13380], + [13488], + [13663], + [13811], + [13976], + [14412], + [14598], + [14767], + [15640], + [15707], + [15775], + [15830], + [16079], + [16354], + [16369], + [16445], + [16595], + [16614], + [16731], + [16943], + [17278], + [17281], + [17548], + [17555], + [17981], + [18022], + [18095], + [18297], + [18413], + [18736], + [18772], + [18990], + [19181], + [20095], + [20197], + [20481], + [20629], + [20871], + [20879], + [20924], + [20977], + [21375], + [21382], + [21391], + [21687], + [21810], + [21828], + [21938], + [22367], + [22372], + [22734], + [23405], + [23505], + [23734], + [23741], + [23781], + [24237], + [24254], + [24345], + [24430], + [25416], + [25896], + [26119], + [26635], + [26842], + [26991], + [26997], + [27075], + [27114], + [27468], + [27501], + [27618], + [27655], + [27720], + [27829], + [28052], + [28118], + [28231], + [28532], + [28571], + [28591], + [28653], + [29013], + [29547], + [29650], + [29925], + [30522], + [30537], + [30996], + [31011], + [31053], + [31096], + [31148], + [31258], + [31350], + [31379], + [31422], + [31789], + [31830], + [32214], + [32666], + [32871], + [33094], + [33376], + [33440], + [33805], + [34368], + [34398], + [34417], + [34418], + [34419], + [34476], + [34494], + [34607], + [34758], + [34761], + [34904], + [34993], + [35117], + [35138], + [35237], + [35487], + [35830], + [35869], + [36033], + [36134], + [36320], + [36399], + [36487], + [36586], + [36676], + [36692], + [36786], + [37077], + [37594], + [37596], + [37786], + [37982], + [38475], + [38791], + [39083], + [39258], + [39487], + [39822], + [40116], + [40125], + [41000], + [41018], + [41256], + [41305], + [41361], + [41447], + [41449], + [41512], + [41604], + [42041], + [42274], + [42368], + [42696], + [42767], + [42804], + [42854], + [42944], + [42989], + [43134], + [43144], + [43189], + [43521], + [43782], + [44082], + [44162], + [44270], + [44308], + [44479], + [44524], + [44965], + [45114], + [45301], + [45382], + [45443], + [45472], + [45488], + [45507], + [45564], + [45662], + [46265], + [46267], + [46275], + [46295], + [46462], + [46468], + [46576], + [46694], + [47093], + [47384], + [47389], + [47446], + [47552], + [47686], + [47744], + [47916], + [48064], + [48167], + [48392], + [48471], + [48664], + [48701], + [49021], + [49193], + [49236], + [49550], + [49694], + [49806], + [49824], + [50001], + [50256], + [0], + [1], +] + +const clioBadWordsId = [ + [3], + [49356], + [1431], + [31715], + [34387], + [20765], + [30702], + [10691], + [49333], + [1266], + [19438], + [43145], + [26523], + [41471], + [2936], +] + +module.exports = { + badWordIds, + clioBadWordsId, +};