From bfe33304df2c49fb0baf12e1a8ecfc6ebfc0f18d Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Thu, 16 Nov 2023 04:11:43 +0900
Subject: [PATCH] [fix] ooba template

---
 src/lib/Setting/Pages/OobaSettings.svelte | 7 +------
 src/ts/storage/database.ts                | 9 +++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/lib/Setting/Pages/OobaSettings.svelte b/src/lib/Setting/Pages/OobaSettings.svelte
index 6a2dbcc6..7a1cffa6 100644
--- a/src/lib/Setting/Pages/OobaSettings.svelte
+++ b/src/lib/Setting/Pages/OobaSettings.svelte
@@ -105,12 +105,7 @@
     <OptionalInput marginBottom={true} bind:value={$DataBase.reverseProxyOobaArgs.custom_token_bans} />
     <span class="text-textcolor">grammar_string</span>
     <OptionalInput marginBottom={true} bind:value={$DataBase.reverseProxyOobaArgs.grammar_string} />
-
-    <span class="text-textcolor">custom_token_bans</span>
-    <OptionalInput marginBottom={true} bind:value={$DataBase.reverseProxyOobaArgs.custom_token_bans} />
-    <span class="text-textcolor">grammar_string</span>
-    <OptionalInput marginBottom={true} bind:value={$DataBase.reverseProxyOobaArgs.grammar_string} />
-
+    
     <span class="text-textcolor">temperature_last</span>
     <OptionalInput marginBottom={true} bind:value={$DataBase.reverseProxyOobaArgs.temperature_last} boolMode />
     <span class="text-textcolor">do_sample</span>
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index 41841a7a..7ef77e3e 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -683,6 +683,8 @@ export interface botPreset{
     NAIappendName?: boolean
     localStopStrings?: string[]
     customProxyRequestModel?: string
+    reverseProxyOobaArgs?: OobaChatCompletionRequestParams
+
 }
 
 
@@ -855,6 +857,9 @@ export const presetTemplate:botPreset = {
     bias: [],
     ooba: cloneDeep(defaultOoba),
     ainconfig: cloneDeep(defaultAIN),
+    reverseProxyOobaArgs: {
+        mode: 'instruct'
+    }
 
 }
 
@@ -910,6 +915,7 @@ export function saveCurrentPreset(){
         localStopStrings: db.localStopStrings,
         autoSuggestPrompt: db.autoSuggestPrompt,
         customProxyRequestModel: db.customProxyRequestModel,
+        reverseProxyOobaArgs: cloneDeep(db.reverseProxyOobaArgs) ?? null
     }
     db.botPresets = pres
     setDatabase(db)
@@ -975,6 +981,9 @@ export function setPreset(db:Database, newPres: botPreset){
     db.NAIsettings.mirostat_lr ??= 1
     db.localStopStrings = newPres.localStopStrings
     db.customProxyRequestModel = newPres.customProxyRequestModel ?? ''
+    db.reverseProxyOobaArgs = cloneDeep(newPres.reverseProxyOobaArgs) ?? {
+        mode: 'instruct'
+    }
     return db
 }