Merge branch 'kwaroran:dev' into dev

src-tauri/tauri.conf.json

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

src/ts/process/index.ts

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

src/ts/process/supaMemory.ts

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

src/ts/storage/database.ts

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

version.json

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