From 0e70869b88c27249d9a8ecb5d085e017ccc69f3b Mon Sep 17 00:00:00 2001
From: LightningHyperBlaze45654
 <73149145+LightningHyperBlaze45654@users.noreply.github.com>
Date: Wed, 12 Jun 2024 17:00:13 -0700
Subject: [PATCH] Solved hypav2 not implemented as expected

The github isn't updating codebase correctly!!!
---
 src/lib/SideBars/CharConfig.svelte |  4 ++--
 src/ts/process/index.ts            |  2 +-
 src/ts/process/memory/hypav2.ts    | 19 ++++++++++++-------
 src/ts/storage/database.ts         |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index 033a5d53..fe223366 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -904,12 +904,12 @@
             <span> <Help key="utilityBot" name={language.utilityBot}/></span>
         </div>
 
-        {#if $DataBase.supaMemoryType === 'hypaV2'}
+        {#if $DataBase.supaMemoryType !== 'none' && $DataBase.hypav2}
             <Button
                 on:click={() => {
                     currentChar.data.chats[currentChar.data.chatPage].hypaV2Data ??= {
                         chunks: [],
-                        mainChunks: []
+                        mainChunks: []  
                     }
                     showHypaV2Alert()
                 }}
diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts
index ea679c51..e0600f4f 100644
--- a/src/ts/process/index.ts
+++ b/src/ts/process/index.ts
@@ -730,7 +730,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
             chats = hn.chats
             currentTokens = hn.tokens
         }
-        else if(db.supaMemoryType === 'hypaV2'){
+        else if(db.supaMemoryType !== 'none' && db.hypav2){ //HypaV2 support needs to be changed like this.
             const sp = await hypaMemoryV2(chats, currentTokens, maxContextTokens, currentChat, nowChatroom, tokenizer)
             if(sp.error){
                 alertError(sp.error)
diff --git a/src/ts/process/memory/hypav2.ts b/src/ts/process/memory/hypav2.ts
index b3df3f4c..a58c2a6e 100644
--- a/src/ts/process/memory/hypav2.ts
+++ b/src/ts/process/memory/hypav2.ts
@@ -18,9 +18,14 @@ export interface HypaV2Data {
     }[];
 }
 
-async function summarize(stringlizedChat: string): Promise<{ success: boolean; data: string }> {
+async function summary(stringlizedChat: string): Promise<{ success: boolean; data: string }> {
     const db = get(DataBase);
-
+    /**
+     * Generates a summary of a given chat by using either the OpenAI API or a submodel or distilbart summarizer.
+     *
+     * @param {string} stringlizedChat - The chat to be summarized, represented as a string.
+     * @return {Promise<{ success: boolean; data: string }>} A promise that resolves to an object containing the success status and the generated summary.
+     */
     if (db.supaMemoryType === 'distilbart') {
         try {
             const sum = await runSummarizer(stringlizedChat);
@@ -36,12 +41,10 @@ async function summarize(stringlizedChat: string): Promise<{ success: boolean; d
     const supaPrompt = db.supaMemoryPrompt === '' ?
         "[Summarize the ongoing role story, It must also remove redundancy and unnecessary text and content from the output to reduce tokens for gpt3 and other sublanguage models]\n"
         : db.supaMemoryPrompt;
-
     let result = '';
 
     if (db.supaMemoryType !== 'subModel') {
         const promptbody = stringlizedChat + '\n\n' + supaPrompt + "\n\nOutput:";
-
         const da = await globalFetch("https://api.openai.com/v1/completions", {
             headers: {
                 "Content-Type": "application/json",
@@ -57,6 +60,7 @@ async function summarize(stringlizedChat: string): Promise<{ success: boolean; d
                 "temperature": 0
             }
         });
+        console.log("Using openAI instruct 3.5 for SupaMemory")
 
         try {
             if (!da.ok) {
@@ -93,6 +97,7 @@ async function summarize(stringlizedChat: string): Promise<{ success: boolean; d
                 content: supaPrompt
             }
         ];
+        console.log("Using submodel: ", db.subModel, "for supaMemory model")
         const da = await requestChatData({
             formated: promptbody,
             bias: {},
@@ -171,7 +176,7 @@ export async function hypaMemoryV2(
 
         const stringlizedChat = halfData.map(e => `${e.role}: ${e.content}`).join('\n');
 
-        const summaryData = await summarize(stringlizedChat);
+        const summaryData = await summary(stringlizedChat);
 
         if (!summaryData.success) {
             return {
@@ -192,7 +197,7 @@ export async function hypaMemoryV2(
         });
 
         if (allocatedTokens < 1500) {
-            const summarizedMp = await summarize(mainPrompt);
+            const summarizedMp = await summary(mainPrompt);
             const mpToken = await tokenizer.tokenizeChat({ role: 'system', content: mainPrompt });
             const summaryToken = await tokenizer.tokenizeChat({ role: 'system', content: summarizedMp.data });
 
@@ -215,7 +220,7 @@ export async function hypaMemoryV2(
     await processor.addText(data.chunks.filter(v => {
         return v.text.trim().length > 0;
     }).map((v) => {
-        return "search_document: " + v.text.trim();
+        return "search_document: " + v.text.trim();hy
     }));
 
     let scoredResults: { [key: string]: number } = {};
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index d6650bb3..c776bd3c 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -568,7 +568,7 @@ export interface Database{
     useAdditionalAssetsPreview:boolean,
     usePlainFetch:boolean
     hypaMemory:boolean
-    hypav2:boolean
+    hypav2:boolean // Why this is not appended?
     proxyRequestModel:string
     ooba:OobaSettings
     ainconfig: AINsettings