diff --git a/src/lib/Setting/Pages/OtherBotSettings.svelte b/src/lib/Setting/Pages/OtherBotSettings.svelte index 48577984..3a29f5ed 100644 --- a/src/lib/Setting/Pages/OtherBotSettings.svelte +++ b/src/lib/Setting/Pages/OtherBotSettings.svelte @@ -107,6 +107,8 @@ } // End HypaV3 + let imageModel = ''; + // add init NAI V4 // if(DBState.db.NAIImgConfig.autoSmea === undefined) DBState.db.NAIImgConfig.autoSmea = false; // if(DBState.db.NAIImgConfig.use_coords === undefined) DBState.db.NAIImgConfig.use_coords = false; @@ -203,6 +205,17 @@ Model + { + DBState.db.NAIImgModel = imageModel; + }}> + 선택하여 자동입력 + nai-diffusion-4-full + nai-diffusion-4-curated-preview + nai-diffusion-3 + nai-diffusion-furry-3 + nai-diffusion-2 + + Width @@ -210,7 +223,8 @@ Sampler - {#if DBState.db.NAIImgModel === 'nai-diffusion-4-full'} + {#if DBState.db.NAIImgModel === 'nai-diffusion-4-full' + || DBState.db.NAIImgModel === 'nai-diffusion-4-curated-preview'} (Recommended)Euler Ancestral (Recommended)DPM++ 2S Ancestral @@ -238,20 +252,22 @@ {#if !DBState.db.NAII2I || DBState.db.NAIImgConfig.sampler !== 'ddim_v3'} - {:else if DBState.db.NAIImgModel !== 'nai-diffusion-4-full'} + {:else if DBState.db.NAIImgModel === 'nai-diffusion-4-full' + || DBState.db.NAIImgModel === 'nai-diffusion-4-curated-preview'} {/if} - {#if DBState.db.NAIImgModel === 'nai-diffusion-4-full'} + {#if DBState.db.NAIImgModel === 'nai-diffusion-4-full' + || DBState.db.NAIImgModel === 'nai-diffusion-4-curated-preview'} - - + + - + {/if} {#if DBState.db.NAII2I} diff --git a/src/ts/process/stableDiff.ts b/src/ts/process/stableDiff.ts index 5fe1ba1f..fb24033a 100644 --- a/src/ts/process/stableDiff.ts +++ b/src/ts/process/stableDiff.ts @@ -155,23 +155,23 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n "reference_information_extracted": db.NAIImgConfig.InfoExtracted, "reference_strength": db.NAIImgConfig.RefStrength, //add v4 - "autoSmea": db.NAIImgConfig.autoSmea || false, - use_coords: db.NAIImgConfig.use_coords || false, - legacy_uc: db.NAIImgConfig.legacy_uc || false, + "autoSmea": db.NAIImgConfig.autoSmea, + use_coords: db.NAIImgConfig.use_coords, + legacy_uc: db.NAIImgConfig.legacy_uc, v4_prompt:{ caption:{ base_caption:genPrompt, char_captions: [] }, - use_coords: false,//db.NAIImgConfig.v4_prompt.use_coords || false, - use_order: true//db.NAIImgConfig.v4_prompt.use_order || true + use_coords: db.NAIImgConfig.v4_prompt.use_coords, + use_order: db.NAIImgConfig.v4_prompt.use_order }, "v4_negative_prompt":{ caption:{ base_caption:neg, char_captions: [] }, - legacy_uc: false//db.NAIImgConfig.v4_negative_prompt.legacy_uc || false, + legacy_uc: db.NAIImgConfig.v4_negative_prompt.legacy_uc, } } }, @@ -211,6 +211,7 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n if(refimgbase64 !== undefined){ reqlist.body.parameters.reference_image = refimgbase64 } + console.log({img2img:reqlist}); }else{ if (db.NAIREF) { @@ -227,8 +228,11 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n reqlist = commonReq; reqlist.body.action = 'generate'; reqlist.body.parameters.reference_image = base64img; + console.log({generate:reqlist}); } else { reqlist = commonReq; + reqlist.body.action = 'generate'; + console.log({nothing:reqlist}); } } try { diff --git a/src/ts/storage/database.svelte.ts b/src/ts/storage/database.svelte.ts index 809ea782..cc3723b7 100644 --- a/src/ts/storage/database.svelte.ts +++ b/src/ts/storage/database.svelte.ts @@ -286,6 +286,27 @@ export function setDatabase(data:Database){ } } } + //add NAI v4 (사용중인 사람용 추가 DB Init) + if(checkNullish(data.NAIImgConfig.v4_prompt)){ + data.NAIImgConfig.autoSmea = false; + data.NAIImgConfig.use_coords = false; + data.NAIImgConfig.legacy_uc = false; + data.NAIImgConfig.v4_prompt = { + caption:{ + base_caption:"", + char_captions:[] + }, + use_coords:false, + use_order:true + }; + data.NAIImgConfig.v4_negative_prompt = { + caption:{ + base_caption:"", + char_captions:[] + }, + legacy_uc:false, + }; + } if(checkNullish(data.customTextTheme)){ data.customTextTheme = { FontColorStandard: "#f8f8f2", @@ -1429,10 +1450,8 @@ interface NAIImgConfigV4CharCaption{ x: number, y: number }[] - } - interface ComfyConfig{ workflow:string, posNodeID: string,