[feat] better drive load and supamemory

src/ts/drive/drive.ts

@@ -3,7 +3,7 @@ import { alertError, alertInput, alertNormal, alertSelect, alertStore } from "..
 import { DataBase, setDatabase, type Database } from "../database";
 import { forageStorage, getUnpargeables, isTauri } from "../globalApi";
 import pako from "pako";
-import { BaseDirectory, readBinaryFile, readDir, writeBinaryFile } from "@tauri-apps/api/fs";
+import { BaseDirectory, exists, readBinaryFile, readDir, writeBinaryFile } from "@tauri-apps/api/fs";
 import { language } from "../../lang";
 import { relaunch } from '@tauri-apps/api/process';
 import { open } from '@tauri-apps/api/shell';
@@ -167,11 +167,16 @@ async function loadDrive(ACCESS_TOKEN:string) {
     let loadedForageKeys = false
 
     async function checkImageExists(images:string) {
-        if(!loadedForageKeys){
+        if(isTauri){
-            foragekeys = await forageStorage.keys()
+            return await exists(`assets/` + images, {dir: BaseDirectory.AppData})
-            loadedForageKeys = true
+        }
+        else{
+            if(!loadedForageKeys){
+                foragekeys = await forageStorage.keys()
+                loadedForageKeys = true
+            }
+            return foragekeys.includes('assets/' + images)
         }
-        return foragekeys.includes('assets/' + images)
     }
     const fileNames = files.map((d) => {
         return d.name

src/ts/process/supaMemory.ts

@@ -25,6 +25,7 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
         }
 
         let supaMemory = ''
+        let lastId = ''
 
         if(room.supaMemoryData && room.supaMemoryData.length > 4){
             const splited = room.supaMemoryData.split('\n')
@@ -41,6 +42,7 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
                     }
                 }
                 if(chats[0].memo === id){
+                    lastId = id
                     break
                 }
                 currentTokens -= (await tokenize(chats[0].content) + 1)
@@ -64,8 +66,6 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
             }
         }
 
-        let lastId = ''
-
 
         async function summarize(stringlizedChat:string){
 
@@ -87,7 +87,7 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
                     body: JSON.stringify({
                         "model": db.supaMemoryType === 'curie' ? "text-curie-001" : "text-davinci-003",
                         "prompt": promptbody,
-                        "max_tokens": 500,
+                        "max_tokens": 600,
                         "temperature": 0
                     })
                 })
@@ -128,40 +128,48 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
             return result
         }
 
-        if(supaMemory.split('\n\n').length >= 4){
-            const result = await summarize(supaMemory)
-            if(typeof(result) !== 'string'){
-                return result
-            }
-            currentTokens -= await tokenize(supaMemory)
-            currentTokens += await tokenize(result  + '\n\n')
-            supaMemory = result + '\n\n'
-        }
-
         while(currentTokens > maxContextTokens){
+            const beforeToken = currentTokens
             let maxChunkSize = maxContextTokens > 3500 ? 1200 : Math.floor(maxContextTokens / 3)
-            while((currentTokens - (maxChunkSize * 0.7)) > maxContextTokens){
+            let summarized = false
-                maxChunkSize = Math.floor(maxChunkSize * 0.7)
-                if(maxChunkSize < 500){
-                    return {
-                        currentTokens: currentTokens,
-                        chats: chats,
-                        error: "Not Enough Tokens"
-                    }
-                }
-            }
-
             let chunkSize = 0
             let stringlizedChat = ''
-            
+            let spiceLen = 0
             while(true){
-                const cont = chats[0]
+                const cont = chats[spiceLen]
                 if(!cont){
-                    return {
+                    currentTokens = beforeToken
-                        currentTokens: currentTokens,
+                    stringlizedChat = ''
-                        chats: chats,
+                    chunkSize = 0
-                        error: "Not Enough Tokens"
+                    spiceLen = 0
+                    if(summarized){
+                        if(maxChunkSize < 500){
+                            return {
+                                currentTokens: currentTokens,
+                                chats: chats,
+                                error: "Not Enough Tokens"
+                            }
+                        }
+                        maxChunkSize = maxChunkSize * 0.7
                     }
+                    else{
+                        const result = await summarize(supaMemory)
+                        if(typeof(result) !== 'string'){
+                            return result
+                        }
+
+                        console.log(currentTokens)
+                        currentTokens -= await tokenize(supaMemory)
+                        currentTokens += await tokenize(result + '\n\n')
+                        console.log(currentTokens)
+
+                        supaMemory = result + '\n\n'
+                        summarized = true
+                        if(currentTokens <= maxContextTokens){
+                            break
+                        }
+                    }
+                    continue
                 }
                 const tokens = await tokenize(cont.content) + 1
                 if((chunkSize + tokens) > maxChunkSize){
@@ -169,30 +177,25 @@ export async function supaMemory(chats:OpenAIChat[],currentTokens:number,maxCont
                     break
                 }
                 stringlizedChat += `${cont.role === 'assistant' ? char.type === 'group' ? '' : char.name : db.username}: ${cont.content}\n\n`
-                chats.splice(0, 1)
+                spiceLen += 1
                 currentTokens -= tokens
                 chunkSize += tokens
             }
+            chats.splice(0, spiceLen)
 
-            const result = await summarize(stringlizedChat)
+            if(stringlizedChat !== ''){
+                const result = await summarize(stringlizedChat)
 
-            if(typeof(result) !== 'string'){
-                return result
-            }
-
-            const tokenz = await tokenize(result + '\n\n') + 5
-            currentTokens += tokenz
-            supaMemory += result.replace(/\n+/g,'\n') + '\n\n'
-            if(supaMemory.split('\n\n').length >= 4){
-                const result = await summarize(supaMemory)
                 if(typeof(result) !== 'string'){
                     return result
                 }
-                currentTokens -= await tokenize(supaMemory)
+    
-                currentTokens += await tokenize(result + '\n\n')
+                const tokenz = await tokenize(result + '\n\n') + 5
-                supaMemory = result + '\n\n'
+                currentTokens += tokenz
+                supaMemory += result.replace(/\n+/g,'\n') + '\n\n'
             }
 
+
         }
 
         chats.unshift({