diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 1dc31c78..a63046fc 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "0.8.0" + "version": "0.8.1" }, "tauri": { "allowlist": { diff --git a/src/lang/en.ts b/src/lang/en.ts index fbd2b0fa..fd3b9f89 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -72,7 +72,6 @@ export const languageEnglish = { scenario: "A brief description about character's scenario. \n\n**It is not recommended to use this option. Describe it in character description instead.**", utilityBot: "When activated, it ignores main prompt. \n\n**It is not recommended to use this option. Modifiy system prompt instead.**", loreSelective: "If Selective mode is toggled, both Activation Key and Secondary key should have a match to activate the lore." - }, setup: { chooseProvider: "Choose AI Provider", @@ -240,5 +239,7 @@ export const languageEnglish = { selective: "Selective", SecondaryKeys: 'Secondary keys', useGlobalSettings: "Use Global Settings", - recursiveScanning: "Recursive Scanning" + recursiveScanning: "Recursive Scanning", + creator: "Creator", + CharVersion: "Character Version" } diff --git a/src/lib/SideBars/BarIcon.svelte b/src/lib/SideBars/BarIcon.svelte index b9ea837b..53340c39 100644 --- a/src/lib/SideBars/BarIcon.svelte +++ b/src/lib/SideBars/BarIcon.svelte @@ -1,36 +1,42 @@ + + + {#await additionalStyle} - -{:then as} - + +{:then as} + {/await} - - \ No newline at end of file + diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte index 945473fe..1169bef8 100644 --- a/src/lib/SideBars/CharConfig.svelte +++ b/src/lib/SideBars/CharConfig.svelte @@ -472,6 +472,12 @@ {/if} + {language.creator} + + + {language.CharVersion} + + {language.altGreet} @@ -513,7 +519,6 @@ {/each}
- {#if $DataBase.showUnrecommended || currentChar.data.utilityBot}
diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte index 15ddf339..d5c85b1f 100644 --- a/src/lib/SideBars/Sidebar.svelte +++ b/src/lib/SideBars/Sidebar.svelte @@ -1,189 +1,284 @@ -
- -
- {#if menuMode === 0} + +
+ +
+ {#if menuMode === 0} {#each charImages as charimg, i} -
- {#if charimg !== ''} - {changeChar(i)}} additionalStyle={getCharImage($DataBase.characters[i].image, 'css')}> - - {:else} - {changeChar(i)}} additionalStyle={i === $selectedCharID ? 'background:#44475a' : ''}> - - - {/if} - {#if editMode} -
- - -
- {/if} -
- {/each} - { - if(sideBarMode === 1){ - reseter(); - sideBarMode = 0 - } - else{ - reseter(); - sideBarMode = 1 - } - }}> - {:else} - { - if($settingsOpen){ - reseter(); - settingsOpen.set(false) - } - else{ - reseter(); - settingsOpen.set(true) - } - }}> - { - reseter(); - openGrid() - }}> - {/if} -
-
1000)}> - - - {#if sideBarMode === 0} - {#if $selectedCharID < 0 || $settingsOpen} - +
+ + {#if charimg !== ""} + +
{ + changeChar(i); + }} + on:keydown={(e) => { + if (e.key === "Enter") { + changeChar(i); + } + }} + tabindex="0" + > + +
{:else} - + +
{ + changeChar(i); + }} + on:keydown={(e) => { + if (e.key === "Enter") { + changeChar(i); + } + }} + tabindex="0" + > + +
{/if} - {:else if sideBarMode === 1} -

Create

- - - -

Edit

- - {/if} + {#if editMode} +
+ + +
+ {/if} +
+ {/each} +
+ { + if (sideBarMode === 1) { + reseter(); + sideBarMode = 0; + } else { + reseter(); + sideBarMode = 1; + } + }} + > +
+ {:else} + { + if ($settingsOpen) { + reseter(); + settingsOpen.set(false); + } else { + reseter(); + settingsOpen.set(true); + } + }}> + { + reseter(); + openGrid(); + }}> + {/if} +
+
1000} +> + + + {#if sideBarMode === 0} + {#if $selectedCharID < 0 || $settingsOpen} + + {:else} + + {/if} + {:else if sideBarMode === 1} +

Create

+ + + +

Edit

+ + {/if}
- - {#if openPresetList} - {openPresetList = false}}/> -{/if} \ No newline at end of file + { + openPresetList = false; + }} + /> +{/if} + + diff --git a/src/lib/SideBars/SidebarAvatar.svelte b/src/lib/SideBars/SidebarAvatar.svelte new file mode 100644 index 00000000..8d133654 --- /dev/null +++ b/src/lib/SideBars/SidebarAvatar.svelte @@ -0,0 +1,33 @@ + + + + {#if src} + {#await src} +
+ {:then img} + avatar + {/await} + {:else} +
+ {/if} + diff --git a/src/lib/SideBars/SidebarIndicator.svelte b/src/lib/SideBars/SidebarIndicator.svelte new file mode 100644 index 00000000..157dae98 --- /dev/null +++ b/src/lib/SideBars/SidebarIndicator.svelte @@ -0,0 +1,17 @@ + + +
diff --git a/src/lib/UI/BaseRoundedButton.svelte b/src/lib/UI/BaseRoundedButton.svelte new file mode 100644 index 00000000..f0e4712b --- /dev/null +++ b/src/lib/UI/BaseRoundedButton.svelte @@ -0,0 +1,16 @@ + + + diff --git a/src/ts/characters.ts b/src/ts/characters.ts index 5cc19592..b9ff6089 100644 --- a/src/ts/characters.ts +++ b/src/ts/characters.ts @@ -281,6 +281,11 @@ export function characterFormatUpdate(index:number|character){ cha.personality = cha.personality ?? '' cha.scenario = cha.scenario ?? '' cha.firstMsgIndex = cha.firstMsgIndex ?? -1 + cha.additionalData = cha.additionalData ?? { + tag: [], + creator: '', + character_version: 0 + } } if(checkNullish(cha.customscript)){ diff --git a/src/ts/database.ts b/src/ts/database.ts index 244a1b5e..f57f79fc 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 = '0.8.0' +export let appVer = '0.8.1' export function setDatabase(data:Database){ diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts index 8b18b3c1..939ad5c0 100644 --- a/src/ts/process/index.ts +++ b/src/ts/process/index.ts @@ -120,10 +120,12 @@ export async function sendChat(chatProcessIndex = -1):Promise { }) } - unformated.authorNote.push({ - role: 'system', - content: replacePlaceholders(currentChat.note, currentChar.name) - }) + if(currentChat.note !== ''){ + unformated.authorNote.push({ + role: 'system', + content: replacePlaceholders(currentChar.postHistoryInstructions, currentChat.note) + }) + } if(currentChar.postHistoryInstructions !== ''){ unformated.authorNote.push({ @@ -169,15 +171,19 @@ export async function sendChat(chatProcessIndex = -1):Promise { content: '[Start a new chat]' }) - chats.push({ - role: 'assistant', - content: processScript(currentChar, - replacePlaceholders(nowChatroom.firstMessage, currentChar.name), - 'editprocess') - }) - currentTokens += await tokenize(processScript(currentChar, - replacePlaceholders(nowChatroom.firstMessage, currentChar.name), - 'editprocess')) + if(nowChatroom.type !== 'group'){ + const firstMsg = nowChatroom.firstMsgIndex === -1 ? nowChatroom.firstMessage : nowChatroom.alternateGreetings[nowChatroom.firstMsgIndex] + + chats.push({ + role: 'assistant', + content: processScript(currentChar, + replacePlaceholders(firstMsg, currentChar.name), + 'editprocess') + }) + currentTokens += await tokenize(processScript(currentChar, + replacePlaceholders(firstMsg, currentChar.name), + 'editprocess')) + } const ms = currentChat.message for(const msg of ms){ diff --git a/version.json b/version.json index 999ffacb..75f4f15e 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"0.8.0"} \ No newline at end of file +{"version":"0.8.1"} \ No newline at end of file