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

Merge branch 'main' of https://github.com/kwaroran/RisuAI

Browse Source
This commit is contained in:
kwaroran
2024-12-07 00:58:13 +09:00
parent e0f6c58540 aa891b7dc4
commit 909e9635d2
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/ChatScreens/Chat.svelte
View File

@@ -57,7 +57,7 @@
}: Props = $props(); }: Props = $props();
let msgDisplay = $state('') let msgDisplay = $state('')
let translated = $state(DBState.db.autoTranslate) let translated = $state(false)
let role = $derived(DBState.db.characters[selIdState.selId].chats[DBState.db.characters[selIdState.selId].chatPage].message[idx]?.role) let role = $derived(DBState.db.characters[selIdState.selId].chats[DBState.db.characters[selIdState.selId].chatPage].message[idx]?.role)
async function rm(e:MouseEvent, rec?:boolean){ async function rm(e:MouseEvent, rec?:boolean){
if(e.shiftKey){ if(e.shiftKey){

15
src/ts/process/memory/hypav2.ts
View File

@@ -87,7 +87,7 @@ async function summary(stringlizedChat: string): Promise<{ success: boolean; dat
let parsedPrompt = parseChatML(supaPrompt.replaceAll('{{slot}}', stringlizedChat)) let parsedPrompt = parseChatML(supaPrompt.replaceAll('{{slot}}', stringlizedChat))
const promptbody: OpenAIChat[] = parsedPrompt ?? [ const promptbody: OpenAIChat[] = (parsedPrompt ?? [
{ {
role: "user", role: "user",
content: stringlizedChat content: stringlizedChat
@@ -96,7 +96,10 @@ async function summary(stringlizedChat: string): Promise<{ success: boolean; dat
role: "system", role: "system",
content: supaPrompt content: supaPrompt
} }
]; ]).map(message => ({
...message,
memo: "supaPrompt"
}));
console.log("Using submodel: ", db.subModel, "for supaMemory model"); console.log("Using submodel: ", db.subModel, "for supaMemory model");
const da = await requestChatData({ const da = await requestChatData({
formated: promptbody, formated: promptbody,
@@ -230,6 +233,7 @@ export async function hypaMemoryV2(
} }
// Fetch additional memory from chunks // Fetch additional memory from chunks
const searchDocumentPrefix = "search_document: ";
const processor = new HypaProcesser(db.hypaModel); const processor = new HypaProcesser(db.hypaModel);
processor.oaikey = db.supaMemoryKey; processor.oaikey = db.supaMemoryKey;
@@ -249,7 +253,7 @@ export async function hypaMemoryV2(
console.log("Older Chunks:", olderChunks); console.log("Older Chunks:", olderChunks);
// Add older chunks to processor for similarity search // Add older chunks to processor for similarity search
await processor.addText(olderChunks.filter(v => v.text.trim().length > 0).map(v => "search_document: " + v.text.trim())); await processor.addText(olderChunks.filter(v => v.text.trim().length > 0).map(v => searchDocumentPrefix + v.text.trim()));
let scoredResults: { [key: string]: number } = {}; let scoredResults: { [key: string]: number } = {};
for (let i = 0; i < 3; i++) { for (let i = 0; i < 3; i++) {
@@ -267,9 +271,10 @@ export async function hypaMemoryV2(
let chunkResultTokens = 0; let chunkResultTokens = 0;
while (allocatedTokens - mainPromptTokens - chunkResultTokens > 0 && scoredArray.length > 0) { while (allocatedTokens - mainPromptTokens - chunkResultTokens > 0 && scoredArray.length > 0) {
const [text] = scoredArray.shift(); const [text] = scoredArray.shift();
const tokenized = await tokenizer.tokenizeChat({ role: 'system', content: text.substring(14) }); const tokenized = await tokenizer.tokenizeChat({ role: 'system', content: text.substring(searchDocumentPrefix.length) });
if (tokenized > allocatedTokens - mainPromptTokens - chunkResultTokens) break; if (tokenized > allocatedTokens - mainPromptTokens - chunkResultTokens) break;
chunkResultPrompts += text.substring(14) + '\n\n'; // Ensure strings are truncated correctly using searchDocumentPrefix.length
chunkResultPrompts += text.substring(searchDocumentPrefix.length) + '\n\n';
chunkResultTokens += tokenized; chunkResultTokens += tokenized;
} }