[fix] posteverything not working

This commit is contained in:
kwaroran
2023-08-09 01:07:22 +09:00
parent a857aeb258
commit f80f1f9e9e
2 changed files with 21 additions and 7 deletions

View File

@@ -169,7 +169,13 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
'personaPrompt':([] as OpenAIChat[]) 'personaPrompt':([] as OpenAIChat[])
} }
if((!currentChar.utilityBot) && (!db.promptTemplate)){ const promptTemplate = cloneDeep(db.promptTemplate)
db.promptTemplate.push({
type: 'postEverything'
})
if((!currentChar.utilityBot) && (!promptTemplate)){
const mainp = currentChar.systemPrompt?.replaceAll('{{original}}', db.mainPrompt) || db.mainPrompt const mainp = currentChar.systemPrompt?.replaceAll('{{original}}', db.mainPrompt) || db.mainPrompt
@@ -256,8 +262,8 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let currentTokens = db.maxResponse let currentTokens = db.maxResponse
if(db.promptTemplate){ if(promptTemplate){
const template = db.promptTemplate const template = promptTemplate
async function tokenizeChatArray(chats:OpenAIChat[]){ async function tokenizeChatArray(chats:OpenAIChat[]){
for(const chat of chats){ for(const chat of chats){
@@ -299,6 +305,10 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
await tokenizeChatArray(unformated.lorebook) await tokenizeChatArray(unformated.lorebook)
break break
} }
case 'postEverything':{
await tokenizeChatArray(unformated.postEverything)
break
}
case 'plain': case 'plain':
case 'jailbreak':{ case 'jailbreak':{
if((!db.jailbreakToggle) && (card.type === 'jailbreak')){ if((!db.jailbreakToggle) && (card.type === 'jailbreak')){
@@ -465,7 +475,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
if(!db.promptTemplate){ if(!promptTemplate){
unformated.lastChat.push(chats[chats.length - 1]) unformated.lastChat.push(chats[chats.length - 1])
chats.splice(chats.length - 1, 1) chats.splice(chats.length - 1, 1)
} }
@@ -523,8 +533,8 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
} }
} }
if(db.promptTemplate){ if(promptTemplate){
const template = db.promptTemplate const template = promptTemplate
for(const card of template){ for(const card of template){
switch(card.type){ switch(card.type){
@@ -558,6 +568,10 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
pushPrompts(unformated.lorebook) pushPrompts(unformated.lorebook)
break break
} }
case 'postEverything':{
pushPrompts(unformated.postEverything)
break
}
case 'plain': case 'plain':
case 'jailbreak':{ case 'jailbreak':{
if((!db.jailbreakToggle) && (card.type === 'jailbreak')){ if((!db.jailbreakToggle) && (card.type === 'jailbreak')){

View File

@@ -8,7 +8,7 @@ export interface ProomptPlain {
} }
export interface ProomptTyped { export interface ProomptTyped {
type: 'persona'|'description'|'authornote'|'lorebook' type: 'persona'|'description'|'authornote'|'lorebook'|'postEverything'
innerFormat?: string innerFormat?: string
} }