fix(ui): ensure only the expected properties are used when converting…

… between control layer adapter settings
invoke-ai · Dec 17, 2024 · f43f930 · f43f930
1 parent 3f57b7a
commit f43f930
Showing 1 changed file with 31 additions and 8 deletions.
diff --git a/invokeai/frontend/web/src/features/controlLayers/store/canvasSlice.ts b/invokeai/frontend/web/src/features/controlLayers/store/canvasSlice.ts
@@ -74,6 +74,7 @@ import {
   getReferenceImageState,
   getRegionalGuidanceState,
   imageDTOToImageWithDims,
+  initialControlLoRA,
   initialControlNet,
   initialIPAdapter,
   initialT2IAdapter,
@@ -462,41 +463,63 @@ export const canvasSlice = createSlice({
       }
       layer.controlAdapter.model = zModelIdentifierField.parse(modelConfig);
 
+      // When converting between control layer types, we may need to add or remove properties. For example, ControlNet
+      // has a control mode, while T2I Adapter does not - otherwise they are the same.
+
       switch (layer.controlAdapter.model.type) {
+        // Converting to T2I adapter from...
         case 't2i_adapter': {
           if (layer.controlAdapter.type === 'controlnet') {
+            // T2I Adapters have all the ControlNet properties, minus control mode - strip it
             const { controlMode: _, ...rest } = layer.controlAdapter;
-            const t2iAdapterConfig: T2IAdapterConfig = { ...rest, type: 't2i_adapter' };
+            const t2iAdapterConfig: T2IAdapterConfig = { ...initialT2IAdapter, ...rest, type: 't2i_adapter' };
             layer.controlAdapter = t2iAdapterConfig;
           } else if (layer.controlAdapter.type === 'control_lora') {
-            const t2iAdapterConfig: T2IAdapterConfig = { ...layer.controlAdapter, ...initialT2IAdapter };
+            // Control LoRAs have only model and weight
+            const t2iAdapterConfig: T2IAdapterConfig = {
+              ...initialT2IAdapter,
+              ...layer.controlAdapter,
+              type: 't2i_adapter',
+            };
             layer.controlAdapter = t2iAdapterConfig;
           }
           break;
         }
 
+        // Converting to ControlNet from...
         case 'controlnet': {
           if (layer.controlAdapter.type === 't2i_adapter') {
+            // ControlNets have all the T2I Adapter properties, plus control mode
             const controlNetConfig: ControlNetConfig = {
+              ...initialControlNet,
               ...layer.controlAdapter,
               type: 'controlnet',
-              controlMode: initialControlNet.controlMode,
             };
             layer.controlAdapter = controlNetConfig;
           } else if (layer.controlAdapter.type === 'control_lora') {
-            const controlNetConfig: ControlNetConfig = { ...layer.controlAdapter, ...initialControlNet };
+            // ControlNets have all the Control LoRA properties, plus control mode and begin/end step pct
+            const controlNetConfig: ControlNetConfig = {
+              ...initialControlNet,
+              ...layer.controlAdapter,
+              type: 'controlnet',
+            };
             layer.controlAdapter = controlNetConfig;
           }
           break;
         }
 
+        // Converting to ControlLoRA from...
         case 'control_lora': {
           if (layer.controlAdapter.type === 'controlnet') {
-            const controlLoraConfig: ControlLoRAConfig = { ...layer.controlAdapter, type: 'control_lora' };
-            layer.controlAdapter = controlLoraConfig;
+            // We only need the model and weight for Control LoRA
+            const { model, weight } = layer.controlAdapter;
+            const controlNetConfig: ControlLoRAConfig = { ...initialControlLoRA, model, weight };
+            layer.controlAdapter = controlNetConfig;
           } else if (layer.controlAdapter.type === 't2i_adapter') {
-            const controlLoraConfig: ControlLoRAConfig = { ...layer.controlAdapter, type: 'control_lora' };
-            layer.controlAdapter = controlLoraConfig;
+            // We only need the model and weight for Control LoRA
+            const { model, weight } = layer.controlAdapter;
+            const t2iAdapterConfig: ControlLoRAConfig = { ...initialControlLoRA, model, weight };
+            layer.controlAdapter = t2iAdapterConfig;
           }
           break;
         }