From 5060bf2f6223b1a94c904bbfa7761ea77a8dd9b2 Mon Sep 17 00:00:00 2001 From: Mary Hipp Date: Fri, 19 Jul 2024 16:27:40 -0400 Subject: [PATCH] lint fix --- .../util/graph/buildMultidiffusionUpscaleGraph.ts | 11 +++++------ .../UpscaleSettingsAccordion/UpscaleSizeDetails.tsx | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildMultidiffusionUpscaleGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildMultidiffusionUpscaleGraph.ts index 214dc2682f..dd5ac70d11 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/buildMultidiffusionUpscaleGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildMultidiffusionUpscaleGraph.ts @@ -1,6 +1,8 @@ import type { RootState } from 'app/store/store'; +import { fetchModelConfigWithTypeGuard } from 'features/metadata/util/modelFetchingHelpers'; import type { GraphType } from 'features/nodes/util/graph/generation/Graph'; import { Graph } from 'features/nodes/util/graph/generation/Graph'; +import { isNonRefinerMainModelConfig, isSpandrelImageToImageModelConfig } from 'services/api/types'; import { assert } from 'tsafe'; import { @@ -22,8 +24,6 @@ import { import { addLoRAs } from './generation/addLoRAs'; import { addSDXLLoRas } from './generation/addSDXLLoRAs'; import { getBoardField, getSDXLStylePrompts } from './graphBuilderUtils'; -import { fetchModelConfigWithTypeGuard } from '../../../metadata/util/modelFetchingHelpers'; -import { isNonRefinerMainModelConfig, isSpandrelImageToImageModelConfig } from '../../../../services/api/types'; export const UPSCALE_SCALE = 2; @@ -38,8 +38,8 @@ export const buildMultidiffusionUpscsaleGraph = async (state: RootState): Promis assert(upscaleInitialImage, 'No initial image found in state'); assert(tileControlnetModel, 'Tile controlnet is required'); - const outputWidth = ((upscaleInitialImage.width * UPSCALE_SCALE) / 8) * 8 - const outputHeight = ((upscaleInitialImage.height * UPSCALE_SCALE) / 8) * 8 + const outputWidth = ((upscaleInitialImage.width * UPSCALE_SCALE) / 8) * 8; + const outputHeight = ((upscaleInitialImage.height * UPSCALE_SCALE) / 8) * 8; const g = new Graph(); @@ -69,7 +69,6 @@ export const buildMultidiffusionUpscsaleGraph = async (state: RootState): Promis g.addEdge(upscaleNode, 'image', unsharpMaskNode2, 'image'); - const resizeNode = g.addNode({ id: RESIZE, type: 'img_resize', @@ -211,7 +210,7 @@ export const buildMultidiffusionUpscsaleGraph = async (state: RootState): Promis upscale_model: Graph.getModelMetadataField(upscaleModelConfig), creativity, sharpness, - structure + structure, }); } diff --git a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSizeDetails.tsx b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSizeDetails.tsx index 00a3775b72..ec2ccf7d05 100644 --- a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSizeDetails.tsx +++ b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleSizeDetails.tsx @@ -1,8 +1,8 @@ import { Flex, Text } from '@invoke-ai/ui-library'; import { useAppSelector } from 'app/store/storeHooks'; +import { UPSCALE_SCALE } from 'features/nodes/util/graph/buildMultidiffusionUpscaleGraph'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { UPSCALE_SCALE } from '../../../nodes/util/graph/buildMultidiffusionUpscaleGraph'; export const UpscaleSizeDetails = () => { const { t } = useTranslation();