[feat] clean autosuggest

This commit is contained in:
aegkmq
2023-08-03 14:58:38 +09:00
parent d6f4dc48fb
commit 28ae0aa992
4 changed files with 13 additions and 4 deletions

View File

@@ -400,7 +400,7 @@
{/if} {/if}
{#if $DataBase.useAutoSuggestions} {#if $DataBase.useAutoSuggestions}
<Suggestion messageInput={(msg)=>messageInput=msg} {send}/> <Suggestion messageInput={(msg)=>messageInput=msg.replace(/ +\(.+?\) *$| - [^"'*]*?$/, '')} {send}/>
{/if} {/if}
{#each messageForm($DataBase.characters[$selectedCharID].chats[$DataBase.characters[$selectedCharID].chatPage].message, loadPages) as chat, i} {#each messageForm($DataBase.characters[$selectedCharID].chats[$DataBase.characters[$selectedCharID].chatPage].message, loadPages) as chat, i}

View File

@@ -306,6 +306,8 @@
<span class="text-textcolor">{language.autoSuggest} Prefix</span> <span class="text-textcolor">{language.autoSuggest} Prefix</span>
<TextInput marginBottom={true} bind:value={$DataBase.autoSuggestPrefix} /> <TextInput marginBottom={true} bind:value={$DataBase.autoSuggestPrefix} />
<Check bind:check={$DataBase.autoSuggestClean} name={`Cleanning ${language.autoSuggest}`}/>
{:else if $DataBase.aiModel.startsWith('novelai')} {:else if $DataBase.aiModel.startsWith('novelai')}
<span class="text-textcolor">Top P</span> <span class="text-textcolor">Top P</span>
<SliderInput min={0} max={1} step={0.01} bind:value={$DataBase.NAIsettings.topP}/> <SliderInput min={0} max={1} step={0.01} bind:value={$DataBase.NAIsettings.topP}/>

View File

@@ -49,8 +49,9 @@ export async function setRecommended(model: string, ask:'ask'|'force') {
pr.mainPrompt = pr.bias = pr.globalNote = undefined pr.mainPrompt = pr.bias = pr.globalNote = undefined
pr.jailbreak = "" pr.jailbreak = ""
if(!db.autoSuggestPrompt || db.autoSuggestPrompt === defaultAutoSuggestPrompt){ if(!db.autoSuggestPrompt || db.autoSuggestPrompt === defaultAutoSuggestPrompt){
pr.autoSuggestPrompt = defaultAutoSuggestPromptOoba; pr.autoSuggestPrompt = defaultAutoSuggestPromptOoba
pr.autoSuggestPrefix = defaultAutoSuggestPrefixOoba; pr.autoSuggestPrefix = defaultAutoSuggestPrefixOoba
pr.autoSuggestClean = true
} }
switch(sel){ switch(sel){
case 0:{ //Vicuna, WizardLM, Airoboros case 0:{ //Vicuna, WizardLM, Airoboros

View File

@@ -271,7 +271,10 @@ export function setDatabase(data:Database){
data.autoSuggestPrompt = defaultAutoSuggestPrompt data.autoSuggestPrompt = defaultAutoSuggestPrompt
} }
if(checkNullish(data.autoSuggestPrefix)){ if(checkNullish(data.autoSuggestPrefix)){
data.autoSuggestPrompt = "" data.autoSuggestPrefix = ""
}
if(checkNullish(data.autoSuggestClean)){
data.autoSuggestClean = true
} }
if(checkNullish(data.imageCompression)){ if(checkNullish(data.imageCompression)){
data.imageCompression = true data.imageCompression = true
@@ -460,6 +463,7 @@ export interface botPreset{
NAISettings?: NAISettings NAISettings?: NAISettings
autoSuggestPrompt?: string autoSuggestPrompt?: string
autoSuggestPrefix?: string autoSuggestPrefix?: string
autoSuggestClean?: boolean
} }
export interface Database{ export interface Database{
@@ -571,6 +575,7 @@ export interface Database{
useAutoSuggestions:boolean useAutoSuggestions:boolean
autoSuggestPrompt:string autoSuggestPrompt:string
autoSuggestPrefix:string autoSuggestPrefix:string
autoSuggestClean:boolean
claudeAPIKey:string, claudeAPIKey:string,
useChatCopy:boolean, useChatCopy:boolean,
novellistAPI:string, novellistAPI:string,
@@ -885,6 +890,7 @@ export function setPreset(db:Database, newPres: botPreset){
db.NAIsettings = newPres.NAISettings ?? db.NAIsettings db.NAIsettings = newPres.NAISettings ?? db.NAIsettings
db.autoSuggestPrompt = newPres.autoSuggestPrompt ?? db.autoSuggestPrompt db.autoSuggestPrompt = newPres.autoSuggestPrompt ?? db.autoSuggestPrompt
db.autoSuggestPrefix = newPres.autoSuggestPrefix ?? db.autoSuggestPrefix db.autoSuggestPrefix = newPres.autoSuggestPrefix ?? db.autoSuggestPrefix
db.autoSuggestClean = newPres.autoSuggestClean ?? db.autoSuggestClean
return db return db
} }