Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

use fn to get width/height of output image

Browse Source
This commit is contained in:
Mary Hipp 2024-07-19 19:39:13 -04:00 committed by psychedelicious
parent 5060bf2f62
commit f18431a999
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
invokeai/frontend/web/src/features/nodes/util/graph/buildMultidiffusionUpscaleGraph.ts
View File

@ -2,7 +2,7 @@ import type { RootState } from 'app/store/store';
import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers'; import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers';
import type { GraphType } from 'features/nodes/util/graph/generation/Graph'; import type { GraphType } from 'features/nodes/util/graph/generation/Graph';
import { Graph } from 'features/nodes/util/graph/generation/Graph'; import { Graph } from 'features/nodes/util/graph/generation/Graph';
import { isNonRefinerMainModelConfig, isSpandrelImageToImageModelConfig } from 'services/api/types'; import { ImageDTO, isNonRefinerMainModelConfig, isSpandrelImageToImageModelConfig } from 'services/api/types';
import { assert } from 'tsafe'; import { assert } from 'tsafe';
import { import {
@ -25,7 +25,11 @@ import { addLoRAs } from './generation/addLoRAs';
import { addSDXLLoRas } from './generation/addSDXLLoRAs'; import { addSDXLLoRas } from './generation/addSDXLLoRAs';
import { getBoardField, getSDXLStylePrompts } from './graphBuilderUtils'; import { getBoardField, getSDXLStylePrompts } from './graphBuilderUtils';
export const UPSCALE_SCALE = 2; const UPSCALE_SCALE = 2;
export const getOutputImageSize = (initialImage: ImageDTO) => {
return { width: ((initialImage.width * UPSCALE_SCALE) / 8) * 8, height: ((initialImage.height * UPSCALE_SCALE) / 8) * 8 }
}
export const buildMultidiffusionUpscsaleGraph = async (state: RootState): Promise<GraphType> => { export const buildMultidiffusionUpscsaleGraph = async (state: RootState): Promise<GraphType> => {
const { model, cfgScale: cfg_scale, scheduler, steps, vaePrecision, seed, vae } = state.generation; const { model, cfgScale: cfg_scale, scheduler, steps, vaePrecision, seed, vae } = state.generation;
@ -38,33 +42,32 @@ export const buildMultidiffusionUpscsaleGraph = async (state: RootState): Promis
assert(upscaleInitialImage, 'No initial image found in state'); assert(upscaleInitialImage, 'No initial image found in state');
assert(tileControlnetModel, 'Tile controlnet is required'); assert(tileControlnetModel, 'Tile controlnet is required');
const outputWidth = ((upscaleInitialImage.width * UPSCALE_SCALE) / 8) * 8; const { width: outputWidth, height: outputHeight } = getOutputImageSize(upscaleInitialImage)
const outputHeight = ((upscaleInitialImage.height * UPSCALE_SCALE) / 8) * 8;
const g = new Graph(); const g = new Graph();
const unsharpMaskNode1 = g.addNode({ // const unsharpMaskNode1 = g.addNode({
id: `${UNSHARP_MASK}_1`, // id: `${UNSHARP_MASK}_1`,
type: 'unsharp_mask', // type: 'unsharp_mask',
image: upscaleInitialImage, // image: upscaleInitialImage,
radius: 2, // radius: 2,
strength: (sharpness + 10) * 3.75 + 25, // strength: (sharpness + 10) * 3.75 + 25,
}); // });
const upscaleNode = g.addNode({ const upscaleNode = g.addNode({
id: SPANDREL, id: SPANDREL,
type: 'spandrel_image_to_image', type: 'spandrel_image_to_image',
image_to_image_model: upscaleModel, image_to_image_model: upscaleModel,
tile_size: 500, tile_size: 500,
image: upscaleInitialImage
}); });
g.addEdge(unsharpMaskNode1, 'image', upscaleNode, 'image');
const unsharpMaskNode2 = g.addNode({ const unsharpMaskNode2 = g.addNode({
id: `${UNSHARP_MASK}_2`, id: `${UNSHARP_MASK}_2`,
type: 'unsharp_mask', type: 'unsharp_mask',
radius: 2, radius: 2,
strength: 50, strength: (sharpness + 10) * 3.75 + 25,
}); });
g.addEdge(upscaleNode, 'image', unsharpMaskNode2, 'image'); g.addEdge(upscaleNode, 'image', unsharpMaskNode2, 'image');

5
invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSizeDetails.tsx
View File

@ -1,6 +1,6 @@
import { Flex, Text } from '@invoke-ai/ui-library'; import { Flex, Text } from '@invoke-ai/ui-library';
import { useAppSelector } from 'app/store/storeHooks'; import { useAppSelector } from 'app/store/storeHooks';
import { UPSCALE_SCALE } from 'features/nodes/util/graph/buildMultidiffusionUpscaleGraph'; import { getOutputImageSize } from 'features/nodes/util/graph/buildMultidiffusionUpscaleGraph';
import { useMemo } from 'react'; import { useMemo } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
@ -10,7 +10,8 @@ export const UpscaleSizeDetails = () => {
const outputSizeText = useMemo(() => { const outputSizeText = useMemo(() => {
if (upscaleInitialImage) { if (upscaleInitialImage) {
return `${t('upscaling.outputImageSize')}: ${upscaleInitialImage.width * UPSCALE_SCALE} ${t('upscaling.x')} ${upscaleInitialImage.height * UPSCALE_SCALE}`; const { width, height } = getOutputImageSize(upscaleInitialImage);
return `${t('upscaling.outputImageSize')}: ${width} ${t('upscaling.x')} ${height}`;
} }
}, [upscaleInitialImage, t]); }, [upscaleInitialImage, t]);