From 68fbb99c425b08e5cfaf73e4c003732aa5d3886e Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Thu, 29 Jun 2023 00:59:08 +0900
Subject: [PATCH] [feat] added hypamemory toggle

---
 src/lib/Setting/Pages/OtherBotSettings.svelte |  5 +++++
 src/ts/process/index.ts                       |  4 +++-
 src/ts/process/memory/supaMemory.ts           | 16 +++++-----------
 src/ts/storage/database.ts                    |  1 +
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/lib/Setting/Pages/OtherBotSettings.svelte b/src/lib/Setting/Pages/OtherBotSettings.svelte
index 09ece2ba..1553c8c8 100644
--- a/src/lib/Setting/Pages/OtherBotSettings.svelte
+++ b/src/lib/Setting/Pages/OtherBotSettings.svelte
@@ -75,4 +75,9 @@
 {#if $DataBase.supaMemoryType !== 'none'}
     <span class="text-neutral-200">{language.SuperMemory} Prompt</span>
     <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.supaMemoryPrompt} placeholder="recommended to leave it blank to use default">
+{/if}
+{#if ($DataBase.supaMemoryType === 'davinci' || $DataBase.supaMemoryType === 'curie') && $DataBase.useExperimental}
+    <div class="flex">
+        <Check bind:check={$DataBase.hypaMemory} name='Able HypaMemory'/> <Help key="experimental" />
+    </div>
 {/if}
\ No newline at end of file
diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts
index e7269dd7..ba1338f8 100644
--- a/src/ts/process/index.ts
+++ b/src/ts/process/index.ts
@@ -296,7 +296,9 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
     }
 
     if(nowChatroom.supaMemory && db.supaMemoryType !== 'none'){
-        const sp = await supaMemory(chats, currentTokens, maxContextTokens, currentChat, nowChatroom, tokenizer)
+        const sp = await supaMemory(chats, currentTokens, maxContextTokens, currentChat, nowChatroom, tokenizer, {
+            asHyper: db.hypaMemory
+        })
         if(sp.error){
             alertError(sp.error)
             return false
diff --git a/src/ts/process/memory/supaMemory.ts b/src/ts/process/memory/supaMemory.ts
index 924f8d57..5c6bbc9e 100644
--- a/src/ts/process/memory/supaMemory.ts
+++ b/src/ts/process/memory/supaMemory.ts
@@ -6,6 +6,7 @@ import { requestChatData } from "../request";
 import { cloneDeep } from "lodash";
 import { HypaProcesser } from "./hypamemory";
 import { stringlizeChat } from "../stringlize";
+import { globalFetch } from "src/ts/storage/globalApi";
 
 export async function supaMemory(
         chats:OpenAIChat[],
@@ -154,28 +155,21 @@ export async function supaMemory(
             if(db.supaMemoryType !== 'subModel'){
                 const promptbody = stringlizedChat + '\n\n' + supaPrompt + "\n\nOutput:"
 
-                const da = await fetch("https://api.openai.com/v1/completions",{
+                const da = await globalFetch("https://api.openai.com/v1/completions",{
                     headers: {
                         "Content-Type": "application/json",
                         "Authorization": "Bearer " + db.supaMemoryKey
                     },
                     method: "POST",
-                    body: JSON.stringify({
+                    body: {
                         "model": db.supaMemoryType === 'curie' ? "text-curie-001" : "text-davinci-003",
                         "prompt": promptbody,
                         "max_tokens": 600,
                         "temperature": 0
-                    })
+                    }
                 })
     
-                if(da.status < 200 || da.status >= 300){
-                    return {
-                        currentTokens: currentTokens,
-                        chats: chats,
-                        error: "SupaMemory: HTTP: " + await da.text()
-                    }
-                }
-                result = (await da.json()).choices[0].text.trim()
+                result = (await da.data).choices[0].text.trim()
             }
             else {
                 const promptbody:OpenAIChat[] = [
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index b944c9e5..2c258a5d 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -529,6 +529,7 @@ export interface Database{
     useChatSticker:boolean,
     useAdditionalAssetsPreview:boolean,
     usePlainFetch:boolean
+    hypaMemory:boolean
 }
 
 interface hordeConfig{