From 0f25d51a533ee076f8a45b1741b46eceb83d546b Mon Sep 17 00:00:00 2001
From: valadaptive <valadaptive@protonmail.com>
Date: Thu, 14 Dec 2023 02:03:36 -0500
Subject: [PATCH] Send Kobold sampler order as an array

---
 public/scripts/kai-settings.js   | 7 -------
 src/endpoints/backends/kobold.js | 5 ++---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/public/scripts/kai-settings.js b/public/scripts/kai-settings.js
index 21037bb32..d88a6ee87 100644
--- a/public/scripts/kai-settings.js
+++ b/public/scripts/kai-settings.js
@@ -129,13 +129,6 @@ export function getKoboldGenerationData(finalPrompt, settings, maxLength, maxCon
         top_p: kai_settings.top_p,
         min_p: (kai_flags.can_use_min_p || isHorde) ? kai_settings.min_p : undefined,
         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,
         singleline: false,
         stop_sequence: (kai_flags.can_use_stop_sequence || isHorde) ? getStoppingStrings(isImpersonate, isContinue) : undefined,
diff --git a/src/endpoints/backends/kobold.js b/src/endpoints/backends/kobold.js
index 66d7990ec..9adf411f8 100644
--- a/src/endpoints/backends/kobold.js
+++ b/src/endpoints/backends/kobold.js
@@ -46,8 +46,7 @@ router.post('/generate', jsonParser, async function (request, response_generate)
         max_length: request.body.max_length,
     };
 
-    if (request.body.gui_settings == false) {
-        const sampler_order = [request.body.s1, request.body.s2, request.body.s3, request.body.s4, request.body.s5, request.body.s6, request.body.s7];
+    if (!request.body.gui_settings) {
         this_settings = {
             prompt: request_prompt,
             use_story: false,
@@ -66,7 +65,7 @@ router.post('/generate', jsonParser, async function (request, response_generate)
             top_p: request.body.top_p,
             min_p: request.body.min_p,
             typical: request.body.typical,
-            sampler_order: sampler_order,
+            sampler_order: request.body.sampler_order,
             singleline: !!request.body.singleline,
             use_default_badwordsids: request.body.use_default_badwordsids,
             mirostat: request.body.mirostat,