fix(package): pin python-multipart to v0.0.12 due to breakage in dependent packages with later versions

docs/contributing/dev-environment.md

@@ -17,49 +17,46 @@ If you just want to use Invoke, you should use the [installer][installer link].
 ## Setup
 
 1. Run through the [requirements][requirements link].
-2. [Fork and clone][forking link] the [InvokeAI repo][repo link].
-3. Create an directory for user data (images, models, db, etc). This is typically at `~/invokeai`, but if you already have a non-dev install, you may want to create a separate directory for the dev install.
-4. Create a python virtual environment inside the directory you just created:
+1. [Fork and clone][forking link] the [InvokeAI repo][repo link].
+1. Create an directory for user data (images, models, db, etc). This is typically at `~/invokeai`, but if you already have a non-dev install, you may want to create a separate directory for the dev install.
+1. Create a python virtual environment inside the directory you just created:
 
-      ```sh
-      python3 -m venv .venv --prompt InvokeAI-Dev
-      ```
+   ```sh
+   python3 -m venv .venv --prompt InvokeAI-Dev
+   ```
 
-5. Activate the venv (you'll need to do this every time you want to run the app):
+1. Activate the venv (you'll need to do this every time you want to run the app):
 
-        ```sh
-        source .venv/bin/activate
-        ```
+   ```sh
+   source .venv/bin/activate
+   ```
 
-6. Install the repo as an [editable install][editable install link]:
+1. Install the repo as an [editable install][editable install link]:
 
-      ```sh
-      pip install -e ".[dev,test,xformers]" --use-pep517 --extra-index-url https://download.pytorch.org/whl/cu121
-      ```
+   ```sh
+   pip install -e ".[dev,test,xformers]" --use-pep517 --extra-index-url https://download.pytorch.org/whl/cu121
+   ```
 
-      Refer to the [manual installation][manual install link]] instructions for more determining the correct install options. `xformers` is optional, but `dev` and `test` are not.
+   Refer to the [manual installation][manual install link]] instructions for more determining the correct install options. `xformers` is optional, but `dev` and `test` are not.
 
-7. Install the frontend dev toolchain:
+1. Install the frontend dev toolchain:
 
    - [`nodejs`](https://nodejs.org/) (recommend v20 LTS)
-   - [`pnpm`](https://pnpm.io/8.x/installation) (must be v8 - not v9!)
+   - [`pnpm`](https://pnpm.io/installation#installing-a-specific-version) (must be v8 - not v9!)
 
-8. Do a production build of the frontend:
+1. Do a production build of the frontend:
 
-      ```sh
-      cd PATH_TO_INVOKEAI_REPO/invokeai/frontend/web
-      pnpm i
-      pnpm build
-      ```
+   ```sh
+   pnpm build
+   ```
 
-9. Start the application:
+1. Start the application:
 
-      ```sh
-      cd PATH_TO_INVOKEAI_REPO
-      python scripts/invokeai-web.py
-      ```
+   ```sh
+   python scripts/invokeai-web.py
+   ```
 
-10. Access the UI at `localhost:9090`.
+1. Access the UI at `localhost:9090`.
 
 ## Updating the UI
 

invokeai/app/invocations/denoise_latents.py

@@ -13,7 +13,6 @@ from diffusers.models.unets.unet_2d_condition import UNet2DConditionModel
 from diffusers.schedulers.scheduling_dpmsolver_sde import DPMSolverSDEScheduler
 from diffusers.schedulers.scheduling_tcd import TCDScheduler
 from diffusers.schedulers.scheduling_utils import SchedulerMixin as Scheduler
-from PIL import Image
 from pydantic import field_validator
 from torchvision.transforms.functional import resize as tv_resize
 from transformers import CLIPVisionModelWithProjection
@@ -511,7 +510,6 @@ class DenoiseLatentsInvocation(BaseInvocation):
         context: InvocationContext,
         t2i_adapters: Optional[Union[T2IAdapterField, list[T2IAdapterField]]],
         ext_manager: ExtensionsManager,
-        bgr_mode: bool = False,
     ) -> None:
         if t2i_adapters is None:
             return
@@ -521,10 +519,6 @@ class DenoiseLatentsInvocation(BaseInvocation):
             t2i_adapters = [t2i_adapters]
 
         for t2i_adapter_field in t2i_adapters:
-            image = context.images.get_pil(t2i_adapter_field.image.image_name)
-            if bgr_mode:  # SDXL t2i trained on cv2's BGR outputs, but PIL won't convert straight to BGR
-                r, g, b = image.split()
-                image = Image.merge("RGB", (b, g, r))
             ext_manager.add_extension(
                 T2IAdapterExt(
                     node_context=context,
@@ -629,10 +623,6 @@ class DenoiseLatentsInvocation(BaseInvocation):
                 max_unet_downscale = 8
             elif t2i_adapter_model_config.base == BaseModelType.StableDiffusionXL:
                 max_unet_downscale = 4
-
-                # SDXL adapters are trained on cv2's BGR outputs
-                r, g, b = image.split()
-                image = Image.merge("RGB", (b, g, r))
             else:
                 raise ValueError(f"Unexpected T2I-Adapter base model type: '{t2i_adapter_model_config.base}'.")
 
@@ -910,8 +900,7 @@ class DenoiseLatentsInvocation(BaseInvocation):
             #    ext = extension_field.to_extension(exit_stack, context, ext_manager)
             #    ext_manager.add_extension(ext)
             self.parse_controlnet_field(exit_stack, context, self.control, ext_manager)
-            bgr_mode = self.unet.unet.base == BaseModelType.StableDiffusionXL
-            self.parse_t2i_adapter_field(exit_stack, context, self.t2i_adapter, ext_manager, bgr_mode)
+            self.parse_t2i_adapter_field(exit_stack, context, self.t2i_adapter, ext_manager)
 
             # ext: t2i/ip adapter
             ext_manager.run_callback(ExtensionCallbackType.SETUP, denoise_ctx)

invokeai/app/invocations/mask.py

@@ -165,7 +165,6 @@ class ApplyMaskTensorToImageInvocation(BaseInvocation, WithMetadata, WithBoard):
 
     mask: TensorField = InputField(description="The mask tensor to apply.")
     image: ImageField = InputField(description="The image to apply the mask to.")
-    invert: bool = InputField(default=False, description="Whether to invert the mask.")
 
     def invoke(self, context: InvocationContext) -> ImageOutput:
         image = context.images.get_pil(self.image.image_name, mode="RGBA")
@@ -180,9 +179,6 @@ class ApplyMaskTensorToImageInvocation(BaseInvocation, WithMetadata, WithBoard):
             mask = mask > 0.5
         mask_np = (mask.float() * 255).byte().cpu().numpy().astype(np.uint8)
 
-        if self.invert:
-            mask_np = 255 - mask_np
-
         # Apply the mask only to the alpha channel where the original alpha is non-zero. This preserves the original
         # image's transparency - else the transparent regions would end up as opaque black.
 

invokeai/app/services/shared/invocation_context.py

@@ -1,4 +1,3 @@
-from copy import deepcopy
 from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING, Callable, Optional, Union
@@ -222,7 +221,7 @@ class ImagesInterface(InvocationContextInterface):
         )
 
     def get_pil(self, image_name: str, mode: IMAGE_MODES | None = None) -> Image:
-        """Gets an image as a PIL Image object. This method returns a copy of the image.
+        """Gets an image as a PIL Image object.
 
         Args:
             image_name: The name of the image to get.
@@ -234,15 +233,11 @@ class ImagesInterface(InvocationContextInterface):
         image = self._services.images.get_pil_image(image_name)
         if mode and mode != image.mode:
             try:
-                # convert makes a copy!
                 image = image.convert(mode)
             except ValueError:
                 self._services.logger.warning(
                     f"Could not convert image from {image.mode} to {mode}. Using original mode instead."
                 )
-        else:
-            # copy the image to prevent the user from modifying the original
-            image = image.copy()
         return image
 
     def get_metadata(self, image_name: str) -> Optional[MetadataField]:
@@ -295,15 +290,15 @@ class TensorsInterface(InvocationContextInterface):
         return name
 
     def load(self, name: str) -> Tensor:
-        """Loads a tensor by name. This method returns a copy of the tensor.
+        """Loads a tensor by name.
 
         Args:
             name: The name of the tensor to load.
 
         Returns:
-            The tensor.
+            The loaded tensor.
         """
-        return self._services.tensors.load(name).clone()
+        return self._services.tensors.load(name)
 
 
 class ConditioningInterface(InvocationContextInterface):
@@ -321,16 +316,16 @@ class ConditioningInterface(InvocationContextInterface):
         return name
 
     def load(self, name: str) -> ConditioningFieldData:
-        """Loads conditioning data by name. This method returns a copy of the conditioning data.
+        """Loads conditioning data by name.
 
         Args:
             name: The name of the conditioning data to load.
 
         Returns:
-            The conditioning data.
+            The loaded conditioning data.
         """
 
-        return deepcopy(self._services.conditioning.load(name))
+        return self._services.conditioning.load(name)
 
 
 class ModelsInterface(InvocationContextInterface):

invokeai/backend/model_manager/load/model_loaders/stable_diffusion.py

@@ -117,6 +117,8 @@ class StableDiffusionDiffusersModel(GenericDiffusersLoader):
             load_class = load_classes[config.base][config.variant]
         except KeyError as e:
             raise Exception(f"No diffusers pipeline known for base={config.base}, variant={config.variant}") from e
+        prediction_type = config.prediction_type.value
+        upcast_attention = config.upcast_attention
 
         # Without SilenceWarnings we get log messages like this:
         # site-packages/huggingface_hub/file_download.py:1132: FutureWarning: `resume_download` is deprecated and will be removed in version 1.0.0. Downloads always resume when possible. If you want to force a new download, use `force_download=True`.
@@ -127,7 +129,13 @@ class StableDiffusionDiffusersModel(GenericDiffusersLoader):
         # ['text_model.embeddings.position_ids']
 
         with SilenceWarnings():
-            pipeline = load_class.from_single_file(config.path, torch_dtype=self._torch_dtype)
+            pipeline = load_class.from_single_file(
+                config.path,
+                torch_dtype=self._torch_dtype,
+                prediction_type=prediction_type,
+                upcast_attention=upcast_attention,
+                load_safety_checker=False,
+            )
 
         if not submodel_type:
             return pipeline

invokeai/backend/model_manager/metadata/fetch/huggingface.py

@@ -20,7 +20,7 @@ from typing import Optional
 
 import requests
 from huggingface_hub import HfApi, configure_http_backend, hf_hub_url
-from huggingface_hub.errors import RepositoryNotFoundError, RevisionNotFoundError
+from huggingface_hub.utils._errors import RepositoryNotFoundError, RevisionNotFoundError
 from pydantic.networks import AnyHttpUrl
 from requests.sessions import Session
 

invokeai/backend/stable_diffusion/extensions/preview.py

@@ -33,7 +33,7 @@ class PreviewExt(ExtensionBase):
     def initial_preview(self, ctx: DenoiseContext):
         self.callback(
             PipelineIntermediateState(
-                step=0,
+                step=-1,
                 order=ctx.scheduler.order,
                 total_steps=len(ctx.inputs.timesteps),
                 timestep=int(ctx.scheduler.config.num_train_timesteps),  # TODO: is there any code which uses it?

invokeai/backend/util/hotfixes.py

@@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 import diffusers
 import torch
 from diffusers.configuration_utils import ConfigMixin, register_to_config
-from diffusers.loaders.single_file_model import FromOriginalModelMixin
+from diffusers.loaders import FromOriginalControlNetMixin
 from diffusers.models.attention_processor import AttentionProcessor, AttnProcessor
 from diffusers.models.controlnet import ControlNetConditioningEmbedding, ControlNetOutput, zero_module
 from diffusers.models.embeddings import (
@@ -32,9 +32,7 @@ from invokeai.backend.util.logging import InvokeAILogger
 logger = InvokeAILogger.get_logger(__name__)
 
 
-# NOTE(ryand): I'm not the origina author of this code, but for future reference, it appears that this class was copied
-# from diffusers in order to add support for the encoder_attention_mask argument.
-class ControlNetModel(ModelMixin, ConfigMixin, FromOriginalModelMixin):
+class ControlNetModel(ModelMixin, ConfigMixin, FromOriginalControlNetMixin):
     """
     A ControlNet model.
 

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

@@ -682,8 +682,7 @@
         "recallParameters": "Recall Parameters",
         "recallParameter": "Recall {{label}}",
         "scheduler": "Scheduler",
-        "seamlessXAxis": "Seamless X Axis",
-        "seamlessYAxis": "Seamless Y Axis",
+        "seamless": "Seamless",
         "seed": "Seed",
         "steps": "Steps",
         "strength": "Image to image strength",
@@ -714,12 +713,8 @@
         "convertToDiffusersHelpText4": "This is a one time process only. It might take around 30s-60s depending on the specifications of your computer.",
         "convertToDiffusersHelpText5": "Please make sure you have enough disk space. Models generally vary between 2GB-7GB in size.",
         "convertToDiffusersHelpText6": "Do you wish to convert this model?",
-        "noDefaultSettings": "No default settings configured for this model. Visit the Model Manager to add default settings.",
         "defaultSettings": "Default Settings",
         "defaultSettingsSaved": "Default Settings Saved",
-        "defaultSettingsOutOfSync": "Some settings do not match the model's defaults:",
-        "restoreDefaultSettings": "Click to use the model's default settings.",
-        "usingDefaultSettings": "Using model's default settings",
         "delete": "Delete",
         "deleteConfig": "Delete Config",
         "deleteModel": "Delete Model",
@@ -804,6 +799,7 @@
         "uploadImage": "Upload Image",
         "urlOrLocalPath": "URL or Local Path",
         "urlOrLocalPathHelper": "URLs should point to a single file. Local paths can point to a single file or folder for a single diffusers model.",
+        "useDefaultSettings": "Use Default Settings",
         "vae": "VAE",
         "vaePrecision": "VAE Precision",
         "variant": "Variant",
@@ -1113,9 +1109,6 @@
         "enableInformationalPopovers": "Enable Informational Popovers",
         "informationalPopoversDisabled": "Informational Popovers Disabled",
         "informationalPopoversDisabledDesc": "Informational popovers have been disabled. Enable them in Settings.",
-        "enableModelDescriptions": "Enable Model Descriptions in Dropdowns",
-        "modelDescriptionsDisabled": "Model Descriptions in Dropdowns Disabled",
-        "modelDescriptionsDisabledDesc": "Model descriptions in dropdowns have been disabled. Enable them in Settings.",
         "enableInvisibleWatermark": "Enable Invisible Watermark",
         "enableNSFWChecker": "Enable NSFW Checker",
         "general": "General",
@@ -1683,8 +1676,6 @@
         "controlLayer": "Control Layer",
         "inpaintMask": "Inpaint Mask",
         "regionalGuidance": "Regional Guidance",
-        "canvasAsRasterLayer": "$t(controlLayers.canvas) as $t(controlLayers.rasterLayer)",
-        "canvasAsControlLayer": "$t(controlLayers.canvas) as $t(controlLayers.controlLayer)",
         "referenceImage": "Reference Image",
         "regionalReferenceImage": "Regional Reference Image",
         "globalReferenceImage": "Global Reference Image",
@@ -1760,7 +1751,6 @@
         "newGallerySessionDesc": "This will clear the canvas and all settings except for your model selection. Generations will be sent to the gallery.",
         "newCanvasSession": "New Canvas Session",
         "newCanvasSessionDesc": "This will clear the canvas and all settings except for your model selection. Generations will be staged on the canvas.",
-        "replaceCurrent": "Replace Current",
         "controlMode": {
             "controlMode": "Control Mode",
             "balanced": "Balanced",
@@ -1890,24 +1880,16 @@
             "apply": "Apply",
             "cancel": "Cancel"
         },
-        "selectObject": {
-            "selectObject": "Select Object",
+        "segment": {
+            "autoMask": "Auto Mask",
             "pointType": "Point Type",
-            "invertSelection": "Invert Selection",
             "include": "Include",
             "exclude": "Exclude",
             "neutral": "Neutral",
-            "apply": "Apply",
             "reset": "Reset",
             "saveAs": "Save As",
             "cancel": "Cancel",
-            "process": "Process",
-            "help1": "Select a single target object. Add <Bold>Include</Bold> and <Bold>Exclude</Bold> points to indicate which parts of the layer are part of the target object.",
-            "help2": "Start with one <Bold>Include</Bold> point within the target object. Add more points to refine the selection. Fewer points typically produce better results.",
-            "help3": "Invert the selection to select everything except the target object.",
-            "clickToAdd": "Click on the layer to add a point",
-            "dragToMove": "Drag a point to move it",
-            "clickToRemove": "Click on a point to remove it"
+            "process": "Process"
         },
         "settings": {
             "snapToGrid": {
@@ -1948,8 +1930,6 @@
             "newRegionalReferenceImage": "New Regional Reference Image",
             "newControlLayer": "New Control Layer",
             "newRasterLayer": "New Raster Layer",
-            "newInpaintMask": "New Inpaint Mask",
-            "newRegionalGuidance": "New Regional Guidance",
             "cropCanvasToBbox": "Crop Canvas to Bbox"
         },
         "stagingArea": {
@@ -2082,11 +2062,13 @@
     },
     "whatsNew": {
         "whatsNewInInvoke": "What's New in Invoke",
-        "line1": "<ItalicComponent>Select Object</ItalicComponent> tool for precise object selection and editing",
-        "line2": "Expanded Flux support, now with Global Reference Images",
-        "line3": "Improved tooltips and context menus",
-        "readReleaseNotes": "Read Release Notes",
-        "watchRecentReleaseVideos": "Watch Recent Release Videos",
-        "watchUiUpdatesOverview": "Watch UI Updates Overview"
+        "canvasV2Announcement": {
+            "newCanvas": "A powerful new control canvas",
+            "newLayerTypes": "New layer types for even more control",
+            "fluxSupport": "Support for the Flux family of models",
+            "readReleaseNotes": "Read Release Notes",
+            "watchReleaseVideo": "Watch Release Video",
+            "watchUiUpdatesOverview": "Watch UI Updates Overview"
+        }
     }
 }

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

@@ -8,7 +8,6 @@ import {
   controlLayerAdded,
   entityRasterized,
   entitySelected,
-  inpaintMaskAdded,
   rasterLayerAdded,
   referenceImageAdded,
   referenceImageIPAdapterImageChanged,
@@ -18,7 +17,6 @@ import {
 import { selectCanvasSlice } from 'features/controlLayers/store/selectors';
 import type {
   CanvasControlLayerState,
-  CanvasInpaintMaskState,
   CanvasRasterLayerState,
   CanvasReferenceImageState,
   CanvasRegionalGuidanceState,
@@ -112,46 +110,6 @@ export const addImageDroppedListener = (startAppListening: AppStartListening) =>
         return;
       }
 
-      /**
-
-      /**
-       * Image dropped on Inpaint Mask
-       */
-      if (
-        overData.actionType === 'ADD_INPAINT_MASK_FROM_IMAGE' &&
-        activeData.payloadType === 'IMAGE_DTO' &&
-        activeData.payload.imageDTO
-      ) {
-        const imageObject = imageDTOToImageObject(activeData.payload.imageDTO);
-        const { x, y } = selectCanvasSlice(getState()).bbox.rect;
-        const overrides: Partial<CanvasInpaintMaskState> = {
-          objects: [imageObject],
-          position: { x, y },
-        };
-        dispatch(inpaintMaskAdded({ overrides, isSelected: true }));
-        return;
-      }
-
-      /**
-
-      /**
-       * Image dropped on Regional Guidance
-       */
-      if (
-        overData.actionType === 'ADD_REGIONAL_GUIDANCE_FROM_IMAGE' &&
-        activeData.payloadType === 'IMAGE_DTO' &&
-        activeData.payload.imageDTO
-      ) {
-        const imageObject = imageDTOToImageObject(activeData.payload.imageDTO);
-        const { x, y } = selectCanvasSlice(getState()).bbox.rect;
-        const overrides: Partial<CanvasRegionalGuidanceState> = {
-          objects: [imageObject],
-          position: { x, y },
-        };
-        dispatch(rgAdded({ overrides, isSelected: true }));
-        return;
-      }
-
       /**
        * Image dropped on Raster layer
        */

invokeai/frontend/web/src/common/hooks/useGroupedModelCombobox.ts

@@ -4,7 +4,6 @@ import { useAppSelector } from 'app/store/storeHooks';
 import type { GroupBase } from 'chakra-react-select';
 import { selectParamsSlice } from 'features/controlLayers/store/paramsSlice';
 import type { ModelIdentifierField } from 'features/nodes/types/common';
-import { selectSystemShouldEnableModelDescriptions } from 'features/system/store/systemSlice';
 import { groupBy, reduce } from 'lodash-es';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -17,6 +16,7 @@ type UseGroupedModelComboboxArg<T extends AnyModelConfig> = {
   getIsDisabled?: (model: T) => boolean;
   isLoading?: boolean;
   groupByType?: boolean;
+  showDescriptions?: boolean;
 };
 
 type UseGroupedModelComboboxReturn = {
@@ -38,8 +38,15 @@ export const useGroupedModelCombobox = <T extends AnyModelConfig>(
 ): UseGroupedModelComboboxReturn => {
   const { t } = useTranslation();
   const base = useAppSelector(selectBaseWithSDXLFallback);
-  const shouldShowModelDescriptions = useAppSelector(selectSystemShouldEnableModelDescriptions);
-  const { modelConfigs, selectedModel, getIsDisabled, onChange, isLoading, groupByType = false } = arg;
+  const {
+    modelConfigs,
+    selectedModel,
+    getIsDisabled,
+    onChange,
+    isLoading,
+    groupByType = false,
+    showDescriptions = false,
+  } = arg;
   const options = useMemo<GroupBase<ComboboxOption>[]>(() => {
     if (!modelConfigs) {
       return [];
@@ -53,7 +60,7 @@ export const useGroupedModelCombobox = <T extends AnyModelConfig>(
           options: val.map((model) => ({
             label: model.name,
             value: model.key,
-            description: (shouldShowModelDescriptions && model.description) || undefined,
+            description: (showDescriptions && model.description) || undefined,
             isDisabled: getIsDisabled ? getIsDisabled(model) : false,
           })),
         });
@@ -63,7 +70,7 @@ export const useGroupedModelCombobox = <T extends AnyModelConfig>(
     );
     _options.sort((a) => (a.label?.split('/')[0]?.toLowerCase().includes(base) ? -1 : 1));
     return _options;
-  }, [modelConfigs, groupByType, getIsDisabled, base, shouldShowModelDescriptions]);
+  }, [modelConfigs, groupByType, getIsDisabled, base, showDescriptions]);
 
   const value = useMemo(
     () =>

invokeai/frontend/web/src/common/hooks/useModelCombobox.ts

@@ -1,7 +1,5 @@
 import type { ComboboxOnChange, ComboboxOption } from '@invoke-ai/ui-library';
-import { useAppSelector } from 'app/store/storeHooks';
 import type { ModelIdentifierField } from 'features/nodes/types/common';
-import { selectSystemShouldEnableModelDescriptions } from 'features/system/store/systemSlice';
 import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { AnyModelConfig } from 'services/api/types';
@@ -26,16 +24,13 @@ type UseModelComboboxReturn = {
 export const useModelCombobox = <T extends AnyModelConfig>(arg: UseModelComboboxArg<T>): UseModelComboboxReturn => {
   const { t } = useTranslation();
   const { modelConfigs, selectedModel, getIsDisabled, onChange, isLoading, optionsFilter = () => true } = arg;
-  const shouldShowModelDescriptions = useAppSelector(selectSystemShouldEnableModelDescriptions);
-
   const options = useMemo<ComboboxOption[]>(() => {
     return modelConfigs.filter(optionsFilter).map((model) => ({
       label: model.name,
       value: model.key,
-      description: (shouldShowModelDescriptions && model.description) || undefined,
       isDisabled: getIsDisabled ? getIsDisabled(model) : false,
     }));
-  }, [optionsFilter, getIsDisabled, modelConfigs, shouldShowModelDescriptions]);
+  }, [optionsFilter, getIsDisabled, modelConfigs]);
 
   const value = useMemo(
     () => options.find((m) => (selectedModel ? m.value === selectedModel.key : false)),

invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsPreserveMask.tsx

@@ -13,7 +13,7 @@ export const CanvasAlertsPreserveMask = memo(() => {
   }
 
   return (
-    <Alert status="warning" borderRadius="base" fontSize="sm" shadow="md" w="fit-content">
+    <Alert status="warning" borderRadius="base" fontSize="sm" shadow="md" w="fit-content" alignSelf="flex-end">
       <AlertIcon />
       <AlertTitle>{t('controlLayers.settings.preserveMask.alert')}</AlertTitle>
     </Alert>

invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsSelectedEntityStatus.tsx

@@ -98,7 +98,7 @@ const CanvasAlertsSelectedEntityStatusContent = memo(({ entityIdentifier, adapte
   }
 
   return (
-    <Alert status={alert.status} borderRadius="base" fontSize="sm" shadow="md" w="fit-content">
+    <Alert status={alert.status} borderRadius="base" fontSize="sm" shadow="md" w="fit-content" alignSelf="flex-end">
       <AlertIcon />
       <AlertTitle>{alert.title}</AlertTitle>
     </Alert>

invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsSendingTo.tsx

@@ -132,6 +132,7 @@ const AlertWrapper = ({
             fontSize="sm"
             shadow="md"
             w="fit-content"
+            alignSelf="flex-end"
           >
             <Flex w="full" alignItems="center">
               <AlertIcon />

invokeai/frontend/web/src/features/controlLayers/components/CanvasContextMenu/CanvasContextMenuSelectedEntityMenuItems.tsx

@@ -1,4 +1,3 @@
-import { MenuGroup } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { ControlLayerMenuItems } from 'features/controlLayers/components/ControlLayer/ControlLayerMenuItems';
 import { InpaintMaskMenuItems } from 'features/controlLayers/components/InpaintMask/InpaintMaskMenuItems';
@@ -9,9 +8,7 @@ import {
   EntityIdentifierContext,
   useEntityIdentifierContext,
 } from 'features/controlLayers/contexts/EntityIdentifierContext';
-import { useEntityTypeString } from 'features/controlLayers/hooks/useEntityTypeString';
 import { selectSelectedEntityIdentifier } from 'features/controlLayers/store/selectors';
-import type { PropsWithChildren } from 'react';
 import { memo } from 'react';
 import type { Equals } from 'tsafe';
 import { assert } from 'tsafe';
@@ -49,20 +46,9 @@ export const CanvasContextMenuSelectedEntityMenuItems = memo(() => {
 
   return (
     <EntityIdentifierContext.Provider value={selectedEntityIdentifier}>
-      <CanvasContextMenuSelectedEntityMenuGroup>
-        <CanvasContextMenuSelectedEntityMenuItemsContent />
-      </CanvasContextMenuSelectedEntityMenuGroup>
+      <CanvasContextMenuSelectedEntityMenuItemsContent />
     </EntityIdentifierContext.Provider>
   );
 });
 
 CanvasContextMenuSelectedEntityMenuItems.displayName = 'CanvasContextMenuSelectedEntityMenuItems';
-
-const CanvasContextMenuSelectedEntityMenuGroup = memo((props: PropsWithChildren) => {
-  const entityIdentifier = useEntityIdentifierContext();
-  const title = useEntityTypeString(entityIdentifier.type);
-
-  return <MenuGroup title={title}>{props.children}</MenuGroup>;
-});
-
-CanvasContextMenuSelectedEntityMenuGroup.displayName = 'CanvasContextMenuSelectedEntityMenuGroup';

invokeai/frontend/web/src/features/controlLayers/components/CanvasDropArea.tsx

@@ -62,7 +62,6 @@ export const CanvasDropArea = memo(() => {
             data={addControlLayerFromImageDropData}
           />
         </GridItem>
-
         <GridItem position="relative">
           <IAIDroppable
             dropLabel={t('controlLayers.canvasContextMenu.newRegionalReferenceImage')}

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListGlobalActionBarAddLayerMenu.tsx

@@ -29,7 +29,7 @@ export const EntityListGlobalActionBarAddLayerMenu = memo(() => {
     <Menu>
       <MenuButton
         as={IconButton}
-        minW={8}
+        size="sm"
         variant="link"
         alignSelf="stretch"
         tooltip={t('controlLayers.addLayer')}

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar.tsx

@@ -1,10 +1,10 @@
 import { Flex, Spacer } from '@invoke-ai/ui-library';
 import { EntityListGlobalActionBarAddLayerMenu } from 'features/controlLayers/components/CanvasEntityList/EntityListGlobalActionBarAddLayerMenu';
+import { EntityListSelectedEntityActionBarAutoMaskButton } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarAutoMaskButton';
 import { EntityListSelectedEntityActionBarDuplicateButton } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarDuplicateButton';
 import { EntityListSelectedEntityActionBarFill } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFill';
 import { EntityListSelectedEntityActionBarFilterButton } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFilterButton';
 import { EntityListSelectedEntityActionBarOpacity } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarOpacity';
-import { EntityListSelectedEntityActionBarSelectObjectButton } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarSelectObjectButton';
 import { EntityListSelectedEntityActionBarTransformButton } from 'features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarTransformButton';
 import { memo } from 'react';
 
@@ -17,7 +17,7 @@ export const EntityListSelectedEntityActionBar = memo(() => {
       <Spacer />
       <EntityListSelectedEntityActionBarFill />
       <Flex h="full">
-        <EntityListSelectedEntityActionBarSelectObjectButton />
+        <EntityListSelectedEntityActionBarAutoMaskButton />
         <EntityListSelectedEntityActionBarFilterButton />
         <EntityListSelectedEntityActionBarTransformButton />
         <EntityListSelectedEntityActionBarSaveToAssetsButton />

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarAutoMaskButton.tsx

@@ -5,9 +5,9 @@ import { selectSelectedEntityIdentifier } from 'features/controlLayers/store/sel
 import { isSegmentableEntityIdentifier } from 'features/controlLayers/store/types';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiShapesFill } from 'react-icons/pi';
+import { PiMaskHappyBold } from 'react-icons/pi';
 
-export const EntityListSelectedEntityActionBarSelectObjectButton = memo(() => {
+export const EntityListSelectedEntityActionBarAutoMaskButton = memo(() => {
   const { t } = useTranslation();
   const selectedEntityIdentifier = useAppSelector(selectSelectedEntityIdentifier);
   const segment = useEntitySegmentAnything(selectedEntityIdentifier);
@@ -24,14 +24,14 @@ export const EntityListSelectedEntityActionBarSelectObjectButton = memo(() => {
     <IconButton
       onClick={segment.start}
       isDisabled={segment.isDisabled}
-      minW={8}
+      size="sm"
       variant="link"
       alignSelf="stretch"
-      aria-label={t('controlLayers.selectObject.selectObject')}
-      tooltip={t('controlLayers.selectObject.selectObject')}
-      icon={<PiShapesFill />}
+      aria-label={t('controlLayers.segment.autoMask')}
+      tooltip={t('controlLayers.segment.autoMask')}
+      icon={<PiMaskHappyBold />}
     />
   );
 });
 
-EntityListSelectedEntityActionBarSelectObjectButton.displayName = 'EntityListSelectedEntityActionBarSelectObjectButton';
+EntityListSelectedEntityActionBarAutoMaskButton.displayName = 'EntityListSelectedEntityActionBarAutoMaskButton';

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarDuplicateButton.tsx

@@ -23,7 +23,7 @@ export const EntityListSelectedEntityActionBarDuplicateButton = memo(() => {
     <IconButton
       onClick={onClick}
       isDisabled={!selectedEntityIdentifier || isBusy}
-      minW={8}
+      size="sm"
       variant="link"
       alignSelf="stretch"
       aria-label={t('controlLayers.duplicate')}

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFilterButton.tsx

@@ -5,7 +5,7 @@ import { selectSelectedEntityIdentifier } from 'features/controlLayers/store/sel
 import { isFilterableEntityIdentifier } from 'features/controlLayers/store/types';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiShootingStarFill } from 'react-icons/pi';
+import { PiShootingStarBold } from 'react-icons/pi';
 
 export const EntityListSelectedEntityActionBarFilterButton = memo(() => {
   const { t } = useTranslation();
@@ -24,12 +24,12 @@ export const EntityListSelectedEntityActionBarFilterButton = memo(() => {
     <IconButton
       onClick={filter.start}
       isDisabled={filter.isDisabled}
-      minW={8}
+      size="sm"
       variant="link"
       alignSelf="stretch"
       aria-label={t('controlLayers.filter.filter')}
       tooltip={t('controlLayers.filter.filter')}
-      icon={<PiShootingStarFill />}
+      icon={<PiShootingStarBold />}
     />
   );
 });

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarSaveToAssetsButton.tsx

@@ -31,7 +31,7 @@ export const EntityListSelectedEntityActionBarSaveToAssetsButton = memo(() => {
     <IconButton
       onClick={onClick}
       isDisabled={!selectedEntityIdentifier || isBusy}
-      minW={8}
+      size="sm"
       variant="link"
       alignSelf="stretch"
       aria-label={t('controlLayers.saveLayerToAssets')}

invokeai/frontend/web/src/features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarTransformButton.tsx

@@ -24,7 +24,7 @@ export const EntityListSelectedEntityActionBarTransformButton = memo(() => {
     <IconButton
       onClick={transform.start}
       isDisabled={transform.isDisabled}
-      minW={8}
+      size="sm"
       variant="link"
       alignSelf="stretch"
       aria-label={t('controlLayers.transform.transform')}

invokeai/frontend/web/src/features/controlLayers/components/CanvasMainPanelContent.tsx

@@ -10,7 +10,7 @@ import { CanvasDropArea } from 'features/controlLayers/components/CanvasDropArea
 import { Filter } from 'features/controlLayers/components/Filters/Filter';
 import { CanvasHUD } from 'features/controlLayers/components/HUD/CanvasHUD';
 import { InvokeCanvasComponent } from 'features/controlLayers/components/InvokeCanvasComponent';
-import { SelectObject } from 'features/controlLayers/components/SelectObject/SelectObject';
+import { SegmentAnything } from 'features/controlLayers/components/SegmentAnything/SegmentAnything';
 import { StagingAreaIsStagingGate } from 'features/controlLayers/components/StagingArea/StagingAreaIsStagingGate';
 import { StagingAreaToolbar } from 'features/controlLayers/components/StagingArea/StagingAreaToolbar';
 import { CanvasToolbar } from 'features/controlLayers/components/Toolbar/CanvasToolbar';
@@ -71,16 +71,12 @@ export const CanvasMainPanelContent = memo(() => {
           >
             <InvokeCanvasComponent />
             <CanvasManagerProviderGate>
-              <Flex
-                position="absolute"
-                flexDir="column"
-                top={1}
-                insetInlineStart={1}
-                pointerEvents="none"
-                gap={2}
-                alignItems="flex-start"
-              >
-                {showHUD && <CanvasHUD />}
+              {showHUD && (
+                <Flex position="absolute" top={1} insetInlineStart={1} pointerEvents="none">
+                  <CanvasHUD />
+                </Flex>
+              )}
+              <Flex flexDir="column" position="absolute" top={1} insetInlineEnd={1} pointerEvents="none" gap={2}>
                 <CanvasAlertsSelectedEntityStatus />
                 <CanvasAlertsPreserveMask />
                 <CanvasAlertsSendingToGallery />
@@ -106,7 +102,7 @@ export const CanvasMainPanelContent = memo(() => {
         <CanvasManagerProviderGate>
           <Filter />
           <Transform />
-          <SelectObject />
+          <SegmentAnything />
         </CanvasManagerProviderGate>
       </Flex>
       <CanvasDropArea />

invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayerControlAdapter.tsx

@@ -21,7 +21,7 @@ import { selectCanvasSlice, selectEntityOrThrow } from 'features/controlLayers/s
 import type { CanvasEntityIdentifier, ControlModeV2 } from 'features/controlLayers/store/types';
 import { memo, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiBoundingBoxBold, PiShootingStarFill, PiUploadBold } from 'react-icons/pi';
+import { PiBoundingBoxBold, PiShootingStarBold, PiUploadBold } from 'react-icons/pi';
 import type { ControlNetModelConfig, PostUploadAction, T2IAdapterModelConfig } from 'services/api/types';
 
 const useControlLayerControlAdapter = (entityIdentifier: CanvasEntityIdentifier<'control_layer'>) => {
@@ -93,7 +93,7 @@ export const ControlLayerControlAdapter = memo(() => {
           variant="link"
           aria-label={t('controlLayers.filter.filter')}
           tooltip={t('controlLayers.filter.filter')}
-          icon={<PiShootingStarFill />}
+          icon={<PiShootingStarBold />}
         />
         <IconButton
           onClick={pullBboxIntoLayer}

invokeai/frontend/web/src/features/controlLayers/components/ControlLayer/ControlLayerMenuItems.tsx

@@ -6,7 +6,7 @@ import { CanvasEntityMenuItemsDelete } from 'features/controlLayers/components/c
 import { CanvasEntityMenuItemsDuplicate } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDuplicate';
 import { CanvasEntityMenuItemsFilter } from 'features/controlLayers/components/common/CanvasEntityMenuItemsFilter';
 import { CanvasEntityMenuItemsSave } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSave';
-import { CanvasEntityMenuItemsSelectObject } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSelectObject';
+import { CanvasEntityMenuItemsSegment } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSegment';
 import { CanvasEntityMenuItemsTransform } from 'features/controlLayers/components/common/CanvasEntityMenuItemsTransform';
 import { ControlLayerMenuItemsConvertToSubMenu } from 'features/controlLayers/components/ControlLayer/ControlLayerMenuItemsConvertToSubMenu';
 import { ControlLayerMenuItemsCopyToSubMenu } from 'features/controlLayers/components/ControlLayer/ControlLayerMenuItemsCopyToSubMenu';
@@ -24,13 +24,14 @@ export const ControlLayerMenuItems = memo(() => {
       <MenuDivider />
       <CanvasEntityMenuItemsTransform />
       <CanvasEntityMenuItemsFilter />
-      <CanvasEntityMenuItemsSelectObject />
+      <CanvasEntityMenuItemsSegment />
       <ControlLayerMenuItemsTransparencyEffect />
       <MenuDivider />
-      <ControlLayerMenuItemsCopyToSubMenu />
-      <ControlLayerMenuItemsConvertToSubMenu />
       <CanvasEntityMenuItemsCropToBbox />
       <CanvasEntityMenuItemsSave />
+      <MenuDivider />
+      <ControlLayerMenuItemsConvertToSubMenu />
+      <ControlLayerMenuItemsCopyToSubMenu />
     </>
   );
 });

invokeai/frontend/web/src/features/controlLayers/components/Filters/Filter.tsx

@@ -1,15 +1,4 @@
-import {
-  Button,
-  ButtonGroup,
-  Flex,
-  Heading,
-  Menu,
-  MenuButton,
-  MenuItem,
-  MenuList,
-  Spacer,
-  Spinner,
-} from '@invoke-ai/ui-library';
+import { Button, ButtonGroup, Flex, Heading, Spacer } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useFocusRegion, useIsRegionFocused } from 'common/hooks/focus';
@@ -26,7 +15,7 @@ import { IMAGE_FILTERS } from 'features/controlLayers/store/filters';
 import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
 import { memo, useCallback, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiCaretDownBold } from 'react-icons/pi';
+import { PiArrowsCounterClockwiseBold, PiCheckBold, PiShootingStarBold, PiXBold } from 'react-icons/pi';
 
 const FilterContent = memo(
   ({ adapter }: { adapter: CanvasEntityAdapterRasterLayer | CanvasEntityAdapterControlLayer }) => {
@@ -36,7 +25,7 @@ const FilterContent = memo(
     const config = useStore(adapter.filterer.$filterConfig);
     const isCanvasFocused = useIsRegionFocused('canvas');
     const isProcessing = useStore(adapter.filterer.$isProcessing);
-    const hasImageState = useStore(adapter.filterer.$hasImageState);
+    const hasProcessed = useStore(adapter.filterer.$hasProcessed);
     const autoProcess = useAppSelector(selectAutoProcess);
 
     const onChangeFilterConfig = useCallback(
@@ -57,22 +46,6 @@ const FilterContent = memo(
       return IMAGE_FILTERS[config.type].validateConfig?.(config as never) ?? true;
     }, [config]);
 
-    const saveAsInpaintMask = useCallback(() => {
-      adapter.filterer.saveAs('inpaint_mask');
-    }, [adapter.filterer]);
-
-    const saveAsRegionalGuidance = useCallback(() => {
-      adapter.filterer.saveAs('regional_guidance');
-    }, [adapter.filterer]);
-
-    const saveAsRasterLayer = useCallback(() => {
-      adapter.filterer.saveAs('raster_layer');
-    }, [adapter.filterer]);
-
-    const saveAsControlLayer = useCallback(() => {
-      adapter.filterer.saveAs('control_layer');
-    }, [adapter.filterer]);
-
     useRegisteredHotkeys({
       id: 'applyFilter',
       category: 'canvas',
@@ -116,56 +89,40 @@ const FilterContent = memo(
         <ButtonGroup isAttached={false} size="sm" w="full">
           <Button
             variant="ghost"
+            leftIcon={<PiShootingStarBold />}
             onClick={adapter.filterer.processImmediate}
+            isLoading={isProcessing}
             loadingText={t('controlLayers.filter.process')}
-            isDisabled={isProcessing || !isValid || (autoProcess && hasImageState)}
+            isDisabled={!isValid || autoProcess}
           >
             {t('controlLayers.filter.process')}
-            {isProcessing && <Spinner ms={3} boxSize={5} color="base.600" />}
           </Button>
           <Spacer />
           <Button
+            leftIcon={<PiArrowsCounterClockwiseBold />}
             onClick={adapter.filterer.reset}
-            isDisabled={isProcessing}
+            isLoading={isProcessing}
             loadingText={t('controlLayers.filter.reset')}
             variant="ghost"
           >
             {t('controlLayers.filter.reset')}
           </Button>
           <Button
-            onClick={adapter.filterer.apply}
-            loadingText={t('controlLayers.filter.apply')}
             variant="ghost"
-            isDisabled={isProcessing || !isValid || !hasImageState}
+            leftIcon={<PiCheckBold />}
+            onClick={adapter.filterer.apply}
+            isLoading={isProcessing}
+            loadingText={t('controlLayers.filter.apply')}
+            isDisabled={!isValid || !hasProcessed}
           >
             {t('controlLayers.filter.apply')}
           </Button>
-          <Menu>
-            <MenuButton
-              as={Button}
-              loadingText={t('controlLayers.selectObject.saveAs')}
-              variant="ghost"
-              isDisabled={isProcessing || !isValid || !hasImageState}
-              rightIcon={<PiCaretDownBold />}
-            >
-              {t('controlLayers.selectObject.saveAs')}
-            </MenuButton>
-            <MenuList>
-              <MenuItem isDisabled={isProcessing || !isValid || !hasImageState} onClick={saveAsInpaintMask}>
-                {t('controlLayers.newInpaintMask')}
-              </MenuItem>
-              <MenuItem isDisabled={isProcessing || !isValid || !hasImageState} onClick={saveAsRegionalGuidance}>
-                {t('controlLayers.newRegionalGuidance')}
-              </MenuItem>
-              <MenuItem isDisabled={isProcessing || !isValid || !hasImageState} onClick={saveAsControlLayer}>
-                {t('controlLayers.newControlLayer')}
-              </MenuItem>
-              <MenuItem isDisabled={isProcessing || !isValid || !hasImageState} onClick={saveAsRasterLayer}>
-                {t('controlLayers.newRasterLayer')}
-              </MenuItem>
-            </MenuList>
-          </Menu>
-          <Button variant="ghost" onClick={adapter.filterer.cancel} loadingText={t('controlLayers.filter.cancel')}>
+          <Button
+            variant="ghost"
+            leftIcon={<PiXBold />}
+            onClick={adapter.filterer.cancel}
+            loadingText={t('controlLayers.filter.cancel')}
+          >
             {t('controlLayers.filter.cancel')}
           </Button>
         </ButtonGroup>

invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMask.tsx

@@ -14,7 +14,7 @@ type Props = {
 };
 
 export const InpaintMask = memo(({ id }: Props) => {
-  const entityIdentifier = useMemo<CanvasEntityIdentifier<'inpaint_mask'>>(() => ({ id, type: 'inpaint_mask' }), [id]);
+  const entityIdentifier = useMemo<CanvasEntityIdentifier>(() => ({ id, type: 'inpaint_mask' }), [id]);
 
   return (
     <EntityIdentifierContext.Provider value={entityIdentifier}>

invokeai/frontend/web/src/features/controlLayers/components/InpaintMask/InpaintMaskMenuItems.tsx

@@ -20,9 +20,10 @@ export const InpaintMaskMenuItems = memo(() => {
       <MenuDivider />
       <CanvasEntityMenuItemsTransform />
       <MenuDivider />
-      <InpaintMaskMenuItemsCopyToSubMenu />
-      <InpaintMaskMenuItemsConvertToSubMenu />
       <CanvasEntityMenuItemsCropToBbox />
+      <MenuDivider />
+      <InpaintMaskMenuItemsConvertToSubMenu />
+      <InpaintMaskMenuItemsCopyToSubMenu />
     </>
   );
 });

invokeai/frontend/web/src/features/controlLayers/components/RasterLayer/RasterLayerMenuItems.tsx

@@ -6,7 +6,7 @@ import { CanvasEntityMenuItemsDelete } from 'features/controlLayers/components/c
 import { CanvasEntityMenuItemsDuplicate } from 'features/controlLayers/components/common/CanvasEntityMenuItemsDuplicate';
 import { CanvasEntityMenuItemsFilter } from 'features/controlLayers/components/common/CanvasEntityMenuItemsFilter';
 import { CanvasEntityMenuItemsSave } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSave';
-import { CanvasEntityMenuItemsSelectObject } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSelectObject';
+import { CanvasEntityMenuItemsSegment } from 'features/controlLayers/components/common/CanvasEntityMenuItemsSegment';
 import { CanvasEntityMenuItemsTransform } from 'features/controlLayers/components/common/CanvasEntityMenuItemsTransform';
 import { RasterLayerMenuItemsConvertToSubMenu } from 'features/controlLayers/components/RasterLayer/RasterLayerMenuItemsConvertToSubMenu';
 import { RasterLayerMenuItemsCopyToSubMenu } from 'features/controlLayers/components/RasterLayer/RasterLayerMenuItemsCopyToSubMenu';
@@ -23,12 +23,13 @@ export const RasterLayerMenuItems = memo(() => {
       <MenuDivider />
       <CanvasEntityMenuItemsTransform />
       <CanvasEntityMenuItemsFilter />
-      <CanvasEntityMenuItemsSelectObject />
+      <CanvasEntityMenuItemsSegment />
       <MenuDivider />
-      <RasterLayerMenuItemsCopyToSubMenu />
-      <RasterLayerMenuItemsConvertToSubMenu />
       <CanvasEntityMenuItemsCropToBbox />
       <CanvasEntityMenuItemsSave />
+      <MenuDivider />
+      <RasterLayerMenuItemsConvertToSubMenu />
+      <RasterLayerMenuItemsCopyToSubMenu />
     </>
   );
 });

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidance.tsx

@@ -16,10 +16,7 @@ type Props = {
 };
 
 export const RegionalGuidance = memo(({ id }: Props) => {
-  const entityIdentifier = useMemo<CanvasEntityIdentifier<'regional_guidance'>>(
-    () => ({ id, type: 'regional_guidance' }),
-    [id]
-  );
+  const entityIdentifier = useMemo<CanvasEntityIdentifier>(() => ({ id, type: 'regional_guidance' }), [id]);
 
   return (
     <EntityIdentifierContext.Provider value={entityIdentifier}>

invokeai/frontend/web/src/features/controlLayers/components/RegionalGuidance/RegionalGuidanceMenuItems.tsx

@@ -25,9 +25,10 @@ export const RegionalGuidanceMenuItems = memo(() => {
       <CanvasEntityMenuItemsTransform />
       <RegionalGuidanceMenuItemsAutoNegative />
       <MenuDivider />
-      <RegionalGuidanceMenuItemsCopyToSubMenu />
-      <RegionalGuidanceMenuItemsConvertToSubMenu />
       <CanvasEntityMenuItemsCropToBbox />
+      <MenuDivider />
+      <RegionalGuidanceMenuItemsConvertToSubMenu />
+      <RegionalGuidanceMenuItemsCopyToSubMenu />
     </>
   );
 });

invokeai/frontend/web/src/features/controlLayers/components/SegmentAnything/SegmentAnything.tsx

@@ -3,36 +3,28 @@ import {
   ButtonGroup,
   Flex,
   Heading,
-  Icon,
-  ListItem,
   Menu,
   MenuButton,
   MenuItem,
   MenuList,
   Spacer,
-  Spinner,
-  Text,
-  Tooltip,
-  UnorderedList,
 } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useFocusRegion, useIsRegionFocused } from 'common/hooks/focus';
 import { CanvasAutoProcessSwitch } from 'features/controlLayers/components/CanvasAutoProcessSwitch';
 import { CanvasOperationIsolatedLayerPreviewSwitch } from 'features/controlLayers/components/CanvasOperationIsolatedLayerPreviewSwitch';
-import { SelectObjectInvert } from 'features/controlLayers/components/SelectObject/SelectObjectInvert';
-import { SelectObjectPointType } from 'features/controlLayers/components/SelectObject/SelectObjectPointType';
+import { SegmentAnythingPointType } from 'features/controlLayers/components/SegmentAnything/SegmentAnythingPointType';
 import { useCanvasManager } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
 import type { CanvasEntityAdapterControlLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterControlLayer';
 import type { CanvasEntityAdapterRasterLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterRasterLayer';
 import { selectAutoProcess } from 'features/controlLayers/store/canvasSettingsSlice';
 import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
-import type { PropsWithChildren } from 'react';
 import { memo, useCallback, useRef } from 'react';
-import { Trans, useTranslation } from 'react-i18next';
-import { PiCaretDownBold, PiInfoBold } from 'react-icons/pi';
+import { useTranslation } from 'react-i18next';
+import { PiArrowsCounterClockwiseBold, PiFloppyDiskBold, PiStarBold, PiXBold } from 'react-icons/pi';
 
-const SelectObjectContent = memo(
+const SegmentAnythingContent = memo(
   ({ adapter }: { adapter: CanvasEntityAdapterRasterLayer | CanvasEntityAdapterControlLayer }) => {
     const { t } = useTranslation();
     const ref = useRef<HTMLDivElement>(null);
@@ -89,86 +81,72 @@ const SelectObjectContent = memo(
         transitionProperty="height"
         transitionDuration="normal"
       >
-        <Flex w="full" gap={4} alignItems="center">
-          <Flex gap={2}>
-            <Heading size="md" color="base.300" userSelect="none">
-              {t('controlLayers.selectObject.selectObject')}
-            </Heading>
-            <Tooltip label={<SelectObjectHelpTooltipContent />}>
-              <Flex alignItems="center">
-                <Icon as={PiInfoBold} color="base.500" />
-              </Flex>
-            </Tooltip>
-          </Flex>
+        <Flex w="full" gap={4}>
+          <Heading size="md" color="base.300" userSelect="none">
+            {t('controlLayers.segment.autoMask')}
+          </Heading>
           <Spacer />
           <CanvasAutoProcessSwitch />
           <CanvasOperationIsolatedLayerPreviewSwitch />
         </Flex>
 
-        <Flex w="full" justifyContent="space-between" py={2}>
-          <SelectObjectPointType adapter={adapter} />
-          <SelectObjectInvert adapter={adapter} />
-        </Flex>
+        <SegmentAnythingPointType adapter={adapter} />
 
         <ButtonGroup isAttached={false} size="sm" w="full">
           <Button
+            leftIcon={<PiStarBold />}
             onClick={adapter.segmentAnything.processImmediate}
-            loadingText={t('controlLayers.selectObject.process')}
+            isLoading={isProcessing}
+            loadingText={t('controlLayers.segment.process')}
             variant="ghost"
-            isDisabled={isProcessing || !hasPoints || (autoProcess && hasImageState)}
+            isDisabled={!hasPoints || autoProcess}
           >
-            {t('controlLayers.selectObject.process')}
-            {isProcessing && <Spinner ms={3} boxSize={5} color="base.600" />}
+            {t('controlLayers.segment.process')}
           </Button>
           <Spacer />
           <Button
+            leftIcon={<PiArrowsCounterClockwiseBold />}
             onClick={adapter.segmentAnything.reset}
-            isDisabled={isProcessing || !hasPoints}
-            loadingText={t('controlLayers.selectObject.reset')}
+            isLoading={isProcessing}
+            loadingText={t('controlLayers.segment.reset')}
             variant="ghost"
           >
-            {t('controlLayers.selectObject.reset')}
-          </Button>
-          <Button
-            onClick={adapter.segmentAnything.apply}
-            loadingText={t('controlLayers.selectObject.apply')}
-            variant="ghost"
-            isDisabled={isProcessing || !hasImageState}
-          >
-            {t('controlLayers.selectObject.apply')}
+            {t('controlLayers.segment.reset')}
           </Button>
           <Menu>
             <MenuButton
               as={Button}
-              loadingText={t('controlLayers.selectObject.saveAs')}
+              leftIcon={<PiFloppyDiskBold />}
+              isLoading={isProcessing}
+              loadingText={t('controlLayers.segment.saveAs')}
               variant="ghost"
-              isDisabled={isProcessing || !hasImageState}
-              rightIcon={<PiCaretDownBold />}
+              isDisabled={!hasImageState}
             >
-              {t('controlLayers.selectObject.saveAs')}
+              {t('controlLayers.segment.saveAs')}
             </MenuButton>
             <MenuList>
-              <MenuItem isDisabled={isProcessing || !hasImageState} onClick={saveAsInpaintMask}>
-                {t('controlLayers.newInpaintMask')}
+              <MenuItem isDisabled={!hasImageState} onClick={saveAsInpaintMask}>
+                {t('controlLayers.inpaintMask')}
               </MenuItem>
-              <MenuItem isDisabled={isProcessing || !hasImageState} onClick={saveAsRegionalGuidance}>
-                {t('controlLayers.newRegionalGuidance')}
+              <MenuItem isDisabled={!hasImageState} onClick={saveAsRegionalGuidance}>
+                {t('controlLayers.regionalGuidance')}
               </MenuItem>
-              <MenuItem isDisabled={isProcessing || !hasImageState} onClick={saveAsControlLayer}>
-                {t('controlLayers.newControlLayer')}
+              <MenuItem isDisabled={!hasImageState} onClick={saveAsControlLayer}>
+                {t('controlLayers.controlLayer')}
               </MenuItem>
-              <MenuItem isDisabled={isProcessing || !hasImageState} onClick={saveAsRasterLayer}>
-                {t('controlLayers.newRasterLayer')}
+              <MenuItem isDisabled={!hasImageState} onClick={saveAsRasterLayer}>
+                {t('controlLayers.rasterLayer')}
               </MenuItem>
             </MenuList>
           </Menu>
           <Button
+            leftIcon={<PiXBold />}
             onClick={adapter.segmentAnything.cancel}
-            isDisabled={isProcessing}
+            isLoading={isProcessing}
             loadingText={t('common.cancel')}
             variant="ghost"
           >
-            {t('controlLayers.selectObject.cancel')}
+            {t('controlLayers.segment.cancel')}
           </Button>
         </ButtonGroup>
       </Flex>
@@ -176,9 +154,9 @@ const SelectObjectContent = memo(
   }
 );
 
-SelectObjectContent.displayName = 'SegmentAnythingContent';
+SegmentAnythingContent.displayName = 'SegmentAnythingContent';
 
-export const SelectObject = memo(() => {
+export const SegmentAnything = () => {
   const canvasManager = useCanvasManager();
   const adapter = useStore(canvasManager.stateApi.$segmentingAdapter);
 
@@ -186,38 +164,5 @@ export const SelectObject = memo(() => {
     return null;
   }
 
-  return <SelectObjectContent adapter={adapter} />;
-});
-
-SelectObject.displayName = 'SelectObject';
-
-const Bold = (props: PropsWithChildren) => (
-  <Text as="span" fontWeight="semibold">
-    {props.children}
-  </Text>
-);
-
-const SelectObjectHelpTooltipContent = memo(() => {
-  const { t } = useTranslation();
-
-  return (
-    <Flex gap={3} flexDir="column">
-      <Text>
-        <Trans i18nKey="controlLayers.selectObject.help1" components={{ Bold: <Bold /> }} />
-      </Text>
-      <Text>
-        <Trans i18nKey="controlLayers.selectObject.help2" components={{ Bold: <Bold /> }} />
-      </Text>
-      <Text>
-        <Trans i18nKey="controlLayers.selectObject.help3" />
-      </Text>
-      <UnorderedList>
-        <ListItem>{t('controlLayers.selectObject.clickToAdd')}</ListItem>
-        <ListItem>{t('controlLayers.selectObject.dragToMove')}</ListItem>
-        <ListItem>{t('controlLayers.selectObject.clickToRemove')}</ListItem>
-      </UnorderedList>
-    </Flex>
-  );
-});
-
-SelectObjectHelpTooltipContent.displayName = 'SelectObjectHelpTooltipContent';
+  return <SegmentAnythingContent adapter={adapter} />;
+};

invokeai/frontend/web/src/features/controlLayers/components/SegmentAnything/SegmentAnythingPointType.tsx

@@ -6,7 +6,7 @@ import { SAM_POINT_LABEL_STRING_TO_NUMBER, zSAMPointLabelString } from 'features
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-export const SelectObjectPointType = memo(
+export const SegmentAnythingPointType = memo(
   ({ adapter }: { adapter: CanvasEntityAdapterRasterLayer | CanvasEntityAdapterControlLayer }) => {
     const { t } = useTranslation();
     const pointType = useStore(adapter.segmentAnything.$pointTypeString);
@@ -21,15 +21,15 @@ export const SelectObjectPointType = memo(
     );
 
     return (
-      <FormControl w="min-content">
-        <FormLabel m={0}>{t('controlLayers.selectObject.pointType')}</FormLabel>
+      <FormControl w="full">
+        <FormLabel>{t('controlLayers.segment.pointType')}</FormLabel>
         <RadioGroup value={pointType} onChange={onChange} w="full" size="md">
           <Flex alignItems="center" w="full" gap={4} fontWeight="semibold" color="base.300">
             <Radio value="foreground">
-              <Text>{t('controlLayers.selectObject.include')}</Text>
+              <Text>{t('controlLayers.segment.include')}</Text>
             </Radio>
             <Radio value="background">
-              <Text>{t('controlLayers.selectObject.exclude')}</Text>
+              <Text>{t('controlLayers.segment.exclude')}</Text>
             </Radio>
           </Flex>
         </RadioGroup>
@@ -38,4 +38,4 @@ export const SelectObjectPointType = memo(
   }
 );
 
-SelectObjectPointType.displayName = 'SelectObject';
+SegmentAnythingPointType.displayName = 'SegmentAnythingPointType';

invokeai/frontend/web/src/features/controlLayers/components/SelectObject/SelectObjectInvert.tsx

@@ -1,26 +0,0 @@
-import { FormControl, FormLabel, Switch } from '@invoke-ai/ui-library';
-import { useStore } from '@nanostores/react';
-import type { CanvasEntityAdapterControlLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterControlLayer';
-import type { CanvasEntityAdapterRasterLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterRasterLayer';
-import { memo, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-
-export const SelectObjectInvert = memo(
-  ({ adapter }: { adapter: CanvasEntityAdapterRasterLayer | CanvasEntityAdapterControlLayer }) => {
-    const { t } = useTranslation();
-    const invert = useStore(adapter.segmentAnything.$invert);
-
-    const onChange = useCallback(() => {
-      adapter.segmentAnything.$invert.set(!adapter.segmentAnything.$invert.get());
-    }, [adapter.segmentAnything.$invert]);
-
-    return (
-      <FormControl w="min-content">
-        <FormLabel m={0}>{t('controlLayers.selectObject.invertSelection')}</FormLabel>
-        <Switch size="sm" isChecked={invert} onChange={onChange} />
-      </FormControl>
-    );
-  }
-);
-
-SelectObjectInvert.displayName = 'SelectObjectInvert';

invokeai/frontend/web/src/features/controlLayers/components/Transform/Transform.tsx

@@ -1,4 +1,4 @@
-import { Button, ButtonGroup, Flex, Heading, Spacer, Spinner } from '@invoke-ai/ui-library';
+import { Button, ButtonGroup, Flex, Heading, Spacer } from '@invoke-ai/ui-library';
 import { useStore } from '@nanostores/react';
 import { useFocusRegion, useIsRegionFocused } from 'common/hooks/focus';
 import { CanvasOperationIsolatedLayerPreviewSwitch } from 'features/controlLayers/components/CanvasOperationIsolatedLayerPreviewSwitch';
@@ -8,6 +8,7 @@ import type { CanvasEntityAdapter } from 'features/controlLayers/konva/CanvasEnt
 import { useRegisteredHotkeys } from 'features/system/components/HotkeysModal/useHotkeyData';
 import { memo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
+import { PiArrowsCounterClockwiseBold, PiCheckBold, PiXBold } from 'react-icons/pi';
 
 const TransformContent = memo(({ adapter }: { adapter: CanvasEntityAdapter }) => {
   const { t } = useTranslation();
@@ -61,28 +62,30 @@ const TransformContent = memo(({ adapter }: { adapter: CanvasEntityAdapter }) =>
 
       <TransformFitToBboxButtons adapter={adapter} />
 
-      <ButtonGroup isAttached={false} size="sm" w="full" alignItems="center">
-        {isProcessing && <Spinner ms={3} boxSize={5} color="base.600" />}
+      <ButtonGroup isAttached={false} size="sm" w="full">
         <Spacer />
         <Button
+          leftIcon={<PiArrowsCounterClockwiseBold />}
           onClick={adapter.transformer.resetTransform}
-          isDisabled={isProcessing}
+          isLoading={isProcessing}
           loadingText={t('controlLayers.transform.reset')}
           variant="ghost"
         >
           {t('controlLayers.transform.reset')}
         </Button>
         <Button
+          leftIcon={<PiCheckBold />}
           onClick={adapter.transformer.applyTransform}
-          isDisabled={isProcessing}
+          isLoading={isProcessing}
           loadingText={t('controlLayers.transform.apply')}
           variant="ghost"
         >
           {t('controlLayers.transform.apply')}
         </Button>
         <Button
+          leftIcon={<PiXBold />}
           onClick={adapter.transformer.stopTransform}
-          isDisabled={isProcessing}
+          isLoading={isProcessing}
           loadingText={t('common.cancel')}
           variant="ghost"
         >

invokeai/frontend/web/src/features/controlLayers/components/Transform/TransformFitToBboxButtons.tsx

@@ -4,6 +4,7 @@ import { useStore } from '@nanostores/react';
 import type { CanvasEntityAdapter } from 'features/controlLayers/konva/CanvasEntity/types';
 import { memo, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { PiArrowsOutBold } from 'react-icons/pi';
 import type { Equals } from 'tsafe';
 import { assert } from 'tsafe';
 import { z } from 'zod';
@@ -59,9 +60,10 @@ export const TransformFitToBboxButtons = memo(({ adapter }: { adapter: CanvasEnt
         <Combobox options={options} value={value} onChange={onChange} isSearchable={false} isClearable={false} />
       </FormControl>
       <Button
+        leftIcon={<PiArrowsOutBold />}
         size="sm"
         onClick={onClick}
-        isDisabled={isProcessing}
+        isLoading={isProcessing}
         loadingText={t('controlLayers.transform.fitToBbox')}
         variant="ghost"
       >

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityMenuItemsCopyToClipboard.tsx

@@ -2,7 +2,6 @@ import { MenuItem } from '@invoke-ai/ui-library';
 import { useEntityAdapterSafe } from 'features/controlLayers/contexts/EntityAdapterContext';
 import { useEntityIdentifierContext } from 'features/controlLayers/contexts/EntityIdentifierContext';
 import { useCopyLayerToClipboard } from 'features/controlLayers/hooks/useCopyLayerToClipboard';
-import { useEntityIsEmpty } from 'features/controlLayers/hooks/useEntityIsEmpty';
 import { useIsEntityInteractable } from 'features/controlLayers/hooks/useEntityIsInteractable';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -13,7 +12,6 @@ export const CanvasEntityMenuItemsCopyToClipboard = memo(() => {
   const entityIdentifier = useEntityIdentifierContext();
   const adapter = useEntityAdapterSafe(entityIdentifier);
   const isInteractable = useIsEntityInteractable(entityIdentifier);
-  const isEmpty = useEntityIsEmpty(entityIdentifier);
   const copyLayerToClipboard = useCopyLayerToClipboard();
 
   const onClick = useCallback(() => {
@@ -21,7 +19,7 @@ export const CanvasEntityMenuItemsCopyToClipboard = memo(() => {
   }, [copyLayerToClipboard, adapter]);
 
   return (
-    <MenuItem onClick={onClick} icon={<PiCopyBold />} isDisabled={!isInteractable || isEmpty}>
+    <MenuItem onClick={onClick} icon={<PiCopyBold />} isDisabled={!isInteractable}>
       {t('common.clipboard')}
     </MenuItem>
   );

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityMenuItemsFilter.tsx

@@ -3,7 +3,7 @@ import { useEntityIdentifierContext } from 'features/controlLayers/contexts/Enti
 import { useEntityFilter } from 'features/controlLayers/hooks/useEntityFilter';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiShootingStarFill } from 'react-icons/pi';
+import { PiShootingStarBold } from 'react-icons/pi';
 
 export const CanvasEntityMenuItemsFilter = memo(() => {
   const { t } = useTranslation();
@@ -11,7 +11,7 @@ export const CanvasEntityMenuItemsFilter = memo(() => {
   const filter = useEntityFilter(entityIdentifier);
 
   return (
-    <MenuItem onClick={filter.start} icon={<PiShootingStarFill />} isDisabled={filter.isDisabled}>
+    <MenuItem onClick={filter.start} icon={<PiShootingStarBold />} isDisabled={filter.isDisabled}>
       {t('controlLayers.filter.filter')}
     </MenuItem>
   );

invokeai/frontend/web/src/features/controlLayers/components/common/CanvasEntityMenuItemsSegment.tsx

@@ -3,18 +3,18 @@ import { useEntityIdentifierContext } from 'features/controlLayers/contexts/Enti
 import { useEntitySegmentAnything } from 'features/controlLayers/hooks/useEntitySegmentAnything';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { PiShapesFill } from 'react-icons/pi';
+import { PiMaskHappyBold } from 'react-icons/pi';
 
-export const CanvasEntityMenuItemsSelectObject = memo(() => {
+export const CanvasEntityMenuItemsSegment = memo(() => {
   const { t } = useTranslation();
   const entityIdentifier = useEntityIdentifierContext();
   const segmentAnything = useEntitySegmentAnything(entityIdentifier);
 
   return (
-    <MenuItem onClick={segmentAnything.start} icon={<PiShapesFill />} isDisabled={segmentAnything.isDisabled}>
-      {t('controlLayers.selectObject.selectObject')}
+    <MenuItem onClick={segmentAnything.start} icon={<PiMaskHappyBold />} isDisabled={segmentAnything.isDisabled}>
+      {t('controlLayers.segment.autoMask')}
     </MenuItem>
   );
 });
 
-CanvasEntityMenuItemsSelectObject.displayName = 'CanvasEntityMenuItemsSelectObject';
+CanvasEntityMenuItemsSegment.displayName = 'CanvasEntityMenuItemsSegment';

invokeai/frontend/web/src/features/controlLayers/hooks/addLayerHooks.ts

@@ -24,9 +24,7 @@ import {
   selectEntityOrThrow,
 } from 'features/controlLayers/store/selectors';
 import type {
-  CanvasControlLayerState,
   CanvasEntityIdentifier,
-  CanvasInpaintMaskState,
   CanvasRasterLayerState,
   CanvasRegionalGuidanceState,
   ControlNetConfig,
@@ -46,8 +44,6 @@ import { useCallback } from 'react';
 import { modelConfigsAdapterSelectors, selectModelConfigsQuery } from 'services/api/endpoints/models';
 import type { ControlNetModelConfig, ImageDTO, IPAdapterModelConfig, T2IAdapterModelConfig } from 'services/api/types';
 import { isControlNetOrT2IAdapterModelConfig, isIPAdapterModelConfig } from 'services/api/types';
-import type { Equals } from 'tsafe';
-import { assert } from 'tsafe';
 
 export const selectDefaultControlAdapter = createSelector(
   selectModelConfigsQuery,
@@ -128,60 +124,6 @@ export const useNewRasterLayerFromImage = () => {
   return func;
 };
 
-export const useNewControlLayerFromImage = () => {
-  const dispatch = useAppDispatch();
-  const bboxRect = useAppSelector(selectBboxRect);
-  const func = useCallback(
-    (imageDTO: ImageDTO) => {
-      const imageObject = imageDTOToImageObject(imageDTO);
-      const overrides: Partial<CanvasControlLayerState> = {
-        position: { x: bboxRect.x, y: bboxRect.y },
-        objects: [imageObject],
-      };
-      dispatch(controlLayerAdded({ overrides, isSelected: true }));
-    },
-    [bboxRect.x, bboxRect.y, dispatch]
-  );
-
-  return func;
-};
-
-export const useNewInpaintMaskFromImage = () => {
-  const dispatch = useAppDispatch();
-  const bboxRect = useAppSelector(selectBboxRect);
-  const func = useCallback(
-    (imageDTO: ImageDTO) => {
-      const imageObject = imageDTOToImageObject(imageDTO);
-      const overrides: Partial<CanvasInpaintMaskState> = {
-        position: { x: bboxRect.x, y: bboxRect.y },
-        objects: [imageObject],
-      };
-      dispatch(inpaintMaskAdded({ overrides, isSelected: true }));
-    },
-    [bboxRect.x, bboxRect.y, dispatch]
-  );
-
-  return func;
-};
-
-export const useNewRegionalGuidanceFromImage = () => {
-  const dispatch = useAppDispatch();
-  const bboxRect = useAppSelector(selectBboxRect);
-  const func = useCallback(
-    (imageDTO: ImageDTO) => {
-      const imageObject = imageDTOToImageObject(imageDTO);
-      const overrides: Partial<CanvasRegionalGuidanceState> = {
-        position: { x: bboxRect.x, y: bboxRect.y },
-        objects: [imageObject],
-      };
-      dispatch(rgAdded({ overrides, isSelected: true }));
-    },
-    [bboxRect.x, bboxRect.y, dispatch]
-  );
-
-  return func;
-};
-
 /**
  * Returns a function that adds a new canvas with the given image as the initial image, replicating the img2img flow:
  * - Reset the canvas
@@ -196,31 +138,18 @@ export const useNewCanvasFromImage = () => {
   const bboxRect = useAppSelector(selectBboxRect);
   const base = useAppSelector(selectBboxModelBase);
   const func = useCallback(
-    (imageDTO: ImageDTO, type: CanvasRasterLayerState['type'] | CanvasControlLayerState['type']) => {
+    (imageDTO: ImageDTO) => {
       // Calculate the new bbox dimensions to fit the image's aspect ratio at the optimal size
       const ratio = imageDTO.width / imageDTO.height;
       const optimalDimension = getOptimalDimension(base);
       const { width, height } = calculateNewSize(ratio, optimalDimension ** 2, base);
 
       // The overrides need to include the layer's ID so we can transform the layer it is initialized
-      let overrides: Partial<CanvasRasterLayerState> | Partial<CanvasControlLayerState>;
-
-      if (type === 'raster_layer') {
-        overrides = {
-          id: getPrefixedId('raster_layer'),
-          position: { x: bboxRect.x, y: bboxRect.y },
-          objects: [imageDTOToImageObject(imageDTO)],
-        } satisfies Partial<CanvasRasterLayerState>;
-      } else if (type === 'control_layer') {
-        overrides = {
-          id: getPrefixedId('control_layer'),
-          position: { x: bboxRect.x, y: bboxRect.y },
-          objects: [imageDTOToImageObject(imageDTO)],
-        } satisfies Partial<CanvasControlLayerState>;
-      } else {
-        // Catch unhandled types
-        assert<Equals<typeof type, never>>(false);
-      }
+      const overrides = {
+        id: getPrefixedId('raster_layer'),
+        position: { x: bboxRect.x, y: bboxRect.y },
+        objects: [imageDTOToImageObject(imageDTO)],
+      } satisfies Partial<CanvasRasterLayerState>;
 
       CanvasEntityAdapterBase.registerInitCallback(async (adapter) => {
         // Skip the callback if the adapter is not the one we are creating
@@ -237,16 +166,7 @@ export const useNewCanvasFromImage = () => {
       dispatch(canvasReset());
       // The `bboxChangedFromCanvas` reducer does no validation! Careful!
       dispatch(bboxChangedFromCanvas({ x: 0, y: 0, width, height }));
-
-      // The type casts are safe because the type is checked above
-      if (type === 'raster_layer') {
-        dispatch(rasterLayerAdded({ overrides: overrides as Partial<CanvasRasterLayerState>, isSelected: true }));
-      } else if (type === 'control_layer') {
-        dispatch(controlLayerAdded({ overrides: overrides as Partial<CanvasControlLayerState>, isSelected: true }));
-      } else {
-        // Catch unhandled types
-        assert<Equals<typeof type, never>>(false);
-      }
+      dispatch(rasterLayerAdded({ overrides, isSelected: true }));
     },
     [base, bboxRect.x, bboxRect.y, dispatch]
   );

invokeai/frontend/web/src/features/controlLayers/hooks/useCopyLayerToClipboard.ts

@@ -1,4 +1,3 @@
-import { logger } from 'app/logging/logger';
 import type { CanvasEntityAdapterControlLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterControlLayer';
 import type { CanvasEntityAdapterInpaintMask } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterInpaintMask';
 import type { CanvasEntityAdapterRasterLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterRasterLayer';
@@ -8,9 +7,6 @@ import { copyBlobToClipboard } from 'features/system/util/copyBlobToClipboard';
 import { toast } from 'features/toast/toast';
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { serializeError } from 'serialize-error';
-
-const log = logger('canvas');
 
 export const useCopyLayerToClipboard = () => {
   const { t } = useTranslation();
@@ -30,13 +26,11 @@ export const useCopyLayerToClipboard = () => {
         const canvas = adapter.getCanvas();
         const blob = await canvasToBlob(canvas);
         copyBlobToClipboard(blob);
-        log.trace('Layer copied to clipboard');
         toast({
           status: 'info',
           title: t('toast.layerCopiedToClipboard'),
         });
       } catch (error) {
-        log.error({ error: serializeError(error) }, 'Problem copying layer to clipboard');
         toast({
           status: 'error',
           title: t('toast.problemCopyingLayer'),

invokeai/frontend/web/src/features/controlLayers/hooks/useEntityIsEmpty.ts

@@ -1,11 +0,0 @@
-import { useAppSelector } from 'app/store/storeHooks';
-import { buildSelectHasObjects } from 'features/controlLayers/store/selectors';
-import type { CanvasEntityIdentifier } from 'features/controlLayers/store/types';
-import { useMemo } from 'react';
-
-export const useEntityIsEmpty = (entityIdentifier: CanvasEntityIdentifier) => {
-  const selectHasObjects = useMemo(() => buildSelectHasObjects(entityIdentifier), [entityIdentifier]);
-  const hasObjects = useAppSelector(selectHasObjects);
-
-  return !hasObjects;
-};

invokeai/frontend/web/src/features/controlLayers/hooks/useEntityTransform.ts

@@ -52,9 +52,8 @@ export const useEntityTransform = (entityIdentifier: CanvasEntityIdentifier | nu
     if (!adapter) {
       return;
     }
-    imageViewer.close();
     await adapter.transformer.startTransform();
-  }, [isDisabled, entityIdentifier, canvasManager, imageViewer]);
+  }, [isDisabled, entityIdentifier, canvasManager]);
 
   const fitToBbox = useCallback(async () => {
     if (isDisabled) {

invokeai/frontend/web/src/features/controlLayers/konva/CanvasEntity/CanvasEntityFilterer.ts

@@ -1,36 +1,27 @@
-import { deepClone } from 'common/util/deepClone';
 import { withResult, withResultAsync } from 'common/util/result';
 import type { CanvasEntityAdapterControlLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterControlLayer';
 import type { CanvasEntityAdapterRasterLayer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityAdapterRasterLayer';
 import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
 import { CanvasModuleBase } from 'features/controlLayers/konva/CanvasModuleBase';
-import { CanvasObjectImage } from 'features/controlLayers/konva/CanvasObject/CanvasObjectImage';
-import { addCoords, getKonvaNodeDebugAttrs, getPrefixedId } from 'features/controlLayers/konva/util';
+import { getPrefixedId } from 'features/controlLayers/konva/util';
 import { selectAutoProcess } from 'features/controlLayers/store/canvasSettingsSlice';
 import type { FilterConfig } from 'features/controlLayers/store/filters';
 import { getFilterForModel, IMAGE_FILTERS } from 'features/controlLayers/store/filters';
-import type { CanvasEntityType, CanvasImageState } from 'features/controlLayers/store/types';
+import type { CanvasImageState } from 'features/controlLayers/store/types';
 import { imageDTOToImageObject } from 'features/controlLayers/store/util';
-import Konva from 'konva';
 import { debounce } from 'lodash-es';
-import { atom, computed } from 'nanostores';
+import { atom } from 'nanostores';
 import type { Logger } from 'roarr';
 import { serializeError } from 'serialize-error';
 import { buildSelectModelConfig } from 'services/api/hooks/modelsByType';
 import { isControlNetOrT2IAdapterModelConfig } from 'services/api/types';
-import stableHash from 'stable-hash';
-import type { Equals } from 'tsafe';
-import { assert } from 'tsafe';
 
 type CanvasEntityFiltererConfig = {
-  /**
-   * The debounce time in milliseconds for processing the filter.
-   */
-  PROCESS_DEBOUNCE_MS: number;
+  processDebounceMs: number;
 };
 
 const DEFAULT_CONFIG: CanvasEntityFiltererConfig = {
-  PROCESS_DEBOUNCE_MS: 1000,
+  processDebounceMs: 1000,
 };
 
 export class CanvasEntityFilterer extends CanvasModuleBase {
@@ -41,65 +32,20 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
   readonly manager: CanvasManager;
   readonly log: Logger;
 
-  config: CanvasEntityFiltererConfig = DEFAULT_CONFIG;
-
+  imageState: CanvasImageState | null = null;
   subscriptions = new Set<() => void>();
+  config: CanvasEntityFiltererConfig = DEFAULT_CONFIG;
 
   /**
    * The AbortController used to cancel the filter processing.
    */
   abortController: AbortController | null = null;
 
-  /**
-   * Whether the module is currently filtering an image.
-   */
   $isFiltering = atom<boolean>(false);
-  /**
-   * The hash of the last processed config. This is used to prevent re-processing the same config.
-   */
-  $lastProcessedHash = atom<string>('');
-
-  /**
-   * Whether the module is currently processing the filter.
-   */
+  $hasProcessed = atom<boolean>(false);
   $isProcessing = atom<boolean>(false);
-
-  /**
-   * The config for the filter.
-   */
   $filterConfig = atom<FilterConfig>(IMAGE_FILTERS.canny_edge_detection.buildDefaults());
 
-  /**
-   * The initial filter config, used to reset the filter config.
-   */
-  $initialFilterConfig = atom<FilterConfig | null>(null);
-
-  /**
-   * The ephemeral image state of the filtered image.
-   */
-  $imageState = atom<CanvasImageState | null>(null);
-
-  /**
-   * Whether the module has an image state. This is a computed value based on $imageState.
-   */
-  $hasImageState = computed(this.$imageState, (imageState) => imageState !== null);
-  /**
-   * The filtered image object module, if it exists.
-   */
-  imageModule: CanvasObjectImage | null = null;
-
-  /**
-   * The Konva nodes for the module.
-   */
-  konva: {
-    /**
-     * The main Konva group node for the module. This is added to the parent layer on start, and removed on teardown.
-     */
-    group: Konva.Group;
-  };
-
-  KONVA_GROUP_NAME = `${this.type}:group`;
-
   constructor(parent: CanvasEntityAdapterRasterLayer | CanvasEntityAdapterControlLayer) {
     super();
     this.id = getPrefixedId(this.type);
@@ -109,17 +55,9 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
     this.log = this.manager.buildLogger(this);
 
     this.log.debug('Creating filter module');
-
-    this.konva = {
-      group: new Konva.Group({ name: this.KONVA_GROUP_NAME }),
-    };
   }
 
-  /**
-   * Adds event listeners needed while filtering the entity.
-   */
   subscribe = () => {
-    // As the filter config changes, process the filter
     this.subscriptions.add(
       this.$filterConfig.listen(() => {
         if (this.manager.stateApi.getSettings().autoProcess && this.$isFiltering.get()) {
@@ -127,7 +65,6 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
         }
       })
     );
-    // When auto-process is enabled, process the filter
     this.subscriptions.add(
       this.manager.stateApi.createStoreSubscription(selectAutoProcess, (autoProcess) => {
         if (autoProcess && this.$isFiltering.get()) {
@@ -137,18 +74,11 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
     );
   };
 
-  /**
-   * Removes event listeners used while filtering the entity.
-   */
   unsubscribe = () => {
     this.subscriptions.forEach((unsubscribe) => unsubscribe());
     this.subscriptions.clear();
   };
 
-  /**
-   * Starts the filter module.
-   * @param config The filter config to start with. If omitted, the default filter config is used.
-   */
   start = (config?: FilterConfig) => {
     const filteringAdapter = this.manager.stateApi.$filteringAdapter.get();
     if (filteringAdapter) {
@@ -158,57 +88,30 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
 
     this.log.trace('Initializing filter');
 
-    // Reset any previous state
-    this.resetEphemeralState();
-    this.$isFiltering.set(true);
-
-    // Update the konva group's position to match the parent entity
-    const pixelRect = this.parent.transformer.$pixelRect.get();
-    const position = addCoords(this.parent.state.position, pixelRect);
-    this.konva.group.setAttrs(position);
-
-    // Add the group to the parent layer
-    this.parent.konva.layer.add(this.konva.group);
-
-    if (config) {
-      // If a config is provided, use it
-      this.$filterConfig.set(config);
-      this.$initialFilterConfig.set(config);
-    } else {
-      this.$filterConfig.set(this.createInitialFilterConfig());
-    }
-
-    this.$initialFilterConfig.set(this.$filterConfig.get());
-
     this.subscribe();
 
-    this.manager.stateApi.$filteringAdapter.set(this.parent);
-
-    if (this.manager.stateApi.getSettings().autoProcess) {
-      this.processImmediate();
-    }
-  };
-
-  createInitialFilterConfig = (): FilterConfig => {
-    if (this.parent.type === 'control_layer_adapter' && this.parent.state.controlAdapter.model) {
+    if (config) {
+      this.$filterConfig.set(config);
+    } else if (this.parent.type === 'control_layer_adapter' && this.parent.state.controlAdapter.model) {
       // If the parent is a control layer adapter, we should check if the model has a default filter and set it if so
       const selectModelConfig = buildSelectModelConfig(
         this.parent.state.controlAdapter.model.key,
         isControlNetOrT2IAdapterModelConfig
       );
       const modelConfig = this.manager.stateApi.runSelector(selectModelConfig);
-      // This always returns a filter
       const filter = getFilterForModel(modelConfig);
-      return filter.buildDefaults();
+      this.$filterConfig.set(filter.buildDefaults());
     } else {
-      // Otherwise, used the default filter
-      return IMAGE_FILTERS.canny_edge_detection.buildDefaults();
+      // Otherwise, set the default filter
+      this.$filterConfig.set(IMAGE_FILTERS.canny_edge_detection.buildDefaults());
+    }
+    this.$isFiltering.set(true);
+    this.manager.stateApi.$filteringAdapter.set(this.parent);
+    if (this.manager.stateApi.getSettings().autoProcess) {
+      this.processImmediate();
     }
   };
 
-  /**
-   * Processes the filter, updating the module's state and rendering the filtered image.
-   */
   processImmediate = async () => {
     const config = this.$filterConfig.get();
     const filterData = IMAGE_FILTERS[config.type];
@@ -220,12 +123,6 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
       return;
     }
 
-    const hash = stableHash({ config });
-    if (hash === this.$lastProcessedHash.get()) {
-      this.log.trace('Already processed config');
-      return;
-    }
-
     this.log.trace({ config }, 'Processing filter');
     const rect = this.parent.transformer.getRelativeRect();
 
@@ -259,181 +156,91 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
       this.manager.stateApi.runGraphAndReturnImageOutput({
         graph,
         outputNodeId,
+        // The filter graph should always be prepended to the queue so it's processed ASAP.
         prepend: true,
+        /**
+         * The filter node may need to download a large model. Currently, the models required by the filter nodes are
+         * downloaded just-in-time, as required by the filter. If we use a timeout here, we might get into a catch-22
+         * where the filter node is waiting for the model to download, but the download gets canceled if the filter
+         * node times out.
+         *
+         * (I suspect the model download will actually _not_ be canceled if the graph is canceled, but let's not chance it!)
+         *
+         * TODO(psyche): Figure out a better way to handle this. Probably need to download the models ahead of time.
+         */
+        // timeout: 5000,
+        /**
+         * The filter node should be able to cancel the request if it's taking too long. This will cancel the graph's
+         * queue item and clear any event listeners on the request.
+         */
         signal: controller.signal,
       })
     );
-
-    // If there is an error, log it and bail out of this processing run
     if (filterResult.isErr()) {
-      this.log.error({ error: serializeError(filterResult.error) }, 'Error filtering');
+      this.log.error({ error: serializeError(filterResult.error) }, 'Error processing filter');
       this.$isProcessing.set(false);
-      // Clean up the abort controller as needed
-      if (!this.abortController.signal.aborted) {
-        this.abortController.abort();
-      }
       this.abortController = null;
       return;
     }
 
-    this.log.trace({ imageDTO: filterResult.value }, 'Filtered');
+    this.log.trace({ imageDTO: filterResult.value }, 'Filter processed');
+    this.imageState = imageDTOToImageObject(filterResult.value);
 
-    // Prepare the ephemeral image state
-    const imageState = imageDTOToImageObject(filterResult.value);
-    this.$imageState.set(imageState);
-
-    // Destroy any existing masked image and create a new one
-    if (this.imageModule) {
-      this.imageModule.destroy();
-    }
-
-    this.imageModule = new CanvasObjectImage(imageState, this);
-
-    // Force update the masked image - after awaiting, the image will be rendered (in memory)
-    await this.imageModule.update(imageState, true);
-
-    this.konva.group.add(this.imageModule.konva.group);
-
-    // The porcessing is complete, set can set the last processed hash and isProcessing to false
-    this.$lastProcessedHash.set(hash);
+    await this.parent.bufferRenderer.setBuffer(this.imageState, true);
 
     this.$isProcessing.set(false);
-
-    // Clean up the abort controller as needed
-    if (!this.abortController.signal.aborted) {
-      this.abortController.abort();
-    }
-
+    this.$hasProcessed.set(true);
     this.abortController = null;
   };
 
-  /**
-   * Debounced version of processImmediate.
-   */
-  process = debounce(this.processImmediate, this.config.PROCESS_DEBOUNCE_MS);
+  process = debounce(this.processImmediate, this.config.processDebounceMs);
 
-  /**
-   * Applies the filter image to the entity, replacing the entity's objects with the filtered image.
-   */
   apply = () => {
-    const filteredImageObjectState = this.$imageState.get();
-    if (!filteredImageObjectState) {
+    const imageState = this.imageState;
+    if (!imageState) {
       this.log.warn('No image state to apply filter to');
       return;
     }
-    this.log.trace('Applying');
-
-    // Have the parent adopt the image module - this prevents a flash of the original layer content before the filtered
-    // image is rendered
-    if (this.imageModule) {
-      this.parent.renderer.adoptObjectRenderer(this.imageModule);
-    }
-
-    // Rasterize the entity, replacing the objects with the masked image
+    this.log.trace('Applying filter');
+    this.parent.bufferRenderer.commitBuffer();
     const rect = this.parent.transformer.getRelativeRect();
     this.manager.stateApi.rasterizeEntity({
       entityIdentifier: this.parent.entityIdentifier,
-      imageObject: filteredImageObjectState,
+      imageObject: imageState,
       position: {
         x: Math.round(rect.x),
         y: Math.round(rect.y),
       },
       replaceObjects: true,
     });
-
-    // Final cleanup and teardown, returning user to main canvas UI
-    this.resetEphemeralState();
-    this.teardown();
-  };
-
-  /**
-   * Saves the filtered image as a new entity of the given type.
-   * @param type The type of entity to save the filtered image as.
-   */
-  saveAs = (type: Exclude<CanvasEntityType, 'reference_image'>) => {
-    const imageState = this.$imageState.get();
-    if (!imageState) {
-      this.log.warn('No image state to apply filter to');
-      return;
-    }
-    this.log.trace(`Saving as ${type}`);
-
-    const rect = this.parent.transformer.getRelativeRect();
-    const arg = {
-      overrides: {
-        objects: [imageState],
-        position: {
-          x: Math.round(rect.x),
-          y: Math.round(rect.y),
-        },
-      },
-      isSelected: true,
-    };
-
-    switch (type) {
-      case 'raster_layer':
-        this.manager.stateApi.addRasterLayer(arg);
-        break;
-      case 'control_layer':
-        this.manager.stateApi.addControlLayer(arg);
-        break;
-      case 'inpaint_mask':
-        this.manager.stateApi.addInpaintMask(arg);
-        break;
-      case 'regional_guidance':
-        this.manager.stateApi.addRegionalGuidance(arg);
-        break;
-      default:
-        assert<Equals<typeof type, never>>(false);
-    }
-
-    // Final cleanup and teardown, returning user to main canvas UI
-    this.resetEphemeralState();
-    this.teardown();
-  };
-
-  resetEphemeralState = () => {
-    // First we need to bail out of any processing
-    if (this.abortController && !this.abortController.signal.aborted) {
-      this.abortController.abort();
-    }
-    this.abortController = null;
-
-    // If the image module exists, and is a child of the group, destroy it. It might not be a child of the group if
-    // the user has applied the filter and the image has been adopted by the parent entity.
-    if (this.imageModule && this.imageModule.konva.group.parent === this.konva.group) {
-      this.imageModule.destroy();
-      this.imageModule = null;
-    }
-    const initialFilterConfig = this.$initialFilterConfig.get() ?? this.createInitialFilterConfig();
-    this.$filterConfig.set(initialFilterConfig);
-    this.$imageState.set(null);
-    this.$lastProcessedHash.set('');
-    this.$isProcessing.set(false);
-  };
-
-  teardown = () => {
-    this.$initialFilterConfig.set(null);
-    this.konva.group.remove();
+    this.imageState = null;
     this.unsubscribe();
     this.$isFiltering.set(false);
+    this.$hasProcessed.set(false);
     this.manager.stateApi.$filteringAdapter.set(null);
   };
 
-  /**
-   * Resets the module (e.g. remove all points and the mask image).
-   *
-   * Does not cancel or otherwise complete the segmenting process.
-   */
   reset = () => {
-    this.log.trace('Resetting');
-    this.resetEphemeralState();
+    this.log.trace('Resetting filter');
+
+    this.abortController?.abort();
+    this.abortController = null;
+    this.parent.bufferRenderer.clearBuffer();
+    this.parent.transformer.updatePosition();
+    this.parent.renderer.syncKonvaCache(true);
+    this.imageState = null;
+    this.$hasProcessed.set(false);
   };
 
   cancel = () => {
-    this.log.trace('Canceling');
-    this.resetEphemeralState();
-    this.teardown();
+    this.log.trace('Cancelling filter');
+
+    this.reset();
+    this.unsubscribe();
+    this.$isProcessing.set(false);
+    this.$isFiltering.set(false);
+    this.$hasProcessed.set(false);
+    this.manager.stateApi.$filteringAdapter.set(null);
   };
 
   repr = () => {
@@ -441,14 +248,11 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
       id: this.id,
       type: this.type,
       path: this.path,
-      parent: this.parent.id,
       config: this.config,
-      imageState: deepClone(this.$imageState.get()),
       $isFiltering: this.$isFiltering.get(),
-      $lastProcessedHash: this.$lastProcessedHash.get(),
+      $hasProcessed: this.$hasProcessed.get(),
       $isProcessing: this.$isProcessing.get(),
       $filterConfig: this.$filterConfig.get(),
-      konva: { group: getKonvaNodeDebugAttrs(this.konva.group) },
     };
   };
 
@@ -459,6 +263,5 @@ export class CanvasEntityFilterer extends CanvasModuleBase {
     }
     this.abortController = null;
     this.unsubscribe();
-    this.konva.group.destroy();
   };
 }

invokeai/frontend/web/src/features/controlLayers/konva/CanvasObject/CanvasObjectImage.ts

@@ -1,7 +1,6 @@
 import { Mutex } from 'async-mutex';
 import { deepClone } from 'common/util/deepClone';
 import type { CanvasEntityBufferObjectRenderer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityBufferObjectRenderer';
-import type { CanvasEntityFilterer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityFilterer';
 import type { CanvasEntityObjectRenderer } from 'features/controlLayers/konva/CanvasEntity/CanvasEntityObjectRenderer';
 import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
 import { CanvasModuleBase } from 'features/controlLayers/konva/CanvasModuleBase';
@@ -22,8 +21,7 @@ export class CanvasObjectImage extends CanvasModuleBase {
     | CanvasEntityObjectRenderer
     | CanvasEntityBufferObjectRenderer
     | CanvasStagingAreaModule
-    | CanvasSegmentAnythingModule
-    | CanvasEntityFilterer;
+    | CanvasSegmentAnythingModule;
   readonly manager: CanvasManager;
   readonly log: Logger;
 
@@ -45,7 +43,6 @@ export class CanvasObjectImage extends CanvasModuleBase {
       | CanvasEntityBufferObjectRenderer
       | CanvasStagingAreaModule
       | CanvasSegmentAnythingModule
-      | CanvasEntityFilterer
   ) {
     super();
     this.id = state.id;

invokeai/frontend/web/src/features/controlLayers/konva/CanvasSegmentAnythingModule.ts

@@ -114,7 +114,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
   subscriptions = new Set<() => void>();
 
   /**
-   * The AbortController used to cancel the segment processing.
+   * The AbortController used to cancel the filter processing.
    */
   abortController: AbortController | null = null;
 
@@ -173,21 +173,16 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
   $hasPoints = computed(this.$points, (points) => points.length > 0);
 
   /**
-   * Whether the module should invert the mask image.
+   * The masked image object, if it exists.
    */
-  $invert = atom<boolean>(false);
-
-  /**
-   * The masked image object module, if it exists.
-   */
-  imageModule: CanvasObjectImage | null = null;
+  maskedImage: CanvasObjectImage | null = null;
 
   /**
    * The Konva nodes for the module.
    */
   konva: {
     /**
-     * The main Konva group node for the module. This is added to the parent layer on start, and removed on teardown.
+     * The main Konva group node for the module.
      */
     group: Konva.Group;
     /**
@@ -298,9 +293,6 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
       if (this.$isDraggingPoint.get()) {
         return;
       }
-      if (e.evt.button !== 0) {
-        return;
-      }
       // This event should not bubble up to the parent, stage or any other nodes
       e.cancelBubble = true;
       circle.destroy();
@@ -461,19 +453,6 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
       })
     );
 
-    // When the invert flag changes, process if autoProcess is enabled
-    this.subscriptions.add(
-      this.$invert.listen(() => {
-        if (this.$points.get().length === 0) {
-          return;
-        }
-
-        if (this.manager.stateApi.getSettings().autoProcess) {
-          this.process();
-        }
-      })
-    );
-
     // When auto-process is enabled, process the points if they have not been processed
     this.subscriptions.add(
       this.manager.stateApi.createStoreSubscription(selectAutoProcess, (autoProcess) => {
@@ -488,7 +467,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
   };
 
   /**
-   * Removes event listeners used while segmenting the entity.
+   * Adds event listeners needed while segmenting the entity.
    */
   unsubscribe = () => {
     this.subscriptions.forEach((unsubscribe) => unsubscribe());
@@ -547,9 +526,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
       return;
     }
 
-    const invert = this.$invert.get();
-
-    const hash = stableHash({ points, invert });
+    const hash = stableHash(points);
     if (hash === this.$lastProcessedHash.get()) {
       this.log.trace('Already processed points');
       return;
@@ -576,7 +553,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
     this.abortController = controller;
 
     // Build the graph for segmenting the image, using the rasterized image DTO
-    const { graph, outputNodeId } = CanvasSegmentAnythingModule.buildGraph(rasterizeResult.value, points, invert);
+    const { graph, outputNodeId } = this.buildGraph(rasterizeResult.value, points);
 
     // Run the graph and get the segmented image output
     const segmentResult = await withResultAsync(() =>
@@ -607,18 +584,18 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
     this.$imageState.set(imageState);
 
     // Destroy any existing masked image and create a new one
-    if (this.imageModule) {
-      this.imageModule.destroy();
+    if (this.maskedImage) {
+      this.maskedImage.destroy();
     }
     if (this.konva.maskTween) {
       this.konva.maskTween.destroy();
       this.konva.maskTween = null;
     }
 
-    this.imageModule = new CanvasObjectImage(imageState, this);
+    this.maskedImage = new CanvasObjectImage(imageState, this);
 
     // Force update the masked image - after awaiting, the image will be rendered (in memory)
-    await this.imageModule.update(imageState, true);
+    await this.maskedImage.update(imageState, true);
 
     // Update the compositing rect to match the image size
     this.konva.compositingRect.setAttrs({
@@ -629,7 +606,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
 
     // Now we can add the masked image to the mask group. It will be rendered above the compositing rect, but should be
     // under it, so we will move the compositing rect to the top
-    this.konva.maskGroup.add(this.imageModule.konva.group);
+    this.konva.maskGroup.add(this.maskedImage.konva.group);
     this.konva.compositingRect.moveToTop();
 
     // Cache the group to ensure the mask is rendered correctly w/ opacity
@@ -666,7 +643,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
   process = debounce(this.processImmediate, this.config.PROCESS_DEBOUNCE_MS);
 
   /**
-   * Applies the segmented image to the entity, replacing the entity's objects with the masked image.
+   * Applies the segmented image to the entity.
    */
   apply = () => {
     const imageState = this.$imageState.get();
@@ -676,7 +653,10 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
     }
     this.log.trace('Applying');
 
-    // Rasterize the entity, replacing the objects with the masked image
+    // Commit the buffer, which will move the buffer to from the layers' buffer renderer to its main renderer
+    this.parent.bufferRenderer.commitBuffer();
+
+    // Rasterize the entity, this time replacing the objects with the masked image
     const rect = this.parent.transformer.getRelativeRect();
     this.manager.stateApi.rasterizeEntity({
       entityIdentifier: this.parent.entityIdentifier,
@@ -694,8 +674,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
   };
 
   /**
-   * Saves the segmented image as a new entity of the given type.
-   * @param type The type of entity to save the segmented image as.
+   * Applies the segmented image to the entity.
    */
   saveAs = (type: Exclude<CanvasEntityType, 'reference_image'>) => {
     const imageState = this.$imageState.get();
@@ -705,11 +684,8 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
     }
     this.log.trace(`Saving as ${type}`);
 
-    // Have the parent adopt the image module - this prevents a flash of the original layer content before the
-    // segmented image is rendered
-    if (this.imageModule) {
-      this.parent.renderer.adoptObjectRenderer(this.imageModule);
-    }
+    // Clear the buffer - we are creating a new entity, so we don't want to keep the old one
+    this.parent.bufferRenderer.clearBuffer();
 
     // Create the new entity with the masked image as its only object
     const rect = this.parent.transformer.getRelativeRect();
@@ -802,12 +778,8 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
     for (const point of this.$points.get()) {
       point.konva.circle.destroy();
     }
-
-    // If the image module exists, and is a child of the group, destroy it. It might not be a child of the group if
-    // the user has applied the segmented image and the image has been adopted by the parent entity.
-    if (this.imageModule && this.imageModule.konva.group.parent === this.konva.group) {
-      this.imageModule.destroy();
-      this.imageModule = null;
+    if (this.maskedImage) {
+      this.maskedImage.destroy();
     }
     if (this.konva.maskTween) {
       this.konva.maskTween.destroy();
@@ -818,23 +790,22 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
     this.$points.set([]);
     this.$imageState.set(null);
     this.$pointType.set(1);
-    this.$invert.set(false);
     this.$lastProcessedHash.set('');
     this.$isProcessing.set(false);
 
     // Reset non-ephemeral konva nodes
     this.konva.compositingRect.visible(false);
     this.konva.maskGroup.clearCache();
+
+    // The parent module's buffer should be reset & forcibly sync the cache
+    this.parent.bufferRenderer.clearBuffer();
+    this.parent.renderer.syncKonvaCache(true);
   };
 
   /**
    * Builds a graph for segmenting an image with the given image DTO.
    */
-  static buildGraph = (
-    { image_name }: ImageDTO,
-    points: SAMPointWithId[],
-    invert: boolean
-  ): { graph: Graph; outputNodeId: string } => {
+  buildGraph = ({ image_name }: ImageDTO, points: SAMPointWithId[]): { graph: Graph; outputNodeId: string } => {
     const graph = new Graph(getPrefixedId('canvas_segment_anything'));
 
     // TODO(psyche): When SAM2 is available in transformers, use it here
@@ -853,7 +824,6 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
       id: getPrefixedId('apply_tensor_mask_to_image'),
       type: 'apply_tensor_mask_to_image',
       image: { image_name },
-      invert,
     });
     graph.addEdge(segmentAnything, 'mask', applyMask, 'mask');
 
@@ -889,7 +859,7 @@ export class CanvasSegmentAnythingModule extends CanvasModuleBase {
         circle: getKonvaNodeDebugAttrs(konva.circle),
       })),
       imageState: deepClone(this.$imageState.get()),
-      imageModule: this.imageModule?.repr(),
+      maskedImage: this.maskedImage?.repr(),
       config: deepClone(this.config),
       $isSegmenting: this.$isSegmenting.get(),
       $lastProcessedHash: this.$lastProcessedHash.get(),

invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingAreaModule.ts

@@ -51,16 +51,10 @@ export class CanvasStagingAreaModule extends CanvasModuleBase {
     /**
      * Sync the $isStaging flag with the redux state. $isStaging is used by the manager to determine the global busy
      * state of the canvas.
-     *
-     * We also set the $shouldShowStagedImage flag when we enter staging mode, so that the staged images are shown,
-     * even if the user disabled this in the last staging session.
      */
     this.subscriptions.add(
-      this.manager.stateApi.createStoreSubscription(selectIsStaging, (isStaging, oldIsStaging) => {
+      this.manager.stateApi.createStoreSubscription(selectIsStaging, (isStaging) => {
         this.$isStaging.set(isStaging);
-        if (isStaging && !oldIsStaging) {
-          this.$shouldShowStagedImage.set(true);
-        }
       })
     );
   }

invokeai/frontend/web/src/features/controlLayers/konva/CanvasStateApiModule.ts

@@ -293,8 +293,6 @@ export class CanvasStateApiModule extends CanvasModuleBase {
       },
     };
 
-    let didSuceed = false;
-
     /**
      * If a timeout is provided, we will cancel the graph if it takes too long - but we need a way to clear the timeout
      * if the graph completes or errors before the timeout.
@@ -346,8 +344,6 @@ export class CanvasStateApiModule extends CanvasModuleBase {
           return;
         }
 
-        didSuceed = true;
-
         // Ok!
         resolve(getImageDTOResult.value);
       };
@@ -438,10 +434,6 @@ export class CanvasStateApiModule extends CanvasModuleBase {
 
       if (timeout) {
         timeoutId = window.setTimeout(() => {
-          if (didSuceed) {
-            // If we already succeeded, we don't need to do anything
-            return;
-          }
           this.log.trace('Graph canceled by timeout');
           clearListeners();
           cancelGraph();
@@ -451,10 +443,6 @@ export class CanvasStateApiModule extends CanvasModuleBase {
 
       if (signal) {
         signal.addEventListener('abort', () => {
-          if (didSuceed) {
-            // If we already succeeded, we don't need to do anything
-            return;
-          }
           this.log.trace('Graph canceled by signal');
           _clearTimeout();
           clearListeners();

invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool/CanvasEraserToolModule.ts

@@ -216,14 +216,12 @@ export class CanvasEraserToolModule extends CanvasModuleBase {
    */
   onStagePointerDown = async (e: KonvaEventObject<PointerEvent>) => {
     const cursorPos = this.parent.$cursorPos.get();
-    const isPrimaryPointerDown = this.parent.$isPrimaryPointerDown.get();
     const selectedEntity = this.manager.stateApi.getSelectedEntityAdapter();
 
-    if (!cursorPos || !selectedEntity || !isPrimaryPointerDown) {
+    if (!cursorPos || !selectedEntity) {
       /**
        * Can't do anything without:
        * - A cursor position: the cursor is not on the stage
-       * - The mouse is down: the user is not drawing
        * - A selected entity: there is no entity to draw on
        */
       return;

invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool/CanvasToolModule.ts

@@ -160,16 +160,11 @@ export class CanvasToolModule extends CanvasModuleBase {
     const stage = this.manager.stage;
     const tool = this.$tool.get();
     const segmentingAdapter = this.manager.stateApi.$segmentingAdapter.get();
-    const transformingAdapter = this.manager.stateApi.$transformingAdapter.get();
 
-    if (this.manager.stage.getIsDragging()) {
-      this.tools.view.syncCursorStyle();
-    } else if (tool === 'view') {
+    if ((this.manager.stage.getIsDragging() || tool === 'view') && !segmentingAdapter) {
       this.tools.view.syncCursorStyle();
     } else if (segmentingAdapter) {
       segmentingAdapter.segmentAnything.syncCursorStyle();
-    } else if (transformingAdapter) {
-      // The transformer handles cursor style via events
     } else if (this.manager.stateApi.$isFiltering.get()) {
       stage.setCursor('not-allowed');
     } else if (this.manager.stagingArea.$isStaging.get()) {

invokeai/frontend/web/src/features/controlLayers/store/selectors.ts

@@ -349,27 +349,6 @@ export const buildSelectIsSelected = (entityIdentifier: CanvasEntityIdentifier)
   );
 };
 
-/**
- * Builds a selector that selects if the entity is empty.
- *
- * Reference images are considered empty if the IP adapter is empty.
- *
- * Other entities are considered empty if they have no objects.
- */
-export const buildSelectHasObjects = (entityIdentifier: CanvasEntityIdentifier) => {
-  return createSelector(selectCanvasSlice, (canvas) => {
-    const entity = selectEntity(canvas, entityIdentifier);
-
-    if (!entity) {
-      return false;
-    }
-    if (entity.type === 'reference_image') {
-      return entity.ipAdapter.image !== null;
-    }
-    return entity.objects.length > 0;
-  });
-};
-
 export const selectWidth = createSelector(selectCanvasSlice, (canvas) => canvas.bbox.rect.width);
 export const selectHeight = createSelector(selectCanvasSlice, (canvas) => canvas.bbox.rect.height);
 export const selectAspectRatioID = createSelector(selectCanvasSlice, (canvas) => canvas.bbox.aspectRatio.id);

invokeai/frontend/web/src/features/dnd/types/index.ts

@@ -42,14 +42,6 @@ export type AddControlLayerFromImageDropData = BaseDropData & {
   actionType: 'ADD_CONTROL_LAYER_FROM_IMAGE';
 };
 
-type AddInpaintMaskFromImageDropData = BaseDropData & {
-  actionType: 'ADD_INPAINT_MASK_FROM_IMAGE';
-};
-
-type AddRegionalGuidanceFromImageDropData = BaseDropData & {
-  actionType: 'ADD_REGIONAL_GUIDANCE_FROM_IMAGE';
-};
-
 export type AddRegionalReferenceImageFromImageDropData = BaseDropData & {
   actionType: 'ADD_REGIONAL_REFERENCE_IMAGE_FROM_IMAGE';
 };
@@ -61,7 +53,7 @@ export type AddGlobalReferenceImageFromImageDropData = BaseDropData & {
 export type ReplaceLayerImageDropData = BaseDropData & {
   actionType: 'REPLACE_LAYER_WITH_IMAGE';
   context: {
-    entityIdentifier: CanvasEntityIdentifier<'control_layer' | 'raster_layer' | 'inpaint_mask' | 'regional_guidance'>;
+    entityIdentifier: CanvasEntityIdentifier<'control_layer' | 'raster_layer'>;
   };
 };
 
@@ -106,9 +98,7 @@ export type TypesafeDroppableData =
   | AddControlLayerFromImageDropData
   | ReplaceLayerImageDropData
   | AddRegionalReferenceImageFromImageDropData
-  | AddGlobalReferenceImageFromImageDropData
-  | AddInpaintMaskFromImageDropData
-  | AddRegionalGuidanceFromImageDropData;
+  | AddGlobalReferenceImageFromImageDropData;
 
 type BaseDragData = {
   id: string;

invokeai/frontend/web/src/features/dnd/util/isValidDrop.ts

@@ -17,8 +17,6 @@ export const isValidDrop = (overData?: TypesafeDroppableData | null, activeData?
     case 'SET_RG_IP_ADAPTER_IMAGE':
     case 'ADD_RASTER_LAYER_FROM_IMAGE':
     case 'ADD_CONTROL_LAYER_FROM_IMAGE':
-    case 'ADD_INPAINT_MASK_FROM_IMAGE':
-    case 'ADD_REGIONAL_GUIDANCE_FROM_IMAGE':
     case 'SET_UPSCALE_INITIAL_IMAGE':
     case 'SET_NODES_IMAGE':
     case 'SELECT_FOR_COMPARE':

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/ImageMenuItemNewCanvasFromImage.tsx

@@ -0,0 +1,39 @@
+import { MenuItem } from '@invoke-ai/ui-library';
+import { useAppDispatch } from 'app/store/storeHooks';
+import { useNewCanvasFromImage } from 'features/controlLayers/hooks/addLayerHooks';
+import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
+import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
+import { useImageDTOContext } from 'features/gallery/contexts/ImageDTOContext';
+import { toast } from 'features/toast/toast';
+import { setActiveTab } from 'features/ui/store/uiSlice';
+import { memo, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { PiFileBold } from 'react-icons/pi';
+
+export const ImageMenuItemNewCanvasFromImage = memo(() => {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const imageDTO = useImageDTOContext();
+  const imageViewer = useImageViewer();
+  const newCanvasFromImage = useNewCanvasFromImage();
+  const isBusy = useCanvasIsBusy();
+
+  const onClick = useCallback(() => {
+    newCanvasFromImage(imageDTO);
+    dispatch(setActiveTab('canvas'));
+    imageViewer.close();
+    toast({
+      id: 'SENT_TO_CANVAS',
+      title: t('toast.sentToCanvas'),
+      status: 'success',
+    });
+  }, [dispatch, imageDTO, imageViewer, newCanvasFromImage, t]);
+
+  return (
+    <MenuItem icon={<PiFileBold />} onClickCapture={onClick} isDisabled={isBusy}>
+      {t('controlLayers.newCanvasFromImage')}
+    </MenuItem>
+  );
+});
+
+ImageMenuItemNewCanvasFromImage.displayName = 'ImageMenuItemNewCanvasFromImage';

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/ImageMenuItemNewFromImageSubMenu.tsx

@@ -1,140 +0,0 @@
-import { Menu, MenuButton, MenuItem, MenuList } from '@invoke-ai/ui-library';
-import { useAppDispatch } from 'app/store/storeHooks';
-import { SubMenuButtonContent, useSubMenu } from 'common/hooks/useSubMenu';
-import { NewLayerIcon } from 'features/controlLayers/components/common/icons';
-import {
-  useNewCanvasFromImage,
-  useNewControlLayerFromImage,
-  useNewInpaintMaskFromImage,
-  useNewRasterLayerFromImage,
-  useNewRegionalGuidanceFromImage,
-} from 'features/controlLayers/hooks/addLayerHooks';
-import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
-import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
-import { useImageDTOContext } from 'features/gallery/contexts/ImageDTOContext';
-import { sentImageToCanvas } from 'features/gallery/store/actions';
-import { toast } from 'features/toast/toast';
-import { setActiveTab } from 'features/ui/store/uiSlice';
-import { memo, useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { PiFileBold, PiPlusBold } from 'react-icons/pi';
-
-export const ImageMenuItemNewFromImageSubMenu = memo(() => {
-  const { t } = useTranslation();
-  const subMenu = useSubMenu();
-  const dispatch = useAppDispatch();
-  const imageDTO = useImageDTOContext();
-  const imageViewer = useImageViewer();
-  const isBusy = useCanvasIsBusy();
-  const newRasterLayerFromImage = useNewRasterLayerFromImage();
-  const newControlLayerFromImage = useNewControlLayerFromImage();
-  const newInpaintMaskFromImage = useNewInpaintMaskFromImage();
-  const newRegionalGuidanceFromImage = useNewRegionalGuidanceFromImage();
-  const newCanvasFromImage = useNewCanvasFromImage();
-
-  const onClickNewCanvasWithRasterLayerFromImage = useCallback(() => {
-    newCanvasFromImage(imageDTO, 'raster_layer');
-    dispatch(setActiveTab('canvas'));
-    imageViewer.close();
-    toast({
-      id: 'SENT_TO_CANVAS',
-      title: t('toast.sentToCanvas'),
-      status: 'success',
-    });
-  }, [dispatch, imageDTO, imageViewer, newCanvasFromImage, t]);
-
-  const onClickNewCanvasWithControlLayerFromImage = useCallback(() => {
-    newCanvasFromImage(imageDTO, 'control_layer');
-    dispatch(setActiveTab('canvas'));
-    imageViewer.close();
-    toast({
-      id: 'SENT_TO_CANVAS',
-      title: t('toast.sentToCanvas'),
-      status: 'success',
-    });
-  }, [dispatch, imageDTO, imageViewer, newCanvasFromImage, t]);
-
-  const onClickNewRasterLayerFromImage = useCallback(() => {
-    dispatch(sentImageToCanvas());
-    newRasterLayerFromImage(imageDTO);
-    dispatch(setActiveTab('canvas'));
-    imageViewer.close();
-    toast({
-      id: 'SENT_TO_CANVAS',
-      title: t('toast.sentToCanvas'),
-      status: 'success',
-    });
-  }, [dispatch, imageDTO, imageViewer, newRasterLayerFromImage, t]);
-
-  const onClickNewControlLayerFromImage = useCallback(() => {
-    dispatch(sentImageToCanvas());
-    newControlLayerFromImage(imageDTO);
-    dispatch(setActiveTab('canvas'));
-    imageViewer.close();
-    toast({
-      id: 'SENT_TO_CANVAS',
-      title: t('toast.sentToCanvas'),
-      status: 'success',
-    });
-  }, [dispatch, imageDTO, imageViewer, newControlLayerFromImage, t]);
-
-  const onClickNewInpaintMaskFromImage = useCallback(() => {
-    dispatch(sentImageToCanvas());
-    newInpaintMaskFromImage(imageDTO);
-    dispatch(setActiveTab('canvas'));
-    imageViewer.close();
-    toast({
-      id: 'SENT_TO_CANVAS',
-      title: t('toast.sentToCanvas'),
-      status: 'success',
-    });
-  }, [dispatch, imageDTO, imageViewer, newInpaintMaskFromImage, t]);
-
-  const onClickNewRegionalGuidanceFromImage = useCallback(() => {
-    dispatch(sentImageToCanvas());
-    newRegionalGuidanceFromImage(imageDTO);
-    dispatch(setActiveTab('canvas'));
-    imageViewer.close();
-    toast({
-      id: 'SENT_TO_CANVAS',
-      title: t('toast.sentToCanvas'),
-      status: 'success',
-    });
-  }, [dispatch, imageDTO, imageViewer, newRegionalGuidanceFromImage, t]);
-
-  return (
-    <MenuItem {...subMenu.parentMenuItemProps} icon={<PiPlusBold />}>
-      <Menu {...subMenu.menuProps}>
-        <MenuButton {...subMenu.menuButtonProps}>
-          <SubMenuButtonContent label="New from Image" />
-        </MenuButton>
-        <MenuList {...subMenu.menuListProps}>
-          <MenuItem icon={<PiFileBold />} onClickCapture={onClickNewCanvasWithRasterLayerFromImage} isDisabled={isBusy}>
-            {t('controlLayers.canvasAsRasterLayer')}
-          </MenuItem>
-          <MenuItem
-            icon={<PiFileBold />}
-            onClickCapture={onClickNewCanvasWithControlLayerFromImage}
-            isDisabled={isBusy}
-          >
-            {t('controlLayers.canvasAsControlLayer')}
-          </MenuItem>
-          <MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewInpaintMaskFromImage} isDisabled={isBusy}>
-            {t('controlLayers.inpaintMask')}
-          </MenuItem>
-          <MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewRegionalGuidanceFromImage} isDisabled={isBusy}>
-            {t('controlLayers.regionalGuidance')}
-          </MenuItem>
-          <MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewControlLayerFromImage} isDisabled={isBusy}>
-            {t('controlLayers.controlLayer')}
-          </MenuItem>
-          <MenuItem icon={<NewLayerIcon />} onClickCapture={onClickNewRasterLayerFromImage} isDisabled={isBusy}>
-            {t('controlLayers.rasterLayer')}
-          </MenuItem>
-        </MenuList>
-      </Menu>
-    </MenuItem>
-  );
-});
-
-ImageMenuItemNewFromImageSubMenu.displayName = 'ImageMenuItemNewFromImageSubMenu';

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/ImageMenuItemNewLayerFromImage.tsx

@@ -0,0 +1,41 @@
+import { MenuItem } from '@invoke-ai/ui-library';
+import { useAppDispatch } from 'app/store/storeHooks';
+import { NewLayerIcon } from 'features/controlLayers/components/common/icons';
+import { useNewRasterLayerFromImage } from 'features/controlLayers/hooks/addLayerHooks';
+import { useCanvasIsBusy } from 'features/controlLayers/hooks/useCanvasIsBusy';
+import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
+import { useImageDTOContext } from 'features/gallery/contexts/ImageDTOContext';
+import { sentImageToCanvas } from 'features/gallery/store/actions';
+import { toast } from 'features/toast/toast';
+import { setActiveTab } from 'features/ui/store/uiSlice';
+import { memo, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+export const ImageMenuItemNewLayerFromImage = memo(() => {
+  const { t } = useTranslation();
+  const dispatch = useAppDispatch();
+  const imageDTO = useImageDTOContext();
+  const imageViewer = useImageViewer();
+  const newRasterLayerFromImage = useNewRasterLayerFromImage();
+  const isBusy = useCanvasIsBusy();
+
+  const onClick = useCallback(() => {
+    dispatch(sentImageToCanvas());
+    newRasterLayerFromImage(imageDTO);
+    dispatch(setActiveTab('canvas'));
+    imageViewer.close();
+    toast({
+      id: 'SENT_TO_CANVAS',
+      title: t('toast.sentToCanvas'),
+      status: 'success',
+    });
+  }, [dispatch, imageDTO, imageViewer, newRasterLayerFromImage, t]);
+
+  return (
+    <MenuItem icon={<NewLayerIcon />} onClickCapture={onClick} isDisabled={isBusy}>
+      {t('controlLayers.newLayerFromImage')}
+    </MenuItem>
+  );
+});
+
+ImageMenuItemNewLayerFromImage.displayName = 'ImageMenuItemNewLayerFromImage';

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/SingleSelectionMenuItems.tsx

@@ -7,7 +7,8 @@ import { ImageMenuItemDelete } from 'features/gallery/components/ImageContextMen
 import { ImageMenuItemDownload } from 'features/gallery/components/ImageContextMenu/ImageMenuItemDownload';
 import { ImageMenuItemLoadWorkflow } from 'features/gallery/components/ImageContextMenu/ImageMenuItemLoadWorkflow';
 import { ImageMenuItemMetadataRecallActions } from 'features/gallery/components/ImageContextMenu/ImageMenuItemMetadataRecallActions';
-import { ImageMenuItemNewFromImageSubMenu } from 'features/gallery/components/ImageContextMenu/ImageMenuItemNewFromImageSubMenu';
+import { ImageMenuItemNewCanvasFromImage } from 'features/gallery/components/ImageContextMenu/ImageMenuItemNewCanvasFromImage';
+import { ImageMenuItemNewLayerFromImage } from 'features/gallery/components/ImageContextMenu/ImageMenuItemNewLayerFromImage';
 import { ImageMenuItemOpenInNewTab } from 'features/gallery/components/ImageContextMenu/ImageMenuItemOpenInNewTab';
 import { ImageMenuItemOpenInViewer } from 'features/gallery/components/ImageContextMenu/ImageMenuItemOpenInViewer';
 import { ImageMenuItemSelectForCompare } from 'features/gallery/components/ImageContextMenu/ImageMenuItemSelectForCompare';
@@ -38,7 +39,8 @@ const SingleSelectionMenuItems = ({ imageDTO }: SingleSelectionMenuItemsProps) =
       <MenuDivider />
       <ImageMenuItemSendToUpscale />
       <CanvasManagerProviderGate>
-        <ImageMenuItemNewFromImageSubMenu />
+        <ImageMenuItemNewLayerFromImage />
+        <ImageMenuItemNewCanvasFromImage />
       </CanvasManagerProviderGate>
       <MenuDivider />
       <ImageMenuItemChangeBoard />

invokeai/frontend/web/src/features/gallery/components/ImageMetadataViewer/ImageMetadataActions.tsx

@@ -35,8 +35,6 @@ const ImageMetadataActions = (props: Props) => {
       <MetadataItem metadata={metadata} handlers={handlers.cfgRescaleMultiplier} />
       <MetadataItem metadata={metadata} handlers={handlers.guidance} />
       {activeTabName !== 'canvas' && <MetadataItem metadata={metadata} handlers={handlers.strength} />}
-      <MetadataItem metadata={metadata} handlers={handlers.seamlessX} />
-      <MetadataItem metadata={metadata} handlers={handlers.seamlessY} />
       <MetadataItem metadata={metadata} handlers={handlers.hrfEnabled} />
       <MetadataItem metadata={metadata} handlers={handlers.hrfMethod} />
       <MetadataItem metadata={metadata} handlers={handlers.hrfStrength} />

invokeai/frontend/web/src/features/gallery/components/ImageViewer/CurrentImagePreview.tsx

@@ -3,7 +3,6 @@ import { useStore } from '@nanostores/react';
 import { skipToken } from '@reduxjs/toolkit/query';
 import { useAppSelector } from 'app/store/storeHooks';
 import IAIDndImage from 'common/components/IAIDndImage';
-import { CanvasAlertsSendingToCanvas } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSendingTo';
 import type { TypesafeDraggableData } from 'features/dnd/types';
 import ImageMetadataViewer from 'features/gallery/components/ImageMetadataViewer/ImageMetadataViewer';
 import NextPrevImageButtons from 'features/gallery/components/NextPrevImageButtons';
@@ -74,9 +73,6 @@ const CurrentImagePreview = () => {
           dataTestId="image-preview"
         />
       )}
-      <Box position="absolute" top={0} insetInlineStart={0}>
-        <CanvasAlertsSendingToCanvas />
-      </Box>
       {shouldShowImageDetails && imageDTO && (
         <Box position="absolute" opacity={0.8} top={0} width="full" height="full" borderRadius="base">
           <ImageMetadataViewer image={imageDTO} />

invokeai/frontend/web/src/features/gallery/components/ImageViewer/ImageViewer.tsx

@@ -2,6 +2,7 @@ import { Box, Flex, IconButton } from '@invoke-ai/ui-library';
 import { useAppSelector } from 'app/store/storeHooks';
 import { useFocusRegion } from 'common/hooks/focus';
 import { useAssertSingleton } from 'common/hooks/useAssertSingleton';
+import { CanvasAlertsSendingToCanvas } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSendingTo';
 import { CompareToolbar } from 'features/gallery/components/ImageViewer/CompareToolbar';
 import CurrentImagePreview from 'features/gallery/components/ImageViewer/CurrentImagePreview';
 import { ImageComparison } from 'features/gallery/components/ImageViewer/ImageComparison';
@@ -45,7 +46,7 @@ export const ImageViewer = memo(({ closeButton }: Props) => {
       right={0}
       bottom={0}
       left={0}
-      rowGap={2}
+      rowGap={4}
       alignItems="center"
       justifyContent="center"
     >
@@ -56,6 +57,9 @@ export const ImageViewer = memo(({ closeButton }: Props) => {
         {hasImageToCompare && <ImageComparison containerDims={containerDims} />}
       </Box>
       <ImageComparisonDroppable />
+      <Box position="absolute" top={14} insetInlineEnd={2}>
+        <CanvasAlertsSendingToCanvas />
+      </Box>
     </Flex>
   );
 });

invokeai/frontend/web/src/features/metadata/util/handlers.ts

@@ -199,16 +199,6 @@ export const handlers = {
     parser: parsers.sdxlPositiveStylePrompt,
     recaller: recallers.sdxlPositiveStylePrompt,
   }),
-  seamlessX: buildHandlers({
-    getLabel: () => t('metadata.seamlessXAxis'),
-    parser: parsers.seamlessX,
-    recaller: recallers.seamlessX,
-  }),
-  seamlessY: buildHandlers({
-    getLabel: () => t('metadata.seamlessYAxis'),
-    parser: parsers.seamlessY,
-    recaller: recallers.seamlessY,
-  }),
   seed: buildHandlers({ getLabel: () => t('metadata.seed'), parser: parsers.seed, recaller: recallers.seed }),
   steps: buildHandlers({ getLabel: () => t('metadata.steps'), parser: parsers.steps, recaller: recallers.steps }),
   strength: buildHandlers({

invokeai/frontend/web/src/features/metadata/util/parsers.ts

@@ -41,8 +41,6 @@ import type {
   ParameterSDXLRefinerNegativeAestheticScore,
   ParameterSDXLRefinerPositiveAestheticScore,
   ParameterSDXLRefinerStart,
-  ParameterSeamlessX,
-  ParameterSeamlessY,
   ParameterSeed,
   ParameterSteps,
   ParameterStrength,
@@ -65,8 +63,6 @@ import {
   isParameterSDXLRefinerNegativeAestheticScore,
   isParameterSDXLRefinerPositiveAestheticScore,
   isParameterSDXLRefinerStart,
-  isParameterSeamlessX,
-  isParameterSeamlessY,
   isParameterSeed,
   isParameterSteps,
   isParameterStrength,
@@ -164,12 +160,6 @@ const parseSteps: MetadataParseFunc<ParameterSteps> = (metadata) => getProperty(
 const parseStrength: MetadataParseFunc<ParameterStrength> = (metadata) =>
   getProperty(metadata, 'strength', isParameterStrength);
 
-const parseSeamlessX: MetadataParseFunc<ParameterSeamlessX> = (metadata) =>
-  getProperty(metadata, 'seamless_x', isParameterSeamlessX);
-
-const parseSeamlessY: MetadataParseFunc<ParameterSeamlessY> = (metadata) =>
-  getProperty(metadata, 'seamless_y', isParameterSeamlessY);
-
 const parseHRFEnabled: MetadataParseFunc<ParameterHRFEnabled> = async (metadata) => {
   try {
     return await getProperty(metadata, 'hrf_enabled', isParameterHRFEnabled);
@@ -657,8 +647,6 @@ export const parsers = {
   height: parseHeight,
   steps: parseSteps,
   strength: parseStrength,
-  seamlessX: parseSeamlessX,
-  seamlessY: parseSeamlessY,
   hrfEnabled: parseHRFEnabled,
   hrfStrength: parseHRFStrength,
   hrfMethod: parseHRFMethod,

invokeai/frontend/web/src/features/metadata/util/recallers.ts

@@ -18,8 +18,6 @@ import {
   setRefinerStart,
   setRefinerSteps,
   setScheduler,
-  setSeamlessXAxis,
-  setSeamlessYAxis,
   setSeed,
   setSteps,
   t5EncoderModelSelected,
@@ -46,8 +44,6 @@ import type {
   ParameterSDXLRefinerNegativeAestheticScore,
   ParameterSDXLRefinerPositiveAestheticScore,
   ParameterSDXLRefinerStart,
-  ParameterSeamlessX,
-  ParameterSeamlessY,
   ParameterSeed,
   ParameterSteps,
   ParameterStrength,
@@ -110,14 +106,6 @@ const recallStrength: MetadataRecallFunc<ParameterStrength> = (strength) => {
   getStore().dispatch(setImg2imgStrength(strength));
 };
 
-const recallSeamlessX: MetadataRecallFunc<ParameterSeamlessX> = (enabled) => {
-  getStore().dispatch(setSeamlessXAxis(enabled));
-};
-
-const recallSeamlessY: MetadataRecallFunc<ParameterSeamlessY> = (enabled) => {
-  getStore().dispatch(setSeamlessYAxis(enabled));
-};
-
 const recallHRFEnabled: MetadataRecallFunc<ParameterHRFEnabled> = (hrfEnabled) => {
   getStore().dispatch(setHrfEnabled(hrfEnabled));
 };
@@ -223,8 +211,6 @@ export const recallers = {
   height: recallHeight,
   steps: recallSteps,
   strength: recallStrength,
-  seamlessX: recallSeamlessX,
-  seamlessY: recallSeamlessY,
   hrfEnabled: recallHRFEnabled,
   hrfStrength: recallHRFStrength,
   hrfMethod: recallHRFMethod,

invokeai/frontend/web/src/features/nodes/util/graph/generation/addImageToImage.ts

@@ -6,31 +6,18 @@ import { addImageToLatents } from 'features/nodes/util/graph/graphBuilderUtils';
 import { isEqual } from 'lodash-es';
 import type { Invocation } from 'services/api/types';
 
-type AddImageToImageArg = {
-  g: Graph;
-  manager: CanvasManager;
-  l2i: Invocation<'l2i' | 'flux_vae_decode'>;
-  denoise: Invocation<'denoise_latents' | 'flux_denoise'>;
-  vaeSource: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader' | 'seamless' | 'vae_loader'>;
-  originalSize: Dimensions;
-  scaledSize: Dimensions;
-  bbox: CanvasState['bbox'];
-  denoising_start: number;
-  fp32: boolean;
-};
-
-export const addImageToImage = async ({
-  g,
-  manager,
-  l2i,
-  denoise,
-  vaeSource,
-  originalSize,
-  scaledSize,
-  bbox,
-  denoising_start,
-  fp32,
-}: AddImageToImageArg): Promise<Invocation<'img_resize' | 'l2i' | 'flux_vae_decode'>> => {
+export const addImageToImage = async (
+  g: Graph,
+  manager: CanvasManager,
+  l2i: Invocation<'l2i' | 'flux_vae_decode'>,
+  denoise: Invocation<'denoise_latents' | 'flux_denoise'>,
+  vaeSource: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader' | 'seamless' | 'vae_loader'>,
+  originalSize: Dimensions,
+  scaledSize: Dimensions,
+  bbox: CanvasState['bbox'],
+  denoising_start: number,
+  fp32: boolean
+): Promise<Invocation<'img_resize' | 'l2i' | 'flux_vae_decode'>> => {
   denoise.denoising_start = denoising_start;
 
   const { image_name } = await manager.compositor.getCompositeRasterLayerImageDTO(bbox.rect);

invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts

@@ -10,33 +10,19 @@ import { addImageToLatents } from 'features/nodes/util/graph/graphBuilderUtils';
 import { isEqual } from 'lodash-es';
 import type { Invocation } from 'services/api/types';
 
-type AddInpaintArg = {
-  state: RootState;
-  g: Graph;
-  manager: CanvasManager;
-  l2i: Invocation<'l2i' | 'flux_vae_decode'>;
-  denoise: Invocation<'denoise_latents' | 'flux_denoise'>;
-  vaeSource: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader' | 'seamless' | 'vae_loader'>;
-  modelLoader: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader'>;
-  originalSize: Dimensions;
-  scaledSize: Dimensions;
-  denoising_start: number;
-  fp32: boolean;
-};
-
-export const addInpaint = async ({
-  state,
-  g,
-  manager,
-  l2i,
-  denoise,
-  vaeSource,
-  modelLoader,
-  originalSize,
-  scaledSize,
-  denoising_start,
-  fp32,
-}: AddInpaintArg): Promise<Invocation<'canvas_v2_mask_and_crop' | 'img_resize'>> => {
+export const addInpaint = async (
+  state: RootState,
+  g: Graph,
+  manager: CanvasManager,
+  l2i: Invocation<'l2i' | 'flux_vae_decode'>,
+  denoise: Invocation<'denoise_latents' | 'flux_denoise'>,
+  vaeSource: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader' | 'seamless' | 'vae_loader'>,
+  modelLoader: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader'>,
+  originalSize: Dimensions,
+  scaledSize: Dimensions,
+  denoising_start: number,
+  fp32: boolean
+): Promise<Invocation<'canvas_v2_mask_and_crop'>> => {
   denoise.denoising_start = denoising_start;
 
   const params = selectParamsSlice(state);
@@ -69,6 +55,16 @@ export const addInpaint = async ({
       type: 'img_resize',
       ...scaledSize,
     });
+    const resizeImageToOriginalSize = g.addNode({
+      id: getPrefixedId('resize_image_to_original_size'),
+      type: 'img_resize',
+      ...originalSize,
+    });
+    const resizeMaskToOriginalSize = g.addNode({
+      id: getPrefixedId('resize_mask_to_original_size'),
+      type: 'img_resize',
+      ...originalSize,
+    });
     const createGradientMask = g.addNode({
       id: getPrefixedId('create_gradient_mask'),
       type: 'create_gradient_mask',
@@ -82,11 +78,6 @@ export const addInpaint = async ({
       type: 'canvas_v2_mask_and_crop',
       mask_blur: params.maskBlur,
     });
-    const resizeOutput = g.addNode({
-      id: getPrefixedId('resize_output'),
-      type: 'img_resize',
-      ...originalSize,
-    });
 
     // Resize initial image and mask to scaled size, feed into to gradient mask
     g.addEdge(alphaToMask, 'image', resizeMaskToScaledSize, 'image');
@@ -103,20 +94,21 @@ export const addInpaint = async ({
 
     g.addEdge(createGradientMask, 'denoise_mask', denoise, 'denoise_mask');
 
-    // Paste the generated masked image back onto the original image
-    g.addEdge(l2i, 'image', canvasPasteBack, 'generated_image');
-    g.addEdge(createGradientMask, 'expanded_mask_area', canvasPasteBack, 'mask');
+    // After denoising, resize the image and mask back to original size
+    g.addEdge(l2i, 'image', resizeImageToOriginalSize, 'image');
+    g.addEdge(createGradientMask, 'expanded_mask_area', resizeMaskToOriginalSize, 'image');
 
-    // Finally, resize the output back to the original size
-    g.addEdge(canvasPasteBack, 'image', resizeOutput, 'image');
+    // Finally, paste the generated masked image back onto the original image
+    g.addEdge(resizeImageToOriginalSize, 'image', canvasPasteBack, 'generated_image');
+    g.addEdge(resizeMaskToOriginalSize, 'image', canvasPasteBack, 'mask');
 
     // Do the paste back if we are sending to gallery (in which case we want to see the full image), or if we are sending
     // to canvas but not outputting only masked regions
     if (!canvasSettings.sendToCanvas || !canvasSettings.outputOnlyMaskedRegions) {
-      g.addEdge(resizeImageToScaledSize, 'image', canvasPasteBack, 'source_image');
+      canvasPasteBack.source_image = { image_name: initialImage.image_name };
     }
 
-    return resizeOutput;
+    return canvasPasteBack;
   } else {
     // No scale before processing, much simpler
     const i2l = addImageToLatents(g, modelLoader.type === 'flux_model_loader', fp32, initialImage.image_name);

invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts

@@ -10,33 +10,19 @@ import { addImageToLatents, getInfill } from 'features/nodes/util/graph/graphBui
 import { isEqual } from 'lodash-es';
 import type { Invocation } from 'services/api/types';
 
-type AddOutpaintArg = {
-  state: RootState;
-  g: Graph;
-  manager: CanvasManager;
-  l2i: Invocation<'l2i' | 'flux_vae_decode'>;
-  denoise: Invocation<'denoise_latents' | 'flux_denoise'>;
-  vaeSource: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader' | 'seamless' | 'vae_loader'>;
-  modelLoader: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader'>;
-  originalSize: Dimensions;
-  scaledSize: Dimensions;
-  denoising_start: number;
-  fp32: boolean;
-};
-
-export const addOutpaint = async ({
-  state,
-  g,
-  manager,
-  l2i,
-  denoise,
-  vaeSource,
-  modelLoader,
-  originalSize,
-  scaledSize,
-  denoising_start,
-  fp32,
-}: AddOutpaintArg): Promise<Invocation<'canvas_v2_mask_and_crop' | 'img_resize'>> => {
+export const addOutpaint = async (
+  state: RootState,
+  g: Graph,
+  manager: CanvasManager,
+  l2i: Invocation<'l2i' | 'flux_vae_decode'>,
+  denoise: Invocation<'denoise_latents' | 'flux_denoise'>,
+  vaeSource: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader' | 'seamless' | 'vae_loader'>,
+  modelLoader: Invocation<'main_model_loader' | 'sdxl_model_loader' | 'flux_model_loader'>,
+  originalSize: Dimensions,
+  scaledSize: Dimensions,
+  denoising_start: number,
+  fp32: boolean
+): Promise<Invocation<'canvas_v2_mask_and_crop'>> => {
   denoise.denoising_start = denoising_start;
 
   const params = selectParamsSlice(state);
@@ -112,33 +98,40 @@ export const addOutpaint = async ({
     g.addEdge(vaeSource, 'vae', i2l, 'vae');
     g.addEdge(i2l, 'latents', denoise, 'latents');
 
+    // Resize the output image back to the original size
+    const resizeOutputImageToOriginalSize = g.addNode({
+      id: getPrefixedId('resize_image_to_original_size'),
+      type: 'img_resize',
+      ...originalSize,
+    });
+    const resizeOutputMaskToOriginalSize = g.addNode({
+      id: getPrefixedId('resize_mask_to_original_size'),
+      type: 'img_resize',
+      ...originalSize,
+    });
     const canvasPasteBack = g.addNode({
       id: getPrefixedId('canvas_v2_mask_and_crop'),
       type: 'canvas_v2_mask_and_crop',
       mask_blur: params.maskBlur,
     });
-    const resizeOutput = g.addNode({
-      id: getPrefixedId('resize_output'),
-      type: 'img_resize',
-      ...originalSize,
-    });
 
     // Resize initial image and mask to scaled size, feed into to gradient mask
 
-    // Paste the generated masked image back onto the original image
-    g.addEdge(l2i, 'image', canvasPasteBack, 'generated_image');
-    g.addEdge(createGradientMask, 'expanded_mask_area', canvasPasteBack, 'mask');
+    // After denoising, resize the image and mask back to original size
+    g.addEdge(l2i, 'image', resizeOutputImageToOriginalSize, 'image');
+    g.addEdge(createGradientMask, 'expanded_mask_area', resizeOutputMaskToOriginalSize, 'image');
 
-    // Finally, resize the output back to the original size
-    g.addEdge(canvasPasteBack, 'image', resizeOutput, 'image');
+    // Finally, paste the generated masked image back onto the original image
+    g.addEdge(resizeOutputImageToOriginalSize, 'image', canvasPasteBack, 'generated_image');
+    g.addEdge(resizeOutputMaskToOriginalSize, 'image', canvasPasteBack, 'mask');
 
     // Do the paste back if we are sending to gallery (in which case we want to see the full image), or if we are sending
     // to canvas but not outputting only masked regions
     if (!canvasSettings.sendToCanvas || !canvasSettings.outputOnlyMaskedRegions) {
-      g.addEdge(resizeInputImageToScaledSize, 'image', canvasPasteBack, 'source_image');
+      canvasPasteBack.source_image = { image_name: initialImage.image_name };
     }
 
-    return resizeOutput;
+    return canvasPasteBack;
   } else {
     infill.image = { image_name: initialImage.image_name };
     // No scale before processing, much simpler

invokeai/frontend/web/src/features/nodes/util/graph/generation/addSeamless.ts

@@ -23,12 +23,6 @@ export const addSeamless = (
 ): Invocation<'seamless'> | null => {
   const { seamlessXAxis: seamless_x, seamlessYAxis: seamless_y } = state.params;
 
-  // Always write seamless metadata to ensure recalling all parameters will reset the seamless settings
-  g.upsertMetadata({
-    seamless_x,
-    seamless_y,
-  });
-
   if (!seamless_x && !seamless_y) {
     return null;
   }
@@ -40,6 +34,11 @@ export const addSeamless = (
     seamless_y,
   });
 
+  g.upsertMetadata({
+    seamless_x: seamless_x || undefined,
+    seamless_y: seamless_y || undefined,
+  });
+
   // Seamless slots into the graph between the model loader and the denoise node
   g.deleteEdgesFrom(modelLoader, ['unet']);
   g.deleteEdgesFrom(modelLoader, ['vae']);

invokeai/frontend/web/src/features/nodes/util/graph/generation/addTextToImage.ts

@@ -4,19 +4,12 @@ import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import { isEqual } from 'lodash-es';
 import type { Invocation } from 'services/api/types';
 
-type AddTextToImageArg = {
-  g: Graph;
-  l2i: Invocation<'l2i' | 'flux_vae_decode'>;
-  originalSize: Dimensions;
-  scaledSize: Dimensions;
-};
-
-export const addTextToImage = ({
-  g,
-  l2i,
-  originalSize,
-  scaledSize,
-}: AddTextToImageArg): Invocation<'img_resize' | 'l2i' | 'flux_vae_decode'> => {
+export const addTextToImage = (
+  g: Graph,
+  l2i: Invocation<'l2i' | 'flux_vae_decode'>,
+  originalSize: Dimensions,
+  scaledSize: Dimensions
+): Invocation<'img_resize' | 'l2i' | 'flux_vae_decode'> => {
   if (!isEqual(scaledSize, originalSize)) {
     // We need to resize the output image back to the original size
     const resizeImageToOriginalSize = g.addNode({

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildFLUXGraph.ts

@@ -14,15 +14,9 @@ import { addOutpaint } from 'features/nodes/util/graph/generation/addOutpaint';
 import { addTextToImage } from 'features/nodes/util/graph/generation/addTextToImage';
 import { addWatermarker } from 'features/nodes/util/graph/generation/addWatermarker';
 import { Graph } from 'features/nodes/util/graph/generation/Graph';
-import {
-  CANVAS_OUTPUT_PREFIX,
-  getBoardField,
-  getPresetModifiedPrompts,
-  getSizes,
-} from 'features/nodes/util/graph/graphBuilderUtils';
+import { getBoardField, getPresetModifiedPrompts, getSizes } from 'features/nodes/util/graph/graphBuilderUtils';
 import type { Invocation } from 'services/api/types';
 import { isNonRefinerMainModelConfig } from 'services/api/types';
-import type { Equals } from 'tsafe';
 import { assert } from 'tsafe';
 
 import { addControlNets } from './addControlAdapters';
@@ -80,7 +74,7 @@ export const buildFLUXGraph = async (
     prompt: positivePrompt,
   });
 
-  const denoise = g.addNode({
+  const noise = g.addNode({
     type: 'flux_denoise',
     id: getPrefixedId('flux_denoise'),
     guidance,
@@ -97,19 +91,23 @@ export const buildFLUXGraph = async (
     id: getPrefixedId('flux_vae_decode'),
   });
 
-  g.addEdge(modelLoader, 'transformer', denoise, 'transformer');
-  g.addEdge(modelLoader, 'vae', denoise, 'controlnet_vae');
+  let canvasOutput: Invocation<
+    'l2i' | 'img_nsfw' | 'img_watermark' | 'img_resize' | 'canvas_v2_mask_and_crop' | 'flux_vae_decode'
+  > = l2i;
+
+  g.addEdge(modelLoader, 'transformer', noise, 'transformer');
+  g.addEdge(modelLoader, 'vae', noise, 'controlnet_vae');
   g.addEdge(modelLoader, 'vae', l2i, 'vae');
 
   g.addEdge(modelLoader, 'clip', posCond, 'clip');
   g.addEdge(modelLoader, 't5_encoder', posCond, 't5_encoder');
   g.addEdge(modelLoader, 'max_seq_len', posCond, 't5_max_seq_len');
 
-  addFLUXLoRAs(state, g, denoise, modelLoader, posCond);
+  addFLUXLoRAs(state, g, noise, modelLoader, posCond);
 
-  g.addEdge(posCond, 'conditioning', denoise, 'positive_text_conditioning');
+  g.addEdge(posCond, 'conditioning', noise, 'positive_text_conditioning');
 
-  g.addEdge(denoise, 'latents', l2i, 'latents');
+  g.addEdge(noise, 'latents', l2i, 'latents');
 
   const modelConfig = await fetchModelConfigWithTypeGuard(model.key, isNonRefinerMainModelConfig);
   assert(modelConfig.base === 'flux');
@@ -128,65 +126,59 @@ export const buildFLUXGraph = async (
     clip_embed_model: clipEmbedModel,
   });
 
-  let denoising_start: number;
+  let denoisingStart: number;
   if (optimizedDenoisingEnabled) {
     // We rescale the img2imgStrength (with exponent 0.2) to effectively use the entire range [0, 1] and make the scale
     // more user-friendly for FLUX. Without this, most of the 'change' is concentrated in the high denoise strength
     // range (>0.9).
-    denoising_start = 1 - img2imgStrength ** 0.2;
+    denoisingStart = 1 - img2imgStrength ** 0.2;
   } else {
-    denoising_start = 1 - img2imgStrength;
+    denoisingStart = 1 - img2imgStrength;
   }
 
-  let canvasOutput: Invocation<
-    'l2i' | 'img_nsfw' | 'img_watermark' | 'img_resize' | 'canvas_v2_mask_and_crop' | 'flux_vae_decode'
-  > = l2i;
-
   if (generationMode === 'txt2img') {
-    canvasOutput = addTextToImage({ g, l2i, originalSize, scaledSize });
+    canvasOutput = addTextToImage(g, l2i, originalSize, scaledSize);
   } else if (generationMode === 'img2img') {
-    canvasOutput = await addImageToImage({
+    canvasOutput = await addImageToImage(
       g,
       manager,
       l2i,
-      denoise,
-      vaeSource: modelLoader,
+      noise,
+      modelLoader,
       originalSize,
       scaledSize,
       bbox,
-      denoising_start,
-      fp32: false,
-    });
+      denoisingStart,
+      false
+    );
   } else if (generationMode === 'inpaint') {
-    canvasOutput = await addInpaint({
+    canvasOutput = await addInpaint(
       state,
       g,
       manager,
       l2i,
-      denoise,
-      vaeSource: modelLoader,
+      noise,
+      modelLoader,
       modelLoader,
       originalSize,
       scaledSize,
-      denoising_start,
-      fp32: false,
-    });
+      denoisingStart,
+      false
+    );
   } else if (generationMode === 'outpaint') {
-    canvasOutput = await addOutpaint({
+    canvasOutput = await addOutpaint(
       state,
       g,
       manager,
       l2i,
-      denoise,
-      vaeSource: modelLoader,
+      noise,
+      modelLoader,
       modelLoader,
       originalSize,
       scaledSize,
-      denoising_start,
-      fp32: false,
-    });
-  } else {
-    assert<Equals<typeof generationMode, never>>(false);
+      denoisingStart,
+      false
+    );
   }
 
   const controlNetCollector = g.addNode({
@@ -202,7 +194,7 @@ export const buildFLUXGraph = async (
     modelConfig.base
   );
   if (controlNetResult.addedControlNets > 0) {
-    g.addEdge(controlNetCollector, 'collection', denoise, 'control');
+    g.addEdge(controlNetCollector, 'collection', noise, 'control');
   } else {
     g.deleteNode(controlNetCollector.id);
   }
@@ -229,14 +221,14 @@ export const buildFLUXGraph = async (
     g.addEdge(modelLoader, 'clip', negCond, 'clip');
     g.addEdge(modelLoader, 't5_encoder', negCond, 't5_encoder');
     g.addEdge(modelLoader, 'max_seq_len', negCond, 't5_max_seq_len');
-    g.addEdge(negCond, 'conditioning', denoise, 'negative_text_conditioning');
+    g.addEdge(negCond, 'conditioning', noise, 'negative_text_conditioning');
 
-    g.updateNode(denoise, {
+    g.updateNode(noise, {
       cfg_scale: 3,
       cfg_scale_start_step,
       cfg_scale_end_step,
     });
-    g.addEdge(ipAdapterCollector, 'collection', denoise, 'ip_adapter');
+    g.addEdge(ipAdapterCollector, 'collection', noise, 'ip_adapter');
   } else {
     g.deleteNode(ipAdapterCollector.id);
   }
@@ -258,12 +250,12 @@ export const buildFLUXGraph = async (
   }
 
   g.updateNode(canvasOutput, {
-    id: getPrefixedId(CANVAS_OUTPUT_PREFIX),
+    id: getPrefixedId('canvas_output'),
     is_intermediate,
     use_cache: false,
     board,
   });
 
   g.setMetadataReceivingNode(canvasOutput);
-  return { g, noise: denoise, posCond };
+  return { g, noise, posCond };
 };

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts

@@ -18,15 +18,9 @@ import { addSeamless } from 'features/nodes/util/graph/generation/addSeamless';
 import { addTextToImage } from 'features/nodes/util/graph/generation/addTextToImage';
 import { addWatermarker } from 'features/nodes/util/graph/generation/addWatermarker';
 import { Graph } from 'features/nodes/util/graph/generation/Graph';
-import {
-  CANVAS_OUTPUT_PREFIX,
-  getBoardField,
-  getPresetModifiedPrompts,
-  getSizes,
-} from 'features/nodes/util/graph/graphBuilderUtils';
+import { getBoardField, getPresetModifiedPrompts, getSizes } from 'features/nodes/util/graph/graphBuilderUtils';
 import type { Invocation } from 'services/api/types';
 import { isNonRefinerMainModelConfig } from 'services/api/types';
-import type { Equals } from 'tsafe';
 import { assert } from 'tsafe';
 
 import { addRegions } from './addRegions';
@@ -126,6 +120,10 @@ export const buildSD1Graph = async (
         })
       : null;
 
+  let canvasOutput: Invocation<
+    'l2i' | 'img_nsfw' | 'img_watermark' | 'img_resize' | 'canvas_v2_mask_and_crop' | 'flux_vae_decode'
+  > = l2i;
+
   g.addEdge(modelLoader, 'unet', denoise, 'unet');
   g.addEdge(modelLoader, 'clip', clipSkip, 'clip');
   g.addEdge(clipSkip, 'clip', posCond, 'clip');
@@ -167,16 +165,10 @@ export const buildSD1Graph = async (
   > = seamless ?? vaeLoader ?? modelLoader;
   g.addEdge(vaeSource, 'vae', l2i, 'vae');
 
-  const denoising_start = 1 - params.img2imgStrength;
-
-  let canvasOutput: Invocation<
-    'l2i' | 'img_nsfw' | 'img_watermark' | 'img_resize' | 'canvas_v2_mask_and_crop' | 'flux_vae_decode'
-  > = l2i;
-
   if (generationMode === 'txt2img') {
-    canvasOutput = addTextToImage({ g, l2i, originalSize, scaledSize });
+    canvasOutput = addTextToImage(g, l2i, originalSize, scaledSize);
   } else if (generationMode === 'img2img') {
-    canvasOutput = await addImageToImage({
+    canvasOutput = await addImageToImage(
       g,
       manager,
       l2i,
@@ -185,11 +177,11 @@ export const buildSD1Graph = async (
       originalSize,
       scaledSize,
       bbox,
-      denoising_start,
-      fp32: vaePrecision === 'fp32',
-    });
+      1 - params.img2imgStrength,
+      vaePrecision === 'fp32'
+    );
   } else if (generationMode === 'inpaint') {
-    canvasOutput = await addInpaint({
+    canvasOutput = await addInpaint(
       state,
       g,
       manager,
@@ -199,11 +191,11 @@ export const buildSD1Graph = async (
       modelLoader,
       originalSize,
       scaledSize,
-      denoising_start,
-      fp32: vaePrecision === 'fp32',
-    });
+      1 - params.img2imgStrength,
+      vaePrecision === 'fp32'
+    );
   } else if (generationMode === 'outpaint') {
-    canvasOutput = await addOutpaint({
+    canvasOutput = await addOutpaint(
       state,
       g,
       manager,
@@ -213,11 +205,9 @@ export const buildSD1Graph = async (
       modelLoader,
       originalSize,
       scaledSize,
-      denoising_start,
-      fp32,
-    });
-  } else {
-    assert<Equals<typeof generationMode, never>>(false);
+      1 - params.img2imgStrength,
+      fp32
+    );
   }
 
   const controlNetCollector = g.addNode({
@@ -301,7 +291,7 @@ export const buildSD1Graph = async (
   }
 
   g.updateNode(canvasOutput, {
-    id: getPrefixedId(CANVAS_OUTPUT_PREFIX),
+    id: getPrefixedId('canvas_output'),
     is_intermediate,
     use_cache: false,
     board,

invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts

@@ -18,15 +18,9 @@ import { addSeamless } from 'features/nodes/util/graph/generation/addSeamless';
 import { addTextToImage } from 'features/nodes/util/graph/generation/addTextToImage';
 import { addWatermarker } from 'features/nodes/util/graph/generation/addWatermarker';
 import { Graph } from 'features/nodes/util/graph/generation/Graph';
-import {
-  CANVAS_OUTPUT_PREFIX,
-  getBoardField,
-  getPresetModifiedPrompts,
-  getSizes,
-} from 'features/nodes/util/graph/graphBuilderUtils';
+import { getBoardField, getPresetModifiedPrompts, getSizes } from 'features/nodes/util/graph/graphBuilderUtils';
 import type { Invocation } from 'services/api/types';
 import { isNonRefinerMainModelConfig } from 'services/api/types';
-import type { Equals } from 'tsafe';
 import { assert } from 'tsafe';
 
 import { addRegions } from './addRegions';
@@ -124,6 +118,10 @@ export const buildSDXLGraph = async (
         })
       : null;
 
+  let canvasOutput: Invocation<
+    'l2i' | 'img_nsfw' | 'img_watermark' | 'img_resize' | 'canvas_v2_mask_and_crop' | 'flux_vae_decode'
+  > = l2i;
+
   g.addEdge(modelLoader, 'unet', denoise, 'unet');
   g.addEdge(modelLoader, 'clip', posCond, 'clip');
   g.addEdge(modelLoader, 'clip', negCond, 'clip');
@@ -170,18 +168,10 @@ export const buildSDXLGraph = async (
     await addSDXLRefiner(state, g, denoise, seamless, posCond, negCond, l2i);
   }
 
-  const denoising_start = refinerModel
-    ? Math.min(refinerStart, 1 - params.img2imgStrength)
-    : 1 - params.img2imgStrength;
-
-  let canvasOutput: Invocation<
-    'l2i' | 'img_nsfw' | 'img_watermark' | 'img_resize' | 'canvas_v2_mask_and_crop' | 'flux_vae_decode'
-  > = l2i;
-
   if (generationMode === 'txt2img') {
-    canvasOutput = addTextToImage({ g, l2i, originalSize, scaledSize });
+    canvasOutput = addTextToImage(g, l2i, originalSize, scaledSize);
   } else if (generationMode === 'img2img') {
-    canvasOutput = await addImageToImage({
+    canvasOutput = await addImageToImage(
       g,
       manager,
       l2i,
@@ -190,11 +180,11 @@ export const buildSDXLGraph = async (
       originalSize,
       scaledSize,
       bbox,
-      denoising_start,
-      fp32,
-    });
+      refinerModel ? Math.min(refinerStart, 1 - params.img2imgStrength) : 1 - params.img2imgStrength,
+      fp32
+    );
   } else if (generationMode === 'inpaint') {
-    canvasOutput = await addInpaint({
+    canvasOutput = await addInpaint(
       state,
       g,
       manager,
@@ -204,11 +194,11 @@ export const buildSDXLGraph = async (
       modelLoader,
       originalSize,
       scaledSize,
-      denoising_start,
-      fp32,
-    });
+      refinerModel ? Math.min(refinerStart, 1 - params.img2imgStrength) : 1 - params.img2imgStrength,
+      fp32
+    );
   } else if (generationMode === 'outpaint') {
-    canvasOutput = await addOutpaint({
+    canvasOutput = await addOutpaint(
       state,
       g,
       manager,
@@ -218,11 +208,9 @@ export const buildSDXLGraph = async (
       modelLoader,
       originalSize,
       scaledSize,
-      denoising_start,
-      fp32,
-    });
-  } else {
-    assert<Equals<typeof generationMode, never>>(false);
+      refinerModel ? Math.min(refinerStart, 1 - params.img2imgStrength) : 1 - params.img2imgStrength,
+      fp32
+    );
   }
 
   const controlNetCollector = g.addNode({
@@ -306,7 +294,7 @@ export const buildSDXLGraph = async (
   }
 
   g.updateNode(canvasOutput, {
-    id: getPrefixedId(CANVAS_OUTPUT_PREFIX),
+    id: getPrefixedId('canvas_output'),
     is_intermediate,
     use_cache: false,
     board,

invokeai/frontend/web/src/features/nodes/util/graph/graphBuilderUtils.ts

@@ -129,5 +129,3 @@ export const addImageToLatents = (g: Graph, isFlux: boolean, fp32: boolean, imag
     return g.addNode({ id: 'i2l', type: 'i2l', fp32, image: image_name ? { image_name } : undefined });
   }
 };
-
-export const CANVAS_OUTPUT_PREFIX = 'canvas_output';

invokeai/frontend/web/src/features/parameters/components/MainModel/UseDefaultSettingsButton.tsx

@@ -1,160 +1,15 @@
-import { Flex, IconButton, ListItem, Text, UnorderedList } from '@invoke-ai/ui-library';
-import { EMPTY_OBJECT } from 'app/store/constants';
+import { IconButton } from '@invoke-ai/ui-library';
 import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
-import {
-  selectCFGRescaleMultiplier,
-  selectCFGScale,
-  selectGuidance,
-  selectModel,
-  selectScheduler,
-  selectSteps,
-  selectVAE,
-  selectVAEPrecision,
-} from 'features/controlLayers/store/paramsSlice';
-import { selectHeight, selectWidth } from 'features/controlLayers/store/selectors';
+import { selectModel } from 'features/controlLayers/store/paramsSlice';
 import { setDefaultSettings } from 'features/parameters/store/actions';
-import { isNil } from 'lodash-es';
-import { useCallback, useMemo } from 'react';
+import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { PiSparkleFill } from 'react-icons/pi';
-import { modelConfigsAdapterSelectors, useGetModelConfigsQuery } from 'services/api/endpoints/models';
-import type { S } from 'services/api/types';
-import { isNonRefinerMainModelConfig } from 'services/api/types';
 
 export const UseDefaultSettingsButton = () => {
   const model = useAppSelector(selectModel);
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const { data: modelConfigs } = useGetModelConfigsQuery();
-
-  const scheduler = useAppSelector(selectScheduler);
-  const steps = useAppSelector(selectSteps);
-  const vae = useAppSelector(selectVAE);
-  const vaePrecision = useAppSelector(selectVAEPrecision);
-  const width = useAppSelector(selectWidth);
-  const height = useAppSelector(selectHeight);
-  const guidance = useAppSelector(selectGuidance);
-  const cfg = useAppSelector(selectCFGScale);
-  const cfgRescale = useAppSelector(selectCFGRescaleMultiplier);
-
-  const modelConfig = useMemo(() => {
-    if (!modelConfigs) {
-      return null;
-    }
-    if (model === null) {
-      return null;
-    }
-
-    return modelConfigsAdapterSelectors.selectById(modelConfigs, model.key);
-  }, [modelConfigs, model]);
-
-  const hasDefaultSettings = useMemo(() => {
-    const settings = modelConfig && isNonRefinerMainModelConfig(modelConfig) && modelConfig.default_settings;
-    return settings && Object.values(settings).some((setting) => !!setting);
-  }, [modelConfig]);
-
-  const defaultSettings = useMemo<S['MainModelDefaultSettings']>(() => {
-    return modelConfig && isNonRefinerMainModelConfig(modelConfig) && modelConfig.default_settings
-      ? modelConfig.default_settings
-      : EMPTY_OBJECT;
-  }, [modelConfig]);
-
-  const outOfSyncSettings = useMemo(() => {
-    const settings = [];
-    if (hasDefaultSettings) {
-      const {
-        vae: defaultVAE,
-        vae_precision: defaultVAEPrecision,
-        cfg_scale: defaultCfg,
-        cfg_rescale_multiplier: defaultCfgRescale,
-        steps: defaultSteps,
-        scheduler: defaultScheduler,
-        width: defaultWidth,
-        height: defaultHeight,
-        guidance: defaultGuidance,
-      } = defaultSettings;
-
-      if (!isNil(defaultVAE) && vae && defaultVAE !== vae.key) {
-        settings.push(t('modelManager.vae'));
-      }
-
-      if (!isNil(defaultVAE) && !vae && defaultVAE !== 'default') {
-        settings.push(t('modelManager.vae'));
-      }
-
-      if (!isNil(defaultVAEPrecision) && defaultVAEPrecision !== vaePrecision) {
-        settings.push(t('modelManager.vaePrecision'));
-      }
-
-      if (!isNil(defaultCfg) && defaultCfg !== cfg) {
-        settings.push(t('parameters.cfgScale'));
-      }
-
-      if (!isNil(defaultCfgRescale) && defaultCfgRescale !== cfgRescale) {
-        settings.push(t('parameters.cfgRescaleMultiplier'));
-      }
-
-      if (!isNil(defaultSteps) && defaultSteps !== steps) {
-        settings.push(t('parameters.steps'));
-      }
-
-      if (!isNil(defaultScheduler) && defaultScheduler !== scheduler) {
-        settings.push(t('parameters.scheduler'));
-      }
-
-      if (!isNil(defaultWidth) && defaultWidth !== width) {
-        settings.push(t('parameters.width'));
-      }
-
-      if (!isNil(defaultHeight) && defaultHeight !== height) {
-        settings.push(t('parameters.height'));
-      }
-
-      if (!isNil(defaultGuidance) && defaultGuidance !== guidance) {
-        settings.push(t('parameters.guidance'));
-      }
-    }
-    return settings;
-  }, [
-    hasDefaultSettings,
-    vae,
-    vaePrecision,
-    cfg,
-    cfgRescale,
-    steps,
-    scheduler,
-    width,
-    height,
-    guidance,
-    t,
-    defaultSettings,
-  ]);
-
-  const tooltip = useMemo(() => {
-    if (!model) {
-      return t('modelManager.noModelSelected');
-    }
-
-    if (!hasDefaultSettings) {
-      return t('modelManager.noDefaultSettings');
-    }
-
-    if (outOfSyncSettings.length === 0) {
-      return t('modelManager.usingDefaultSettings');
-    }
-
-    return (
-      <Flex direction="column" gap={2}>
-        <Text>{t('modelManager.defaultSettingsOutOfSync')}</Text>
-        <UnorderedList>
-          {outOfSyncSettings.map((setting) => (
-            <ListItem key={setting}>{setting}</ListItem>
-          ))}
-        </UnorderedList>
-        <Text>{t('modelManager.restoreDefaultSettings')}</Text>
-      </Flex>
-    );
-  }, [model, hasDefaultSettings, outOfSyncSettings, t]);
 
   const handleClickDefaultSettings = useCallback(() => {
     dispatch(setDefaultSettings());
@@ -163,13 +18,12 @@ export const UseDefaultSettingsButton = () => {
   return (
     <IconButton
       icon={<PiSparkleFill />}
-      tooltip={tooltip}
+      tooltip={t('modelManager.useDefaultSettings')}
       aria-label={t('modelManager.useDefaultSettings')}
-      isDisabled={!model || !hasDefaultSettings || outOfSyncSettings.length === 0}
+      isDisabled={!model}
       onClick={handleClickDefaultSettings}
       size="sm"
       variant="ghost"
-      colorScheme="warning"
     />
   );
 };

invokeai/frontend/web/src/features/parameters/types/parameterSchemas.ts

@@ -141,20 +141,6 @@ export const isParameterStrength = (val: unknown): val is ParameterStrength =>
   zParameterStrength.safeParse(val).success;
 // #endregion
 
-// #region SeamlessX
-const zParameterSeamlessX = z.boolean();
-export type ParameterSeamlessX = z.infer<typeof zParameterSeamlessX>;
-export const isParameterSeamlessX = (val: unknown): val is ParameterSeamlessX =>
-  zParameterSeamlessX.safeParse(val).success;
-// #endregion
-
-// #region SeamlessY
-const zParameterSeamlessY = z.boolean();
-export type ParameterSeamlessY = z.infer<typeof zParameterSeamlessY>;
-export const isParameterSeamlessY = (val: unknown): val is ParameterSeamlessY =>
-  zParameterSeamlessY.safeParse(val).success;
-// #endregion
-
 // #region Precision
 const zParameterPrecision = z.enum(['fp16', 'fp32']);
 export type ParameterPrecision = z.infer<typeof zParameterPrecision>;

invokeai/frontend/web/src/features/system/components/SettingsModal/SettingsModal.tsx

@@ -31,12 +31,10 @@ import {
   selectSystemShouldConfirmOnDelete,
   selectSystemShouldConfirmOnNewSession,
   selectSystemShouldEnableInformationalPopovers,
-  selectSystemShouldEnableModelDescriptions,
   selectSystemShouldUseNSFWChecker,
   selectSystemShouldUseWatermarker,
   setShouldConfirmOnDelete,
   setShouldEnableInformationalPopovers,
-  setShouldEnableModelDescriptions,
   shouldAntialiasProgressImageChanged,
   shouldConfirmOnNewSessionToggled,
   shouldUseNSFWCheckerChanged,
@@ -101,7 +99,6 @@ const SettingsModal = ({ config = defaultConfig, children }: SettingsModalProps)
   const shouldUseNSFWChecker = useAppSelector(selectSystemShouldUseNSFWChecker);
   const shouldUseWatermarker = useAppSelector(selectSystemShouldUseWatermarker);
   const shouldEnableInformationalPopovers = useAppSelector(selectSystemShouldEnableInformationalPopovers);
-  const shouldEnableModelDescriptions = useAppSelector(selectSystemShouldEnableModelDescriptions);
   const shouldConfirmOnNewSession = useAppSelector(selectSystemShouldConfirmOnNewSession);
   const onToggleConfirmOnNewSession = useCallback(() => {
     dispatch(shouldConfirmOnNewSessionToggled());
@@ -157,12 +154,6 @@ const SettingsModal = ({ config = defaultConfig, children }: SettingsModalProps)
     },
     [dispatch]
   );
-  const handleChangeShouldEnableModelDescriptions = useCallback(
-    (e: ChangeEvent<HTMLInputElement>) => {
-      dispatch(setShouldEnableModelDescriptions(e.target.checked));
-    },
-    [dispatch]
-  );
   const handleChangeShouldUseCpuNoise = useCallback(
     (e: ChangeEvent<HTMLInputElement>) => {
       dispatch(shouldUseCpuNoiseChanged(e.target.checked));
@@ -235,13 +226,6 @@ const SettingsModal = ({ config = defaultConfig, children }: SettingsModalProps)
                         onChange={handleChangeShouldEnableInformationalPopovers}
                       />
                     </FormControl>
-                    <FormControl>
-                      <FormLabel>{t('settings.enableModelDescriptions')}</FormLabel>
-                      <Switch
-                        isChecked={shouldEnableModelDescriptions}
-                        onChange={handleChangeShouldEnableModelDescriptions}
-                      />
-                    </FormControl>
                   </StickyScrollable>
 
                   {Boolean(config?.shouldShowDeveloperSettings) && (

invokeai/frontend/web/src/features/system/store/systemSlice.ts

@@ -17,7 +17,6 @@ const initialSystemState: SystemState = {
   shouldUseNSFWChecker: false,
   shouldUseWatermarker: false,
   shouldEnableInformationalPopovers: true,
-  shouldEnableModelDescriptions: true,
   logIsEnabled: true,
   logLevel: 'debug',
   logNamespaces: [...zLogNamespace.options],
@@ -58,9 +57,6 @@ export const systemSlice = createSlice({
     setShouldEnableInformationalPopovers(state, action: PayloadAction<boolean>) {
       state.shouldEnableInformationalPopovers = action.payload;
     },
-    setShouldEnableModelDescriptions(state, action: PayloadAction<boolean>) {
-      state.shouldEnableModelDescriptions = action.payload;
-    },
     shouldConfirmOnNewSessionToggled(state) {
       state.shouldConfirmOnNewSession = !state.shouldConfirmOnNewSession;
     },
@@ -77,7 +73,6 @@ export const {
   shouldUseNSFWCheckerChanged,
   shouldUseWatermarkerChanged,
   setShouldEnableInformationalPopovers,
-  setShouldEnableModelDescriptions,
   shouldConfirmOnNewSessionToggled,
 } = systemSlice.actions;
 
@@ -113,7 +108,4 @@ export const selectSystemShouldAntialiasProgressImage = createSystemSelector(
 export const selectSystemShouldEnableInformationalPopovers = createSystemSelector(
   (system) => system.shouldEnableInformationalPopovers
 );
-export const selectSystemShouldEnableModelDescriptions = createSystemSelector(
-  (system) => system.shouldEnableModelDescriptions
-);
 export const selectSystemShouldConfirmOnNewSession = createSystemSelector((system) => system.shouldConfirmOnNewSession);

invokeai/frontend/web/src/features/system/store/types.ts

@@ -37,7 +37,6 @@ export interface SystemState {
   shouldUseNSFWChecker: boolean;
   shouldUseWatermarker: boolean;
   shouldEnableInformationalPopovers: boolean;
-  shouldEnableModelDescriptions: boolean;
   logIsEnabled: boolean;
   logLevel: LogLevel;
   logNamespaces: LogNamespace[];

invokeai/frontend/web/src/features/ui/components/CanvasV2Announcement.tsx

@@ -1,34 +1,27 @@
-import { ExternalLink, Flex, ListItem, Text, UnorderedList } from '@invoke-ai/ui-library';
+import { ExternalLink, Flex, ListItem, UnorderedList } from '@invoke-ai/ui-library';
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
 import { selectConfigSlice } from 'features/system/store/configSlice';
-import { Trans, useTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 
 const selectIsLocal = createSelector(selectConfigSlice, (config) => config.isLocal);
 
-export const WhatsNew = () => {
+export const CanvasV2Announcement = () => {
   const { t } = useTranslation();
   const isLocal = useAppSelector(selectIsLocal);
 
   return (
     <Flex gap={4} flexDir="column">
       <UnorderedList fontSize="sm">
-        <ListItem>
-          <Trans
-            i18nKey="whatsNew.line1"
-            components={{
-              ItalicComponent: <Text as="span" color="white" fontSize="sm" fontStyle="italic" />,
-            }}
-          />
-        </ListItem>
-        <ListItem>{t('whatsNew.line2')}</ListItem>
-        <ListItem>{t('whatsNew.line3')}</ListItem>
+        <ListItem>{t('whatsNew.canvasV2Announcement.newCanvas')}</ListItem>
+        <ListItem>{t('whatsNew.canvasV2Announcement.newLayerTypes')}</ListItem>
+        <ListItem>{t('whatsNew.canvasV2Announcement.fluxSupport')}</ListItem>
       </UnorderedList>
       <Flex flexDir="column" gap={1}>
         <ExternalLink
           fontSize="sm"
           fontWeight="semibold"
-          label={t('whatsNew.readReleaseNotes')}
+          label={t('whatsNew.canvasV2Announcement.readReleaseNotes')}
           href={
             isLocal
               ? 'https://github.com/invoke-ai/InvokeAI/releases/tag/v5.0.0'
@@ -38,8 +31,14 @@ export const WhatsNew = () => {
         <ExternalLink
           fontSize="sm"
           fontWeight="semibold"
-          label={t('whatsNew.watchRecentReleaseVideos')}
-          href="https://www.youtube.com/@invokeai/videos"
+          label={t('whatsNew.canvasV2Announcement.watchReleaseVideo')}
+          href="https://www.youtube.com/watch?v=y80W3PjR0Gc"
+        />
+        <ExternalLink
+          fontSize="sm"
+          fontWeight="semibold"
+          label={t('whatsNew.canvasV2Announcement.watchUiUpdatesOverview')}
+          href="https://www.youtube.com/watch?v=Tl-69JvwJ2s"
         />
       </Flex>
     </Flex>

invokeai/frontend/web/src/features/ui/components/Notifications.tsx

@@ -21,14 +21,14 @@ import { useTranslation } from 'react-i18next';
 import { PiLightbulbFilamentBold } from 'react-icons/pi';
 import { useGetAppVersionQuery } from 'services/api/endpoints/appInfo';
 
-import { WhatsNew } from './WhatsNew';
+import { CanvasV2Announcement } from './CanvasV2Announcement';
 
 const selectIsLocal = createSelector(selectConfigSlice, (config) => config.isLocal);
 
 export const Notifications = () => {
   const { t } = useTranslation();
   const dispatch = useAppDispatch();
-  const shouldShowNotification = useAppSelector((s) => s.ui.shouldShowNotificationV2);
+  const shouldShowNotification = useAppSelector((s) => s.ui.shouldShowNotification);
   const resetIndicator = useCallback(() => {
     dispatch(shouldShowNotificationChanged(false));
   }, [dispatch]);
@@ -58,16 +58,11 @@ export const Notifications = () => {
           <Flex alignItems="center" gap={3}>
             <Image src={InvokeSymbol} boxSize={6} />
             {t('whatsNew.whatsNewInInvoke')}
-            {!!data.version.length &&
-              (isLocal ? (
-                <Text variant="subtext">{`v${data.version}`}</Text>
-              ) : (
-                <Text variant="subtext">{data.version}</Text>
-              ))}
+            {isLocal && <Text variant="subtext">{`v${data.version}`}</Text>}
           </Flex>
         </PopoverHeader>
-        <PopoverBody p={2} maxW={300}>
-          <WhatsNew />
+        <PopoverBody p={2}>
+          <CanvasV2Announcement />
         </PopoverBody>
       </PopoverContent>
     </Popover>

invokeai/frontend/web/src/features/ui/store/uiSlice.ts

@@ -15,7 +15,7 @@ const initialUIState: UIState = {
   shouldShowProgressInViewer: true,
   accordions: {},
   expanders: {},
-  shouldShowNotificationV2: true,
+  shouldShowNotification: true,
 };
 
 export const uiSlice = createSlice({
@@ -43,7 +43,7 @@ export const uiSlice = createSlice({
       state.expanders[id] = isOpen;
     },
     shouldShowNotificationChanged: (state, action: PayloadAction<boolean>) => {
-      state.shouldShowNotificationV2 = action.payload;
+      state.shouldShowNotification = action.payload;
     },
   },
   extraReducers(builder) {

invokeai/frontend/web/src/features/ui/store/uiTypes.ts

@@ -31,7 +31,7 @@ export interface UIState {
    */
   expanders: Record<string, boolean>;
   /**
-   * Whether or not to show the user the open notification. Bump version to reset users who may have closed previous version.
+   * Whether or not to show the user the open notification.
    */
-  shouldShowNotificationV2: boolean;
+  shouldShowNotification: boolean;
 }

invokeai/frontend/web/src/services/api/schema.ts

@@ -1714,12 +1714,6 @@ export type components = {
              * @default null
              */
             image?: components["schemas"]["ImageField"];
-            /**
-             * Invert
-             * @description Whether to invert the mask.
-             * @default false
-             */
-            invert?: boolean;
             /**
              * type
              * @default apply_tensor_mask_to_image

invokeai/frontend/web/src/services/events/onInvocationComplete.tsx

@@ -6,7 +6,6 @@ import { stagingAreaImageStaged } from 'features/controlLayers/store/canvasStagi
 import { boardIdSelected, galleryViewChanged, imageSelected, offsetChanged } from 'features/gallery/store/gallerySlice';
 import { $nodeExecutionStates, upsertExecutionState } from 'features/nodes/hooks/useExecutionState';
 import { zNodeStatus } from 'features/nodes/types/invocation';
-import { CANVAS_OUTPUT_PREFIX } from 'features/nodes/util/graph/graphBuilderUtils';
 import { boardsApi } from 'services/api/endpoints/boards';
 import { getImageDTOSafe, imagesApi } from 'services/api/endpoints/images';
 import type { ImageDTO, S } from 'services/api/types';
@@ -16,7 +15,7 @@ import { $lastProgressEvent } from 'services/events/stores';
 const log = logger('events');
 
 const isCanvasOutputNode = (data: S['InvocationCompleteEvent']) => {
-  return data.invocation_source_id.split(':')[0] === CANVAS_OUTPUT_PREFIX;
+  return data.invocation_source_id.split(':')[0] === 'canvas_output';
 };
 
 const nodeTypeDenylist = ['load_image', 'image'];

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "5.4.0a1"
+__version__ = "5.3.0rc1"

pyproject.toml

@@ -33,12 +33,12 @@ classifiers = [
 ]
 dependencies = [
   # Core generation dependencies, pinned for reproducible builds.
-  "accelerate==1.0.1",
+  "accelerate==0.30.1",
   "bitsandbytes==0.43.3; sys_platform!='darwin'",
   "clip_anytorch==2.6.0",       # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip",
   "compel==2.0.2",
   "controlnet-aux==0.0.7",
-  "diffusers[torch]==0.31.0",
+  "diffusers[torch]==0.27.2",
   "gguf==0.10.0",
   "invisible-watermark==0.2.0", # needed to install SDXL base and refiner using their repo_ids
   "mediapipe>=0.10.7",          # needed for "mediapipeface" controlnet model
@@ -61,7 +61,7 @@ dependencies = [
   # Core application dependencies, pinned for reproducible builds.
   "fastapi-events==0.11.1",
   "fastapi==0.111.0",
-  "huggingface-hub==0.26.1",
+  "huggingface-hub==0.23.1",
   "pydantic-settings==2.2.1",
   "pydantic==2.7.2",
   "python-socketio==5.11.1",
@@ -89,7 +89,7 @@ dependencies = [
   "pypatchmatch",
   'pyperclip',
   "pyreadline3",
-  "python-multipart",
+  "python-multipart==0.0.12",
   "requests~=2.28.2",
   "rich~=13.3",
   "scikit-image~=0.21.0",