From efe4708b8b65dd624ce215fc60d7fc0ea3a5777d Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Fri, 21 Mar 2025 08:50:29 +1000 Subject: [PATCH] feat(ui): better error message/warning for FLUX Fill w/ Control LoRA --- invokeai/frontend/web/public/locales/en.json | 3 ++- .../web/src/features/controlLayers/store/validators.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json index 0a8a16d347..1e51a2157f 100644 --- a/invokeai/frontend/web/public/locales/en.json +++ b/invokeai/frontend/web/public/locales/en.json @@ -1950,7 +1950,8 @@ "rgNegativePromptNotSupported": "Negative Prompt not supported for selected base model", "rgReferenceImagesNotSupported": "regional Reference Images not supported for selected base model", "rgAutoNegativeNotSupported": "Auto-Negative not supported for selected base model", - "rgNoRegion": "no region drawn" + "rgNoRegion": "no region drawn", + "fluxFillIncompatibleWithControlLoRA": "Control LoRA is not compatible with FLUX Fill" }, "errors": { "unableToFindImage": "Unable to find image", diff --git a/invokeai/frontend/web/src/features/controlLayers/store/validators.ts b/invokeai/frontend/web/src/features/controlLayers/store/validators.ts index a829d44b30..425dab23ff 100644 --- a/invokeai/frontend/web/src/features/controlLayers/store/validators.ts +++ b/invokeai/frontend/web/src/features/controlLayers/store/validators.ts @@ -20,6 +20,7 @@ const WARNINGS = { CONTROL_ADAPTER_NO_MODEL_SELECTED: 'controlLayers.warnings.controlAdapterNoModelSelected', CONTROL_ADAPTER_INCOMPATIBLE_BASE_MODEL: 'controlLayers.warnings.controlAdapterIncompatibleBaseModel', CONTROL_ADAPTER_NO_CONTROL: 'controlLayers.warnings.controlAdapterNoControl', + FLUX_FILL_NO_WORKY_WITH_CONTROL_LORA: 'controlLayers.warnings.fluxFillIncompatibleWithControlLoRA', } as const; type WarningTKey = (typeof WARNINGS)[keyof typeof WARNINGS]; @@ -135,7 +136,7 @@ export const getControlLayerWarnings = ( entity.controlAdapter.model.type === 'control_lora' ) { // FLUX inpaint variants are FLUX Fill models - not compatible w/ Control LoRA - warnings.push(WARNINGS.UNSUPPORTED_MODEL); + warnings.push(WARNINGS.FLUX_FILL_NO_WORKY_WITH_CONTROL_LORA); } }