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

tidy(ui): shuffle graph builder logic

Browse Source
This commit is contained in:
psychedelicious 2024-04-19 09:24:02 +10:00 committed by Kent Keirsey
parent c217e052a8
commit e6c57edf87
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
invokeai/frontend/web/src/features/nodes/util/graph/addRegionalPromptsToGraph.ts
View File

@ -24,13 +24,11 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// const isSDXL = state.generation.model?.base === 'sdxl'; // const isSDXL = state.generation.model?.base === 'sdxl';
const layers = state.regionalPrompts.present.layers const layers = state.regionalPrompts.present.layers
.filter((l) => l.kind === 'promptRegionLayer') // We only want the prompt region layers .filter((l) => l.kind === 'promptRegionLayer') // We only want the prompt region layers
.filter((l) => l.isVisible); // Only visible layers are rendered on the canvas .filter((l) => l.isVisible) // Only visible layers are rendered on the canvas
.filter((l) => l.negativePrompt || l.positivePrompt); // Only layers with prompts get added to the graph
const layerIds = layers.map((l) => l.id); // We only need the IDs
const layerIds = layers.map((l) => l.id);
const blobs = await getRegionalPromptLayerBlobs(layerIds); const blobs = await getRegionalPromptLayerBlobs(layerIds);
console.log('blobs', blobs, 'layerIds', layerIds);
assert(size(blobs) === size(layerIds), 'Mismatch between layer IDs and blobs'); assert(size(blobs) === size(layerIds), 'Mismatch between layer IDs and blobs');
// 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
@ -103,15 +101,11 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// TODO: Store the uploaded image names in redux to reuse them, so long as the layer hasn't otherwise changed. This // TODO: Store the uploaded image names in redux to reuse them, so long as the layer hasn't otherwise changed. This
// would be a great perf win - not only would we skip re-uploading the same image, but we'd be able to use the node // would be a great perf win - not only would we skip re-uploading the same image, but we'd be able to use the node
// cache (currently, when we re-use the same mask data, since it is a different image, the node cache is not used). // cache (currently, when we re-use the same mask data, since it is a different image, the node cache is not used).
for (const [layerId, blob] of Object.entries(blobs)) { for (const layer of layers) {
const layer = layers.find((l) => l.id === layerId); const blob = blobs[layer.id];
assert(layer, `Layer ${layerId} not found`); assert(blob, `Blob for layer ${layer.id} not found`);
if (!layer.positivePrompt && !layer.negativePrompt) { const file = new File([blob], `${layer.id}_mask.png`, { type: 'image/png' });
continue;
}
const file = new File([blob], `${layerId}_mask.png`, { type: 'image/png' });
const req = dispatch( const req = dispatch(
imagesApi.endpoints.uploadImage.initiate({ file, image_category: 'mask', is_intermediate: true }) imagesApi.endpoints.uploadImage.initiate({ file, image_category: 'mask', is_intermediate: true })
); );
@ -122,7 +116,7 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// This mask (image primitive) will be fed into at least once mask-to-tensor node - two if we use the "invert" mode // This mask (image primitive) will be fed into at least once mask-to-tensor node - two if we use the "invert" mode
const maskImageNode: S['ImageInvocation'] = { const maskImageNode: S['ImageInvocation'] = {
id: `${PROMPT_REGION_MASK_IMAGE_PRIMITIVE_PREFIX}_${layerId}`, id: `${PROMPT_REGION_MASK_IMAGE_PRIMITIVE_PREFIX}_${layer.id}`,
type: 'image', type: 'image',
image: { image: {
image_name, image_name,
@ -132,7 +126,7 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// The main mask-to-tensor node // The main mask-to-tensor node
const maskToTensorNode: S['AlphaMaskToTensorInvocation'] = { const maskToTensorNode: S['AlphaMaskToTensorInvocation'] = {
id: `${PROMPT_REGION_MASK_TO_TENSOR_PREFIX}_${layerId}`, id: `${PROMPT_REGION_MASK_TO_TENSOR_PREFIX}_${layer.id}`,
type: 'alpha_mask_to_tensor', type: 'alpha_mask_to_tensor',
}; };
graph.nodes[maskToTensorNode.id] = maskToTensorNode; graph.nodes[maskToTensorNode.id] = maskToTensorNode;
@ -153,7 +147,7 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// The main positive conditioning node // The main positive conditioning node
const regionalPositiveCondNode: S['SDXLCompelPromptInvocation'] = { const regionalPositiveCondNode: S['SDXLCompelPromptInvocation'] = {
type: 'sdxl_compel_prompt', type: 'sdxl_compel_prompt',
id: `${PROMPT_REGION_POSITIVE_COND_PREFIX}_${layerId}`, id: `${PROMPT_REGION_POSITIVE_COND_PREFIX}_${layer.id}`,
prompt: layer.positivePrompt, prompt: layer.positivePrompt,
style: layer.positivePrompt, // TODO: Should we put the positive prompt in both fields? style: layer.positivePrompt, // TODO: Should we put the positive prompt in both fields?
}; };
@ -186,7 +180,7 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// The main negative conditioning node // The main negative conditioning node
const regionalNegativeCondNode: S['SDXLCompelPromptInvocation'] = { const regionalNegativeCondNode: S['SDXLCompelPromptInvocation'] = {
type: 'sdxl_compel_prompt', type: 'sdxl_compel_prompt',
id: `${PROMPT_REGION_NEGATIVE_COND_PREFIX}_${layerId}`, id: `${PROMPT_REGION_NEGATIVE_COND_PREFIX}_${layer.id}`,
prompt: layer.negativePrompt, prompt: layer.negativePrompt,
style: layer.negativePrompt, style: layer.negativePrompt,
}; };
@ -220,7 +214,7 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// We re-use the mask image, but invert it when converting to tensor // We re-use the mask image, but invert it when converting to tensor
// TODO: Probably faster to invert the tensor from the earlier mask rather than read the mask image and convert... // TODO: Probably faster to invert the tensor from the earlier mask rather than read the mask image and convert...
const invertedMaskToTensorNode: S['AlphaMaskToTensorInvocation'] = { const invertedMaskToTensorNode: S['AlphaMaskToTensorInvocation'] = {
id: `${PROMPT_REGION_MASK_TO_TENSOR_INVERTED_PREFIX}_${layerId}`, id: `${PROMPT_REGION_MASK_TO_TENSOR_INVERTED_PREFIX}_${layer.id}`,
type: 'alpha_mask_to_tensor', type: 'alpha_mask_to_tensor',
invert: true, invert: true,
}; };
@ -242,7 +236,7 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
// positive prompt // positive prompt
const regionalPositiveCondInvertedNode: S['SDXLCompelPromptInvocation'] = { const regionalPositiveCondInvertedNode: S['SDXLCompelPromptInvocation'] = {
type: 'sdxl_compel_prompt', type: 'sdxl_compel_prompt',
id: `${PROMPT_REGION_POSITIVE_COND_INVERTED_PREFIX}_${layerId}`, id: `${PROMPT_REGION_POSITIVE_COND_INVERTED_PREFIX}_${layer.id}`,
prompt: layer.positivePrompt, prompt: layer.positivePrompt,
style: layer.positivePrompt, style: layer.positivePrompt,
}; };