fix,feat: canvas followups 9

invokeai/frontend/web/public/locales/en.json

@@ -173,102 +173,11 @@
         "comparing": "Comparing",
         "comparingDesc": "Comparing two images",
         "enabled": "Enabled",
-        "disabled": "Disabled"
-    },
-    "controlnet": {
-        "controlAdapter_one": "Control Adapter",
-        "controlAdapter_other": "Control Adapters",
-        "controlnet": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.controlNet))",
-        "ip_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.ipAdapter))",
-        "t2i_adapter": "$t(controlnet.controlAdapter_one) #{{number}} ($t(common.t2iAdapter))",
-        "addControlNet": "Add $t(common.controlNet)",
-        "addIPAdapter": "Add $t(common.ipAdapter)",
-        "addT2IAdapter": "Add $t(common.t2iAdapter)",
-        "amult": "a_mult",
-        "autoConfigure": "Auto configure processor",
-        "balanced": "Balanced",
-        "base": "Base",
-        "beginEndStepPercent": "Begin / End Step Percentage",
-        "beginEndStepPercentShort": "Begin/End %",
-        "bgth": "bg_th",
-        "canny": "Canny",
-        "cannyDescription": "Canny edge detection",
-        "colorMap": "Color",
-        "colorMapDescription": "Generates a color map from the image",
-        "coarse": "Coarse",
-        "contentShuffle": "Content Shuffle",
-        "contentShuffleDescription": "Shuffles the content in an image",
-        "control": "Control",
-        "controlMode": "Control Mode",
-        "crop": "Crop",
-        "delete": "Delete",
-        "depthAnything": "Depth Anything",
-        "depthAnythingDescription": "Depth map generation using the Depth Anything technique",
-        "depthAnythingSmallV2": "Small V2",
-        "depthMidas": "Depth (Midas)",
-        "depthMidasDescription": "Depth map generation using Midas",
-        "depthZoe": "Depth (Zoe)",
-        "depthZoeDescription": "Depth map generation using Zoe",
-        "detectResolution": "Detect Resolution",
-        "duplicate": "Duplicate",
-        "f": "F",
-        "fill": "Fill",
-        "h": "H",
-        "face": "Face",
-        "body": "Body",
-        "hands": "Hands",
-        "hed": "HED",
-        "hedDescription": "Holistically-Nested Edge Detection",
-        "hideAdvanced": "Hide Advanced",
-        "highThreshold": "High Threshold",
-        "imageResolution": "Image Resolution",
-        "colorMapTileSize": "Tile Size",
-        "importImageFromCanvas": "Import Image From Canvas",
-        "importMaskFromCanvas": "Import Mask From Canvas",
-        "large": "Large",
-        "lineart": "Lineart",
-        "lineartAnime": "Lineart Anime",
-        "lineartAnimeDescription": "Anime-style lineart processing",
-        "lineartDescription": "Converts image to lineart",
-        "lowThreshold": "Low Threshold",
-        "maxFaces": "Max Faces",
-        "mediapipeFace": "Mediapipe Face",
-        "mediapipeFaceDescription": "Face detection using Mediapipe",
-        "megaControl": "Mega Control",
-        "minConfidence": "Min Confidence",
-        "mlsd": "M-LSD",
-        "mlsdDescription": "Minimalist Line Segment Detector",
-        "modelSize": "Model Size",
+        "disabled": "Disabled",
+        "placeholderSelectAModel": "Select a model",
+        "reset": "Reset",
         "none": "None",
-        "noneDescription": "No processing applied",
-        "normalBae": "Normal BAE",
-        "normalBaeDescription": "Normal BAE processing",
-        "dwOpenpose": "DW Openpose",
-        "dwOpenposeDescription": "Human pose estimation using DW Openpose",
-        "pidi": "PIDI",
-        "pidiDescription": "PIDI image processing",
-        "processor": "Processor",
-        "prompt": "Prompt",
-        "resetControlImage": "Reset Control Image",
-        "resize": "Resize",
-        "resizeSimple": "Resize (Simple)",
-        "resizeMode": "Resize Mode",
-        "ipAdapterMethod": "Method",
-        "full": "Full",
-        "style": "Style Only",
-        "composition": "Composition Only",
-        "safe": "Safe",
-        "saveControlImage": "Save Control Image",
-        "scribble": "Scribble",
-        "selectModel": "Select a model",
-        "selectCLIPVisionModel": "Select a CLIP Vision model",
-        "setControlImageDimensions": "Copy size to W/H (optimize for model)",
-        "setControlImageDimensionsForce": "Copy size to W/H (ignore model)",
-        "showAdvanced": "Show Advanced",
-        "small": "Small",
-        "toggleControlNet": "Toggle this ControlNet",
-        "w": "W",
-        "weight": "Weight"
+        "new": "New"
     },
     "hrf": {
         "hrf": "High Resolution Fix",
@@ -1664,18 +1573,30 @@
         "storeNotInitialized": "Store is not initialized"
     },
     "controlLayers": {
+        "regional": "Regional",
+        "global": "Global",
         "canvas": "Canvas",
         "bookmark": "Bookmark for Quick Switch",
         "fitBboxToLayers": "Fit Bbox To Layers",
         "removeBookmark": "Remove Bookmark",
         "saveCanvasToGallery": "Save Canvas to Gallery",
         "saveBboxToGallery": "Save Bbox to Gallery",
-        "newRegionalIPAdapterFromBbox": "New Regional IP Adapter from Bbox",
-        "newGlobalIPAdapterFromBbox": "New Global IP Adapter from Bbox",
         "newControlLayerFromBbox": "New Control Layer from Bbox",
         "newRasterLayerFromBbox": "New Raster Layer from Bbox",
         "savedToGalleryOk": "Saved to Gallery",
         "savedToGalleryError": "Error saving to gallery",
+        "newGlobalReferenceImageOk": "Created Global Reference Image",
+        "newGlobalReferenceImageError": "Problem Creating Global Reference Image",
+        "newRegionalReferenceImageOk": "Created Regional Reference Image",
+        "newRegionalReferenceImageError": "Problem Creating Regional Reference Image",
+        "newControlLayerOk": "Created Control Layer",
+        "newControlLayerError": "Problem Creating Control Layer",
+        "newRasterLayerOk": "Created Raster Layer",
+        "newRasterLayerError": "Problem Creating Raster Layer",
+        "pullBboxIntoLayerOk": "Bbox Pulled Into Layer",
+        "pullBboxIntoLayerError": "Problem Pulling BBox Into Layer",
+        "pullBboxIntoReferenceImageOk": "Bbox Pulled Into ReferenceImage",
+        "pullBboxIntoReferenceImageError": "Problem Pulling BBox Into ReferenceImage",
         "regionIsEmpty": "Selected region is empty",
         "mergeVisible": "Merge Visible",
         "mergeVisibleOk": "Merged visible layers",
@@ -1709,25 +1630,29 @@
         "enableAutoNegative": "Enable Auto Negative",
         "disableAutoNegative": "Disable Auto Negative",
         "deletePrompt": "Delete Prompt",
+        "deleteReferenceImage": "Delete Reference Image",
         "resetRegion": "Reset Region",
         "debugLayers": "Debug Layers",
         "showHUD": "Show HUD",
         "rectangle": "Rectangle",
         "maskFill": "Mask Fill",
-        "addPositivePrompt": "Add $t(common.positivePrompt)",
-        "addNegativePrompt": "Add $t(common.negativePrompt)",
-        "addIPAdapter": "Add $t(common.ipAdapter)",
+        "addPositivePrompt": "Add $t(controlLayers.prompt)",
+        "addNegativePrompt": "Add $t(controlLayers.negativePrompt)",
+        "addReferenceImage": "Add $t(controlLayers.referenceImage)",
         "addRasterLayer": "Add $t(controlLayers.rasterLayer)",
         "addControlLayer": "Add $t(controlLayers.controlLayer)",
         "addInpaintMask": "Add $t(controlLayers.inpaintMask)",
         "addRegionalGuidance": "Add $t(controlLayers.regionalGuidance)",
+        "addGlobalReferenceImage": "Add $t(controlLayers.globalReferenceImage)",
         "regionalGuidanceLayer": "$t(controlLayers.regionalGuidance) $t(unifiedCanvas.layer)",
         "raster": "Raster",
         "rasterLayer": "Raster Layer",
         "controlLayer": "Control Layer",
         "inpaintMask": "Inpaint Mask",
         "regionalGuidance": "Regional Guidance",
-        "ipAdapter": "IP Adapter",
+        "referenceImage": "Reference Image",
+        "regionalReferenceImage": "Regional Reference Image",
+        "globalReferenceImage": "Global Reference Image",
         "sendingToCanvas": "Sending to Canvas",
         "sendingToGallery": "Sending to Gallery",
         "sendToGallery": "Send To Gallery",
@@ -1740,29 +1665,23 @@
         "controlLayer_withCount_one": "$t(controlLayers.controlLayer)",
         "inpaintMask_withCount_one": "$t(controlLayers.inpaintMask)",
         "regionalGuidance_withCount_one": "$t(controlLayers.regionalGuidance)",
-        "ipAdapter_withCount_one": "$t(controlLayers.ipAdapter)",
+        "globalReferenceImage_withCount_one": "$t(controlLayers.globalReferenceImage)",
         "rasterLayer_withCount_other": "Raster Layers",
         "controlLayer_withCount_other": "Control Layers",
         "inpaintMask_withCount_other": "Inpaint Masks",
         "regionalGuidance_withCount_other": "Regional Guidance",
-        "ipAdapter_withCount_other": "IP Adapters",
+        "globalReferenceImage_withCount_other": "Global Reference Images",
         "opacity": "Opacity",
         "regionalGuidance_withCount_hidden": "Regional Guidance ({{count}} hidden)",
         "controlLayers_withCount_hidden": "Control Layers ({{count}} hidden)",
         "rasterLayers_withCount_hidden": "Raster Layers ({{count}} hidden)",
-        "globalIPAdapters_withCount_hidden": "Global IP Adapters ({{count}} hidden)",
+        "globalReferenceImages_withCount_hidden": "Global Reference Images ({{count}} hidden)",
         "inpaintMasks_withCount_hidden": "Inpaint Masks ({{count}} hidden)",
         "regionalGuidance_withCount_visible": "Regional Guidance ({{count}})",
         "controlLayers_withCount_visible": "Control Layers ({{count}})",
         "rasterLayers_withCount_visible": "Raster Layers ({{count}})",
-        "globalIPAdapters_withCount_visible": "Global IP Adapters ({{count}})",
+        "globalReferenceImages_withCount_visible": "Global Reference Images ({{count}})",
         "inpaintMasks_withCount_visible": "Inpaint Masks ({{count}})",
-        "globalControlAdapter": "Global $t(controlnet.controlAdapter_one)",
-        "globalControlAdapterLayer": "Global $t(controlnet.controlAdapter_one) $t(unifiedCanvas.layer)",
-        "globalIPAdapter": "Global $t(common.ipAdapter)",
-        "globalIPAdapterLayer": "Global $t(common.ipAdapter) $t(unifiedCanvas.layer)",
-        "globalInitialImage": "Global Initial Image",
-        "globalInitialImageLayer": "$t(controlLayers.globalInitialImage) $t(unifiedCanvas.layer)",
         "layer": "Layer",
         "opacityFilter": "Opacity Filter",
         "clearProcessor": "Clear Processor",
@@ -1793,8 +1712,27 @@
         "stagingOnCanvas": "Staging images on",
         "replaceLayer": "Replace Layer",
         "pullBboxIntoLayer": "Pull Bbox into Layer",
-        "pullBboxIntoIPAdapter": "Pull Bbox into IP Adapter",
+        "pullBboxIntoReferenceImage": "Pull Bbox into Reference Image",
         "showProgressOnCanvas": "Show Progress on Canvas",
+        "prompt": "Prompt",
+        "negativePrompt": "Negative Prompt",
+        "beginEndStepPercentShort": "Begin/End %",
+        "weight": "Weight",
+        "controlMode": {
+            "controlMode": "Control Mode",
+            "balanced": "Balanced",
+            "prompt": "Prompt",
+            "control": "Control",
+            "megaControl": "Mega Control"
+        },
+        "ipAdapterMethod": {
+            "ipAdapterMethod": "IP Adapter Method",
+            "full": "Full",
+            "style": "Style Only",
+            "composition": "Composition Only"
+        },
+        "useSizeOptimizeForModel": "Copy size to W/H (optimize for model)",
+        "useSizeIgnoreModel": "Copy size to W/H (ignore model)",
         "fill": {
             "fillColor": "Fill Color",
             "fillStyle": "Fill Style",
@@ -1914,7 +1852,7 @@
                 "off": "Off"
             },
             "preserveMask": {
-                "label": "Preserve Mask Region",
+                "label": "Preserve Masked Region",
                 "alert": "Preserving Masked Region"
             }
         },
@@ -1930,6 +1868,16 @@
                 "isDisabled": "{{title}} is disabled",
                 "isEmpty": "{{title}} is empty"
             }
+        },
+        "canvasContextMenu": {
+            "saveToGalleryGroup": "Save To Gallery",
+            "saveCanvasToGallery": "Save Canvas To Gallery",
+            "saveBboxToGallery": "Save Bbox To Gallery",
+            "bboxGroup": "Create From Bbox",
+            "newGlobalReferenceImage": "New Global Reference Image",
+            "newRegionalReferenceImage": "New Regional Reference Image",
+            "newControlLayer": "New Control Layer",
+            "newRasterLayer": "New Raster Layer"
         }
     },
     "upscaling": {

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/addCommitStagingAreaImageListener.ts

@@ -5,7 +5,7 @@ import { canvasReset, rasterLayerAdded } from 'features/controlLayers/store/canv
 import { stagingAreaImageAccepted, stagingAreaReset } from 'features/controlLayers/store/canvasStagingAreaSlice';
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
 import type { CanvasRasterLayerState } from 'features/controlLayers/store/types';
-import { imageDTOToImageObject } from 'features/controlLayers/store/types';
+import { imageDTOToImageObject } from 'features/controlLayers/store/util';
 import { toast } from 'features/toast/toast';
 import { t } from 'i18next';
 import { queueApi } from 'services/api/endpoints/queue';

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDeletionListeners.ts

@@ -1,7 +1,7 @@
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
 import type { AppDispatch, RootState } from 'app/store/store';
-import { entityDeleted, ipaImageChanged } from 'features/controlLayers/store/canvasSlice';
+import { entityDeleted, referenceImageIPAdapterImageChanged } from 'features/controlLayers/store/canvasSlice';
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
 import { getEntityIdentifier } from 'features/controlLayers/store/types';
 import { imageDeletionConfirmed } from 'features/deleteImageModal/store/actions';
@@ -53,9 +53,9 @@ const deleteNodesImages = (state: RootState, dispatch: AppDispatch, imageDTO: Im
 // };
 
 const deleteIPAdapterImages = (state: RootState, dispatch: AppDispatch, imageDTO: ImageDTO) => {
-  selectCanvasSlice(state).ipAdapters.entities.forEach((entity) => {
+  selectCanvasSlice(state).referenceImages.entities.forEach((entity) => {
     if (entity.ipAdapter.image?.image_name === imageDTO.image_name) {
-      dispatch(ipaImageChanged({ entityIdentifier: getEntityIdentifier(entity), imageDTO: null }));
+      dispatch(referenceImageIPAdapterImageChanged({ entityIdentifier: getEntityIdentifier(entity), imageDTO: null }));
     }
   });
 };

invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/imageDropped.ts

@@ -1,18 +1,27 @@
 import { createAction } from '@reduxjs/toolkit';
 import { logger } from 'app/logging/logger';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
-import { selectDefaultControlAdapter } from 'features/controlLayers/hooks/addLayerHooks';
+import { deepClone } from 'common/util/deepClone';
+import { selectDefaultControlAdapter, selectDefaultIPAdapter } from 'features/controlLayers/hooks/addLayerHooks';
+import { getPrefixedId } from 'features/controlLayers/konva/util';
 import {
   controlLayerAdded,
   entityRasterized,
   entitySelected,
-  ipaImageChanged,
   rasterLayerAdded,
+  referenceImageAdded,
+  referenceImageIPAdapterImageChanged,
+  rgAdded,
   rgIPAdapterImageChanged,
 } from 'features/controlLayers/store/canvasSlice';
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
-import type { CanvasControlLayerState, CanvasRasterLayerState } from 'features/controlLayers/store/types';
-import { imageDTOToImageObject } from 'features/controlLayers/store/types';
+import type {
+  CanvasControlLayerState,
+  CanvasRasterLayerState,
+  CanvasReferenceImageState,
+  CanvasRegionalGuidanceState,
+} from 'features/controlLayers/store/types';
+import { imageDTOToImageObject, imageDTOToImageWithDims } from 'features/controlLayers/store/util';
 import type { TypesafeDraggableData, TypesafeDroppableData } from 'features/dnd/types';
 import { isValidDrop } from 'features/dnd/util/isValidDrop';
 import { imageToCompareChanged, selectionChanged } from 'features/gallery/store/gallerySlice';
@@ -56,7 +65,10 @@ export const addImageDroppedListener = (startAppListening: AppStartListening) =>
       ) {
         const { id } = overData.context;
         dispatch(
-          ipaImageChanged({ entityIdentifier: { id, type: 'ip_adapter' }, imageDTO: activeData.payload.imageDTO })
+          referenceImageIPAdapterImageChanged({
+            entityIdentifier: { id, type: 'reference_image' },
+            imageDTO: activeData.payload.imageDTO,
+          })
         );
         return;
       }
@@ -69,11 +81,11 @@ export const addImageDroppedListener = (startAppListening: AppStartListening) =>
         activeData.payloadType === 'IMAGE_DTO' &&
         activeData.payload.imageDTO
       ) {
-        const { id, ipAdapterId } = overData.context;
+        const { id, referenceImageId } = overData.context;
         dispatch(
           rgIPAdapterImageChanged({
             entityIdentifier: { id, type: 'regional_guidance' },
-            ipAdapterId,
+            referenceImageId,
             imageDTO: activeData.payload.imageDTO,
           })
         );
@@ -119,6 +131,36 @@ export const addImageDroppedListener = (startAppListening: AppStartListening) =>
         return;
       }
 
+      if (
+        overData.actionType === 'ADD_REGIONAL_REFERENCE_IMAGE_FROM_IMAGE' &&
+        activeData.payloadType === 'IMAGE_DTO' &&
+        activeData.payload.imageDTO
+      ) {
+        const state = getState();
+        const ipAdapter = deepClone(selectDefaultIPAdapter(state));
+        ipAdapter.image = imageDTOToImageWithDims(activeData.payload.imageDTO);
+        const overrides: Partial<CanvasRegionalGuidanceState> = {
+          referenceImages: [{ id: getPrefixedId('regional_guidance_reference_image'), ipAdapter }],
+        };
+        dispatch(rgAdded({ overrides, isSelected: true }));
+        return;
+      }
+
+      if (
+        overData.actionType === 'ADD_GLOBAL_REFERENCE_IMAGE_FROM_IMAGE' &&
+        activeData.payloadType === 'IMAGE_DTO' &&
+        activeData.payload.imageDTO
+      ) {
+        const state = getState();
+        const ipAdapter = deepClone(selectDefaultIPAdapter(state));
+        ipAdapter.image = imageDTOToImageWithDims(activeData.payload.imageDTO);
+        const overrides: Partial<CanvasReferenceImageState> = {
+          ipAdapter,
+        };
+        dispatch(referenceImageAdded({ overrides, isSelected: true }));
+        return;
+      }
+
       /**
        * Image dropped on Raster layer
        */