mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add pt_ positions

Browse Source
This commit is contained in:
kwaroran
2024-05-30 12:23:35 +09:00
parent f8c65018b1
commit c169cd4e96
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ts/process/index.ts
View File

@@ -418,6 +418,18 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
//for unexpected error //for unexpected error
currentTokens += 50 currentTokens += 50
const positionRegex = /{{position::(.+?)}}/g
const positionParser = (text:string) => {
return text.replace(positionRegex, (match, p1) => {
const MatchingLorebooks = lorepmt.actives.filter(v => {
return v.pos === ('pt_' + p1)
})
return MatchingLorebooks.map(v => {
return v.prompt
}).join('\n')
})
}
if(promptTemplate){ if(promptTemplate){
const template = promptTemplate const template = promptTemplate
@@ -429,14 +441,13 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
} }
} }
for(const card of template){ for(const card of template){
switch(card.type){ switch(card.type){
case 'persona':{ case 'persona':{
let pmt = structuredClone(unformated.personaPrompt) let pmt = structuredClone(unformated.personaPrompt)
if(card.innerFormat && pmt.length > 0){ if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){ for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(card.innerFormat, {chara: currentChar}).replace('{{slot}}', pmt[i].content) pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
} }
} }
@@ -447,7 +458,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let pmt = structuredClone(unformated.description) let pmt = structuredClone(unformated.description)
if(card.innerFormat && pmt.length > 0){ if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){ for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(card.innerFormat, {chara: currentChar}).replace('{{slot}}', pmt[i].content) pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
} }
} }
@@ -458,7 +469,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let pmt = structuredClone(unformated.authorNote) let pmt = structuredClone(unformated.authorNote)
if(card.innerFormat && pmt.length > 0){ if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){ for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(card.innerFormat, {chara: currentChar}).replace('{{slot}}', pmt[i].content || card.defaultText || '') pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content || card.defaultText || '')
} }
} }
@@ -495,7 +506,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
"bot": "assistant" "bot": "assistant"
} as const } as const
let content = card.text let content = positionParser(card.text)
if(card.type2 === 'globalNote'){ if(card.type2 === 'globalNote'){
content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara: currentChar, role: card.role})) content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara: currentChar, role: card.role}))
@@ -877,7 +888,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let pmt = structuredClone(unformated.personaPrompt) let pmt = structuredClone(unformated.personaPrompt)
if(card.innerFormat && pmt.length > 0){ if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){ for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(card.innerFormat, {chara: currentChar}).replace('{{slot}}', pmt[i].content) pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
} }
} }
@@ -888,7 +899,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let pmt = structuredClone(unformated.description) let pmt = structuredClone(unformated.description)
if(card.innerFormat && pmt.length > 0){ if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){ for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(card.innerFormat, {chara: currentChar}).replace('{{slot}}', pmt[i].content) pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content)
} }
} }
@@ -899,7 +910,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let pmt = structuredClone(unformated.authorNote) let pmt = structuredClone(unformated.authorNote)
if(card.innerFormat && pmt.length > 0){ if(card.innerFormat && pmt.length > 0){
for(let i=0;i<pmt.length;i++){ for(let i=0;i<pmt.length;i++){
pmt[i].content = risuChatParser(card.innerFormat, {chara: currentChar}).replace('{{slot}}', pmt[i].content || card.defaultText || '') pmt[i].content = risuChatParser(positionParser(card.innerFormat), {chara: currentChar}).replace('{{slot}}', pmt[i].content || card.defaultText || '')
} }
} }
@@ -936,7 +947,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
"bot": "assistant" "bot": "assistant"
} as const } as const
let content = card.text let content = positionParser(card.text)
if(card.type2 === 'globalNote'){ if(card.type2 === 'globalNote'){
content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara:currentChar, role: card.role})) content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara:currentChar, role: card.role}))

2
src/ts/process/lorebook.ts
View File

@@ -379,7 +379,7 @@ export async function loadLoreBookV3Prompt(){
} }
} }
case 'position':{ case 'position':{
if(["after_desc", "before_desc", "personality", "scenario"].includes(arg[0])){ if(arg[0].startsWith('pt_') || ["after_desc", "before_desc", "personality", "scenario"].includes(arg[0])){
pos = arg[0] pos = arg[0]
return return
} }