From 2ce4698eef9d8ab69fe955f1857c4758787ab640 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Wed, 24 Jul 2024 19:46:51 +1000 Subject: [PATCH] fix(ui): conflicts after rebasing --- .../nodes/util/graph/buildAdHocPostProcessingGraph.ts | 3 +-- .../util/graph/buildMultidiffusionUpscaleGraph.ts | 11 +++++------ .../nodes/util/graph/generation/Graph.test.ts | 2 +- .../src/features/nodes/util/graph/generation/Graph.ts | 2 +- .../AdvancedSettingsAccordion.tsx | 2 +- .../UpscaleSettingsAccordion/UpscaleWarning.tsx | 2 +- .../ParametersPanels/ParametersPanelUpscale.tsx | 1 + 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/buildAdHocPostProcessingGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/buildAdHocPostProcessingGraph.ts index 7e943500cb..30ca457cda 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/buildAdHocPostProcessingGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/buildAdHocPostProcessingGraph.ts @@ -7,7 +7,6 @@ import type { ImageDTO } from 'services/api/types'; import { isSpandrelImageToImageModelConfig } from 'services/api/types'; import { assert } from 'tsafe'; -import { getModelMetadataField } from './canvas/metadata'; import { SPANDREL } from './constants'; type Arg = { @@ -33,7 +32,7 @@ export const buildAdHocPostProcessingGraph = async ({ image, state }: Arg): Prom const modelConfig = await fetchModelConfigWithTypeGuard(postProcessingModel.key, isSpandrelImageToImageModelConfig); g.upsertMetadata({ - upscale_model: getModelMetadataField(modelConfig), + upscale_model: Graph.getModelMetadataField(modelConfig), }); return g.getGraph(); 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 7c17b406de..31a22fa6fb 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,6 @@ 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 { addSDXLLoRAs } from 'features/nodes/util/graph/generation/addSDXLLoRAs'; import { Graph } from 'features/nodes/util/graph/generation/Graph'; import { isNonRefinerMainModelConfig, isSpandrelImageToImageModelConfig } from 'services/api/types'; import { assert } from 'tsafe'; @@ -21,11 +21,10 @@ import { VAE_LOADER, } from './constants'; import { addLoRAs } from './generation/addLoRAs'; -import { addSDXLLoRas } from './generation/addSDXLLoRAs'; import { getBoardField, getPresetModifiedPrompts } from './graphBuilderUtils'; -export const buildMultidiffusionUpscaleGraph = async (state: RootState): Promise => { - const { model, cfgScale: cfg_scale, scheduler, steps, vaePrecision, seed, vae } = state.generation; +export const buildMultidiffusionUpscaleGraph = async (state: RootState): Promise => { + const { model, cfgScale: cfg_scale, scheduler, steps, vaePrecision, seed, vae } = state.canvasV2.params; const { upscaleModel, upscaleInitialImage, structure, creativity, tileControlnetModel, scale } = state.upscale; assert(model, 'No model found in state'); @@ -123,7 +122,7 @@ export const buildMultidiffusionUpscaleGraph = async (state: RootState): Promise g.addEdge(modelNode, 'clip2', posCondNode, 'clip2'); g.addEdge(modelNode, 'clip2', negCondNode, 'clip2'); g.addEdge(modelNode, 'unet', tiledMultidiffusionNode, 'unet'); - addSDXLLoRas(state, g, tiledMultidiffusionNode, modelNode, null, posCondNode, negCondNode); + addSDXLLoRAs(state, g, tiledMultidiffusionNode, modelNode, null, posCondNode, negCondNode); g.upsertMetadata({ positive_prompt: positivePrompt, @@ -245,5 +244,5 @@ export const buildMultidiffusionUpscaleGraph = async (state: RootState): Promise g.addEdge(collectNode, 'collection', tiledMultidiffusionNode, 'control'); - return g.getGraph(); + return g; }; diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.test.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.test.ts index f2e09adfa1..3c26edc787 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.test.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.test.ts @@ -600,7 +600,7 @@ describe('Graph', () => { }); g.upsertMetadata({ test: 'test' }); g.addEdgeToMetadata(n1, 'width', 'width'); - const metadata = g._getMetadataNode(); + const metadata = g.getMetadataNode(); expect(g.getEdgesFrom(n1).length).toBe(1); expect(g.getEdgesTo(metadata as unknown as AnyInvocation).length).toBe(1); }); diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.ts index d223d1f500..3510d20f15 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/Graph.ts @@ -409,7 +409,7 @@ export class Graph { metadataField: string ): Edge { // @ts-expect-error `Graph` excludes `core_metadata` nodes due to its excessively wide typing - return this.addEdge(fromNode, fromField, this._getMetadataNode(), metadataField); + return this.addEdge(fromNode, fromField, this.getMetadataNode(), metadataField); } /** * Set the node that should receive metadata. All other edges from the metadata node are deleted. diff --git a/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx b/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx index 2ca7c926b0..daad281fc8 100644 --- a/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx +++ b/invokeai/frontend/web/src/features/settingsAccordions/components/AdvancedSettingsAccordion/AdvancedSettingsAccordion.tsx @@ -54,7 +54,7 @@ export const AdvancedSettingsAccordion = memo(() => { if (params.seamlessXAxis || params.seamlessYAxis) { badges.push('seamless'); } - if (activeTabName === 'upscaling' && !generation.shouldRandomizeSeed) { + if (activeTabName === 'upscaling' && !params.shouldRandomizeSeed) { badges.push('Manual Seed'); } return badges; diff --git a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx index d12b4e62ef..0992ac865a 100644 --- a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx +++ b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx @@ -10,7 +10,7 @@ import { useControlNetModels } from 'services/api/hooks/modelsByType'; export const UpscaleWarning = () => { const { t } = useTranslation(); - const model = useAppSelector((s) => s.generation.model); + const model = useAppSelector((s) => s.canvasV2.params.model); const upscaleModel = useAppSelector((s) => s.upscale.upscaleModel); const tileControlnetModel = useAppSelector((s) => s.upscale.tileControlnetModel); const upscaleInitialImage = useAppSelector((s) => s.upscale.upscaleInitialImage); diff --git a/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx b/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx index af9e0dd2ef..1e9d7ec328 100644 --- a/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx +++ b/invokeai/frontend/web/src/features/ui/components/ParametersPanels/ParametersPanelUpscale.tsx @@ -20,6 +20,7 @@ const overlayScrollbarsStyles: CSSProperties = { const ParametersPanelUpscale = () => { const isMenuOpen = useStore($isMenuOpen); + return (