From ce69aa898e0103982084260226336ed03d6d56d2 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Tue, 30 Jul 2024 20:48:05 +0900 Subject: [PATCH] Rework other bots gui --- src/lib/Setting/Pages/OtherBotSettings.svelte | 660 +++++++++--------- src/lib/UI/Arcodion.svelte | 7 +- 2 files changed, 352 insertions(+), 315 deletions(-) diff --git a/src/lib/Setting/Pages/OtherBotSettings.svelte b/src/lib/Setting/Pages/OtherBotSettings.svelte index 6a9154b3..2efd6801 100644 --- a/src/lib/Setting/Pages/OtherBotSettings.svelte +++ b/src/lib/Setting/Pages/OtherBotSettings.svelte @@ -34,241 +34,271 @@ $DataBase.NAIImgConfig.sm_dyn = false } } + + let submenu = $DataBase.useLegacyGUI ? -1 : 0

{language.otherBots}

- - {language.imageGeneration} {language.provider} - - None - Stable Diffusion WebUI - Novel AI - Dall-E - Stability API - ComfyUI - - - {#if $DataBase.sdProvider === 'webui'} - You must use WebUI with --api flag - You must use WebUI without agpl license or use unmodified version with agpl license to observe the contents of the agpl license. - {#if !isTauri} - You are using web version. you must use ngrok or other tunnels to use your local webui. - {/if} - WebUI {language.providerURL} - - Steps - +{#if submenu !== -1} +
+ + + + +
+{/if} + +{#if submenu === 3 || submenu === -1} + + {language.imageGeneration} {language.provider} + + None + Stable Diffusion WebUI + Novel AI + Dall-E + Stability API + ComfyUI + - CFG Scale - - - Width - - Height - - Sampler - + {#if $DataBase.sdProvider === 'webui'} + You must use WebUI with --api flag + You must use WebUI without agpl license or use unmodified version with agpl license to observe the contents of the agpl license. + {#if !isTauri} + You are using web version. you must use ngrok or other tunnels to use your local webui. + {/if} + WebUI {language.providerURL} + + Steps + + + CFG Scale + -
- -
- {#if $DataBase.sdConfig.enable_hr === true} - denoising_strength - - hr_scale - - Upscaler - + Width + + Height + + Sampler + + +
+ +
+ {#if $DataBase.sdConfig.enable_hr === true} + denoising_strength + + hr_scale + + Upscaler + + {/if} {/if} - {/if} - - {#if $DataBase.sdProvider === 'novelai'} - Novel AI {language.providerURL} - - API Key - - - Model - - - Width - - Height - - Sampler - - Euler - Euler Ancestral - DPM++ 2S Ancestral - DPM++ 2M - DPM++ SDE - DPM++ 2S - DDIM - - steps - - CFG scale - - - {#if !$DataBase.NAII2I || $DataBase.NAIImgConfig.sampler !== 'ddim_v3'} - - - {/if} - - - {#if $DataBase.NAII2I} - - Strength - - {$DataBase.NAIImgConfig.strength} - Noise - - {$DataBase.NAIImgConfig.noise} - - Base image - - - {/if} - - - - {#if $DataBase.NAIREF} - - - Information Extracted - - {$DataBase.NAIImgConfig.InfoExtracted} - Reference Strength - - {$DataBase.NAIImgConfig.RefStrength} - - - - - Reference image - - {/if} - {/if} - - - {#if $DataBase.sdProvider === 'dalle'} - OpenAI API Key - - - Dall-E Quality - - Standard - HD - - - {/if} - - {#if $DataBase.sdProvider === 'stability'} - Stability API Key - - - Stability Model - - SD Ultra - SD Core - SD3 Large - SD3 Medium - - - {#if $DataBase.stabilityModel === 'core'} - SD Core Style - - Unspecified - 3D Model - Analog Film - Anime - Cinematic - Comic Book - Digital Art - Enhance - Fantasy Art - Isometric - Line Art - Low Poly - Modeling Compound - Neon Punk - Origami - Photographic - Pixel Art - Tile Texture + + {#if $DataBase.sdProvider === 'novelai'} + Novel AI {language.providerURL} + + API Key + + + Model + + + Width + + Height + + Sampler + + Euler + Euler Ancestral + DPM++ 2S Ancestral + DPM++ 2M + DPM++ SDE + DPM++ 2S + DDIM + steps + + CFG scale + + + {#if !$DataBase.NAII2I || $DataBase.NAIImgConfig.sampler !== 'ddim_v3'} + + + {/if} + + + {#if $DataBase.NAII2I} + + Strength + + {$DataBase.NAIImgConfig.strength} + Noise + + {$DataBase.NAIImgConfig.noise} + + Base image + + + {/if} + + + + {#if $DataBase.NAIREF} + + + Information Extracted + + {$DataBase.NAIImgConfig.InfoExtracted} + Reference Strength + + {$DataBase.NAIImgConfig.RefStrength} + + + + + Reference image + + {/if} {/if} - {/if} - {#if $DataBase.sdProvider === 'comfy'} - The first image generated by the prompt will be selected. - {#if !isTauri} - "Please run comfyUI with --enable-cors-header." + + {#if $DataBase.sdProvider === 'dalle'} + OpenAI API Key + + + Dall-E Quality + + Standard + HD + + {/if} - ComfyUI {language.providerURL} - - Workflow - - Positive Text Node: ID - - Positive Text Node: Input Field Name - - Negative Text Node: ID - - Positive Text Node: Input Field Name - - Timeout (sec) - - {/if} - + {#if $DataBase.sdProvider === 'stability'} + Stability API Key + - + Stability Model + + SD Ultra + SD Core + SD3 Large + SD3 Medium + + + {#if $DataBase.stabilityModel === 'core'} + SD Core Style + + Unspecified + 3D Model + Analog Film + Anime + Cinematic + Comic Book + Digital Art + Enhance + Fantasy Art + Isometric + Line Art + Low Poly + Modeling Compound + Neon Punk + Origami + Photographic + Pixel Art + Tile Texture + + {/if} + {/if} + + {#if $DataBase.sdProvider === 'comfy'} + The first image generated by the prompt will be selected. + {#if !isTauri} + "Please run comfyUI with --enable-cors-header." + {/if} + ComfyUI {language.providerURL} + + Workflow + + + Positive Text Node: ID + + Positive Text Node: Input Field Name + + Negative Text Node: ID + + Positive Text Node: Input Field Name + + Timeout (sec) + + {/if} + +{/if} + +{#if submenu === 1 || submenu === -1} + ElevenLabs API key @@ -285,8 +315,10 @@ +{/if} - +{#if submenu === 2 || submenu === -1} + {language.emotionMethod} @@ -294,103 +326,107 @@ MiniLM-L6-v2 +{/if} - - {language.type} +{#if submenu === 0 || submenu === -1} + + {language.type} - { - //@ts-ignore - const value = v.target.value - if (value === 'supaMemory'){ - $DataBase.supaModelType = 'distilbart' - $DataBase.memoryAlgorithmType = 'supaMemory' - $DataBase.hypav2 = false - $DataBase.hanuraiEnable = false - } else if (value === 'hanuraiMemory'){ - $DataBase.supaModelType = 'none' - $DataBase.memoryAlgorithmType = 'hanuraiMemory' - $DataBase.hypav2 = false - $DataBase.hanuraiEnable = true - } else if (value === 'hypaV2') { - $DataBase.supaModelType = 'distilbart' - $DataBase.memoryAlgorithmType = 'hypaMemoryV2' - $DataBase.hypav2= true - $DataBase.hanuraiEnable = false - } else { - $DataBase.supaModelType = 'none' - $DataBase.memoryAlgorithmType = 'none' - $DataBase.hypav2 = false - $DataBase.hanuraiEnable = false - } - }}> - None - {language.SuperMemory} - {language.HypaMemory} V2 - {language.hanuraiMemory} - + { + //@ts-ignore + const value = v.target.value + if (value === 'supaMemory'){ + $DataBase.supaModelType = 'distilbart' + $DataBase.memoryAlgorithmType = 'supaMemory' + $DataBase.hypav2 = false + $DataBase.hanuraiEnable = false + } else if (value === 'hanuraiMemory'){ + $DataBase.supaModelType = 'none' + $DataBase.memoryAlgorithmType = 'hanuraiMemory' + $DataBase.hypav2 = false + $DataBase.hanuraiEnable = true + } else if (value === 'hypaV2') { + $DataBase.supaModelType = 'distilbart' + $DataBase.memoryAlgorithmType = 'hypaMemoryV2' + $DataBase.hypav2= true + $DataBase.hanuraiEnable = false + } else { + $DataBase.supaModelType = 'none' + $DataBase.memoryAlgorithmType = 'none' + $DataBase.hypav2 = false + $DataBase.hanuraiEnable = false + } + }}> + None + {language.SuperMemory} + {language.HypaMemory} V2 + {language.hanuraiMemory} + - {#if $DataBase.hanuraiEnable} - {language.hanuraiDesc} - Chunk Size - -
- -
- {:else if $DataBase.hypav2} - {language.hypaV2Desc} - {language.SuperMemory} {language.model} - - distilbart-cnn-6-6 (Free/Local) - OpenAI 3.5 Turbo Instruct - {language.submodel} - - {#if $DataBase.supaModelType === 'davinci' || $DataBase.supaModelType === 'curie' || $DataBase.supaModelType === 'instruct35'} - {language.SuperMemory} OpenAI Key - - {/if} - {language.SuperMemory} Prompt - - {language.HypaMemory} Model - - MiniLM-L6-v2 (Free / Local) - Nomic (Free / Local) - OpenAI Ada (Davinci / Curie Only) - - {language.hypaChunkSize} - - {language.hypaAllocatedTokens} - - {:else if ($DataBase.supaModelType !== 'none' && $DataBase.hypav2 === false)} - {language.supaDesc} - {language.SuperMemory} {language.model} - - distilbart-cnn-6-6 (Free/Local) - OpenAI 3.5 Turbo Instruct - {language.submodel} - - {language.maxSupaChunkSize} - - {#if $DataBase.supaModelType === 'davinci' || $DataBase.supaModelType === 'curie' || $DataBase.supaModelType === 'instruct35'} + {#if $DataBase.hanuraiEnable} + {language.hanuraiDesc} + Chunk Size + +
+ +
+ {:else if $DataBase.hypav2} + {language.hypaV2Desc} + {language.SuperMemory} {language.model} + + distilbart-cnn-6-6 (Free/Local) + OpenAI 3.5 Turbo Instruct + {language.submodel} + + {#if $DataBase.supaModelType === 'davinci' || $DataBase.supaModelType === 'curie' || $DataBase.supaModelType === 'instruct35'} {language.SuperMemory} OpenAI Key - {/if} - {#if $DataBase.supaModelType !== 'none'} + {/if} {language.SuperMemory} Prompt - {/if} - {#if $DataBase.hypaMemory} {language.HypaMemory} Model - MiniLM-L6-v2 (Free / Local) - OpenAI Ada (Davinci / Curie Only) + MiniLM-L6-v2 (Free / Local) + Nomic (Free / Local) + OpenAI Ada (Davinci / Curie Only) + {language.hypaChunkSize} + + {language.hypaAllocatedTokens} + + {:else if ($DataBase.supaModelType !== 'none' && $DataBase.hypav2 === false)} + {language.supaDesc} + {language.SuperMemory} {language.model} + + distilbart-cnn-6-6 (Free/Local) + OpenAI 3.5 Turbo Instruct + {language.submodel} + + {language.maxSupaChunkSize} + + {#if $DataBase.supaModelType === 'davinci' || $DataBase.supaModelType === 'curie' || $DataBase.supaModelType === 'instruct35'} + {language.SuperMemory} OpenAI Key + + {/if} + {#if $DataBase.supaModelType !== 'none'} + {language.SuperMemory} Prompt + + {/if} + {#if $DataBase.hypaMemory} + {language.HypaMemory} Model + + MiniLM-L6-v2 (Free / Local) + OpenAI Ada (Davinci / Curie Only) + + {/if} +
+ +
{/if} -
- -
- {/if} - + + +{/if} \ No newline at end of file diff --git a/src/lib/UI/Arcodion.svelte b/src/lib/UI/Arcodion.svelte index 1c676a48..03d4418b 100644 --- a/src/lib/UI/Arcodion.svelte +++ b/src/lib/UI/Arcodion.svelte @@ -6,10 +6,11 @@ let open = false export let styled = false export let help: (keyof (typeof language.help))|'' = '' - + export let disabled = false - -{#if styled} +{#if disabled} + +{:else if styled}