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

feat(ui): write layers to metadata

Browse Source
This commit is contained in:
psychedelicious 2024-05-07 17:04:53 +10:00 committed by Kent Keirsey
parent e47629cbe7
commit 6e8b7f9421
1 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
invokeai/frontend/web/src/features/nodes/util/graph/addControlLayersToGraph.ts
View File

@ -6,7 +6,7 @@ import {
isRegionalGuidanceLayer, isRegionalGuidanceLayer,
rgLayerMaskImageUploaded, rgLayerMaskImageUploaded,
} from 'features/controlLayers/store/controlLayersSlice'; } from 'features/controlLayers/store/controlLayersSlice';
import type { RegionalGuidanceLayer } from 'features/controlLayers/store/types'; import type { Layer, RegionalGuidanceLayer } from 'features/controlLayers/store/types';
import { import {
type ControlNetConfigV2, type ControlNetConfigV2,
type ImageWithDims, type ImageWithDims,
@ -344,57 +344,45 @@ export const addControlLayersToGraph = async (state: RootState, graph: NonNullab
assert(mainModel, 'Missing main model when building graph'); assert(mainModel, 'Missing main model when building graph');
const isSDXL = mainModel.base === 'sdxl'; const isSDXL = mainModel.base === 'sdxl';
const layersMetadata: Layer[] = [];
// Add global control adapters // Add global control adapters
const globalControlNets = state.controlLayers.present.layers const validControlAdapterLayers = state.controlLayers.present.layers
// Must be a CA layer // Must be a Control Adapter layer
.filter(isControlAdapterLayer) .filter(isControlAdapterLayer)
// Must be enabled // Must be enabled
.filter((l) => l.isEnabled) .filter((l) => l.isEnabled)
// We want the CAs themselves .filter((l) => {
.map((l) => l.controlAdapter) const ca = l.controlAdapter;
// Must be a ControlNet // Must be have a model that matches the current base and must have a control image
.filter(isControlNetConfigV2)
.filter((ca) => {
const hasModel = Boolean(ca.model); const hasModel = Boolean(ca.model);
const modelMatchesBase = ca.model?.base === mainModel.base; const modelMatchesBase = ca.model?.base === mainModel.base;
const hasControlImage = ca.image || (ca.processedImage && ca.processorConfig); const hasControlImage = ca.image || (ca.processedImage && ca.processorConfig);
return hasModel && modelMatchesBase && hasControlImage; return hasModel && modelMatchesBase && hasControlImage;
}); });
addGlobalControlNetsToGraph(globalControlNets, graph, denoiseNodeId); const validControlNets = validControlAdapterLayers.map((l) => l.controlAdapter).filter(isControlNetConfigV2);
addGlobalControlNetsToGraph(validControlNets, graph, denoiseNodeId);
const globalT2IAdapters = state.controlLayers.present.layers const validT2IAdapters = validControlAdapterLayers.map((l) => l.controlAdapter).filter(isT2IAdapterConfigV2);
// Must be a CA layer addGlobalT2IAdaptersToGraph(validT2IAdapters, graph, denoiseNodeId);
.filter(isControlAdapterLayer)
// Must be enabled
.filter((l) => l.isEnabled)
// We want the CAs themselves
.map((l) => l.controlAdapter)
// Must have a ControlNet CA
.filter(isT2IAdapterConfigV2)
.filter((ca) => {
const hasModel = Boolean(ca.model);
const modelMatchesBase = ca.model?.base === mainModel.base;
const hasControlImage = ca.image || (ca.processedImage && ca.processorConfig);
return hasModel && modelMatchesBase && hasControlImage;
});
addGlobalT2IAdaptersToGraph(globalT2IAdapters, graph, denoiseNodeId);
const globalIPAdapters = state.controlLayers.present.layers const validIPAdapterLayers = state.controlLayers.present.layers
// Must be an IP Adapter layer // Must be an IP Adapter layer
.filter(isIPAdapterLayer) .filter(isIPAdapterLayer)
// Must be enabled // Must be enabled
.filter((l) => l.isEnabled) .filter((l) => l.isEnabled)
// We want the IP Adapters themselves // We want the IP Adapters themselves
.map((l) => l.ipAdapter) .filter((l) => {
.filter((ca) => { const ipa = l.ipAdapter;
const hasModel = Boolean(ca.model); const hasModel = Boolean(ipa.model);
const modelMatchesBase = ca.model?.base === mainModel.base; const modelMatchesBase = ipa.model?.base === mainModel.base;
const hasControlImage = Boolean(ca.image); const hasImage = Boolean(ipa.image);
return hasModel && modelMatchesBase && hasControlImage; return hasModel && modelMatchesBase && hasImage;
}); });
addGlobalIPAdaptersToGraph(globalIPAdapters, graph, denoiseNodeId); const validIPAdapters = validIPAdapterLayers.map((l) => l.ipAdapter);
addGlobalIPAdaptersToGraph(validIPAdapters, graph, denoiseNodeId);
const rgLayers = state.controlLayers.present.layers const validRGLayers = state.controlLayers.present.layers
// Only RG layers are get masks // Only RG layers are get masks
.filter(isRegionalGuidanceLayer) .filter(isRegionalGuidanceLayer)
// Only visible layers are rendered on the canvas // Only visible layers are rendered on the canvas
@ -406,6 +394,8 @@ export const addControlLayersToGraph = async (state: RootState, graph: NonNullab
return hasTextPrompt || hasIPAdapter; return hasTextPrompt || hasIPAdapter;
}); });
layersMetadata.push(...validRGLayers, ...validControlAdapterLayers, ...validIPAdapterLayers);
// TODO: We should probably just use conditioning collectors by default, and skip all this fanagling with re-routing // TODO: We should probably just use conditioning collectors by default, and skip all this fanagling with re-routing
// the existing conditioning nodes. // the existing conditioning nodes.
@ -468,11 +458,11 @@ export const addControlLayersToGraph = async (state: RootState, graph: NonNullab
}, },
}); });
const layerIds = rgLayers.map((l) => l.id); const layerIds = validRGLayers.map((l) => l.id);
const blobs = await getRegionalPromptLayerBlobs(layerIds); const blobs = await getRegionalPromptLayerBlobs(layerIds);
assert(size(blobs) === size(layerIds), 'Mismatch between layer IDs and blobs'); assert(size(blobs) === size(layerIds), 'Mismatch between layer IDs and blobs');
for (const layer of rgLayers) { for (const layer of validRGLayers) {
const blob = blobs[layer.id]; const blob = blobs[layer.id];
assert(blob, `Blob for layer ${layer.id} not found`); assert(blob, `Blob for layer ${layer.id} not found`);
// Upload the mask image, or get the cached image if it exists // Upload the mask image, or get the cached image if it exists
@ -669,6 +659,8 @@ export const addControlLayersToGraph = async (state: RootState, graph: NonNullab
}); });
} }
} }
upsertMetadata(graph, { layers: layersMetadata });
}; };
const getMaskImage = async (layer: RegionalGuidanceLayer, blob: Blob): Promise<ImageDTO> => { const getMaskImage = async (layer: RegionalGuidanceLayer, blob: Blob): Promise<ImageDTO> => {