From 4c3c2297b90ac08039785b6f32811432d74b0bdc Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Tue, 14 May 2024 20:18:32 +1000 Subject: [PATCH] tidy(ui): organise graph builder files --- ...abControlLayers.ts => addControlLayers.ts} | 2 +- .../{addGenerationTabHRF.ts => addHRF.ts} | 2 +- .../{addGenerationTabLoRAs.ts => addLoRAs.ts} | 2 +- ...ionTabNSFWChecker.ts => addNSFWChecker.ts} | 2 +- ...erationTabSDXLLoRAs.ts => addSDXLLoRAs.ts} | 2 +- ...ionTabSDXLRefiner.ts => addSDXLRefiner.ts} | 2 +- ...enerationTabSeamless.ts => addSeamless.ts} | 2 +- ...ionTabWatermarker.ts => addWatermarker.ts} | 2 +- .../generation/buildGenerationTabGraph.ts | 24 +++++++++---------- .../generation/buildGenerationTabSDXLGraph.ts | 24 +++++++++---------- 10 files changed, 32 insertions(+), 32 deletions(-) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabControlLayers.ts => addControlLayers.ts} (99%) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabHRF.ts => addHRF.ts} (99%) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabLoRAs.ts => addLoRAs.ts} (98%) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabNSFWChecker.ts => addNSFWChecker.ts} (94%) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabSDXLLoRAs.ts => addSDXLLoRAs.ts} (98%) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabSDXLRefiner.ts => addSDXLRefiner.ts} (98%) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabSeamless.ts => addSeamless.ts} (97%) rename invokeai/frontend/web/src/features/nodes/util/graph/generation/{addGenerationTabWatermarker.ts => addWatermarker.ts} (94%) diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabControlLayers.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addControlLayers.ts similarity index 99% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabControlLayers.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addControlLayers.ts index 303800720c..b5e5f8f246 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabControlLayers.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addControlLayers.ts @@ -50,7 +50,7 @@ import { assert } from 'tsafe'; * @param vaeSource The VAE source (either seamless, vae_loader, main_model_loader, or sdxl_model_loader) * @returns A promise that resolves to the layers that were added to the graph */ -export const addGenerationTabControlLayers = async ( +export const addControlLayers = async ( state: RootState, g: Graph, base: BaseModelType, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabHRF.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addHRF.ts similarity index 99% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabHRF.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addHRF.ts index 99e3f4f28d..68286e337c 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabHRF.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addHRF.ts @@ -65,7 +65,7 @@ function calculateHrfRes( * @param vaeSource The VAE source node (may be a model loader, VAE loader, or seamless node) * @returns The HRF image output node. */ -export const addGenerationTabHRF = ( +export const addHRF = ( state: RootState, g: Graph, denoise: Invocation<'denoise_latents'>, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabLoRAs.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addLoRAs.ts similarity index 98% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabLoRAs.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addLoRAs.ts index b4623c82eb..3623343367 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabLoRAs.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addLoRAs.ts @@ -5,7 +5,7 @@ import type { Graph } from 'features/nodes/util/graph/generation/Graph'; import { filter, size } from 'lodash-es'; import type { Invocation, S } from 'services/api/types'; -export const addGenerationTabLoRAs = ( +export const addLoRAs = ( state: RootState, g: Graph, denoise: Invocation<'denoise_latents'>, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabNSFWChecker.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addNSFWChecker.ts similarity index 94% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabNSFWChecker.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addNSFWChecker.ts index 8ddc501cee..504cad14aa 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabNSFWChecker.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addNSFWChecker.ts @@ -8,7 +8,7 @@ import type { Invocation } from 'services/api/types'; * @param imageOutput The current image output node * @returns The nsfw checker node */ -export const addGenerationTabNSFWChecker = ( +export const addNSFWChecker = ( g: Graph, imageOutput: Invocation<'l2i'> | Invocation<'img_nsfw'> | Invocation<'img_watermark'> ): Invocation<'img_nsfw'> => { diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSDXLLoRAs.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addSDXLLoRAs.ts similarity index 98% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSDXLLoRAs.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addSDXLLoRAs.ts index 40b99cbf8f..f38e8de570 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSDXLLoRAs.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addSDXLLoRAs.ts @@ -5,7 +5,7 @@ import type { Graph } from 'features/nodes/util/graph/generation/Graph'; import { filter, size } from 'lodash-es'; import type { Invocation, S } from 'services/api/types'; -export const addGenerationTabSDXLLoRAs = ( +export const addSDXLLoRas = ( state: RootState, g: Graph, denoise: Invocation<'denoise_latents'>, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSDXLRefiner.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addSDXLRefiner.ts similarity index 98% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSDXLRefiner.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addSDXLRefiner.ts index e2b85628be..806a138b62 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSDXLRefiner.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addSDXLRefiner.ts @@ -13,7 +13,7 @@ import type { Invocation } from 'services/api/types'; import { isRefinerMainModelModelConfig } from 'services/api/types'; import { assert } from 'tsafe'; -export const addGenerationTabSDXLRefiner = async ( +export const addSDXLRefiner = async ( state: RootState, g: Graph, denoise: Invocation<'denoise_latents'>, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSeamless.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addSeamless.ts similarity index 97% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSeamless.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addSeamless.ts index 958a163f56..25a3e7e3ac 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabSeamless.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addSeamless.ts @@ -14,7 +14,7 @@ import type { Invocation } from 'services/api/types'; * @param vaeLoader The VAE loader node in the graph, if it exists * @returns The seamless node, if it was added to the graph */ -export const addGenerationTabSeamless = ( +export const addSeamless = ( state: RootState, g: Graph, denoise: Invocation<'denoise_latents'>, diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabWatermarker.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addWatermarker.ts similarity index 94% rename from invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabWatermarker.ts rename to invokeai/frontend/web/src/features/nodes/util/graph/generation/addWatermarker.ts index ba4d194992..50986ac3ff 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/addGenerationTabWatermarker.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/addWatermarker.ts @@ -8,7 +8,7 @@ import type { Invocation } from 'services/api/types'; * @param imageOutput The image output node * @returns The watermark node */ -export const addGenerationTabWatermarker = ( +export const addWatermarker = ( g: Graph, imageOutput: Invocation<'l2i'> | Invocation<'img_nsfw'> | Invocation<'img_watermark'> ): Invocation<'img_watermark'> => { diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabGraph.ts index 7c15fcaaac..d6afbace72 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabGraph.ts @@ -14,12 +14,12 @@ import { POSITIVE_CONDITIONING_COLLECT, VAE_LOADER, } from 'features/nodes/util/graph/constants'; -import { addGenerationTabControlLayers } from 'features/nodes/util/graph/generation/addGenerationTabControlLayers'; -import { addGenerationTabHRF } from 'features/nodes/util/graph/generation/addGenerationTabHRF'; -import { addGenerationTabLoRAs } from 'features/nodes/util/graph/generation/addGenerationTabLoRAs'; -import { addGenerationTabNSFWChecker } from 'features/nodes/util/graph/generation/addGenerationTabNSFWChecker'; -import { addGenerationTabSeamless } from 'features/nodes/util/graph/generation/addGenerationTabSeamless'; -import { addGenerationTabWatermarker } from 'features/nodes/util/graph/generation/addGenerationTabWatermarker'; +import { addControlLayers } from 'features/nodes/util/graph/generation/addControlLayers'; +import { addHRF } from 'features/nodes/util/graph/generation/addHRF'; +import { addLoRAs } from 'features/nodes/util/graph/generation/addLoRAs'; +import { addNSFWChecker } from 'features/nodes/util/graph/generation/addNSFWChecker'; +import { addSeamless } from 'features/nodes/util/graph/generation/addSeamless'; +import { addWatermarker } from 'features/nodes/util/graph/generation/addWatermarker'; import type { GraphType } from 'features/nodes/util/graph/generation/Graph'; import { Graph } from 'features/nodes/util/graph/generation/Graph'; import { getBoardField } from 'features/nodes/util/graph/graphBuilderUtils'; @@ -143,15 +143,15 @@ export const buildGenerationTabGraph = async (state: RootState): Promise isInitialImageLayer(l) || isRegionalGuidanceLayer(l)); if (isHRFAllowed && state.hrf.hrfEnabled) { - imageOutput = addGenerationTabHRF(state, g, denoise, noise, l2i, vaeSource); + imageOutput = addHRF(state, g, denoise, noise, l2i, vaeSource); } if (state.system.shouldUseNSFWChecker) { - imageOutput = addGenerationTabNSFWChecker(g, imageOutput); + imageOutput = addNSFWChecker(g, imageOutput); } if (state.system.shouldUseWatermarker) { - imageOutput = addGenerationTabWatermarker(g, imageOutput); + imageOutput = addWatermarker(g, imageOutput); } g.setMetadataReceivingNode(imageOutput); diff --git a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabSDXLGraph.ts b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabSDXLGraph.ts index 8210964820..06c2ded18a 100644 --- a/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabSDXLGraph.ts +++ b/invokeai/frontend/web/src/features/nodes/util/graph/generation/buildGenerationTabSDXLGraph.ts @@ -12,12 +12,12 @@ import { SDXL_MODEL_LOADER, VAE_LOADER, } from 'features/nodes/util/graph/constants'; -import { addGenerationTabControlLayers } from 'features/nodes/util/graph/generation/addGenerationTabControlLayers'; -import { addGenerationTabNSFWChecker } from 'features/nodes/util/graph/generation/addGenerationTabNSFWChecker'; -import { addGenerationTabSDXLLoRAs } from 'features/nodes/util/graph/generation/addGenerationTabSDXLLoRAs'; -import { addGenerationTabSDXLRefiner } from 'features/nodes/util/graph/generation/addGenerationTabSDXLRefiner'; -import { addGenerationTabSeamless } from 'features/nodes/util/graph/generation/addGenerationTabSeamless'; -import { addGenerationTabWatermarker } from 'features/nodes/util/graph/generation/addGenerationTabWatermarker'; +import { addControlLayers } from 'features/nodes/util/graph/generation/addControlLayers'; +import { addNSFWChecker } from 'features/nodes/util/graph/generation/addNSFWChecker'; +import { addSDXLLoRas } from 'features/nodes/util/graph/generation/addSDXLLoRAs'; +import { addSDXLRefiner } from 'features/nodes/util/graph/generation/addSDXLRefiner'; +import { addSeamless } from 'features/nodes/util/graph/generation/addSeamless'; +import { addWatermarker } from 'features/nodes/util/graph/generation/addWatermarker'; import { Graph } from 'features/nodes/util/graph/generation/Graph'; import { getBoardField, getSDXLStylePrompts } from 'features/nodes/util/graph/graphBuilderUtils'; import type { Invocation, NonNullableGraph } from 'services/api/types'; @@ -135,9 +135,9 @@ export const buildGenerationTabSDXLGraph = async (state: RootState): Promise