Fixes failed canvas generation when gallery is empty

There was some old logic from before Unified Canvas which aborted generation when there was no currentImage. 

If you have an image in the gallery, there is always a currentImage. But if gallery is empty, there is no currentImage. Generation would silently fail in this case.

We apparently never tested with an empty gallery and thus never ran into the issue. This removes this old and now-unused logic.
This commit is contained in:
psychedelicious
2022-12-02 13:46:29 +11:00
committed by Lincoln Stein
parent 2723dd9051
commit b1091ecda1
4 changed files with 42 additions and 57 deletions

File diff suppressed because one or more lines are too long

View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>InvokeAI - A Stable Diffusion Toolkit</title> <title>InvokeAI - A Stable Diffusion Toolkit</title>
<link rel="shortcut icon" type="icon" href="./assets/favicon.0d253ced.ico" /> <link rel="shortcut icon" type="icon" href="./assets/favicon.0d253ced.ico" />
<script type="module" crossorigin src="./assets/index.bd109a2c.js"></script> <script type="module" crossorigin src="./assets/index.637f12bd.js"></script>
<link rel="stylesheet" href="./assets/index.c609c0c8.css"> <link rel="stylesheet" href="./assets/index.c609c0c8.css">
</head> </head>

View File

@ -42,7 +42,6 @@ const makeSocketIOEmitters = (
options: optionsState, options: optionsState,
system: systemState, system: systemState,
canvas: canvasState, canvas: canvasState,
gallery: galleryState,
} = state; } = state;
const frontendToBackendParametersConfig: FrontendToBackendParametersConfig = const frontendToBackendParametersConfig: FrontendToBackendParametersConfig =
@ -55,13 +54,6 @@ const makeSocketIOEmitters = (
dispatch(generationRequested()); dispatch(generationRequested());
if (!['txt2img', 'img2img'].includes(generationMode)) {
if (!galleryState.currentImage?.url) return;
frontendToBackendParametersConfig.imageToProcessUrl =
galleryState.currentImage.url;
}
const { generationParameters, esrganParameters, facetoolParameters } = const { generationParameters, esrganParameters, facetoolParameters } =
frontendToBackendParameters(frontendToBackendParametersConfig); frontendToBackendParameters(frontendToBackendParametersConfig);

View File

@ -30,13 +30,7 @@ export const frontendToBackendParameters = (
): { [key: string]: any } => { ): { [key: string]: any } => {
const canvasBaseLayer = getCanvasBaseLayer(); const canvasBaseLayer = getCanvasBaseLayer();
const { const { generationMode, optionsState, canvasState, systemState } = config;
generationMode,
optionsState,
canvasState,
systemState,
imageToProcessUrl,
} = config;
const { const {
cfgScale, cfgScale,
@ -164,7 +158,6 @@ export const frontendToBackendParameters = (
generationParameters.fit = false; generationParameters.fit = false;
generationParameters.init_img = imageToProcessUrl;
generationParameters.strength = img2imgStrength; generationParameters.strength = img2imgStrength;
generationParameters.invert_mask = shouldPreserveMaskedArea; generationParameters.invert_mask = shouldPreserveMaskedArea;