diff --git a/src/lib/Others/AlertComp.svelte b/src/lib/Others/AlertComp.svelte index fb4f31f2..2c68c0f0 100644 --- a/src/lib/Others/AlertComp.svelte +++ b/src/lib/Others/AlertComp.svelte @@ -7,6 +7,7 @@ import BarIcon from '../SideBars/BarIcon.svelte'; import { User } from 'lucide-svelte'; import { hubURL } from 'src/ts/characterCards'; + import TextInput from '../UI/GUI/TextInput.svelte'; let btn let input = '' @@ -90,7 +91,7 @@ }) }}>OK {:else if $alertStore.type === 'input'} - + {:else if step === 5} -

{language.setup.inputName}

+

{language.setup.inputName}

- +
+ {#if $DataBase.bias.length === 0} @@ -334,16 +334,18 @@ {#each $DataBase.bias as bias, i} - + - + + + + - {/each} diff --git a/src/lib/Setting/Pages/DisplaySettings.svelte b/src/lib/Setting/Pages/DisplaySettings.svelte index 6b06395f..a4adb15d 100644 --- a/src/lib/Setting/Pages/DisplaySettings.svelte +++ b/src/lib/Setting/Pages/DisplaySettings.svelte @@ -4,6 +4,7 @@ import { changeFullscreen, selectSingleFile, sleep } from "src/ts/util"; import Check from "src/lib/Others/Check.svelte"; import Help from "src/lib/Others/Help.svelte"; + import SliderInput from "src/lib/UI/GUI/SliderInput.svelte";

{language.display}

@@ -19,12 +20,12 @@ {#if $DataBase.theme === "waifu"} {language.waifuWidth} - - {($DataBase.waifuWidth)}% + + {($DataBase.waifuWidth)}% {language.waifuWidth2} - - {($DataBase.waifuWidth2)}% + + {($DataBase.waifuWidth2)}% {/if} {language.textColor} @@ -54,11 +55,11 @@ {/if} {language.UISize} - + {($DataBase.zoomsize)}% {language.iconSize} - + {($DataBase.iconsize)}%
diff --git a/src/lib/Setting/Pages/OtherBotSettings.svelte b/src/lib/Setting/Pages/OtherBotSettings.svelte index 1553c8c8..4a954f98 100644 --- a/src/lib/Setting/Pages/OtherBotSettings.svelte +++ b/src/lib/Setting/Pages/OtherBotSettings.svelte @@ -4,6 +4,8 @@ import Help from "src/lib/Others/Help.svelte"; import { DataBase } from "src/ts/storage/database"; import { isTauri } from "src/ts/storage/globalApi"; + import NumberInput from "src/lib/UI/GUI/NumberInput.svelte"; + import TextInput from "src/lib/UI/GUI/TextInput.svelte";

{language.otherBots}

@@ -25,40 +27,40 @@ You are using web version. you must use ngrok or other tunnels to use your local webui. {/if} WebUI {language.providerURL} - + Steps - + CFG Scale - + Width - + Height - + Sampler - +
{#if $DataBase.sdConfig.enable_hr === true} denoising_strength - + hr_scale - + Upscaler - + {/if} {/if} TTS ElevenLabs API key - + VOICEVOX URL - + {language.SuperMemory} {language.SuperMemory} {language.model} @@ -70,11 +72,11 @@ {#if $DataBase.supaMemoryType === 'davinci' || $DataBase.supaMemoryType === 'curie'} {language.SuperMemory} OpenAI Key - + {/if} {#if $DataBase.supaMemoryType !== 'none'} {language.SuperMemory} Prompt - + {/if} {#if ($DataBase.supaMemoryType === 'davinci' || $DataBase.supaMemoryType === 'curie') && $DataBase.useExperimental}
diff --git a/src/lib/Setting/Pages/PersonaSettings.svelte b/src/lib/Setting/Pages/PersonaSettings.svelte index e72d2128..b32002af 100644 --- a/src/lib/Setting/Pages/PersonaSettings.svelte +++ b/src/lib/Setting/Pages/PersonaSettings.svelte @@ -1,6 +1,7 @@

{language.plugin}

@@ -48,9 +50,9 @@ {/each} {:else if plugin.arguments[arg] === 'string'} - + {:else if plugin.arguments[arg] === 'int'} - + {/if} {/each}
diff --git a/src/lib/Setting/botpreset.svelte b/src/lib/Setting/botpreset.svelte index b3533c4d..0a2fdbc7 100644 --- a/src/lib/Setting/botpreset.svelte +++ b/src/lib/Setting/botpreset.svelte @@ -4,6 +4,7 @@ import { DataBase, changeToPreset, copyPreset, downloadPreset, importPreset, presetTemplate } from "../../ts/storage/database"; import { CopyIcon, DownloadIcon, EditIcon, FolderUpIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte"; import { cloneDeep } from "lodash"; + import TextInput from "../UI/GUI/TextInput.svelte"; let editMode = false export let close = () => {} @@ -28,7 +29,7 @@ } }} class="flex items-center text-neutral-200 border-t-1 border-solid border-0 border-gray-600 p-2 cursor-pointer" class:bg-selected={i === $DataBase.botPresetsId}> {#if editMode} - + {:else} {#if i < 9} {i + 1} diff --git a/src/lib/Setting/lorepreset.svelte b/src/lib/Setting/lorepreset.svelte index 6bb56c67..34b1f956 100644 --- a/src/lib/Setting/lorepreset.svelte +++ b/src/lib/Setting/lorepreset.svelte @@ -3,6 +3,7 @@ import { language } from "../../lang"; import { DataBase } from "../../ts/storage/database"; import { EditIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte"; + import TextInput from "../UI/GUI/TextInput.svelte"; let editMode = false export let close = () => {} @@ -24,7 +25,7 @@ } }} class="flex items-center text-neutral-200 border-t-1 border-solid border-0 border-gray-600 p-2 cursor-pointer" class:bg-selected={ind === $DataBase.loreBookPage}> {#if editMode} - + {:else} {lore.name} {/if} diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte index 2216f260..35ba35d0 100644 --- a/src/lib/SideBars/CharConfig.svelte +++ b/src/lib/SideBars/CharConfig.svelte @@ -3,7 +3,7 @@ import { tokenize } from "../../ts/tokenizer"; import { DataBase, saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database"; import { selectedCharID } from "../../ts/stores"; - import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBracesIcon, Volume2Icon, XIcon } from 'lucide-svelte' + import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBraces, Volume2Icon, XIcon } from 'lucide-svelte' import Check from "../Others/Check.svelte"; import { addCharEmotion, addingEmotion, getCharImage, rmCharEmotion, selectCharImg, makeGroupImage } from "../../ts/characters"; import LoreBook from "./LoreBookSetting.svelte"; @@ -19,6 +19,8 @@ import { checkCharOrder, getFileSrc } from "src/ts/storage/globalApi"; import { addGroupChar, rmCharFromGroup } from "src/ts/process/group"; import HubUpload from "../UI/HubUpload.svelte"; + import TextInput from "../UI/GUI/TextInput.svelte"; + import NumberInput from "../UI/GUI/NumberInput.svelte"; let subMenu = 0 let openHubUpload = false @@ -142,7 +144,7 @@ {/if} + {#if currentChar.data.bias.length === 0} @@ -408,20 +412,22 @@ {/if} {#each currentChar.data.bias as bias, i} - + - - + + - + + + + - {/each} @@ -515,16 +521,16 @@ {/if} Speed scale - + Pitch scale - + Volume scale - + Intonation scale - + To use VOICEVOX, you need to run a colab and put the localtunnel URL in "Settings → Other Bots". https://colab.research.google.com/drive/1tyeXJSklNfjW-aZJAib1JfgOMFarAwze {/if} {#if currentChar.data.ttsMode === 'webspeech' || currentChar.data.ttsMode === 'elevenlab' || currentChar.data.ttsMode === 'VOICEVOX'} @@ -568,10 +574,10 @@ {language.creator} - + {language.CharVersion} - + {language.altGreet} @@ -660,7 +666,7 @@ {assets[0]}/ {/if} {/if} - +
diff --git a/src/lib/SideBars/LoreBookData.svelte b/src/lib/SideBars/LoreBookData.svelte index d1e03c05..f468ee16 100644 --- a/src/lib/SideBars/LoreBookData.svelte +++ b/src/lib/SideBars/LoreBookData.svelte @@ -5,6 +5,8 @@ import { alertConfirm } from "../../ts/alert"; import Check from "../Others/Check.svelte"; import Help from "../Others/Help.svelte"; + import TextInput from "../UI/GUI/TextInput.svelte"; + import NumberInput from "../UI/GUI/NumberInput.svelte"; export let value:loreBook export let onRemove: () => void = () => {} let open = false @@ -30,31 +32,31 @@ {#if open}
{language.name} - + {#if !value.alwaysActive} {language.activationKeys} {language.activationKeysInfo} - + {#if value.selective} {language.SecondaryKeys} {language.activationKeysInfo} - + {/if} {/if} {#if !(value.activationPercent === undefined || value.activationPercent === null)} {language.activationProbability} - { + { if(isNaN(value.activationPercent) || !value.activationPercent || value.activationPercent < 0){ value.activationPercent = 0 } if(value.activationPercent > 100){ value.activationPercent = 100 } - }}> + }} /> {/if} {language.insertOrder} - + {language.prompt}
diff --git a/src/lib/SideBars/LoreBookSetting.svelte b/src/lib/SideBars/LoreBookSetting.svelte index 3eaa0fa0..fbe823d1 100644 --- a/src/lib/SideBars/LoreBookSetting.svelte +++ b/src/lib/SideBars/LoreBookSetting.svelte @@ -6,6 +6,7 @@ import { addLorebook, exportLoreBook, importLoreBook } from "../../ts/process/lorebook"; import LoreBookData from "./LoreBookData.svelte"; import Check from "../Others/Check.svelte"; + import NumberInput from "../UI/GUI/NumberInput.svelte"; let submenu = 0 export let globalMode = false @@ -94,9 +95,9 @@
{language.loreBookDepth} - + {language.loreBookToken} - + {:else}
{ diff --git a/src/lib/SideBars/RegexData.svelte b/src/lib/SideBars/RegexData.svelte index 4271a96b..03ca0d55 100644 --- a/src/lib/SideBars/RegexData.svelte +++ b/src/lib/SideBars/RegexData.svelte @@ -4,6 +4,7 @@ import { alertConfirm } from "src/ts/alert"; import type { customscript } from "src/ts/storage/database"; import Check from "../Others/Check.svelte"; + import TextInput from "../UI/GUI/TextInput.svelte"; export let value:customscript export let onRemove: () => void = () => {} @@ -29,7 +30,7 @@ {#if open}
{language.name} - + Modification Type IN: - + OUT: - + {#if value.ableFlag} FLAG: - + {/if}
{ diff --git a/src/lib/UI/GUI/NumberInput.svelte b/src/lib/UI/GUI/NumberInput.svelte new file mode 100644 index 00000000..293502ed --- /dev/null +++ b/src/lib/UI/GUI/NumberInput.svelte @@ -0,0 +1,31 @@ + + + + \ No newline at end of file diff --git a/src/lib/UI/GUI/SliderInput.svelte b/src/lib/UI/GUI/SliderInput.svelte new file mode 100644 index 00000000..b83036a8 --- /dev/null +++ b/src/lib/UI/GUI/SliderInput.svelte @@ -0,0 +1,27 @@ + + + + \ No newline at end of file diff --git a/src/lib/UI/GUI/TextInput.svelte b/src/lib/UI/GUI/TextInput.svelte new file mode 100644 index 00000000..2fd8c4b7 --- /dev/null +++ b/src/lib/UI/GUI/TextInput.svelte @@ -0,0 +1,33 @@ + + + + \ No newline at end of file diff --git a/src/lib/UI/Hub.svelte b/src/lib/UI/Hub.svelte index 5ae0c4c1..4945ed70 100644 --- a/src/lib/UI/Hub.svelte +++ b/src/lib/UI/Hub.svelte @@ -6,6 +6,7 @@ import { language } from "src/lang"; import RisuHubIcon from "./RisuHubIcon.svelte"; import { DataBase } from "src/ts/storage/database"; + import TextInput from "./GUI/TextInput.svelte"; let openedData:null|hubType = null @@ -33,7 +34,7 @@
- + @@ -67,6 +67,7 @@ import { alertError } from "src/ts/alert"; import { shareRisuHub } from "src/ts/characterCards"; import { DataBase, type character } from "src/ts/storage/database"; + import TextInput from "./GUI/TextInput.svelte"; export let close = () => {} export let char:character let tags="" diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 6ed9f45b..75ef951f 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -337,6 +337,11 @@ export function risuChatParser(da:string, arg:{ } case 'char': case 'bot':{ + let selectedChar = get(selectedCharID) + let currentChar = db.characters[selectedChar] + if(currentChar.type !== 'group'){ + return currentChar.name + } if(chara){ if(typeof(chara) === 'string'){ return chara @@ -345,8 +350,6 @@ export function risuChatParser(da:string, arg:{ return chara.name } } - let selectedChar = get(selectedCharID) - let currentChar = db.characters[selectedChar] return currentChar.name } case 'user':{ diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts index bf55b12e..bdd8b4bd 100644 --- a/src/ts/process/scripts.ts +++ b/src/ts/process/scripts.ts @@ -140,7 +140,7 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc } } } - if(db.officialplugins.automark){ + if(db.officialplugins.automark && mode === 'editdisplay'){ data = autoMarkPlugin(data) } return {data, emoChanged} diff --git a/src/ts/storage/globalApi.ts b/src/ts/storage/globalApi.ts index 4d6d7dcf..60a4ed9a 100644 --- a/src/ts/storage/globalApi.ts +++ b/src/ts/storage/globalApi.ts @@ -959,4 +959,21 @@ function formDataToString(formData: FormData): string { } return params.join('&'); - } \ No newline at end of file +} + +export function getModelMaxContext(model:string):number|undefined{ + if(model.startsWith('gpt35')){ + if(model.includes('16k')){ + return 16000 + } + return 4000 + } + if(model.startsWith('gpt4')){ + if(model.includes('32k')){ + return 32000 + } + return 8000 + } + + return undefined +} \ No newline at end of file