diff --git a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLImageToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLImageToImageGraph.ts index 36fc66e559..d958b78a90 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLImageToImageGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLImageToImageGraph.ts @@ -45,7 +45,6 @@ export const buildCanvasSDXLImageToImageGraph = ( seed, steps, vaePrecision, - clipSkip, shouldUseCpuNoise, seamlessXAxis, seamlessYAxis, @@ -339,7 +338,6 @@ export const buildCanvasSDXLImageToImageGraph = ( vae: undefined, // option; set in addVAEToGraph controlnets: [], // populated in addControlNetToLinearGraph loras: [], // populated in addLoRAsToGraph - clip_skip: clipSkip, strength, init_image: initialImage.image_name, }; diff --git a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLTextToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLTextToImageGraph.ts index 37245d7b6a..9f9a442b99 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLTextToImageGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLTextToImageGraph.ts @@ -46,7 +46,6 @@ export const buildCanvasSDXLTextToImageGraph = ( seed, steps, vaePrecision, - clipSkip, shouldUseCpuNoise, seamlessXAxis, seamlessYAxis, @@ -321,7 +320,6 @@ export const buildCanvasSDXLTextToImageGraph = ( vae: undefined, // option; set in addVAEToGraph controlnets: [], // populated in addControlNetToLinearGraph loras: [], // populated in addLoRAsToGraph - clip_skip: clipSkip, }; graph.edges.push({ diff --git a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLImageToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLImageToImageGraph.ts index b10f4c5542..bc02fb5a66 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLImageToImageGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLImageToImageGraph.ts @@ -49,7 +49,6 @@ export const buildLinearSDXLImageToImageGraph = ( shouldFitToWidthHeight, width, height, - clipSkip, shouldUseCpuNoise, vaePrecision, seamlessXAxis, @@ -349,7 +348,6 @@ export const buildLinearSDXLImageToImageGraph = ( vae: undefined, controlnets: [], loras: [], - clip_skip: clipSkip, strength: strength, init_image: initialImage.imageName, positive_style_prompt: positiveStylePrompt, diff --git a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLTextToImageGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLTextToImageGraph.ts index 73c831081d..22a7dd4192 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLTextToImageGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLTextToImageGraph.ts @@ -38,7 +38,6 @@ export const buildLinearSDXLTextToImageGraph = ( steps, width, height, - clipSkip, shouldUseCpuNoise, vaePrecision, seamlessXAxis, @@ -243,7 +242,6 @@ export const buildLinearSDXLTextToImageGraph = ( vae: undefined, controlnets: [], loras: [], - clip_skip: clipSkip, positive_style_prompt: positiveStylePrompt, negative_style_prompt: negativeStylePrompt, }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse.tsx index dea4bb7b3d..85b6eaa903 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamAdvancedCollapse.tsx @@ -13,16 +13,16 @@ import ParamClipSkip from './ParamClipSkip'; const selector = createSelector( stateSelector, (state: RootState) => { - const { clipSkip, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise } = + const { clipSkip, model, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise } = state.generation; - return { clipSkip, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise }; + return { clipSkip, model, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise }; }, defaultSelectorOptions ); export default function ParamAdvancedCollapse() { - const { clipSkip, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise } = + const { clipSkip, model, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise } = useAppSelector(selector); const { t } = useTranslation(); const activeLabel = useMemo(() => { @@ -34,7 +34,7 @@ export default function ParamAdvancedCollapse() { activeLabel.push(t('parameters.gpuNoise')); } - if (clipSkip > 0) { + if (clipSkip > 0 && model && model.base_model !== 'sdxl') { activeLabel.push( t('parameters.clipSkipWithLayerCount', { layerCount: clipSkip }) ); @@ -49,15 +49,19 @@ export default function ParamAdvancedCollapse() { } return activeLabel.join(', '); - }, [clipSkip, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise, t]); + }, [clipSkip, model, seamlessXAxis, seamlessYAxis, shouldUseCpuNoise, t]); return ( - - + {model && model?.base_model !== 'sdxl' && ( + <> + + + + )} diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx index a7d3d3c655..a5ab8b9a94 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/Advanced/ParamClipSkip.tsx @@ -42,6 +42,10 @@ export default function ParamClipSkip() { return clipSkipMap[model.base_model].markers; }, [model]); + if (model?.base_model === 'sdxl') { + return null; + } + return (