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

Add role CBS

Browse Source
This commit is contained in:
kwaroran
2024-03-07 00:13:44 +09:00
parent 0c2a9eef6c
commit 3c39c8fa5d
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ts/parser.ts
View File

@@ -394,6 +394,7 @@ type matcherArg = {
tokenizeAccurate?:boolean tokenizeAccurate?:boolean
consistantChar?:boolean consistantChar?:boolean
displaying?:boolean displaying?:boolean
role?:string
} }
const matcher = (p1:string,matcherArg:matcherArg) => { const matcher = (p1:string,matcherArg:matcherArg) => {
if(p1.length > 100000){ if(p1.length > 100000){
@@ -635,6 +636,9 @@ const matcher = (p1:string,matcherArg:matcherArg) => {
case 'axmodel':{ case 'axmodel':{
return db.subModel return db.subModel
} }
case 'role': {
return matcherArg.role ?? 'role'
}
} }
const arra = p1.split("::") const arra = p1.split("::")
if(arra.length > 1){ if(arra.length > 1){
@@ -824,7 +828,8 @@ export function risuChatParser(da:string, arg:{
var?:{[key:string]:string} var?:{[key:string]:string}
tokenizeAccurate?:boolean tokenizeAccurate?:boolean
consistantChar?:boolean consistantChar?:boolean
visualize?:boolean visualize?:boolean,
role?:string
} = {}):string{ } = {}):string{
const chatID = arg.chatID ?? -1 const chatID = arg.chatID ?? -1
const db = arg.db ?? get(DataBase) const db = arg.db ?? get(DataBase)
@@ -870,6 +875,7 @@ export function risuChatParser(da:string, arg:{
var: arg.var ?? null, var: arg.var ?? null,
tokenizeAccurate: arg.tokenizeAccurate ?? false, tokenizeAccurate: arg.tokenizeAccurate ?? false,
displaying: arg.visualize ?? false, displaying: arg.visualize ?? false,
role: arg.role
} }
let pef = performance.now() let pef = performance.now()
while(pointer < da.length){ while(pointer < da.length){

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

@@ -431,13 +431,13 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let content = card.text let content = card.text
if(card.type2 === 'globalNote'){ if(card.type2 === 'globalNote'){
content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara:currentChar})) content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara: currentChar, role: card.role}))
} }
else if(card.type2 === 'main'){ else if(card.type2 === 'main'){
content = (risuChatParser(content, {chara: currentChar})) content = (risuChatParser(content, {chara: currentChar, role: card.role}))
} }
else{ else{
content = risuChatParser(content, {chara: currentChar}) content = risuChatParser(content, {chara: currentChar, role: card.role})
} }
const prompt:OpenAIChat ={ const prompt:OpenAIChat ={
@@ -802,13 +802,13 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
let content = card.text let content = card.text
if(card.type2 === 'globalNote'){ if(card.type2 === 'globalNote'){
content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara:currentChar})) content = (risuChatParser(currentChar.replaceGlobalNote?.replaceAll('{{original}}', content) || content, {chara:currentChar, role: card.role}))
} }
else if(card.type2 === 'main'){ else if(card.type2 === 'main'){
content = (risuChatParser(content, {chara: currentChar})) content = (risuChatParser(content, {chara: currentChar, role: card.role}))
} }
else{ else{
content = risuChatParser(content, {chara: currentChar}) content = risuChatParser(content, {chara: currentChar, role: card.role})
} }
const prompt:OpenAIChat ={ const prompt:OpenAIChat ={