From b4fbd4c1b4e08574e0602467b487399ddd78d1eb Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Wed, 26 Jul 2023 19:52:58 +0900
Subject: [PATCH] [feat] lorebook fullWordMatching

---
 src/lang/en.ts                                   | 1 +
 src/lib/SideBars/LoreBook/LoreBookSetting.svelte | 3 +++
 src/ts/characterCards.ts                         | 6 +++++-
 src/ts/process/lorebook.ts                       | 6 ++++--
 src/ts/storage/database.ts                       | 1 +
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 73c685f5..42d5717e 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -357,4 +357,5 @@ export const languageEnglish = {
     cancel: "Cancel",
     renameFolder: "Rename Folder",
     changeFolderColor: "Change Folder Color",
+    fullWordMatching: "Full Word Matching",
 }
\ No newline at end of file
diff --git a/src/lib/SideBars/LoreBook/LoreBookSetting.svelte b/src/lib/SideBars/LoreBook/LoreBookSetting.svelte
index 97afcbe6..08829bf4 100644
--- a/src/lib/SideBars/LoreBook/LoreBookSetting.svelte
+++ b/src/lib/SideBars/LoreBook/LoreBookSetting.svelte
@@ -48,6 +48,9 @@
         <div class="flex items-center mt-4">
             <Check bind:check={$DataBase.characters[$selectedCharID].loreSettings.recursiveScanning} name={language.recursiveScanning}/>
         </div>
+        <div class="flex items-center mt-4">
+            <Check bind:check={$DataBase.characters[$selectedCharID].loreSettings.fullWordMatching} name={language.fullWordMatching}/>
+        </div>
         <span class="text-neutral-200 mt-4 mb-2">{language.loreBookDepth}</span>
         <NumberInput size="sm" min={0} max={20} bind:value={$DataBase.characters[$selectedCharID].loreSettings.scanDepth} />
         <span class="text-neutral-200">{language.loreBookToken}</span>
diff --git a/src/ts/characterCards.ts b/src/ts/characterCards.ts
index cf575e71..ca07fd59 100644
--- a/src/ts/characterCards.ts
+++ b/src/ts/characterCards.ts
@@ -275,7 +275,8 @@ async function importSpecv2(card:CharacterCardV2, img?:Uint8Array, mode?:'hub'|'
             loresettings = {
                 tokenBudget:charbook.token_budget,
                 scanDepth:charbook.scan_depth,
-                recursiveScanning: charbook.recursive_scanning
+                recursiveScanning: charbook.recursive_scanning,
+                fullWordMatching: charbook?.extensions?.risu_fullWordMatching ?? false,
             }
         }
 
@@ -382,6 +383,9 @@ async function createBaseV2(char:character) {
             case_sensitive: caseSensitive,
         })
     }
+    char.loreExt ??= {}
+
+    char.loreExt.risu_fullWordMatching = char.loreSettings?.fullWordMatching ?? false
 
     const card:CharacterCardV2 = {
         spec: "chara_card_v2",
diff --git a/src/ts/process/lorebook.ts b/src/ts/process/lorebook.ts
index b2bc26b9..946067a3 100644
--- a/src/ts/process/lorebook.ts
+++ b/src/ts/process/lorebook.ts
@@ -72,6 +72,7 @@ export async function loadLoreBookPrompt(){
     const currentChat = char.chats[page].message
     const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth
     const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken
+    const fullWordMatching = char.loreSettings?.fullWordMatching ?? false
 
     let activatiedPrompt: string[] = []
 
@@ -120,6 +121,7 @@ export async function loadLoreBookPrompt(){
     while(loreListUpdated){
         loreListUpdated = false
         const formatedChat = formatedChatMain + activatiedPrompt.join('').replace(rmRegex,'').toLocaleLowerCase()
+        const formatedChatList = fullWordMatching ? formatedChat.split(' ') : formatedChat
         for(let i=0;i<formatedLore.length;i++){
             const lore = formatedLore[i]
             if(lore.activatied){
@@ -141,7 +143,7 @@ export async function loadLoreBookPrompt(){
             if(Array.isArray(lore.keys)){
                 for(const key of lore.keys){
                     if(key){
-                        if(formatedChat.includes(key)){
+                        if(formatedChatList.includes(key)){
                             firstKeyActivation = true
                             break
                         }
@@ -163,7 +165,7 @@ export async function loadLoreBookPrompt(){
                         continue
                     }
                     for(const key of lore.secondKey){
-                        if(formatedChat.includes(key)){
+                        if(formatedChatList.includes(key)){
                             activatiedPrompt.push(lore.content)
                             lore.activatied = true
                             loreListUpdated = true
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index fb9a0b85..e21ed85d 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -375,6 +375,7 @@ export interface loreSettings{
     tokenBudget: number
     scanDepth:number
     recursiveScanning: boolean
+    fullWordMatching?: boolean
 }