From 27657f8b7af27a314b47b5f87e56c81fe1e509a6 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Thu, 4 Jul 2024 20:55:55 +1000 Subject: [PATCH] tidy(ui): organise files --- .../listeners/enqueueRequestedLinear.ts | 2 +- .../components/StageComponent.tsx | 2 +- .../{background.ts => CanvasBackground.ts} | 2 +- .../konva/{bbox.ts => CanvasBbox.ts} | 2 +- ...rolAdapters.ts => CanvasControlAdapter.ts} | 0 ...verlay.ts => CanvasDocumentSizeOverlay.ts} | 2 +- .../{inpaintMask.ts => CanvasInpaintMask.ts} | 2 +- .../konva/{layers.ts => CanvasLayer.ts} | 2 +- .../konva/{preview.ts => CanvasPreview.ts} | 8 +++--- .../konva/{regions.ts => CanvasRegion.ts} | 4 +-- .../{stagingArea.ts => CanvasStagingArea.ts} | 2 +- .../konva/{tool.ts => CanvasTool.ts} | 2 +- .../{nodeManager.ts => KonvaNodeManager.ts} | 26 +++++++++---------- .../konva/{stateApi.ts => StateApi.ts} | 0 .../features/controlLayers/konva/events.ts | 2 +- .../util/graph/generation/addImageToImage.ts | 2 +- .../nodes/util/graph/generation/addInpaint.ts | 2 +- .../util/graph/generation/addOutpaint.ts | 2 +- .../nodes/util/graph/generation/addRegions.ts | 2 +- .../generation/buildImageToImageSDXLGraph.ts | 2 +- .../util/graph/generation/buildSD1Graph.ts | 2 +- .../util/graph/generation/buildSDXLGraph.ts | 2 +- .../generation/buildTextToImageSD1SD2Graph.ts | 2 +- 23 files changed, 37 insertions(+), 37 deletions(-) rename invokeai/frontend/web/src/features/controlLayers/konva/{background.ts => CanvasBackground.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{bbox.ts => CanvasBbox.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{controlAdapters.ts => CanvasControlAdapter.ts} (100%) rename invokeai/frontend/web/src/features/controlLayers/konva/{documentSizeOverlay.ts => CanvasDocumentSizeOverlay.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{inpaintMask.ts => CanvasInpaintMask.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{layers.ts => CanvasLayer.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{preview.ts => CanvasPreview.ts} (76%) rename invokeai/frontend/web/src/features/controlLayers/konva/{regions.ts => CanvasRegion.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{stagingArea.ts => CanvasStagingArea.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{tool.ts => CanvasTool.ts} (99%) rename invokeai/frontend/web/src/features/controlLayers/konva/{nodeManager.ts => KonvaNodeManager.ts} (95%) rename invokeai/frontend/web/src/features/controlLayers/konva/{stateApi.ts => StateApi.ts} (100%) diff --git a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts index d15a48da48..0064614667 100644 --- a/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts +++ b/invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/listeners/enqueueRequestedLinear.ts @@ -1,6 +1,6 @@ import { enqueueRequested } from 'app/store/actions'; import type { AppStartListening } from 'app/store/middleware/listenerMiddleware'; -import { getNodeManager } from 'features/controlLayers/konva/nodeManager'; +import { getNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { stagingAreaCanceledStaging, stagingAreaStartedStaging } from 'features/controlLayers/store/canvasV2Slice'; import { prepareLinearUIBatch } from 'features/nodes/util/graph/buildLinearBatchConfig'; import { buildSD1Graph } from 'features/nodes/util/graph/generation/buildSD1Graph'; diff --git a/invokeai/frontend/web/src/features/controlLayers/components/StageComponent.tsx b/invokeai/frontend/web/src/features/controlLayers/components/StageComponent.tsx index 10fceda110..6cafcd1066 100644 --- a/invokeai/frontend/web/src/features/controlLayers/components/StageComponent.tsx +++ b/invokeai/frontend/web/src/features/controlLayers/components/StageComponent.tsx @@ -3,7 +3,7 @@ import { logger } from 'app/logging/logger'; import { $isDebugging } from 'app/store/nanostores/isDebugging'; import { useAppStore } from 'app/store/storeHooks'; import { HeadsUpDisplay } from 'features/controlLayers/components/HeadsUpDisplay'; -import { KonvaNodeManager, setNodeManager } from 'features/controlLayers/konva/nodeManager'; +import { KonvaNodeManager, setNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import Konva from 'konva'; import { memo, useCallback, useEffect, useLayoutEffect, useState } from 'react'; import { useDevicePixelRatio } from 'use-device-pixel-ratio'; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/background.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBackground.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/background.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasBackground.ts index dfa614a96d..01c5980cab 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/background.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBackground.ts @@ -1,5 +1,5 @@ import { getArbitraryBaseColor } from '@invoke-ai/ui-library'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import Konva from 'konva'; const baseGridLineColor = getArbitraryBaseColor(27); diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/bbox.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBbox.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/bbox.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasBbox.ts index f87689afff..d6dd391484 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/bbox.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasBbox.ts @@ -1,10 +1,10 @@ import { roundToMultiple, roundToMultipleMin } from 'common/util/roundDownToMultiple'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { PREVIEW_GENERATION_BBOX_DUMMY_RECT, PREVIEW_GENERATION_BBOX_GROUP, PREVIEW_GENERATION_BBOX_TRANSFORMER, } from 'features/controlLayers/konva/naming'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; import Konva from 'konva'; import type { IRect } from 'konva/lib/types'; import { atom } from 'nanostores'; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/controlAdapters.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasControlAdapter.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/konva/controlAdapters.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasControlAdapter.ts diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/documentSizeOverlay.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasDocumentSizeOverlay.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/documentSizeOverlay.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasDocumentSizeOverlay.ts index 7259d2d6cb..be780449db 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/documentSizeOverlay.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasDocumentSizeOverlay.ts @@ -1,6 +1,6 @@ import { getArbitraryBaseColor } from '@invoke-ai/ui-library'; import { DOCUMENT_FIT_PADDING_PX } from 'features/controlLayers/konva/constants'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import Konva from 'konva'; export class CanvasDocumentSizeOverlay { diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/inpaintMask.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasInpaintMask.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/inpaintMask.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasInpaintMask.ts index 4c7257879d..0151e896b2 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/inpaintMask.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasInpaintMask.ts @@ -1,7 +1,7 @@ import { rgbColorToString } from 'common/util/colorCodeTransformers'; import { getNodeBboxFast } from 'features/controlLayers/konva/entityBbox'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { getObjectGroupId,INPAINT_MASK_LAYER_ID } from 'features/controlLayers/konva/naming'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; import { KonvaBrushLine, KonvaEraserLine, KonvaRect } from 'features/controlLayers/konva/objects'; import { mapId } from 'features/controlLayers/konva/util'; import { type InpaintMaskEntity, isDrawingTool } from 'features/controlLayers/store/types'; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/layers.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/layers.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts index c902f24802..a5660bdfc4 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/layers.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayer.ts @@ -1,5 +1,5 @@ +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { getObjectGroupId } from 'features/controlLayers/konva/naming'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; import { KonvaBrushLine, KonvaEraserLine, KonvaImage, KonvaRect } from 'features/controlLayers/konva/objects'; import { mapId } from 'features/controlLayers/konva/util'; import { isDrawingTool, type LayerEntity } from 'features/controlLayers/store/types'; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/preview.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasPreview.ts similarity index 76% rename from invokeai/frontend/web/src/features/controlLayers/konva/preview.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasPreview.ts index beddbcc10b..f5f0842941 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/preview.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasPreview.ts @@ -1,9 +1,9 @@ import Konva from 'konva'; -import type { CanvasBbox } from './bbox'; -import type { CanvasDocumentSizeOverlay } from './documentSizeOverlay'; -import type { CanvasStagingArea } from './stagingArea'; -import type { CanvasTool } from './tool'; +import type { CanvasBbox } from './CanvasBbox'; +import type { CanvasDocumentSizeOverlay } from './CanvasDocumentSizeOverlay'; +import type { CanvasStagingArea } from './CanvasStagingArea'; +import type { CanvasTool } from './CanvasTool'; export class CanvasPreview { layer: Konva.Layer; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/regions.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasRegion.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/regions.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasRegion.ts index 2d5ed1dd07..9d72f02744 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/regions.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasRegion.ts @@ -1,7 +1,7 @@ import { rgbColorToString } from 'common/util/colorCodeTransformers'; -import { getObjectGroupId } from 'features/controlLayers/konva/naming'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; import { getNodeBboxFast } from 'features/controlLayers/konva/entityBbox'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; +import { getObjectGroupId } from 'features/controlLayers/konva/naming'; import { KonvaBrushLine, KonvaEraserLine, KonvaRect } from 'features/controlLayers/konva/objects'; import { mapId } from 'features/controlLayers/konva/util'; import { isDrawingTool, type RegionEntity } from 'features/controlLayers/store/types'; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/stagingArea.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/stagingArea.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts index 02b1a50fdb..9f5ce759e6 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/stagingArea.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasStagingArea.ts @@ -1,4 +1,4 @@ -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { KonvaImage, KonvaProgressImage } from 'features/controlLayers/konva/objects'; import Konva from 'konva'; import type { ImageDTO } from 'services/api/types'; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/tool.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool.ts similarity index 99% rename from invokeai/frontend/web/src/features/controlLayers/konva/tool.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool.ts index e1e99b50c6..ed6e0d35ee 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/tool.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasTool.ts @@ -4,8 +4,8 @@ import { BRUSH_BORDER_OUTER_COLOR, BRUSH_ERASER_BORDER_WIDTH, } from 'features/controlLayers/konva/constants'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { PREVIEW_RECT_ID } from 'features/controlLayers/konva/naming'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; import Konva from 'konva'; export class CanvasTool { diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/nodeManager.ts b/invokeai/frontend/web/src/features/controlLayers/konva/KonvaNodeManager.ts similarity index 95% rename from invokeai/frontend/web/src/features/controlLayers/konva/nodeManager.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/KonvaNodeManager.ts index 9f705cd27f..796efae4a7 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/nodeManager.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/KonvaNodeManager.ts @@ -1,10 +1,6 @@ import type { Store } from '@reduxjs/toolkit'; import type { RootState } from 'app/store/store'; import { getImageDataTransparency } from 'common/util/arrayBuffer'; -import { CanvasBackground } from 'features/controlLayers/konva/background'; -import { setStageEventHandlers } from 'features/controlLayers/konva/events'; -import { CanvasPreview } from 'features/controlLayers/konva/preview'; -import { konvaNodeToBlob, konvaNodeToImageData, previewBlob } from 'features/controlLayers/konva/util'; import { $lastProgressEvent, $shouldShowStagedImage } from 'features/controlLayers/store/canvasV2Slice'; import type { CanvasV2State, GenerationMode, Rect } from 'features/controlLayers/store/types'; import { isValidLayer } from 'features/nodes/util/graph/generation/addLayers'; @@ -14,15 +10,19 @@ import { getImageDTO as defaultGetImageDTO, uploadImage as defaultUploadImage } import type { ImageCategory, ImageDTO } from 'services/api/types'; import { assert } from 'tsafe'; -import { CanvasBbox } from './bbox'; -import { CanvasControlAdapter } from './controlAdapters'; -import { CanvasDocumentSizeOverlay } from './documentSizeOverlay'; -import { CanvasInpaintMask } from './inpaintMask'; -import { CanvasLayer } from './layers'; -import { CanvasRegion } from './regions'; -import { CanvasStagingArea } from './stagingArea'; -import { StateApi } from './stateApi'; -import { CanvasTool } from './tool'; +import { CanvasBackground } from './CanvasBackground'; +import { CanvasBbox } from './CanvasBbox'; +import { CanvasControlAdapter } from './CanvasControlAdapter'; +import { CanvasDocumentSizeOverlay } from './CanvasDocumentSizeOverlay'; +import { CanvasInpaintMask } from './CanvasInpaintMask'; +import { CanvasLayer } from './CanvasLayer'; +import { CanvasPreview } from './CanvasPreview'; +import { CanvasRegion } from './CanvasRegion'; +import { CanvasStagingArea } from './CanvasStagingArea'; +import { CanvasTool } from './CanvasTool'; +import { setStageEventHandlers } from './events'; +import { StateApi } from './StateApi'; +import { konvaNodeToBlob, konvaNodeToImageData, previewBlob } from './util'; type Util = { getImageDTO: (imageName: string) => Promise; diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/stateApi.ts b/invokeai/frontend/web/src/features/controlLayers/konva/StateApi.ts similarity index 100% rename from invokeai/frontend/web/src/features/controlLayers/konva/stateApi.ts rename to invokeai/frontend/web/src/features/controlLayers/konva/StateApi.ts diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/events.ts b/invokeai/frontend/web/src/features/controlLayers/konva/events.ts index 32483ee4ee..bf76ffbfe9 100644 --- a/invokeai/frontend/web/src/features/controlLayers/konva/events.ts +++ b/invokeai/frontend/web/src/features/controlLayers/konva/events.ts @@ -1,4 +1,4 @@ -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { getScaledCursorPosition } from 'features/controlLayers/konva/util'; import type { CanvasEntity } from 'features/controlLayers/store/types'; import type Konva from 'konva'; diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addImageToImage.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addImageToImage.ts index fa6dd026a5..c3b2953113 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addImageToImage.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addImageToImage.ts @@ -1,4 +1,4 @@ -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import type { CanvasV2State, Size } from 'features/controlLayers/store/types'; import type { Graph } from 'features/nodes/util/graph/generation/Graph'; import { isEqual, pick } from 'lodash-es'; diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts index 450f683242..f578ff8202 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addInpaint.ts @@ -1,4 +1,4 @@ -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import type { CanvasV2State, Size } from 'features/controlLayers/store/types'; import type { Graph } from 'features/nodes/util/graph/generation/Graph'; import type { ParameterPrecision } from 'features/parameters/types/parameterSchemas'; diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts index 02559d0b5b..c4b828e275 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addOutpaint.ts @@ -1,4 +1,4 @@ -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import type { CanvasV2State, Size } from 'features/controlLayers/store/types'; import type { Graph } from 'features/nodes/util/graph/generation/Graph'; import { getInfill } from 'features/nodes/util/graph/graphBuilderUtils'; diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addRegions.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addRegions.ts index 30a399d211..86c1d66491 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addRegions.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addRegions.ts @@ -1,5 +1,5 @@ import { deepClone } from 'common/util/deepClone'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import type { IPAdapterEntity, Rect, RegionEntity } from 'features/controlLayers/store/types'; import { PROMPT_REGION_INVERT_TENSOR_MASK_PREFIX, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImageToImageSDXLGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImageToImageSDXLGraph.ts index 4dd0e1e056..5b8bc5d550 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImageToImageSDXLGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildImageToImageSDXLGraph.ts @@ -1,5 +1,5 @@ import type { RootState } from 'app/store/store'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers'; import { LATENTS_TO_IMAGE, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts index 9b929cc9ce..ddc8114c22 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSD1Graph.ts @@ -1,5 +1,5 @@ import type { RootState } from 'app/store/store'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers'; import { CANVAS_OUTPUT, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts index 04c0f0cf2f..f3eedd42c0 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildSDXLGraph.ts @@ -1,5 +1,5 @@ import type { RootState } from 'app/store/store'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers'; import { CANVAS_OUTPUT, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildTextToImageSD1SD2Graph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildTextToImageSD1SD2Graph.ts index 044cca05ce..2c6f95b4fa 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildTextToImageSD1SD2Graph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildTextToImageSD1SD2Graph.ts @@ -1,5 +1,5 @@ import type { RootState } from 'app/store/store'; -import type { KonvaNodeManager } from 'features/controlLayers/konva/nodeManager'; +import type { KonvaNodeManager } from 'features/controlLayers/konva/KonvaNodeManager'; import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers'; import { CLIP_SKIP,