From b8ead62da43aa829061c10c3f1305f3683a2ca57 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Wed, 24 May 2023 10:40:02 +0900 Subject: [PATCH 1/3] [fix] lorebook replace error --- src/ts/process/lorebook.ts | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/ts/process/lorebook.ts b/src/ts/process/lorebook.ts index 137fb056..f88ef962 100644 --- a/src/ts/process/lorebook.ts +++ b/src/ts/process/lorebook.ts @@ -68,7 +68,7 @@ export async function loadLoreBookPrompt(){ const characterLore = char.globalLore const chatLore = char.chats[page].localLore const globalLore = db.loreBook[db.loreBookPage].data - const fullLore = characterLore.concat(chatLore.concat(globalLore)) + const fullLore = characterLore.concat(chatLore.concat(globalLore ?? [])) const currentChat = char.chats[page].message const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken @@ -78,18 +78,20 @@ export async function loadLoreBookPrompt(){ let formatedLore:formatedLore[] = [] for (const lore of fullLore){ - if(lore.key.length > 1 || lore.alwaysActive){ - formatedLore.push({ - keys: lore.alwaysActive ? 'always' : lore.key.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { - return a.length > 1 - }), - secondKey: lore.selective ? lore.secondkey.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { - return a.length > 1 - }) : [], - content: lore.content, - order: lore.insertorder, - activatied: false - }) + if(lore && lore.key){ + if(lore.key.length > 1 || lore.alwaysActive){ + formatedLore.push({ + keys: lore.alwaysActive ? 'always' : lore.key.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { + return a.length > 1 + }), + secondKey: lore.selective ? lore.secondkey.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { + return a.length > 1 + }) : [], + content: lore.content, + order: lore.insertorder, + activatied: false + }) + } } } From b082070bfc7aba8a642494ef0cbd75ba263d7375 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Wed, 24 May 2023 10:41:35 +0900 Subject: [PATCH 2/3] [fix] lorebook replace error 2 --- src/ts/process/lorebook.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ts/process/lorebook.ts b/src/ts/process/lorebook.ts index f88ef962..f767f240 100644 --- a/src/ts/process/lorebook.ts +++ b/src/ts/process/lorebook.ts @@ -65,10 +65,10 @@ export async function loadLoreBookPrompt(){ const db = get(DataBase) const char = db.characters[selectedID] const page = char.chatPage - const characterLore = char.globalLore - const chatLore = char.chats[page].localLore - const globalLore = db.loreBook[db.loreBookPage].data - const fullLore = characterLore.concat(chatLore.concat(globalLore ?? [])) + const characterLore = char.globalLore ?? [] + const chatLore = char.chats[page].localLore ?? [] + const globalLore = db.loreBook[db.loreBookPage].data ?? [] + const fullLore = [...characterLore, ...chatLore, ...globalLore] const currentChat = char.chats[page].message const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken From 852b24de6b54e5a1e7ee597d6ab971d421142d6d Mon Sep 17 00:00:00 2001 From: kwaroran Date: Wed, 24 May 2023 10:43:52 +0900 Subject: [PATCH 3/3] [fix] lorebook replace error 3 --- src-tauri/tauri.conf.json | 2 +- src/ts/database.ts | 2 +- src/ts/process/lorebook.ts | 8 ++++---- version.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5a146ac3..8436439c 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "1.16.0" + "version": "1.16.1" }, "tauri": { "allowlist": { diff --git a/src/ts/database.ts b/src/ts/database.ts index 2047fd26..55c639f1 100644 --- a/src/ts/database.ts +++ b/src/ts/database.ts @@ -7,7 +7,7 @@ import { cloneDeep } from 'lodash'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = '1.16.0' +export let appVer = '1.16.1' export function setDatabase(data:Database){ diff --git a/src/ts/process/lorebook.ts b/src/ts/process/lorebook.ts index f767f240..991b27b6 100644 --- a/src/ts/process/lorebook.ts +++ b/src/ts/process/lorebook.ts @@ -68,7 +68,7 @@ export async function loadLoreBookPrompt(){ const characterLore = char.globalLore ?? [] const chatLore = char.chats[page].localLore ?? [] const globalLore = db.loreBook[db.loreBookPage].data ?? [] - const fullLore = [...characterLore, ...chatLore, ...globalLore] + const fullLore = characterLore.concat(chatLore) const currentChat = char.chats[page].message const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken @@ -78,13 +78,13 @@ export async function loadLoreBookPrompt(){ let formatedLore:formatedLore[] = [] for (const lore of fullLore){ - if(lore && lore.key){ + if(lore){ if(lore.key.length > 1 || lore.alwaysActive){ formatedLore.push({ - keys: lore.alwaysActive ? 'always' : lore.key.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { + keys: lore.alwaysActive ? 'always' : (lore.key ?? '').replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { return a.length > 1 }), - secondKey: lore.selective ? lore.secondkey.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { + secondKey: lore.selective ? (lore.secondkey ?? '').replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => { return a.length > 1 }) : [], content: lore.content, diff --git a/version.json b/version.json index dba713ae..cfaa627d 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"1.16.0"} \ No newline at end of file +{"version":"1.16.1"} \ No newline at end of file