Merge branch 'main' of https://github.com/kwaroran/RisuAI

src/lib/Setting/Pages/AdvancedSettings.svelte

@@ -61,6 +61,9 @@
 </div>
 <div class="flex items-center mt-4">
     <Check bind:check={$DataBase.usePlainFetch} name="Force Plain Fetch"/>
+    {#if $DataBase.usePlainFetch}
+        <span class="text-draculared text-xs ml-2">{language.usePlainFetchWarn}</span>
+    {/if}
 </div>
 <div class="flex items-center mt-4">
     <Check bind:check={$DataBase.autofillRequestUrl} name="Autofill Request URL"/>

src/lib/Setting/Pages/BotSettings.svelte

@@ -20,8 +20,8 @@
     import OptionInput from "src/lib/UI/GUI/OptionInput.svelte";
     import { openRouterModels } from "src/ts/model/openrouter";
     import { novelLogin } from "src/ts/process/models/nai";
-  import { alertConfirm } from "src/ts/alert";
-  import OobaSettings from "./OobaSettings.svelte";
+    import { alertConfirm } from "src/ts/alert";
+    import OobaSettings from "./OobaSettings.svelte";
 
     let tokens = {
         mainPrompt: 0,

src/lib/Setting/Pages/LanguageSettings.svelte

@@ -3,15 +3,15 @@
     import { changeLanguage, language } from "src/lang";
     import { DataBase } from "src/ts/storage/database";
     import { sleep } from "src/ts/util";
-    import Help from "src/lib/Others/Help.svelte";
     import OptionInput from "src/lib/UI/GUI/OptionInput.svelte";
     import SelectInput from "src/lib/UI/GUI/SelectInput.svelte";
     import { alertNormal } from "src/ts/alert";
-    import { downloadFile } from "src/ts/storage/globalApi";
+    import { downloadFile, isTauri } from "src/ts/storage/globalApi";
     import { languageEnglish } from "src/lang/en";
-  import TextInput from "src/lib/UI/GUI/TextInput.svelte";
-  import TextAreaInput from "src/lib/UI/GUI/TextAreaInput.svelte";
+    import TextInput from "src/lib/UI/GUI/TextInput.svelte";
+    import TextAreaInput from "src/lib/UI/GUI/TextAreaInput.svelte";
     let langChanged = false
+
 </script>
 <h2 class="mb-2 text-2xl font-bold mt-2">{language.language}</h2>
 
@@ -61,16 +61,17 @@
     </SelectInput>
 
     {#if $DataBase.translatorType === 'deepl'}
-
+        {#if !isTauri}
+            <span class="text-draculared text-xs ml-2">{language.webdeeplwarn}</span>
+        {/if}
         <span class="text-textcolor mt-4">{language.deeplKey}</span>
         <TextInput bind:value={$DataBase.deeplOptions.key} />
 
         <div class="flex items-center mt-2">
             <Check bind:check={$DataBase.deeplOptions.freeApi} name={language.deeplFreeKey}/>
         </div>
-
     {/if}
-
+    
     {#if $DataBase.translatorType === 'llm'}
         <span class="text-textcolor mt-4">{language.translationPrompt}</span>
         <TextAreaInput bind:value={$DataBase.translatorPrompt} placeholder={"You are a translator. translate the following html or text into {{slot}}. do not output anything other than the translation."}/>

src/lib/Setting/Pages/OtherBotSettings.svelte

@@ -13,7 +13,12 @@
     import Button from "src/lib/UI/GUI/Button.svelte";
     import { getCharImage } from "src/ts/characters";
     import Arcodion from "src/lib/UI/Arcodion.svelte";
-
+    $:{
+        if ($DataBase.NAIImgConfig.sampler === 'ddim_v3'){
+            $DataBase.NAIImgConfig.sm = false
+            $DataBase.NAIImgConfig.sm_dyn = false
+        }
+    }
 </script>
 <h2 class="mb-2 text-2xl font-bold mt-2">{language.otherBots}</h2>
 
@@ -76,13 +81,21 @@
         <span class="text-textcolor">Height</span>
         <NumberInput size="sm" marginBottom min={0} max={2048} bind:value={$DataBase.NAIImgConfig.height}/>
         <span class="text-textcolor">Sampler</span>
-        <TextInput size="sm" marginBottom bind:value={$DataBase.NAIImgConfig.sampler}/>
+        <SelectInput className="mt-2 mb-4" bind:value={$DataBase.NAIImgConfig.sampler}>
+            <OptionInput value="k_euler" >Euler</OptionInput>
+            <OptionInput value="k_euler_ancestral" >Euler Ancestral</OptionInput>
+            <OptionInput value="k_dpmpp_2s_ancestral" >DPM++ 2S Ancestral</OptionInput>
+            <OptionInput value="k_dpmpp_2m" >DPM++ 2M</OptionInput>
+            <OptionInput value="k_dpmpp_sde" >DPM++ SDE</OptionInput>
+            <OptionInput value="k_dpmpp_2s" >DPM++ 2S</OptionInput>
+            <OptionInput value="ddim_v3" >DDIM</OptionInput>
+        </SelectInput>
         <span class="text-textcolor">steps</span>
         <NumberInput size="sm" marginBottom min={0} max={2048} bind:value={$DataBase.NAIImgConfig.steps}/>
         <span class="text-textcolor">CFG scale</span>
         <NumberInput size="sm" marginBottom min={0} max={2048} bind:value={$DataBase.NAIImgConfig.scale}/>
     
-        {#if !$DataBase.NAII2I}
+        {#if !$DataBase.NAII2I || $DataBase.NAIImgConfig.sampler === 'ddim_v3'}
             <Check bind:check={$DataBase.NAIImgConfig.sm} name="Use SMEA"/>
             <Check bind:check={$DataBase.NAIImgConfig.sm_dyn} name='Use DYN'/>
         {/if}

src/lib/SideBars/CharConfig.svelte

@@ -397,6 +397,12 @@
 
         <CheckInput bind:check={currentChar.data.inlayViewScreen} name={language.inlayViewScreen} onChange={() => {
             if(currentChar.type === 'character'){
+                if(currentChar.data.inlayViewScreen || currentChar.data.additionalAssets === undefined){
+                    currentChar.data.additionalAssets = []
+                }else if(!currentChar.data.inlayViewScreen || currentChar.data.additionalAssets.length === 0){
+                    currentChar.data.additionalAssets = undefined
+                }
+                
                 currentChar.data = updateInlayScreen(currentChar.data)
             }
         }}/>