From fbd137da9f09360f8ec2ae8bf8a352db42f58d11 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:34:59 +1000 Subject: [PATCH] tidy(ui): disable preview images on every enqueue --- .../listeners/enqueueRequestedLinear.ts | 3 --- .../nodes/util/graph/generation/addImageToImage.ts | 5 +---- .../features/nodes/util/graph/generation/addInpaint.ts | 10 ++-------- .../nodes/util/graph/generation/addOutpaint.ts | 10 ++-------- .../features/nodes/util/graph/generation/addRegions.ts | 2 +- 5 files changed, 6 insertions(+), 24 deletions(-) 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 1a476f889f..71ac79b206 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 @@ -25,9 +25,6 @@ export const addEnqueueRequestedLinear = (startAppListening: AppStartListening) assert(model, 'No model found in state'); const base = model.base; - manager.getInpaintMaskImage({ bbox: state.canvasV2.bbox, preview: true }); - manager.getImageSourceImage({ bbox: state.canvasV2.bbox, preview: true }); - if (base === 'sdxl') { g = await buildSDXLGraph(state, manager); } else if (base === 'sd-1' || base === 'sd-2') { 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 59f2cd9a6a..fa6dd026a5 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 @@ -18,10 +18,7 @@ export const addImageToImage = async ( denoise.denoising_start = denoising_start; const cropBbox = pick(bbox, ['x', 'y', 'width', 'height']); - const initialImage = await manager.getImageSourceImage({ - bbox: cropBbox, - preview: true, - }); + const initialImage = await manager.getImageSourceImage({ bbox: cropBbox }); if (!isEqual(scaledSize, originalSize)) { // Resize the initial image to the scaled size, denoise, then resize back to the original size 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 9936166ec6..450f683242 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 @@ -22,14 +22,8 @@ export const addInpaint = async ( denoise.denoising_start = denoising_start; const cropBbox = pick(bbox, ['x', 'y', 'width', 'height']); - const initialImage = await manager.getImageSourceImage({ - bbox: cropBbox, - preview: true, - }); - const maskImage = await manager.getInpaintMaskImage({ - bbox: cropBbox, - preview: true, - }); + const initialImage = await manager.getImageSourceImage({ bbox: cropBbox }); + const maskImage = await manager.getInpaintMaskImage({ bbox: cropBbox }); if (!isEqual(scaledSize, originalSize)) { // Scale before processing requires some resizing 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 aede59db13..d546646aae 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 @@ -21,14 +21,8 @@ export const addOutpaint = async ( vaePrecision: ParameterPrecision ): Promise> => { const cropBbox = pick(bbox, ['x', 'y', 'width', 'height']); - const initialImage = await manager.getImageSourceImage({ - bbox: cropBbox, - preview: true, - }); - const maskImage = await manager.getInpaintMaskImage({ - bbox: cropBbox, - preview: true, - }); + const initialImage = await manager.getImageSourceImage({ bbox: cropBbox }); + const maskImage = await manager.getInpaintMaskImage({ bbox: cropBbox }); const infill = getInfill(g, compositing); if (!isEqual(scaledSize, originalSize)) { 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 3b85f15bfd..30a399d211 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 @@ -44,7 +44,7 @@ export const addRegions = async ( for (const region of validRegions) { // Upload the mask image, or get the cached image if it exists - const { image_name } = await manager.getRegionMaskImage({ id: region.id, bbox, preview: true }); + const { image_name } = await manager.getRegionMaskImage({ id: region.id, bbox }); // The main mask-to-tensor node const maskToTensor = g.addNode({