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

Merge branch 'dev' of https://github.com/ljh5650/RisuAI into dev

Browse Source
This commit is contained in:
LL
2023-05-30 22:52:02 +09:00
parent 86ac06bfd8 ce3e1a4bf4
commit 307aeaa36d
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-tauri/tauri.conf.json
View File

@@ -8,7 +8,7 @@
}, },
"package": { "package": {
"productName": "RisuAI", "productName": "RisuAI",
"version": "1.21.1" "version": "1.21.2"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {

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

@@ -93,6 +93,7 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
} }
} }
let unformated = { let unformated = {
'main':([] as OpenAIChat[]), 'main':([] as OpenAIChat[]),
'jailbreak':([] as OpenAIChat[]), 'jailbreak':([] as OpenAIChat[]),
@@ -162,10 +163,11 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
}).join('\n\n') }).join('\n\n')
}).join('\n\n')) + db.maxResponse) + 150 }).join('\n\n')) + db.maxResponse) + 150
const examples = exampleMessage(currentChar) const examples = exampleMessage(currentChar)
for(const example of examples){ for(const example of examples){
currentTokens += await tokenize(example.content) currentTokens += await tokenize(example.content) + 5
} }
let chats:OpenAIChat[] = examples let chats:OpenAIChat[] = examples
@@ -215,7 +217,7 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
memo: msg.chatId, memo: msg.chatId,
name: name name: name
}) })
currentTokens += (await tokenize(formedChat) + 1) currentTokens += (await tokenize(formedChat) + 5)
} }
if(nowChatroom.type === 'group'){ if(nowChatroom.type === 'group'){
@@ -224,7 +226,7 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
role: 'system', role: 'system',
content: systemMsg content: systemMsg
}) })
currentTokens += (await tokenize(systemMsg) + 1) currentTokens += (await tokenize(systemMsg) + 5)
} }
if(nowChatroom.supaMemory && db.supaMemoryType !== 'none'){ if(nowChatroom.supaMemory && db.supaMemoryType !== 'none'){
@@ -246,7 +248,7 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
return false return false
} }
currentTokens -= (await tokenize(chats[0].content) + 1) currentTokens -= (await tokenize(chats[0].content) + 5)
chats.splice(0, 1) chats.splice(0, 1)
} }
currentChat.lastMemory = chats[0].memo currentChat.lastMemory = chats[0].memo

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

@@ -171,7 +171,7 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
} }
continue continue
} }
const tokens = await tokenize(cont.content) + 1 const tokens = await tokenize(cont.content) + 5
if((chunkSize + tokens) > maxChunkSize){ if((chunkSize + tokens) > maxChunkSize){
if(stringlizedChat === ''){ if(stringlizedChat === ''){
stringlizedChat += `${cont.role === 'assistant' ? char.type === 'group' ? '' : char.name : db.username}: ${cont.content}\n\n` stringlizedChat += `${cont.role === 'assistant' ? char.type === 'group' ? '' : char.name : db.username}: ${cont.content}\n\n`

2
src/ts/storage/database.ts
View File

@@ -8,7 +8,7 @@ import { defaultAutoSuggestPrompt, defaultJailbreak, defaultMainPrompt } from '.
export const DataBase = writable({} as any as Database) export const DataBase = writable({} as any as Database)
export const loadedStore = writable(false) export const loadedStore = writable(false)
export let appVer = '1.21.1' export let appVer = '1.21.2'
export function setDatabase(data:Database){ export function setDatabase(data:Database){
if(checkNullish(data.characters)){ if(checkNullish(data.characters)){

2
version.json
View File

@@ -1 +1 @@
{"version":"1.21.1"} {"version":"1.21.2"}