Merge remote-tracking branch 'origin/main' into release/3.4

docs/nodes/communityNodes.md

@@ -32,6 +32,7 @@ To use a community workflow, download the the `.json` node graph file and load i
     + [Size Stepper Nodes](#size-stepper-nodes)
     + [Text font to Image](#text-font-to-image)
     + [Thresholding](#thresholding)
+    + [Unsharp Mask](#unsharp-mask)
     + [XY Image to Grid and Images to Grids nodes](#xy-image-to-grid-and-images-to-grids-nodes)
 - [Example Node Template](#example-node-template)
 - [Disclaimer](#disclaimer)
@@ -316,6 +317,13 @@ Highlights/Midtones/Shadows (with LUT blur enabled):
 <img src="https://github.com/invoke-ai/InvokeAI/assets/34005131/0a440e43-697f-4d17-82ee-f287467df0a5" width="300" />
 <img src="https://github.com/invoke-ai/InvokeAI/assets/34005131/0701fd0f-2ca7-4fe2-8613-2b52547bafce" width="300" />
 
+--------------------------------
+### Unsharp Mask
+
+**Description:** Applies an unsharp mask filter to an image, preserving its alpha channel in the process.
+
+**Node Link:** https://github.com/JPPhoto/unsharp-mask-node
+
 --------------------------------
 ### XY Image to Grid and Images to Grids nodes
 

invokeai/app/invocations/image.py

@@ -8,7 +8,7 @@ import numpy
 from PIL import Image, ImageChops, ImageFilter, ImageOps
 
 from invokeai.app.invocations.primitives import BoardField, ColorField, ImageField, ImageOutput
-from invokeai.app.services.image_records.image_records_common import ImageCategory, ResourceOrigin
+from invokeai.app.services.image_records.image_records_common import ImageCategory, ImageRecordChanges, ResourceOrigin
 from invokeai.app.shared.fields import FieldDescriptions
 from invokeai.backend.image_util.invisible_watermark import InvisibleWatermark
 from invokeai.backend.image_util.safety_checker import SafetyChecker
@@ -1017,3 +1017,35 @@ class SaveImageInvocation(BaseInvocation, WithWorkflow, WithMetadata):
             width=image_dto.width,
             height=image_dto.height,
         )
+
+
+@invocation(
+    "linear_ui_output",
+    title="Linear UI Image Output",
+    tags=["primitives", "image"],
+    category="primitives",
+    version="1.0.1",
+    use_cache=False,
+)
+class LinearUIOutputInvocation(BaseInvocation, WithWorkflow, WithMetadata):
+    """Handles Linear UI Image Outputting tasks."""
+
+    image: ImageField = InputField(description=FieldDescriptions.image)
+    board: Optional[BoardField] = InputField(default=None, description=FieldDescriptions.board, input=Input.Direct)
+
+    def invoke(self, context: InvocationContext) -> ImageOutput:
+        image_dto = context.services.images.get_dto(self.image.image_name)
+
+        if self.board:
+            context.services.board_images.add_image_to_board(self.board.board_id, self.image.image_name)
+
+        if image_dto.is_intermediate != self.is_intermediate:
+            context.services.images.update(
+                self.image.image_name, changes=ImageRecordChanges(is_intermediate=self.is_intermediate)
+            )
+
+        return ImageOutput(
+            image=ImageField(image_name=self.image.image_name),
+            width=image_dto.width,
+            height=image_dto.height,
+        )

invokeai/app/invocations/metadata.py

@@ -112,7 +112,7 @@ GENERATION_MODES = Literal[
 ]
 
 
-@invocation("core_metadata", title="Core Metadata", tags=["metadata"], category="metadata", version="1.0.0")
+@invocation("core_metadata", title="Core Metadata", tags=["metadata"], category="metadata", version="1.0.1")
 class CoreMetadataInvocation(BaseInvocation):
     """Collects core generation metadata into a MetadataField"""
 
@@ -160,7 +160,7 @@ class CoreMetadataInvocation(BaseInvocation):
     )
 
     # High resolution fix metadata.
-    hrf_enabled: Optional[float] = InputField(
+    hrf_enabled: Optional[bool] = InputField(
         default=None,
         description="Whether or not high resolution fix was enabled.",
     )

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

@@ -1222,7 +1222,8 @@
         "seamless": "无缝",
         "fit": "图生图匹配",
         "recallParameters": "召回参数",
-        "noRecallParameters": "未找到要召回的参数"
+        "noRecallParameters": "未找到要召回的参数",
+        "vae": "VAE"
     },
     "models": {
         "noMatchingModels": "无相匹配的模型",
@@ -1501,5 +1502,18 @@
         "clear": "清除",
         "maxCacheSize": "最大缓存大小",
         "cacheSize": "缓存大小"
+    },
+    "hrf": {
+        "enableHrf": "启用高分辨率修复",
+        "upscaleMethod": "放大方法",
+        "enableHrfTooltip": "使用较低的分辨率进行初始生成，放大到基础分辨率后进行图生图。",
+        "metadata": {
+            "strength": "高分辨率修复强度",
+            "enabled": "高分辨率修复已启用",
+            "method": "高分辨率修复方法"
+        },
+        "hrf": "高分辨率修复",
+        "hrfStrength": "高分辨率修复强度",
+        "strengthTooltip": "值越低细节越少，但可以减少部分潜在的伪影。"
     }
 }

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

@@ -8,7 +8,6 @@ import {
   selectControlAdapterById,
 } from 'features/controlAdapters/store/controlAdaptersSlice';
 import { isControlNetOrT2IAdapter } from 'features/controlAdapters/store/types';
-import { SAVE_IMAGE } from 'features/nodes/util/graphBuilders/constants';
 import { addToast } from 'features/system/store/systemSlice';
 import { t } from 'i18next';
 import { imagesApi } from 'services/api/endpoints/images';
@@ -38,6 +37,7 @@ export const addControlNetImageProcessedListener = () => {
       // ControlNet one-off procressing graph is just the processor node, no edges.
       // Also we need to grab the image.
 
+      const nodeId = ca.processorNode.id;
       const enqueueBatchArg: BatchConfig = {
         prepend: true,
         batch: {
@@ -46,27 +46,10 @@ export const addControlNetImageProcessedListener = () => {
               [ca.processorNode.id]: {
                 ...ca.processorNode,
                 is_intermediate: true,
+                use_cache: false,
                 image: { image_name: ca.controlImage },
               },
-              [SAVE_IMAGE]: {
-                id: SAVE_IMAGE,
-                type: 'save_image',
-                is_intermediate: true,
-                use_cache: false,
-              },
             },
-            edges: [
-              {
-                source: {
-                  node_id: ca.processorNode.id,
-                  field: 'image',
-                },
-                destination: {
-                  node_id: SAVE_IMAGE,
-                  field: 'image',
-                },
-              },
-            ],
           },
           runs: 1,
         },
@@ -90,7 +73,7 @@ export const addControlNetImageProcessedListener = () => {
             socketInvocationComplete.match(action) &&
             action.payload.data.queue_batch_id ===
               enqueueResult.batch.batch_id &&
-            action.payload.data.source_node_id === SAVE_IMAGE
+            action.payload.data.source_node_id === nodeId
         );
 
         // We still have to check the output type

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

@@ -7,7 +7,10 @@ import {
   imageSelected,
 } from 'features/gallery/store/gallerySlice';
 import { IMAGE_CATEGORIES } from 'features/gallery/store/types';
-import { CANVAS_OUTPUT } from 'features/nodes/util/graphBuilders/constants';
+import {
+  LINEAR_UI_OUTPUT,
+  nodeIDDenyList,
+} from 'features/nodes/util/graphBuilders/constants';
 import { boardsApi } from 'services/api/endpoints/boards';
 import { imagesApi } from 'services/api/endpoints/images';
 import { isImageOutput } from 'services/api/guards';
@@ -19,7 +22,7 @@ import {
 import { startAppListening } from '../..';
 
 // These nodes output an image, but do not actually *save* an image, so we don't want to handle the gallery logic on them
-const nodeDenylist = ['load_image', 'image'];
+const nodeTypeDenylist = ['load_image', 'image'];
 
 export const addInvocationCompleteEventListener = () => {
   startAppListening({
@@ -32,22 +35,31 @@ export const addInvocationCompleteEventListener = () => {
         `Invocation complete (${action.payload.data.node.type})`
       );
 
-      const { result, node, queue_batch_id } = data;
+      const { result, node, queue_batch_id, source_node_id } = data;
 
       // This complete event has an associated image output
-      if (isImageOutput(result) && !nodeDenylist.includes(node.type)) {
+      if (
+        isImageOutput(result) &&
+        !nodeTypeDenylist.includes(node.type) &&
+        !nodeIDDenyList.includes(source_node_id)
+      ) {
         const { image_name } = result.image;
         const { canvas, gallery } = getState();
 
         // This populates the `getImageDTO` cache
-        const imageDTO = await dispatch(
+        const imageDTORequest = dispatch(
-          imagesApi.endpoints.getImageDTO.initiate(image_name)
+          imagesApi.endpoints.getImageDTO.initiate(image_name, {
-        ).unwrap();
+            forceRefetch: true,
+          })
+        );
+
+        const imageDTO = await imageDTORequest.unwrap();
+        imageDTORequest.unsubscribe();
 
         // Add canvas images to the staging area
         if (
           canvas.batchIds.includes(queue_batch_id) &&
-          [CANVAS_OUTPUT].includes(data.source_node_id)
+          [LINEAR_UI_OUTPUT].includes(data.source_node_id)
         ) {
           dispatch(addImageToStagingArea(imageDTO));
         }

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

@@ -157,6 +157,8 @@ const ImageMetadataActions = (props: Props) => {
     return null;
   }
 
+  console.log(metadata);
+
   return (
     <>
       {metadata.created_by && (

invokeai/frontend/web/src/features/nodes/util/graphBuilders/addHrfToGraph.ts

@@ -23,7 +23,7 @@ import {
   RESIZE_HRF,
   VAE_LOADER,
 } from './constants';
-import { upsertMetadata } from './metadata';
+import { setMetadataReceivingNode, upsertMetadata } from './metadata';
 
 // Copy certain connections from previous DENOISE_LATENTS to new DENOISE_LATENTS_HRF.
 function copyConnectionsToDenoiseLatentsHrf(graph: NonNullableGraph): void {
@@ -369,4 +369,5 @@ export const addHrfToGraph = (
     hrf_enabled: hrfEnabled,
     hrf_method: hrfMethod,
   });
+  setMetadataReceivingNode(graph, LATENTS_TO_IMAGE_HRF_HR);
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/addLinearUIOutputNode.ts

@@ -1,20 +1,20 @@
 import { RootState } from 'app/store/store';
 import { NonNullableGraph } from 'features/nodes/types/types';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
-import { SaveImageInvocation } from 'services/api/types';
+import { LinearUIOutputInvocation } from 'services/api/types';
 import {
   CANVAS_OUTPUT,
   LATENTS_TO_IMAGE,
   LATENTS_TO_IMAGE_HRF_HR,
+  LINEAR_UI_OUTPUT,
   NSFW_CHECKER,
-  SAVE_IMAGE,
   WATERMARKER,
 } from './constants';
 
 /**
  * Set the `use_cache` field on the linear/canvas graph's final image output node to False.
  */
-export const addSaveImageNode = (
+export const addLinearUIOutputNode = (
   state: RootState,
   graph: NonNullableGraph
 ): void => {
@@ -23,18 +23,18 @@ export const addSaveImageNode = (
     activeTabName === 'unifiedCanvas' ? !state.canvas.shouldAutoSave : false;
   const { autoAddBoardId } = state.gallery;
 
-  const saveImageNode: SaveImageInvocation = {
+  const linearUIOutputNode: LinearUIOutputInvocation = {
-    id: SAVE_IMAGE,
+    id: LINEAR_UI_OUTPUT,
-    type: 'save_image',
+    type: 'linear_ui_output',
     is_intermediate,
     use_cache: false,
     board: autoAddBoardId === 'none' ? undefined : { board_id: autoAddBoardId },
   };
 
-  graph.nodes[SAVE_IMAGE] = saveImageNode;
+  graph.nodes[LINEAR_UI_OUTPUT] = linearUIOutputNode;
 
   const destination = {
-    node_id: SAVE_IMAGE,
+    node_id: LINEAR_UI_OUTPUT,
     field: 'image',
   };
 

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildAdHocUpscaleGraph.ts

@@ -4,9 +4,9 @@ import { ESRGANModelName } from 'features/parameters/store/postprocessingSlice';
 import {
   ESRGANInvocation,
   Graph,
-  SaveImageInvocation,
+  LinearUIOutputInvocation,
 } from 'services/api/types';
-import { REALESRGAN as ESRGAN, SAVE_IMAGE } from './constants';
+import { ESRGAN, LINEAR_UI_OUTPUT } from './constants';
 import { addCoreMetadataNode, upsertMetadata } from './metadata';
 
 type Arg = {
@@ -28,9 +28,9 @@ export const buildAdHocUpscaleGraph = ({
     is_intermediate: true,
   };
 
-  const saveImageNode: SaveImageInvocation = {
+  const linearUIOutputNode: LinearUIOutputInvocation = {
-    id: SAVE_IMAGE,
+    id: LINEAR_UI_OUTPUT,
-    type: 'save_image',
+    type: 'linear_ui_output',
     use_cache: false,
     is_intermediate: false,
     board: autoAddBoardId === 'none' ? undefined : { board_id: autoAddBoardId },
@@ -40,7 +40,7 @@ export const buildAdHocUpscaleGraph = ({
     id: `adhoc-esrgan-graph`,
     nodes: {
       [ESRGAN]: realesrganNode,
-      [SAVE_IMAGE]: saveImageNode,
+      [LINEAR_UI_OUTPUT]: linearUIOutputNode,
     },
     edges: [
       {
@@ -49,14 +49,14 @@ export const buildAdHocUpscaleGraph = ({
           field: 'image',
         },
         destination: {
-          node_id: SAVE_IMAGE,
+          node_id: LINEAR_UI_OUTPUT,
           field: 'image',
         },
       },
     ],
   };
 
-  addCoreMetadataNode(graph, {});
+  addCoreMetadataNode(graph, {}, ESRGAN);
   upsertMetadata(graph, {
     esrgan_model: esrganModelName,
   });

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasImageToImageGraph.ts

@@ -6,7 +6,7 @@ import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
 import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addLoRAsToGraph } from './addLoRAsToGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -308,24 +308,30 @@ export const buildCanvasImageToImageGraph = (
     });
   }
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'img2img',
+    graph,
-    cfg_scale,
+    {
-    width: !isUsingScaledDimensions ? width : scaledBoundingBoxDimensions.width,
+      generation_mode: 'img2img',
-    height: !isUsingScaledDimensions
+      cfg_scale,
-      ? height
+      width: !isUsingScaledDimensions
-      : scaledBoundingBoxDimensions.height,
+        ? width
-    positive_prompt: positivePrompt,
+        : scaledBoundingBoxDimensions.width,
-    negative_prompt: negativePrompt,
+      height: !isUsingScaledDimensions
-    model,
+        ? height
-    seed,
+        : scaledBoundingBoxDimensions.height,
-    steps,
+      positive_prompt: positivePrompt,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      negative_prompt: negativePrompt,
-    scheduler,
+      model,
-    clip_skip: clipSkip,
+      seed,
-    strength,
+      steps,
-    init_image: initialImage.image_name,
+      rand_device: use_cpu ? 'cpu' : 'cuda',
-  });
+      scheduler,
+      clip_skip: clipSkip,
+      strength,
+      init_image: initialImage.image_name,
+    },
+    CANVAS_OUTPUT
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -357,7 +363,7 @@ export const buildCanvasImageToImageGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasInpaintGraph.ts

@@ -13,7 +13,7 @@ import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
 import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addLoRAsToGraph } from './addLoRAsToGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -666,7 +666,7 @@ export const buildCanvasInpaintGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasOutpaintGraph.ts

@@ -12,7 +12,7 @@ import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
 import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addLoRAsToGraph } from './addLoRAsToGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -770,7 +770,7 @@ export const buildCanvasOutpaintGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLImageToImageGraph.ts

@@ -7,7 +7,7 @@ import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
 import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
 import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
 import { addWatermarkerToGraph } from './addWatermarkerToGraph';
@@ -319,23 +319,29 @@ export const buildCanvasSDXLImageToImageGraph = (
     });
   }
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'img2img',
+    graph,
-    cfg_scale,
+    {
-    width: !isUsingScaledDimensions ? width : scaledBoundingBoxDimensions.width,
+      generation_mode: 'img2img',
-    height: !isUsingScaledDimensions
+      cfg_scale,
-      ? height
+      width: !isUsingScaledDimensions
-      : scaledBoundingBoxDimensions.height,
+        ? width
-    positive_prompt: positivePrompt,
+        : scaledBoundingBoxDimensions.width,
-    negative_prompt: negativePrompt,
+      height: !isUsingScaledDimensions
-    model,
+        ? height
-    seed,
+        : scaledBoundingBoxDimensions.height,
-    steps,
+      positive_prompt: positivePrompt,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      negative_prompt: negativePrompt,
-    scheduler,
+      model,
-    strength,
+      seed,
-    init_image: initialImage.image_name,
+      steps,
-  });
+      rand_device: use_cpu ? 'cpu' : 'cuda',
+      scheduler,
+      strength,
+      init_image: initialImage.image_name,
+    },
+    CANVAS_OUTPUT
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -380,7 +386,7 @@ export const buildCanvasSDXLImageToImageGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLInpaintGraph.ts

@@ -14,7 +14,7 @@ import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
 import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
 import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -696,7 +696,7 @@ export const buildCanvasSDXLInpaintGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLOutpaintGraph.ts

@@ -13,7 +13,7 @@ import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
 import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
 import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -799,7 +799,7 @@ export const buildCanvasSDXLOutpaintGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasSDXLTextToImageGraph.ts

@@ -10,7 +10,7 @@ import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
 import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
 import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -301,21 +301,27 @@ export const buildCanvasSDXLTextToImageGraph = (
     });
   }
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'txt2img',
+    graph,
-    cfg_scale,
+    {
-    width: !isUsingScaledDimensions ? width : scaledBoundingBoxDimensions.width,
+      generation_mode: 'txt2img',
-    height: !isUsingScaledDimensions
+      cfg_scale,
-      ? height
+      width: !isUsingScaledDimensions
-      : scaledBoundingBoxDimensions.height,
+        ? width
-    positive_prompt: positivePrompt,
+        : scaledBoundingBoxDimensions.width,
-    negative_prompt: negativePrompt,
+      height: !isUsingScaledDimensions
-    model,
+        ? height
-    seed,
+        : scaledBoundingBoxDimensions.height,
-    steps,
+      positive_prompt: positivePrompt,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      negative_prompt: negativePrompt,
-    scheduler,
+      model,
-  });
+      seed,
+      steps,
+      rand_device: use_cpu ? 'cpu' : 'cuda',
+      scheduler,
+    },
+    CANVAS_OUTPUT
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -360,7 +366,7 @@ export const buildCanvasSDXLTextToImageGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildCanvasTextToImageGraph.ts

@@ -9,7 +9,7 @@ import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
 import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addLoRAsToGraph } from './addLoRAsToGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -289,22 +289,28 @@ export const buildCanvasTextToImageGraph = (
     });
   }
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'txt2img',
+    graph,
-    cfg_scale,
+    {
-    width: !isUsingScaledDimensions ? width : scaledBoundingBoxDimensions.width,
+      generation_mode: 'txt2img',
-    height: !isUsingScaledDimensions
+      cfg_scale,
-      ? height
+      width: !isUsingScaledDimensions
-      : scaledBoundingBoxDimensions.height,
+        ? width
-    positive_prompt: positivePrompt,
+        : scaledBoundingBoxDimensions.width,
-    negative_prompt: negativePrompt,
+      height: !isUsingScaledDimensions
-    model,
+        ? height
-    seed,
+        : scaledBoundingBoxDimensions.height,
-    steps,
+      positive_prompt: positivePrompt,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      negative_prompt: negativePrompt,
-    scheduler,
+      model,
-    clip_skip: clipSkip,
+      seed,
-  });
+      steps,
+      rand_device: use_cpu ? 'cpu' : 'cuda',
+      scheduler,
+      clip_skip: clipSkip,
+    },
+    CANVAS_OUTPUT
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -336,7 +342,7 @@ export const buildCanvasTextToImageGraph = (
     addWatermarkerToGraph(state, graph, CANVAS_OUTPUT);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearImageToImageGraph.ts

@@ -9,7 +9,7 @@ import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
 import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addLoRAsToGraph } from './addLoRAsToGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -311,22 +311,26 @@ export const buildLinearImageToImageGraph = (
     });
   }
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'img2img',
+    graph,
-    cfg_scale,
+    {
-    height,
+      generation_mode: 'img2img',
-    width,
+      cfg_scale,
-    positive_prompt: positivePrompt,
+      height,
-    negative_prompt: negativePrompt,
+      width,
-    model,
+      positive_prompt: positivePrompt,
-    seed,
+      negative_prompt: negativePrompt,
-    steps,
+      model,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      seed,
-    scheduler,
+      steps,
-    clip_skip: clipSkip,
+      rand_device: use_cpu ? 'cpu' : 'cuda',
-    strength,
+      scheduler,
-    init_image: initialImage.imageName,
+      clip_skip: clipSkip,
-  });
+      strength,
+      init_image: initialImage.imageName,
+    },
+    IMAGE_TO_LATENTS
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -358,7 +362,7 @@ export const buildLinearImageToImageGraph = (
     addWatermarkerToGraph(state, graph);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLImageToImageGraph.ts

@@ -10,7 +10,7 @@ import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
 import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
 import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -331,23 +331,27 @@ export const buildLinearSDXLImageToImageGraph = (
     });
   }
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'sdxl_img2img',
+    graph,
-    cfg_scale,
+    {
-    height,
+      generation_mode: 'sdxl_img2img',
-    width,
+      cfg_scale,
-    positive_prompt: positivePrompt,
+      height,
-    negative_prompt: negativePrompt,
+      width,
-    model,
+      positive_prompt: positivePrompt,
-    seed,
+      negative_prompt: negativePrompt,
-    steps,
+      model,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      seed,
-    scheduler,
+      steps,
-    strength,
+      rand_device: use_cpu ? 'cpu' : 'cuda',
-    init_image: initialImage.imageName,
+      scheduler,
-    positive_style_prompt: positiveStylePrompt,
+      strength,
-    negative_style_prompt: negativeStylePrompt,
+      init_image: initialImage.imageName,
-  });
+      positive_style_prompt: positiveStylePrompt,
+      negative_style_prompt: negativeStylePrompt,
+    },
+    IMAGE_TO_LATENTS
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -388,7 +392,7 @@ export const buildLinearSDXLImageToImageGraph = (
     addWatermarkerToGraph(state, graph);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearSDXLTextToImageGraph.ts

@@ -6,7 +6,7 @@ import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
 import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
 import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -225,21 +225,25 @@ export const buildLinearSDXLTextToImageGraph = (
     ],
   };
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'sdxl_txt2img',
+    graph,
-    cfg_scale,
+    {
-    height,
+      generation_mode: 'sdxl_txt2img',
-    width,
+      cfg_scale,
-    positive_prompt: positivePrompt,
+      height,
-    negative_prompt: negativePrompt,
+      width,
-    model,
+      positive_prompt: positivePrompt,
-    seed,
+      negative_prompt: negativePrompt,
-    steps,
+      model,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      seed,
-    scheduler,
+      steps,
-    positive_style_prompt: positiveStylePrompt,
+      rand_device: use_cpu ? 'cpu' : 'cuda',
-    negative_style_prompt: negativeStylePrompt,
+      scheduler,
-  });
+      positive_style_prompt: positiveStylePrompt,
+      negative_style_prompt: negativeStylePrompt,
+    },
+    LATENTS_TO_IMAGE
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -280,7 +284,7 @@ export const buildLinearSDXLTextToImageGraph = (
     addWatermarkerToGraph(state, graph);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/buildLinearTextToImageGraph.ts

@@ -10,7 +10,7 @@ import { addHrfToGraph } from './addHrfToGraph';
 import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
 import { addLoRAsToGraph } from './addLoRAsToGraph';
 import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSaveImageNode } from './addSaveImageNode';
+import { addLinearUIOutputNode } from './addLinearUIOutputNode';
 import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
@@ -234,20 +234,24 @@ export const buildLinearTextToImageGraph = (
     ],
   };
 
-  addCoreMetadataNode(graph, {
+  addCoreMetadataNode(
-    generation_mode: 'txt2img',
+    graph,
-    cfg_scale,
+    {
-    height,
+      generation_mode: 'txt2img',
-    width,
+      cfg_scale,
-    positive_prompt: positivePrompt,
+      height,
-    negative_prompt: negativePrompt,
+      width,
-    model,
+      positive_prompt: positivePrompt,
-    seed,
+      negative_prompt: negativePrompt,
-    steps,
+      model,
-    rand_device: use_cpu ? 'cpu' : 'cuda',
+      seed,
-    scheduler,
+      steps,
-    clip_skip: clipSkip,
+      rand_device: use_cpu ? 'cpu' : 'cuda',
-  });
+      scheduler,
+      clip_skip: clipSkip,
+    },
+    LATENTS_TO_IMAGE
+  );
 
   // Add Seamless To Graph
   if (seamlessXAxis || seamlessYAxis) {
@@ -286,7 +290,7 @@ export const buildLinearTextToImageGraph = (
     addWatermarkerToGraph(state, graph);
   }
 
-  addSaveImageNode(state, graph);
+  addLinearUIOutputNode(state, graph);
 
   return graph;
 };

invokeai/frontend/web/src/features/nodes/util/graphBuilders/constants.ts

@@ -9,7 +9,7 @@ export const LATENTS_TO_IMAGE_HRF_LR = 'latents_to_image_hrf_lr';
 export const IMAGE_TO_LATENTS_HRF = 'image_to_latents_hrf';
 export const RESIZE_HRF = 'resize_hrf';
 export const ESRGAN_HRF = 'esrgan_hrf';
-export const SAVE_IMAGE = 'save_image';
+export const LINEAR_UI_OUTPUT = 'linear_ui_output';
 export const NSFW_CHECKER = 'nsfw_checker';
 export const WATERMARKER = 'invisible_watermark';
 export const NOISE = 'noise';
@@ -67,7 +67,7 @@ export const BATCH_PROMPT = 'batch_prompt';
 export const BATCH_STYLE_PROMPT = 'batch_style_prompt';
 export const METADATA_COLLECT = 'metadata_collect';
 export const MERGE_METADATA = 'merge_metadata';
-export const REALESRGAN = 'esrgan';
+export const ESRGAN = 'esrgan';
 export const DIVIDE = 'divide';
 export const SCALE = 'scale_image';
 export const SDXL_MODEL_LOADER = 'sdxl_model_loader';
@@ -82,6 +82,32 @@ export const SDXL_REFINER_INPAINT_CREATE_MASK = 'refiner_inpaint_create_mask';
 export const SEAMLESS = 'seamless';
 export const SDXL_REFINER_SEAMLESS = 'refiner_seamless';
 
+// these image-outputting nodes are from the linear UI and we should not handle the gallery logic on them
+// instead, we wait for LINEAR_UI_OUTPUT node, and handle it like any other image-outputting node
+export const nodeIDDenyList = [
+  CANVAS_OUTPUT,
+  LATENTS_TO_IMAGE,
+  LATENTS_TO_IMAGE_HRF_HR,
+  NSFW_CHECKER,
+  WATERMARKER,
+  ESRGAN,
+  ESRGAN_HRF,
+  RESIZE_HRF,
+  LATENTS_TO_IMAGE_HRF_LR,
+  IMG2IMG_RESIZE,
+  INPAINT_IMAGE,
+  SCALED_INPAINT_IMAGE,
+  INPAINT_IMAGE_RESIZE_UP,
+  INPAINT_IMAGE_RESIZE_DOWN,
+  INPAINT_INFILL,
+  INPAINT_INFILL_RESIZE_DOWN,
+  INPAINT_FINAL_IMAGE,
+  INPAINT_CREATE_MASK,
+  INPAINT_MASK,
+  PASTE_IMAGE,
+  SCALE,
+];
+
 // friendly graph ids
 export const TEXT_TO_IMAGE_GRAPH = 'text_to_image_graph';
 export const IMAGE_TO_IMAGE_GRAPH = 'image_to_image_graph';

invokeai/frontend/web/src/features/nodes/util/graphBuilders/metadata.ts

@@ -1,11 +1,12 @@
 import { NonNullableGraph } from 'features/nodes/types/types';
 import { CoreMetadataInvocation } from 'services/api/types';
 import { JsonObject } from 'type-fest';
-import { METADATA, SAVE_IMAGE } from './constants';
+import { METADATA } from './constants';
 
 export const addCoreMetadataNode = (
   graph: NonNullableGraph,
-  metadata: Partial<CoreMetadataInvocation>
+  metadata: Partial<CoreMetadataInvocation>,
+  nodeId: string
 ): void => {
   graph.nodes[METADATA] = {
     id: METADATA,
@@ -19,7 +20,7 @@ export const addCoreMetadataNode = (
       field: 'metadata',
     },
     destination: {
-      node_id: SAVE_IMAGE,
+      node_id: nodeId,
       field: 'metadata',
     },
   });
@@ -64,3 +65,21 @@ export const getHasMetadata = (graph: NonNullableGraph): boolean => {
 
   return Boolean(metadataNode);
 };
+
+export const setMetadataReceivingNode = (
+  graph: NonNullableGraph,
+  nodeId: string
+) => {
+  graph.edges = graph.edges.filter((edge) => edge.source.node_id !== METADATA);
+
+  graph.edges.push({
+    source: {
+      node_id: METADATA,
+      field: 'metadata',
+    },
+    destination: {
+      node_id: nodeId,
+      field: 'metadata',
+    },
+  });
+};

invokeai/frontend/web/src/features/nodes/util/parseSchema.ts

@@ -19,7 +19,7 @@ const RESERVED_INPUT_FIELD_NAMES = ['id', 'type', 'use_cache'];
 const RESERVED_OUTPUT_FIELD_NAMES = ['type'];
 const RESERVED_FIELD_TYPES = ['IsIntermediate'];
 
-const invocationDenylist: AnyInvocationType[] = ['graph'];
+const invocationDenylist: AnyInvocationType[] = ['graph', 'linear_ui_output'];
 
 const isReservedInputField = (nodeType: string, fieldName: string) => {
   if (RESERVED_INPUT_FIELD_NAMES.includes(fieldName)) {

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

@@ -142,7 +142,7 @@ export type DivideInvocation = s['DivideInvocation'];
 export type ImageNSFWBlurInvocation = s['ImageNSFWBlurInvocation'];
 export type ImageWatermarkInvocation = s['ImageWatermarkInvocation'];
 export type SeamlessModeInvocation = s['SeamlessModeInvocation'];
-export type SaveImageInvocation = s['SaveImageInvocation'];
+export type LinearUIOutputInvocation = s['LinearUIOutputInvocation'];
 export type MetadataInvocation = s['MetadataInvocation'];
 export type CoreMetadataInvocation = s['CoreMetadataInvocation'];
 export type MetadataItemInvocation = s['MetadataItemInvocation'];