import { requestChatData } from "src/ts/process/request";
import { doingChat, type OpenAIChat } from "../../ts/process/index";
- import { DataBase, setDatabase, type character, type Message, type groupChat, type Database } from "../../ts/storage/database";
+ import { DBState, setDatabase, type character, type Message, type groupChat, type Database } from "../../ts/storage/database.svelte";
import { selectedCharID } from "../../ts/stores";
import { translate } from "src/ts/translator/translator";
import { CopyIcon, LanguagesIcon, RefreshCcwIcon } from "lucide-svelte";
@@ -18,9 +18,9 @@
}
let { send, messageInput }: Props = $props();
- let suggestMessages:string[] = $state($DataBase.characters[$selectedCharID]?.chats[$DataBase.characters[$selectedCharID].chatPage]?.suggestMessages)
+ let suggestMessages:string[] = $state(DBState.db.characters[$selectedCharID]?.chats[DBState.db.characters[$selectedCharID].chatPage]?.suggestMessages)
let suggestMessagesTranslated:string[] = $state()
- let toggleTranslate:boolean = $state($DataBase.autoTranslate)
+ let toggleTranslate:boolean = $state(DBState.db.autoTranslate)
let progress:boolean = $state();
let progressChatPage=-1;
let abortController:AbortController;
@@ -32,7 +32,7 @@
progress=false
abortController?.abort()
}
- let currentChar = $DataBase.characters[$selectedCharID];
+ let currentChar = DBState.db.characters[$selectedCharID];
suggestMessages = currentChar?.chats[currentChar.chatPage].suggestMessages
}
}
@@ -45,7 +45,7 @@
suggestMessages = []
}
if(!v && $selectedCharID > -1 && (!suggestMessages || suggestMessages.length === 0) && !progress){
- let currentChar:character|groupChat = $DataBase.characters[$selectedCharID];
+ let currentChar:character|groupChat = DBState.db.characters[$selectedCharID];
let messages:Message[] = []
messages = [...messages, ...currentChar.chats[currentChar.chatPage].message];
@@ -55,7 +55,7 @@
let promptbody:OpenAIChat[] = [
{
role:'system',
- content: replacePlaceholders($DataBase.autoSuggestPrompt, currentChar.name)
+ content: replacePlaceholders(DBState.db.autoSuggestPrompt, currentChar.name)
}
,{
role: 'user',
@@ -63,11 +63,11 @@
}
]
- if($DataBase.subModel === "textgen_webui" || $DataBase.subModel === 'mancer' || $DataBase.subModel.startsWith('local_')){
+ if(DBState.db.subModel === "textgen_webui" || DBState.db.subModel === 'mancer' || DBState.db.subModel.startsWith('local_')){
promptbody = [
{
role: 'system',
- content: replacePlaceholders($DataBase.autoSuggestPrompt, currentChar.name)
+ content: replacePlaceholders(DBState.db.autoSuggestPrompt, currentChar.name)
},
...lastMessages.map(({ role, data }) => ({
role: role === "user" ? "user" as const : "assistant" as const,
@@ -86,7 +86,7 @@
}, 'submodel', abortController.signal).then(rq2=>{
if(rq2.type !== 'fail' && rq2.type !== 'streaming' && rq2.type !== 'multiline' && progress){
var suggestMessagesNew = rq2.result.split('\n').filter(msg => msg.startsWith('-')).map(msg => msg.replace('-','').trim())
- const db:Database = get(DataBase);
+ const db:Database = DBState.db;
db.characters[$selectedCharID].chats[currentChar.chatPage].suggestMessages = suggestMessagesNew
setDatabase(db)
suggestMessages = suggestMessagesNew
@@ -112,7 +112,7 @@
$effect.pre(() => {
$selectedCharID
//FIXME add selectedChatPage for optimize render
- chatPage = $DataBase.characters[$selectedCharID].chatPage
+ chatPage = DBState.db.characters[$selectedCharID].chatPage
updateSuggestions()
});
$effect.pre(() => {translateSuggest(toggleTranslate, suggestMessages)});
@@ -125,7 +125,7 @@
{language.creatingSuggestions}
{:else if !$doingChat}
- {#if $DataBase.translator !== ''}
+ {#if DBState.db.translator !== ''}
diff --git a/src/lib/Mobile/MobileBody.svelte b/src/lib/Mobile/MobileBody.svelte
index 73124580..865fd02b 100644
--- a/src/lib/Mobile/MobileBody.svelte
+++ b/src/lib/Mobile/MobileBody.svelte
@@ -10,7 +10,7 @@
import SideChatList from "../SideBars/SideChatList.svelte";
import DevTool from "../SideBars/DevTool.svelte";
import { isLite } from "src/ts/lite";
- import { DataBase } from "src/ts/storage/database";
+ import { DBState } from "src/ts/storage/database.svelte";
{#if $MobileSideBar > 0 && !$isLite}
@@ -36,7 +36,7 @@
{#if $MobileSideBar > 0}
{#if $MobileSideBar === 1}
-
+
{:else if $MobileSideBar === 2}
{:else if $MobileSideBar === 3}
diff --git a/src/lib/Mobile/MobileCharacters.svelte b/src/lib/Mobile/MobileCharacters.svelte
index 0072875f..4045f88c 100644
--- a/src/lib/Mobile/MobileCharacters.svelte
+++ b/src/lib/Mobile/MobileCharacters.svelte
@@ -1,5 +1,5 @@
- {#each sortChar($DataBase.characters) as char, i}
+ {#each sortChar(DBState.db.characters) as char, i}
{#if char.name.toLocaleLowerCase().includes($MobileSearch.toLocaleLowerCase())}
-
{$DataBase.characters[$selectedCharID].name}
+
{DBState.db.characters[$selectedCharID].name}