rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-04-03 05:31:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1530 from valadaptive/cleanup-sampler-order

Browse Source 
Send Kobold sampler order as an array
This commit is contained in:
Cohee 2023-12-14 18:37:27 +02:00 committed by GitHub
commit 37b652825e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/scripts/kai-settings.js
View File

@ -129,13 +129,6 @@ export function getKoboldGenerationData(finalPrompt, settings, maxLength, maxCon
top_p: kai_settings.top_p, top_p: kai_settings.top_p,
min_p: (kai_flags.can_use_min_p || isHorde) ? kai_settings.min_p : undefined, min_p: (kai_flags.can_use_min_p || isHorde) ? kai_settings.min_p : undefined,
typical: kai_settings.typical, typical: kai_settings.typical,
s1: sampler_order[0],
s2: sampler_order[1],
s3: sampler_order[2],
s4: sampler_order[3],
s5: sampler_order[4],
s6: sampler_order[5],
s7: sampler_order[6],
use_world_info: false, use_world_info: false,
singleline: false, singleline: false,
stop_sequence: (kai_flags.can_use_stop_sequence || isHorde) ? getStoppingStrings(isImpersonate, isContinue) : undefined, stop_sequence: (kai_flags.can_use_stop_sequence || isHorde) ? getStoppingStrings(isImpersonate, isContinue) : undefined,

5
src/endpoints/backends/kobold.js
View File

@ -46,8 +46,7 @@ router.post('/generate', jsonParser, async function (request, response_generate)
max_length: request.body.max_length, max_length: request.body.max_length,
}; };
if (request.body.gui_settings == false) { if (!request.body.gui_settings) {
const sampler_order = [request.body.s1, request.body.s2, request.body.s3, request.body.s4, request.body.s5, request.body.s6, request.body.s7];
this_settings = { this_settings = {
prompt: request_prompt, prompt: request_prompt,
use_story: false, use_story: false,
@ -66,7 +65,7 @@ router.post('/generate', jsonParser, async function (request, response_generate)
top_p: request.body.top_p, top_p: request.body.top_p,
min_p: request.body.min_p, min_p: request.body.min_p,
typical: request.body.typical, typical: request.body.typical,
sampler_order: sampler_order, sampler_order: request.body.sampler_order,
singleline: !!request.body.singleline, singleline: !!request.body.singleline,
use_default_badwordsids: request.body.use_default_badwordsids, use_default_badwordsids: request.body.use_default_badwordsids,
mirostat: request.body.mirostat, mirostat: request.body.mirostat,