[fix] group chat formating and notes

This commit is contained in:
kwaroran
2023-05-24 20:06:14 +09:00
parent 80f11b7e03
commit 1dff7b8149
3 changed files with 10 additions and 5 deletions

View File

@@ -178,9 +178,7 @@
<span class="text-neutral-200">{language.firstMessage} <Help key="charFirstMessage"/></span> <span class="text-neutral-200">{language.firstMessage} <Help key="charFirstMessage"/></span>
<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 text-xs resize-none h-20 focus:bg-selected" autocomplete="off" bind:value={currentChar.data.firstMessage}></textarea> <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 text-xs resize-none h-20 focus:bg-selected" autocomplete="off" bind:value={currentChar.data.firstMessage}></textarea>
<span class="text-gray-400 mb-6 text-sm">{tokens.firstMsg} {language.tokens}</span> <span class="text-gray-400 mb-6 text-sm">{tokens.firstMsg} {language.tokens}</span>
<span class="text-neutral-200">{language.authorNote} <Help key="chatNote"/></span>
<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 focus:bg-selected text-xs" autocomplete="off" bind:value={currentChar.data.chats[currentChar.data.chatPage].note}></textarea>
<span class="text-gray-400 mb-6 text-sm">{tokens.localNote} {language.tokens}</span>
{:else} {:else}
<input class="text-neutral-200 mt-2 mb-4 p-2 bg-transparent input-text text-xl focus:bg-selected" placeholder="Group Name" bind:value={currentChar.data.name}> <input class="text-neutral-200 mt-2 mb-4 p-2 bg-transparent input-text text-xl focus:bg-selected" placeholder="Group Name" bind:value={currentChar.data.name}>
<span class="text-neutral-200">{language.character}</span> <span class="text-neutral-200">{language.character}</span>
@@ -210,7 +208,9 @@
</div> </div>
{/if} {/if}
<span class="text-neutral-200">{language.authorNote} <Help key="chatNote"/></span>
<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 focus:bg-selected text-xs" autocomplete="off" bind:value={currentChar.data.chats[currentChar.data.chatPage].note}></textarea>
<span class="text-gray-400 mb-6 text-sm">{tokens.localNote} {language.tokens}</span>
<div class="flex mt-6 items-center"> <div class="flex mt-6 items-center">
<Check bind:check={$DataBase.jailbreakToggle}/> <Check bind:check={$DataBase.jailbreakToggle}/>
<span class="text-neutral-200 ml-2">{language.jailbreakToggle}</span> <span class="text-neutral-200 ml-2">{language.jailbreakToggle}</span>

View File

@@ -327,7 +327,8 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
formated: formated, formated: formated,
bias: bias, bias: bias,
currentChar: currentChar, currentChar: currentChar,
useStreaming: true useStreaming: true,
isGroupChat: nowChatroom.type === 'group'
}, 'model') }, 'model')
let result = '' let result = ''

View File

@@ -17,6 +17,7 @@ interface requestDataArgument{
PresensePenalty?: number PresensePenalty?: number
frequencyPenalty?: number, frequencyPenalty?: number,
useStreaming?:boolean useStreaming?:boolean
isGroupChat?:boolean
} }
type requestDataResponse = { type requestDataResponse = {
@@ -57,6 +58,9 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
case 'gpt4':{ case 'gpt4':{
for(let i=0;i<formated.length;i++){ for(let i=0;i<formated.length;i++){
if(arg.isGroupChat){
formated[i].content = formated[i].name + ": " + formated[i].content
}
formated[i].name = undefined formated[i].name = undefined
} }