diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c460c2c9..155294d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,6 +158,9 @@ importers: ml-distance: specifier: ^4.0.1 version: 4.0.1 + mnemonist: + specifier: ^0.40.3 + version: 0.40.3 mobile-drag-drop: specifier: 3.0.0-rc.0 version: 3.0.0-rc.0 @@ -2756,6 +2759,9 @@ packages: ml-tree-similarity@1.0.0: resolution: {integrity: sha512-XJUyYqjSuUQkNQHMscr6tcjldsOoAekxADTplt40QKfwW6nd++1wHWV9AArl0Zvw/TIHgNaZZNvr8QGvE8wLRg==} + mnemonist@0.40.3: + resolution: {integrity: sha512-Vjyr90sJ23CKKH/qPAgUKicw/v6pRoamxIEDFOF8uSgFME7DqPRpHgRTejWVjkdGg5dXj0/NyxZHZ9bcjH+2uQ==} + mobile-drag-drop@3.0.0-rc.0: resolution: {integrity: sha512-f8wIDTbBYLBW/+5sei1cqUE+StyDpf/LP+FRZELlVX6tmOOmELk84r3wh1z3woxCB9G5octhF06K5COvFjGgqg==} @@ -2900,6 +2906,9 @@ packages: object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} + obliterator@2.0.5: + resolution: {integrity: sha512-42CPE9AhahZRsMNslczq0ctAEtqk8Eka26QofnqC346BZdHDySk3LWka23LI7ULIw11NmltpiLagIq8gBozxTw==} + ollama@0.5.0: resolution: {integrity: sha512-CRtRzsho210EGdK52GrUMohA2pU+7NbgEaBG3DcYeRmvQthDO7E2LHOkLlUUeaYUlNmEd8icbjC02ug9meSYnw==} @@ -6505,6 +6514,10 @@ snapshots: binary-search: 1.3.6 num-sort: 2.1.0 + mnemonist@0.40.3: + dependencies: + obliterator: 2.0.5 + mobile-drag-drop@3.0.0-rc.0: {} modify-values@1.0.1: {} @@ -6665,6 +6678,8 @@ snapshots: object-inspect@1.13.1: {} + obliterator@2.0.5: {} + ollama@0.5.0: dependencies: whatwg-fetch: 3.6.20 diff --git a/src/lib/Setting/Pages/OtherBotSettings.svelte b/src/lib/Setting/Pages/OtherBotSettings.svelte index 13b8e9bd..8dbd65e4 100644 --- a/src/lib/Setting/Pages/OtherBotSettings.svelte +++ b/src/lib/Setting/Pages/OtherBotSettings.svelte @@ -3,7 +3,8 @@ import { language } from "src/lang"; import Help from "src/lib/Others/Help.svelte"; import { selectSingleFile } from "src/ts/util"; - + import { alertError } from "src/ts/alert"; + import { DBState } from 'src/ts/stores.svelte'; import { isTauri, saveAsset } from "src/ts/globalApi.svelte"; import NumberInput from "src/lib/UI/GUI/NumberInput.svelte"; @@ -39,6 +40,7 @@ autoSmea:false, legacy_uc:false, use_coords:false, + cfg_rescale:0, v4_prompt:{ caption:{ base_caption:'', @@ -53,7 +55,12 @@ char_captions:[] }, legacy_uc:false, - } + }, + reference_image_multiple: [], + reference_strength_multiple: [0.7], + vibe_data: undefined, + vibe_model_selection: undefined, + noise_schedule: 'karras' } if (DBState.db.NAIImgConfig.sampler === 'ddim_v3'){ DBState.db.NAIImgConfig.sm = false @@ -69,7 +76,7 @@ untrack(() => { DBState.db.hypaV3Settings.recentMemoryRatio = newValue; - + if (newValue + DBState.db.hypaV3Settings.similarMemoryRatio > 1) { DBState.db.hypaV3Settings.similarMemoryRatio = 1 - newValue; } @@ -162,7 +169,7 @@ ComfyUI (Legacy) {/if} - + {#if DBState.db.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. @@ -173,17 +180,17 @@ Steps - + CFG Scale - + Width Height Sampler - +
@@ -250,6 +257,13 @@ CFG scale + Noise Schedule + + karras + exponential + polyexponential + + {#if !DBState.db.NAII2I || DBState.db.NAIImgConfig.sampler !== 'ddim_v3'} {:else if DBState.db.NAIImgModel === 'nai-diffusion-4-full' @@ -260,13 +274,17 @@ {#if DBState.db.NAIImgModel === 'nai-diffusion-4-full' || DBState.db.NAIImgModel === 'nai-diffusion-4-curated-preview'} + + Prompt Guidance Rescale + + + - {/if} @@ -308,43 +326,138 @@ - {#if DBState.db.NAIREF} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vibe + + + {#if DBState.db.NAIImgConfig.vibe_data} +
+ Vibe Preview + +
+ + Vibe Model + { + // When vibe model changes, set InfoExtracted to the first value + if (DBState.db.NAIImgConfig.vibe_data?.encodings && + DBState.db.NAIImgConfig.vibe_model_selection && + DBState.db.NAIImgConfig.vibe_data.encodings[DBState.db.NAIImgConfig.vibe_model_selection]) { + const encodings = DBState.db.NAIImgConfig.vibe_data.encodings[DBState.db.NAIImgConfig.vibe_model_selection]; + const firstKey = Object.keys(encodings)[0]; + if (firstKey) { + DBState.db.NAIImgConfig.InfoExtracted = Number(encodings[firstKey].params.information_extracted); + } + } + }}> + {#if DBState.db.NAIImgConfig.vibe_data.encodings?.v4full} + nai-diffusion-4-full + {/if} + {#if DBState.db.NAIImgConfig.vibe_data.encodings?.v4curated} + nai-diffusion-4-curated + {/if} + Information Extracted - - {DBState.db.NAIImgConfig.InfoExtracted} - Reference Strength - - {DBState.db.NAIImgConfig.RefStrength} - - - - - Reference image - + + + Reference Strength Multiple + {/if} {/if} @@ -468,16 +581,16 @@ ElevenLabs API key - + VOICEVOX URL - + OpenAI Key NovelAI API key - + Huggingface Key @@ -679,4 +792,4 @@ {/if} -{/if} \ No newline at end of file +{/if} diff --git a/src/lib/UI/GUI/OptionInput.svelte b/src/lib/UI/GUI/OptionInput.svelte index 2112e776..4494e294 100644 --- a/src/lib/UI/GUI/OptionInput.svelte +++ b/src/lib/UI/GUI/OptionInput.svelte @@ -1,7 +1,7 @@