tidy(ui): organise graph builder files

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

@@ -8,8 +8,8 @@ import { blobToDataURL } from 'features/canvas/util/blobToDataURL';
 import { getCanvasData } from 'features/canvas/util/getCanvasData';
 import { getCanvasGenerationMode } from 'features/canvas/util/getCanvasGenerationMode';
 import { canvasGraphBuilt } from 'features/nodes/store/actions';
-import { buildCanvasGraph } from 'features/nodes/util/graph/buildCanvasGraph';
 import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig';
+import { buildCanvasGraph } from 'features/nodes/util/graph/canvas/buildCanvasGraph';
 import { imagesApi } from 'services/api/endpoints/images';
 import { queueApi } from 'services/api/endpoints/queue';
 import type { ImageDTO } from 'services/api/types';

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

@@ -1,9 +1,9 @@
 import { enqueueRequested } from 'app/store/actions';
 import type { AppStartListening } from 'app/store/middleware/listenerMiddleware';
 import { isImageViewerOpenChanged } from 'features/gallery/store/gallerySlice';
-import { buildGenerationTabGraph } from 'features/nodes/util/graph/buildGenerationTabGraph';
-import { buildGenerationTabSDXLGraph } from 'features/nodes/util/graph/buildGenerationTabSDXLGraph';
 import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig';
+import { buildGenerationTabGraph } from 'features/nodes/util/graph/generation/buildGenerationTabGraph';
+import { buildGenerationTabSDXLGraph } from 'features/nodes/util/graph/generation/buildGenerationTabSDXLGraph';
 import { queueApi } from 'services/api/endpoints/queue';
 
 export const addEnqueueRequestedLinear = (startAppListening: AppStartListening) => {

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

@@ -2,8 +2,8 @@ import type { RootState } from 'app/store/store';
 import { getBoardField } from 'features/nodes/util/graph/graphBuilderUtils';
 import type { ESRGANInvocation, Graph, NonNullableGraph } from 'services/api/types';
 
+import { addCoreMetadataNode, upsertMetadata } from './canvas/metadata';
 import { ESRGAN } from './constants';
-import { addCoreMetadataNode, upsertMetadata } from './metadata';
 
 type Arg = {
   image_name: string;

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

@@ -5,8 +5,8 @@ import { range } from 'lodash-es';
 import type { components } from 'services/api/schema';
 import type { Batch, BatchConfig, NonNullableGraph } from 'services/api/types';
 
+import { getHasMetadata, removeMetadata } from './canvas/metadata';
 import { CANVAS_COHERENCE_NOISE, METADATA, NOISE, POSITIVE_CONDITIONING } from './constants';
-import { getHasMetadata, removeMetadata } from './metadata';
 
 export const prepareLinearUIBatch = (state: RootState, graph: NonNullableGraph, prepend: boolean): BatchConfig => {
   const { iterations, model, shouldRandomizeSeed, seed } = state.generation;

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addControlNetToLinearGraph.ts

@@ -2,6 +2,8 @@ import type { RootState } from 'app/store/store';
 import { selectValidControlNets } from 'features/controlAdapters/store/controlAdaptersSlice';
 import type { ControlAdapterProcessorType, ControlNetConfig } from 'features/controlAdapters/store/types';
 import type { ImageField } from 'features/nodes/types/common';
+import { upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
+import { CONTROL_NET_COLLECT } from 'features/nodes/util/graph/constants';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import type {
   CollectInvocation,
@@ -12,9 +14,6 @@ import type {
 } from 'services/api/types';
 import { assert } from 'tsafe';
 
-import { CONTROL_NET_COLLECT } from './constants';
-import { upsertMetadata } from './metadata';
-
 export const addControlNetToLinearGraph = async (
   state: RootState,
   graph: NonNullableGraph,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addIPAdapterToLinearGraph.ts

@@ -2,6 +2,8 @@ import type { RootState } from 'app/store/store';
 import { selectValidIPAdapters } from 'features/controlAdapters/store/controlAdaptersSlice';
 import type { IPAdapterConfig } from 'features/controlAdapters/store/types';
 import type { ImageField } from 'features/nodes/types/common';
+import { upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
+import { IP_ADAPTER_COLLECT } from 'features/nodes/util/graph/constants';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import type {
   CollectInvocation,
@@ -12,9 +14,6 @@ import type {
 } from 'services/api/types';
 import { assert } from 'tsafe';
 
-import { IP_ADAPTER_COLLECT } from './constants';
-import { upsertMetadata } from './metadata';
-
 export const addIPAdapterToLinearGraph = async (
   state: RootState,
   graph: NonNullableGraph,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addLoRAsToGraph.ts

@@ -1,11 +1,16 @@
 import type { RootState } from 'app/store/store';
 import { zModelIdentifierField } from 'features/nodes/types/common';
+import { upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
+import {
+  CLIP_SKIP,
+  LORA_LOADER,
+  MAIN_MODEL_LOADER,
+  NEGATIVE_CONDITIONING,
+  POSITIVE_CONDITIONING,
+} from 'features/nodes/util/graph/constants';
 import { filter, size } from 'lodash-es';
 import type { CoreMetadataInvocation, LoRALoaderInvocation, NonNullableGraph } from 'services/api/types';
 
-import { CLIP_SKIP, LORA_LOADER, MAIN_MODEL_LOADER, NEGATIVE_CONDITIONING, POSITIVE_CONDITIONING } from './constants';
-import { upsertMetadata } from './metadata';
-
 export const addLoRAsToGraph = async (
   state: RootState,
   graph: NonNullableGraph,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addNSFWCheckerToGraph.ts

@@ -1,9 +1,8 @@
 import type { RootState } from 'app/store/store';
+import { LATENTS_TO_IMAGE, NSFW_CHECKER } from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
 import type { ImageNSFWBlurInvocation, LatentsToImageInvocation, NonNullableGraph } from 'services/api/types';
 
-import { LATENTS_TO_IMAGE, NSFW_CHECKER } from './constants';
-import { getBoardField, getIsIntermediate } from './graphBuilderUtils';
-
 export const addNSFWCheckerToGraph = (
   state: RootState,
   graph: NonNullableGraph,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addSDXLLoRAstoGraph.ts

@@ -1,8 +1,6 @@
 import type { RootState } from 'app/store/store';
 import { zModelIdentifierField } from 'features/nodes/types/common';
-import { filter, size } from 'lodash-es';
-import type { CoreMetadataInvocation, NonNullableGraph, SDXLLoRALoaderInvocation } from 'services/api/types';
-
+import { upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
 import {
   LORA_LOADER,
   NEGATIVE_CONDITIONING,
@@ -10,8 +8,9 @@ import {
   SDXL_MODEL_LOADER,
   SDXL_REFINER_INPAINT_CREATE_MASK,
   SEAMLESS,
-} from './constants';
-import { upsertMetadata } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import { filter, size } from 'lodash-es';
+import type { CoreMetadataInvocation, NonNullableGraph, SDXLLoRALoaderInvocation } from 'services/api/types';
 
 export const addSDXLLoRAsToGraph = async (
   state: RootState,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addSDXLRefinerToGraph.ts

@@ -1,8 +1,6 @@
 import type { RootState } from 'app/store/store';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
-import type { NonNullableGraph, SeamlessModeInvocation } from 'services/api/types';
-import { isRefinerMainModelModelConfig } from 'services/api/types';
-
+import { getModelMetadataField, upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
 import {
   CANVAS_OUTPUT,
   INPAINT_CREATE_MASK,
@@ -17,9 +15,10 @@ import {
   SDXL_REFINER_NEGATIVE_CONDITIONING,
   SDXL_REFINER_POSITIVE_CONDITIONING,
   SDXL_REFINER_SEAMLESS,
-} from './constants';
-import { getSDXLStylePrompts } from './graphBuilderUtils';
-import { getModelMetadataField, upsertMetadata } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import { getSDXLStylePrompts } from 'features/nodes/util/graph/graphBuilderUtils';
+import type { NonNullableGraph, SeamlessModeInvocation } from 'services/api/types';
+import { isRefinerMainModelModelConfig } from 'services/api/types';
 
 export const addSDXLRefinerToGraph = async (
   state: RootState,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addSeamlessToLinearGraph.ts

@@ -1,6 +1,5 @@
 import type { RootState } from 'app/store/store';
-import type { NonNullableGraph, SeamlessModeInvocation } from 'services/api/types';
-
+import { upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
 import {
   DENOISE_LATENTS,
   SDXL_CANVAS_IMAGE_TO_IMAGE_GRAPH,
@@ -11,8 +10,8 @@ import {
   SDXL_DENOISE_LATENTS,
   SEAMLESS,
   VAE_LOADER,
-} from './constants';
-import { upsertMetadata } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import type { NonNullableGraph, SeamlessModeInvocation } from 'services/api/types';
 
 export const addSeamlessToLinearGraph = (
   state: RootState,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addT2IAdapterToLinearGraph.ts

@@ -2,6 +2,8 @@ import type { RootState } from 'app/store/store';
 import { selectValidT2IAdapters } from 'features/controlAdapters/store/controlAdaptersSlice';
 import type { ControlAdapterProcessorType, T2IAdapterConfig } from 'features/controlAdapters/store/types';
 import type { ImageField } from 'features/nodes/types/common';
+import { upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
+import { T2I_ADAPTER_COLLECT } from 'features/nodes/util/graph/constants';
 import { activeTabNameSelector } from 'features/ui/store/uiSelectors';
 import type {
   CollectInvocation,
@@ -12,9 +14,6 @@ import type {
 } from 'services/api/types';
 import { assert } from 'tsafe';
 
-import { T2I_ADAPTER_COLLECT } from './constants';
-import { upsertMetadata } from './metadata';
-
 export const addT2IAdaptersToLinearGraph = async (
   state: RootState,
   graph: NonNullableGraph,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addVAEToGraph.ts

@@ -1,6 +1,5 @@
 import type { RootState } from 'app/store/store';
-import type { NonNullableGraph } from 'services/api/types';
-
+import { upsertMetadata } from 'features/nodes/util/graph/canvas/metadata';
 import {
   CANVAS_IMAGE_TO_IMAGE_GRAPH,
   CANVAS_INPAINT_GRAPH,
@@ -21,8 +20,8 @@ import {
   SDXL_REFINER_SEAMLESS,
   SEAMLESS,
   VAE_LOADER,
-} from './constants';
-import { upsertMetadata } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import type { NonNullableGraph } from 'services/api/types';
 
 export const addVAEToGraph = async (
   state: RootState,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/addWatermarkerToGraph.ts

@@ -1,4 +1,6 @@
 import type { RootState } from 'app/store/store';
+import { LATENTS_TO_IMAGE, NSFW_CHECKER, WATERMARKER } from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
 import type {
   ImageNSFWBlurInvocation,
   ImageWatermarkInvocation,
@@ -6,9 +8,6 @@ import type {
   NonNullableGraph,
 } from 'services/api/types';
 
-import { LATENTS_TO_IMAGE, NSFW_CHECKER, WATERMARKER } from './constants';
-import { getBoardField, getIsIntermediate } from './graphBuilderUtils';
-
 export const addWatermarkerToGraph = (
   state: RootState,
   graph: NonNullableGraph,

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasImageToImageGraph.ts

@@ -1,6 +1,21 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
+import { addCoreMetadataNode, getModelMetadataField } from 'features/nodes/util/graph/canvas/metadata';
+import {
+  CANVAS_IMAGE_TO_IMAGE_GRAPH,
+  CANVAS_OUTPUT,
+  CLIP_SKIP,
+  DENOISE_LATENTS,
+  IMAGE_TO_LATENTS,
+  IMG2IMG_RESIZE,
+  LATENTS_TO_IMAGE,
+  MAIN_MODEL_LOADER,
+  NEGATIVE_CONDITIONING,
+  NOISE,
+  POSITIVE_CONDITIONING,
+  SEAMLESS,
+} from 'features/nodes/util/graph/constants';
 import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
 import {
   type ImageDTO,
@@ -17,21 +32,6 @@ import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
 import { addWatermarkerToGraph } from './addWatermarkerToGraph';
-import {
-  CANVAS_IMAGE_TO_IMAGE_GRAPH,
-  CANVAS_OUTPUT,
-  CLIP_SKIP,
-  DENOISE_LATENTS,
-  IMAGE_TO_LATENTS,
-  IMG2IMG_RESIZE,
-  LATENTS_TO_IMAGE,
-  MAIN_MODEL_LOADER,
-  NEGATIVE_CONDITIONING,
-  NOISE,
-  POSITIVE_CONDITIONING,
-  SEAMLESS,
-} from './constants';
-import { addCoreMetadataNode, getModelMetadataField } from './metadata';
 
 /**
  * Builds the Canvas tab's Image to Image graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasInpaintGraph.ts

@@ -1,22 +1,5 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
-import type {
-  CanvasPasteBackInvocation,
-  CreateGradientMaskInvocation,
-  ImageDTO,
-  ImageToLatentsInvocation,
-  NoiseInvocation,
-  NonNullableGraph,
-} from 'services/api/types';
-
-import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
-import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
-import { addLoRAsToGraph } from './addLoRAsToGraph';
-import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
-import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
-import { addVAEToGraph } from './addVAEToGraph';
-import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 import {
   CANVAS_INPAINT_GRAPH,
   CANVAS_OUTPUT,
@@ -34,8 +17,25 @@ import {
   NOISE,
   POSITIVE_CONDITIONING,
   SEAMLESS,
-} from './constants';
-import { getBoardField, getIsIntermediate } from './graphBuilderUtils';
+} from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
+import type {
+  CanvasPasteBackInvocation,
+  CreateGradientMaskInvocation,
+  ImageDTO,
+  ImageToLatentsInvocation,
+  NoiseInvocation,
+  NonNullableGraph,
+} from 'services/api/types';
+
+import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
+import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
+import { addLoRAsToGraph } from './addLoRAsToGraph';
+import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
+import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
+import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
+import { addVAEToGraph } from './addVAEToGraph';
+import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 
 /**
  * Builds the Canvas tab's Inpaint graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasOutpaintGraph.ts

@@ -1,22 +1,5 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
-import type {
-  ImageDTO,
-  ImageToLatentsInvocation,
-  InfillPatchMatchInvocation,
-  InfillTileInvocation,
-  NoiseInvocation,
-  NonNullableGraph,
-} from 'services/api/types';
-
-import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
-import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
-import { addLoRAsToGraph } from './addLoRAsToGraph';
-import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
-import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
-import { addVAEToGraph } from './addVAEToGraph';
-import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 import {
   CANVAS_OUTPAINT_GRAPH,
   CANVAS_OUTPUT,
@@ -38,8 +21,25 @@ import {
   NOISE,
   POSITIVE_CONDITIONING,
   SEAMLESS,
-} from './constants';
-import { getBoardField, getIsIntermediate } from './graphBuilderUtils';
+} from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
+import type {
+  ImageDTO,
+  ImageToLatentsInvocation,
+  InfillPatchMatchInvocation,
+  InfillTileInvocation,
+  NoiseInvocation,
+  NonNullableGraph,
+} from 'services/api/types';
+
+import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
+import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
+import { addLoRAsToGraph } from './addLoRAsToGraph';
+import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
+import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
+import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
+import { addVAEToGraph } from './addVAEToGraph';
+import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 
 /**
  * Builds the Canvas tab's Outpaint graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasSDXLImageToImageGraph.ts

@@ -1,6 +1,22 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
+import { addCoreMetadataNode, getModelMetadataField } from 'features/nodes/util/graph/canvas/metadata';
+import {
+  CANVAS_OUTPUT,
+  IMAGE_TO_LATENTS,
+  IMG2IMG_RESIZE,
+  LATENTS_TO_IMAGE,
+  NEGATIVE_CONDITIONING,
+  NOISE,
+  POSITIVE_CONDITIONING,
+  SDXL_CANVAS_IMAGE_TO_IMAGE_GRAPH,
+  SDXL_DENOISE_LATENTS,
+  SDXL_MODEL_LOADER,
+  SDXL_REFINER_SEAMLESS,
+  SEAMLESS,
+} from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from 'features/nodes/util/graph/graphBuilderUtils';
 import {
   type ImageDTO,
   type ImageToLatentsInvocation,
@@ -17,22 +33,6 @@ import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
 import { addWatermarkerToGraph } from './addWatermarkerToGraph';
-import {
-  CANVAS_OUTPUT,
-  IMAGE_TO_LATENTS,
-  IMG2IMG_RESIZE,
-  LATENTS_TO_IMAGE,
-  NEGATIVE_CONDITIONING,
-  NOISE,
-  POSITIVE_CONDITIONING,
-  SDXL_CANVAS_IMAGE_TO_IMAGE_GRAPH,
-  SDXL_DENOISE_LATENTS,
-  SDXL_MODEL_LOADER,
-  SDXL_REFINER_SEAMLESS,
-  SEAMLESS,
-} from './constants';
-import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from './graphBuilderUtils';
-import { addCoreMetadataNode, getModelMetadataField } from './metadata';
 
 /**
  * Builds the Canvas tab's Image to Image graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasSDXLInpaintGraph.ts

@@ -1,5 +1,24 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
+import {
+  CANVAS_OUTPUT,
+  INPAINT_CREATE_MASK,
+  INPAINT_IMAGE,
+  INPAINT_IMAGE_RESIZE_DOWN,
+  INPAINT_IMAGE_RESIZE_UP,
+  LATENTS_TO_IMAGE,
+  MASK_RESIZE_DOWN,
+  MASK_RESIZE_UP,
+  NEGATIVE_CONDITIONING,
+  NOISE,
+  POSITIVE_CONDITIONING,
+  SDXL_CANVAS_INPAINT_GRAPH,
+  SDXL_DENOISE_LATENTS,
+  SDXL_MODEL_LOADER,
+  SDXL_REFINER_SEAMLESS,
+  SEAMLESS,
+} from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from 'features/nodes/util/graph/graphBuilderUtils';
 import type {
   CanvasPasteBackInvocation,
   CreateGradientMaskInvocation,
@@ -18,25 +37,6 @@ import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
 import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
 import { addVAEToGraph } from './addVAEToGraph';
 import { addWatermarkerToGraph } from './addWatermarkerToGraph';
-import {
-  CANVAS_OUTPUT,
-  INPAINT_CREATE_MASK,
-  INPAINT_IMAGE,
-  INPAINT_IMAGE_RESIZE_DOWN,
-  INPAINT_IMAGE_RESIZE_UP,
-  LATENTS_TO_IMAGE,
-  MASK_RESIZE_DOWN,
-  MASK_RESIZE_UP,
-  NEGATIVE_CONDITIONING,
-  NOISE,
-  POSITIVE_CONDITIONING,
-  SDXL_CANVAS_INPAINT_GRAPH,
-  SDXL_DENOISE_LATENTS,
-  SDXL_MODEL_LOADER,
-  SDXL_REFINER_SEAMLESS,
-  SEAMLESS,
-} from './constants';
-import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from './graphBuilderUtils';
 
 /**
  * Builds the Canvas tab's Inpaint graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasSDXLOutpaintGraph.ts

@@ -1,23 +1,5 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
-import type {
-  ImageDTO,
-  ImageToLatentsInvocation,
-  InfillPatchMatchInvocation,
-  InfillTileInvocation,
-  NoiseInvocation,
-  NonNullableGraph,
-} from 'services/api/types';
-
-import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
-import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
-import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
-import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
-import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
-import { addVAEToGraph } from './addVAEToGraph';
-import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 import {
   CANVAS_OUTPUT,
   INPAINT_CREATE_MASK,
@@ -39,8 +21,26 @@ import {
   SDXL_MODEL_LOADER,
   SDXL_REFINER_SEAMLESS,
   SEAMLESS,
-} from './constants';
-import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from './graphBuilderUtils';
+} from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from 'features/nodes/util/graph/graphBuilderUtils';
+import type {
+  ImageDTO,
+  ImageToLatentsInvocation,
+  InfillPatchMatchInvocation,
+  InfillTileInvocation,
+  NoiseInvocation,
+  NonNullableGraph,
+} from 'services/api/types';
+
+import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
+import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
+import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
+import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
+import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
+import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
+import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
+import { addVAEToGraph } from './addVAEToGraph';
+import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 
 /**
  * Builds the Canvas tab's Outpaint graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasSDXLTextToImageGraph.ts

@@ -1,17 +1,7 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
-import { isNonRefinerMainModelConfig, type NonNullableGraph } from 'services/api/types';
-
-import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
-import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
-import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
-import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
-import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
-import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
-import { addVAEToGraph } from './addVAEToGraph';
-import { addWatermarkerToGraph } from './addWatermarkerToGraph';
+import { addCoreMetadataNode, getModelMetadataField } from 'features/nodes/util/graph/canvas/metadata';
 import {
   CANVAS_OUTPUT,
   LATENTS_TO_IMAGE,
@@ -23,9 +13,19 @@ import {
   SDXL_MODEL_LOADER,
   SDXL_REFINER_SEAMLESS,
   SEAMLESS,
-} from './constants';
-import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from './graphBuilderUtils';
-import { addCoreMetadataNode, getModelMetadataField } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate, getSDXLStylePrompts } from 'features/nodes/util/graph/graphBuilderUtils';
+import { isNonRefinerMainModelConfig, type NonNullableGraph } from 'services/api/types';
+
+import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
+import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
+import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
+import { addSDXLLoRAsToGraph } from './addSDXLLoRAstoGraph';
+import { addSDXLRefinerToGraph } from './addSDXLRefinerToGraph';
+import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
+import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
+import { addVAEToGraph } from './addVAEToGraph';
+import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 
 /**
  * Builds the Canvas tab's Text to Image graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/buildCanvasTextToImageGraph.ts

@@ -1,17 +1,7 @@
 import { logger } from 'app/logging/logger';
 import type { RootState } from 'app/store/store';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
-import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
-import { isNonRefinerMainModelConfig, type NonNullableGraph } from 'services/api/types';
-
-import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
-import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
-import { addLoRAsToGraph } from './addLoRAsToGraph';
-import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
-import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
-import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
-import { addVAEToGraph } from './addVAEToGraph';
-import { addWatermarkerToGraph } from './addWatermarkerToGraph';
+import { addCoreMetadataNode, getModelMetadataField } from 'features/nodes/util/graph/canvas/metadata';
 import {
   CANVAS_OUTPUT,
   CANVAS_TEXT_TO_IMAGE_GRAPH,
@@ -23,8 +13,18 @@ import {
   NOISE,
   POSITIVE_CONDITIONING,
   SEAMLESS,
-} from './constants';
-import { addCoreMetadataNode, getModelMetadataField } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
+import { isNonRefinerMainModelConfig, type NonNullableGraph } from 'services/api/types';
+
+import { addControlNetToLinearGraph } from './addControlNetToLinearGraph';
+import { addIPAdapterToLinearGraph } from './addIPAdapterToLinearGraph';
+import { addLoRAsToGraph } from './addLoRAsToGraph';
+import { addNSFWCheckerToGraph } from './addNSFWCheckerToGraph';
+import { addSeamlessToLinearGraph } from './addSeamlessToLinearGraph';
+import { addT2IAdaptersToLinearGraph } from './addT2IAdapterToLinearGraph';
+import { addVAEToGraph } from './addVAEToGraph';
+import { addWatermarkerToGraph } from './addWatermarkerToGraph';
 
 /**
  * Builds the Canvas tab's Text to Image graph.

invokeai/frontend/web/src/features/nodes/util/graph/canvas/metadata.ts

@@ -1,9 +1,8 @@
 import type { JSONObject } from 'common/types';
 import type { ModelIdentifierField } from 'features/nodes/types/common';
+import { METADATA } from 'features/nodes/util/graph/constants';
 import type { AnyModelConfig, CoreMetadataInvocation, NonNullableGraph } from 'services/api/types';
 
-import { METADATA } from './constants';
-
 export const addCoreMetadataNode = (
   graph: NonNullableGraph,
   metadata: Partial<CoreMetadataInvocation>,

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

@@ -1,4 +1,4 @@
-import { Graph } from 'features/nodes/util/graph/Graph';
+import { Graph } from 'features/nodes/util/graph/generation/Graph';
 import type { AnyInvocation, Invocation } from 'services/api/types';
 import { assert, AssertionError, is } from 'tsafe';
 import { validate } from 'uuid';

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

@@ -30,7 +30,7 @@ import {
   RESIZE,
   T2I_ADAPTER_COLLECT,
 } from 'features/nodes/util/graph/constants';
-import type { Graph } from 'features/nodes/util/graph/Graph';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import { size } from 'lodash-es';
 import { getImageDTO, imagesApi } from 'services/api/endpoints/images';
 import type { BaseModelType, ImageDTO, Invocation } from 'services/api/types';

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

@@ -1,11 +1,6 @@
 import type { RootState } from 'app/store/store';
 import { deepClone } from 'common/util/deepClone';
 import { roundToMultiple } from 'common/util/roundDownToMultiple';
-import type { Graph } from 'features/nodes/util/graph/Graph';
-import { getBoardField, getIsIntermediate } from 'features/nodes/util/graph/graphBuilderUtils';
-import { selectOptimalDimension } from 'features/parameters/store/generationSlice';
-import type { Invocation } from 'services/api/types';
-
 import {
   DENOISE_LATENTS_HRF,
   ESRGAN_HRF,
@@ -14,7 +9,11 @@ import {
   LATENTS_TO_IMAGE_HRF_LR,
   NOISE_HRF,
   RESIZE_HRF,
-} from './constants';
+} from 'features/nodes/util/graph/constants';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
+import { getBoardField } from 'features/nodes/util/graph/graphBuilderUtils';
+import { selectOptimalDimension } from 'features/parameters/store/generationSlice';
+import type { Invocation } from 'services/api/types';
 
 /**
  * Calculates the new resolution for high-resolution features (HRF) based on base model type.
@@ -150,7 +149,7 @@ export const addGenerationTabHRF = (
     type: 'l2i',
     id: LATENTS_TO_IMAGE_HRF_HR,
     fp32: l2i.fp32,
-    is_intermediate: getIsIntermediate(state),
+    is_intermediate: false,
     board: getBoardField(state),
   });
   g.addEdge(vaeSource, 'vae', l2iHrfHR, 'vae');

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

@@ -1,11 +1,10 @@
 import type { RootState } from 'app/store/store';
 import { zModelIdentifierField } from 'features/nodes/types/common';
-import type { Graph } from 'features/nodes/util/graph/Graph';
+import { LORA_LOADER } from 'features/nodes/util/graph/constants';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import { filter, size } from 'lodash-es';
 import type { Invocation, S } from 'services/api/types';
 
-import { LORA_LOADER } from './constants';
-
 export const addGenerationTabLoRAs = (
   state: RootState,
   g: Graph,

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

@@ -1,8 +1,7 @@
-import type { Graph } from 'features/nodes/util/graph/Graph';
+import { NSFW_CHECKER } from 'features/nodes/util/graph/constants';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import type { Invocation } from 'services/api/types';
 
-import { NSFW_CHECKER } from './constants';
-
 /**
  * Adds the NSFW checker to the output image
  * @param g The graph

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

@@ -1,11 +1,10 @@
 import type { RootState } from 'app/store/store';
 import { zModelIdentifierField } from 'features/nodes/types/common';
-import type { Graph } from 'features/nodes/util/graph/Graph';
+import { LORA_LOADER } from 'features/nodes/util/graph/constants';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import { filter, size } from 'lodash-es';
 import type { Invocation, S } from 'services/api/types';
 
-import { LORA_LOADER } from './constants';
-
 export const addGenerationTabSDXLLoRAs = (
   state: RootState,
   g: Graph,

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

@@ -1,18 +1,17 @@
 import type { RootState } from 'app/store/store';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
-import type { Graph } from 'features/nodes/util/graph/Graph';
-import type { Invocation } from 'services/api/types';
-import { isRefinerMainModelModelConfig } from 'services/api/types';
-import { assert } from 'tsafe';
-
+import { getModelMetadataField } from 'features/nodes/util/graph/canvas/metadata';
 import {
   SDXL_REFINER_DENOISE_LATENTS,
   SDXL_REFINER_MODEL_LOADER,
   SDXL_REFINER_NEGATIVE_CONDITIONING,
   SDXL_REFINER_POSITIVE_CONDITIONING,
   SDXL_REFINER_SEAMLESS,
-} from './constants';
-import { getModelMetadataField } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
+import type { Invocation } from 'services/api/types';
+import { isRefinerMainModelModelConfig } from 'services/api/types';
+import { assert } from 'tsafe';
 
 export const addGenerationTabSDXLRefiner = async (
   state: RootState,

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

@@ -1,9 +1,8 @@
 import type { RootState } from 'app/store/store';
-import type { Graph } from 'features/nodes/util/graph/Graph';
+import { SEAMLESS } from 'features/nodes/util/graph/constants';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import type { Invocation } from 'services/api/types';
 
-import { SEAMLESS } from './constants';
-
 /**
  * Adds the seamless node to the graph and connects it to the model loader and denoise node.
  * Because the seamless node may insert a VAE loader node between the model loader and itself,

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

@@ -1,8 +1,7 @@
-import type { Graph } from 'features/nodes/util/graph/Graph';
+import { WATERMARKER } from 'features/nodes/util/graph/constants';
+import type { Graph } from 'features/nodes/util/graph/generation/Graph';
 import type { Invocation } from 'services/api/types';
 
-import { WATERMARKER } from './constants';
-
 /**
  * Adds a watermark to the output image
  * @param g The graph

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

@@ -1,19 +1,6 @@
 import type { RootState } from 'app/store/store';
 import { isInitialImageLayer, isRegionalGuidanceLayer } from 'features/controlLayers/store/controlLayersSlice';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
-import { addGenerationTabControlLayers } from 'features/nodes/util/graph/addGenerationTabControlLayers';
-import { addGenerationTabHRF } from 'features/nodes/util/graph/addGenerationTabHRF';
-import { addGenerationTabLoRAs } from 'features/nodes/util/graph/addGenerationTabLoRAs';
-import { addGenerationTabNSFWChecker } from 'features/nodes/util/graph/addGenerationTabNSFWChecker';
-import { addGenerationTabSeamless } from 'features/nodes/util/graph/addGenerationTabSeamless';
-import { addGenerationTabWatermarker } from 'features/nodes/util/graph/addGenerationTabWatermarker';
-import type { GraphType } from 'features/nodes/util/graph/Graph';
-import { Graph } from 'features/nodes/util/graph/Graph';
-import { getBoardField } from 'features/nodes/util/graph/graphBuilderUtils';
-import type { Invocation } from 'services/api/types';
-import { isNonRefinerMainModelConfig } from 'services/api/types';
-import { assert } from 'tsafe';
-
 import {
   CLIP_SKIP,
   CONTROL_LAYERS_GRAPH,
@@ -26,8 +13,19 @@ import {
   POSITIVE_CONDITIONING,
   POSITIVE_CONDITIONING_COLLECT,
   VAE_LOADER,
-} from './constants';
-import { getModelMetadataField } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import { addGenerationTabControlLayers } from 'features/nodes/util/graph/generation/addGenerationTabControlLayers';
+import { addGenerationTabHRF } from 'features/nodes/util/graph/generation/addGenerationTabHRF';
+import { addGenerationTabLoRAs } from 'features/nodes/util/graph/generation/addGenerationTabLoRAs';
+import { addGenerationTabNSFWChecker } from 'features/nodes/util/graph/generation/addGenerationTabNSFWChecker';
+import { addGenerationTabSeamless } from 'features/nodes/util/graph/generation/addGenerationTabSeamless';
+import { addGenerationTabWatermarker } from 'features/nodes/util/graph/generation/addGenerationTabWatermarker';
+import type { GraphType } from 'features/nodes/util/graph/generation/Graph';
+import { Graph } from 'features/nodes/util/graph/generation/Graph';
+import { getBoardField } from 'features/nodes/util/graph/graphBuilderUtils';
+import type { Invocation } from 'services/api/types';
+import { isNonRefinerMainModelConfig } from 'services/api/types';
+import { assert } from 'tsafe';
 
 export const buildGenerationTabGraph = async (state: RootState): Promise<GraphType> => {
   const {
@@ -136,7 +134,7 @@ export const buildGenerationTabGraph = async (state: RootState): Promise<GraphTy
     width,
     positive_prompt: positivePrompt,
     negative_prompt: negativePrompt,
-    model: getModelMetadataField(modelConfig),
+    model: Graph.getModelMetadataField(modelConfig),
     seed,
     steps,
     rand_device: shouldUseCpuNoise ? 'cpu' : 'cuda',

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

@@ -1,16 +1,5 @@
 import type { RootState } from 'app/store/store';
 import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
-import { addGenerationTabControlLayers } from 'features/nodes/util/graph/addGenerationTabControlLayers';
-import { addGenerationTabNSFWChecker } from 'features/nodes/util/graph/addGenerationTabNSFWChecker';
-import { addGenerationTabSDXLLoRAs } from 'features/nodes/util/graph/addGenerationTabSDXLLoRAs';
-import { addGenerationTabSDXLRefiner } from 'features/nodes/util/graph/addGenerationTabSDXLRefiner';
-import { addGenerationTabSeamless } from 'features/nodes/util/graph/addGenerationTabSeamless';
-import { addGenerationTabWatermarker } from 'features/nodes/util/graph/addGenerationTabWatermarker';
-import { Graph } from 'features/nodes/util/graph/Graph';
-import type { Invocation, NonNullableGraph } from 'services/api/types';
-import { isNonRefinerMainModelConfig } from 'services/api/types';
-import { assert } from 'tsafe';
-
 import {
   LATENTS_TO_IMAGE,
   NEGATIVE_CONDITIONING,
@@ -22,9 +11,18 @@ import {
   SDXL_DENOISE_LATENTS,
   SDXL_MODEL_LOADER,
   VAE_LOADER,
-} from './constants';
-import { getBoardField, getSDXLStylePrompts } from './graphBuilderUtils';
-import { getModelMetadataField } from './metadata';
+} from 'features/nodes/util/graph/constants';
+import { addGenerationTabControlLayers } from 'features/nodes/util/graph/generation/addGenerationTabControlLayers';
+import { addGenerationTabNSFWChecker } from 'features/nodes/util/graph/generation/addGenerationTabNSFWChecker';
+import { addGenerationTabSDXLLoRAs } from 'features/nodes/util/graph/generation/addGenerationTabSDXLLoRAs';
+import { addGenerationTabSDXLRefiner } from 'features/nodes/util/graph/generation/addGenerationTabSDXLRefiner';
+import { addGenerationTabSeamless } from 'features/nodes/util/graph/generation/addGenerationTabSeamless';
+import { addGenerationTabWatermarker } from 'features/nodes/util/graph/generation/addGenerationTabWatermarker';
+import { Graph } from 'features/nodes/util/graph/generation/Graph';
+import { getBoardField, getSDXLStylePrompts } from 'features/nodes/util/graph/graphBuilderUtils';
+import type { Invocation, NonNullableGraph } from 'services/api/types';
+import { isNonRefinerMainModelConfig } from 'services/api/types';
+import { assert } from 'tsafe';
 
 export const buildGenerationTabSDXLGraph = async (state: RootState): Promise<NonNullableGraph> => {
   const {
@@ -127,7 +125,7 @@ export const buildGenerationTabSDXLGraph = async (state: RootState): Promise<Non
     width,
     positive_prompt: positivePrompt,
     negative_prompt: negativePrompt,
-    model: getModelMetadataField(modelConfig),
+    model: Graph.getModelMetadataField(modelConfig),
     seed,
     steps,
     rand_device: shouldUseCpuNoise ? 'cpu' : 'cuda',