From 28ae0aa9920699b07b66231859fbf7695203bf7e Mon Sep 17 00:00:00 2001
From: aegkmq <140575296+aegkmq@users.noreply.github.com>
Date: Thu, 3 Aug 2023 14:58:38 +0900
Subject: [PATCH] [feat] clean autosuggest

---
 src/lib/ChatScreens/DefaultChatScreen.svelte | 2 +-
 src/lib/Setting/Pages/BotSettings.svelte     | 2 ++
 src/ts/process/templates/getRecomended.ts    | 5 +++--
 src/ts/storage/database.ts                   | 8 +++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte
index 27b102ae..1b88b33e 100644
--- a/src/lib/ChatScreens/DefaultChatScreen.svelte
+++ b/src/lib/ChatScreens/DefaultChatScreen.svelte
@@ -400,7 +400,7 @@
             {/if}
 
             {#if $DataBase.useAutoSuggestions}
-                <Suggestion messageInput={(msg)=>messageInput=msg} {send}/>
+                <Suggestion messageInput={(msg)=>messageInput=msg.replace(/ +\(.+?\) *$| - [^"'*]*?$/, '')} {send}/>
             {/if}
             
             {#each messageForm($DataBase.characters[$selectedCharID].chats[$DataBase.characters[$selectedCharID].chatPage].message, loadPages) as chat, i}
diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte
index 598f414b..bb991c29 100644
--- a/src/lib/Setting/Pages/BotSettings.svelte
+++ b/src/lib/Setting/Pages/BotSettings.svelte
@@ -306,6 +306,8 @@
 
     <span class="text-textcolor">{language.autoSuggest} Prefix</span>
     <TextInput marginBottom={true} bind:value={$DataBase.autoSuggestPrefix} />
+
+    <Check bind:check={$DataBase.autoSuggestClean} name={`Cleanning ${language.autoSuggest}`}/>
 {:else if $DataBase.aiModel.startsWith('novelai')}
     <span class="text-textcolor">Top P</span>
     <SliderInput min={0} max={1} step={0.01} bind:value={$DataBase.NAIsettings.topP}/>
diff --git a/src/ts/process/templates/getRecomended.ts b/src/ts/process/templates/getRecomended.ts
index 29919962..5206f683 100644
--- a/src/ts/process/templates/getRecomended.ts
+++ b/src/ts/process/templates/getRecomended.ts
@@ -49,8 +49,9 @@ export async function setRecommended(model: string, ask:'ask'|'force') {
         pr.mainPrompt = pr.bias = pr.globalNote = undefined
         pr.jailbreak = ""
         if(!db.autoSuggestPrompt || db.autoSuggestPrompt === defaultAutoSuggestPrompt){
-            pr.autoSuggestPrompt = defaultAutoSuggestPromptOoba;
-            pr.autoSuggestPrefix = defaultAutoSuggestPrefixOoba;
+            pr.autoSuggestPrompt = defaultAutoSuggestPromptOoba
+            pr.autoSuggestPrefix = defaultAutoSuggestPrefixOoba
+            pr.autoSuggestClean = true
         }
         switch(sel){
             case 0:{ //Vicuna, WizardLM, Airoboros
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index 6fe83d6d..d9881967 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -271,7 +271,10 @@ export function setDatabase(data:Database){
         data.autoSuggestPrompt = defaultAutoSuggestPrompt
     }
     if(checkNullish(data.autoSuggestPrefix)){
-        data.autoSuggestPrompt = ""
+        data.autoSuggestPrefix = ""
+    }
+    if(checkNullish(data.autoSuggestClean)){
+        data.autoSuggestClean = true
     }
     if(checkNullish(data.imageCompression)){
         data.imageCompression = true
@@ -460,6 +463,7 @@ export interface botPreset{
     NAISettings?: NAISettings
     autoSuggestPrompt?: string
     autoSuggestPrefix?: string
+    autoSuggestClean?: boolean
 }
 
 export interface Database{
@@ -571,6 +575,7 @@ export interface Database{
     useAutoSuggestions:boolean
     autoSuggestPrompt:string
     autoSuggestPrefix:string
+    autoSuggestClean:boolean
     claudeAPIKey:string,
     useChatCopy:boolean,
     novellistAPI:string,
@@ -885,6 +890,7 @@ export function setPreset(db:Database, newPres: botPreset){
     db.NAIsettings = newPres.NAISettings ?? db.NAIsettings
     db.autoSuggestPrompt = newPres.autoSuggestPrompt ?? db.autoSuggestPrompt
     db.autoSuggestPrefix = newPres.autoSuggestPrefix ?? db.autoSuggestPrefix
+    db.autoSuggestClean = newPres.autoSuggestClean ?? db.autoSuggestClean
     return db
 }