github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): do not add promptless conditioning nodes

Browse Source
This commit is contained in:
psychedelicious
2024-04-19 08:38:22 +10:00
committed by Kent Keirsey
parent a6e64423d9
commit 964e2236b9
1 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,10 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
const layer = layers.find((l) => l.id === layerId); const layer = layers.find((l) => l.id === layerId);
assert(layer, `Layer ${layerId} not found`); assert(layer, `Layer ${layerId} not found`);
if (!layer.positivePrompt && !layer.negativePrompt) {
continue;
}
const file = new File([blob], `${layerId}_mask.png`, { type: 'image/png' }); 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 })
@@ -145,66 +149,74 @@ export const addRegionalPromptsToGraph = async (state: RootState, graph: NonNull
}, },
}); });
// The main positive conditioning node if (layer.positivePrompt) {
const regionalPositiveCondNode: S['SDXLCompelPromptInvocation'] = { // The main positive conditioning node
type: 'sdxl_compel_prompt', const regionalPositiveCondNode: S['SDXLCompelPromptInvocation'] = {
id: `${PROMPT_REGION_POSITIVE_COND_PREFIX}_${layerId}`, type: 'sdxl_compel_prompt',
prompt: layer.positivePrompt, id: `${PROMPT_REGION_POSITIVE_COND_PREFIX}_${layerId}`,
style: layer.positivePrompt, // TODO: Should we put the positive prompt in both fields? prompt: layer.positivePrompt,
}; style: layer.positivePrompt, // TODO: Should we put the positive prompt in both fields?
graph.nodes[regionalPositiveCondNode.id] = regionalPositiveCondNode; };
graph.nodes[regionalPositiveCondNode.id] = regionalPositiveCondNode;
// Connect the mask to the conditioning // Connect the mask to the conditioning
graph.edges.push({ graph.edges.push({
source: { node_id: maskToTensorNode.id, field: 'mask' }, source: { node_id: maskToTensorNode.id, field: 'mask' },
destination: { node_id: regionalPositiveCondNode.id, field: 'mask' }, destination: { node_id: regionalPositiveCondNode.id, field: 'mask' },
}); });
// Connect the conditioning to the collector // Connect the conditioning to the collector
graph.edges.push({ graph.edges.push({
source: { node_id: regionalPositiveCondNode.id, field: 'conditioning' }, source: { node_id: regionalPositiveCondNode.id, field: 'conditioning' },
destination: { node_id: posCondCollectNode.id, field: 'item' }, destination: { node_id: posCondCollectNode.id, field: 'item' },
}); });
// The main negative conditioning node // Copy the connections to the "global" positive conditioning node to the regional cond
const regionalNegativeCondNode: S['SDXLCompelPromptInvocation'] = { for (const edge of graph.edges) {
type: 'sdxl_compel_prompt', if (edge.destination.node_id === POSITIVE_CONDITIONING && edge.destination.field !== 'prompt') {
id: `${PROMPT_REGION_NEGATIVE_COND_PREFIX}_${layerId}`, graph.edges.push({
prompt: layer.negativePrompt, source: edge.source,
style: layer.negativePrompt, destination: { node_id: regionalPositiveCondNode.id, field: edge.destination.field },
}; });
graph.nodes[regionalNegativeCondNode.id] = regionalNegativeCondNode; }
// Connect the mask to the conditioning
graph.edges.push({
source: { node_id: maskToTensorNode.id, field: 'mask' },
destination: { node_id: regionalNegativeCondNode.id, field: 'mask' },
});
// Connect the conditioning to the collector
graph.edges.push({
source: { node_id: regionalNegativeCondNode.id, field: 'conditioning' },
destination: { node_id: negCondCollectNode.id, field: 'item' },
});
// Copy the connections to the "global" positive and negative conditioning nodes to our regional nodes
for (const edge of graph.edges) {
if (edge.destination.node_id === POSITIVE_CONDITIONING && edge.destination.field !== 'prompt') {
graph.edges.push({
source: edge.source,
destination: { node_id: regionalPositiveCondNode.id, field: edge.destination.field },
});
} }
if (edge.destination.node_id === NEGATIVE_CONDITIONING && edge.destination.field !== 'prompt') { }
graph.edges.push({
source: edge.source, if (layer.negativePrompt) {
destination: { node_id: regionalNegativeCondNode.id, field: edge.destination.field }, // The main negative conditioning node
}); const regionalNegativeCondNode: S['SDXLCompelPromptInvocation'] = {
type: 'sdxl_compel_prompt',
id: `${PROMPT_REGION_NEGATIVE_COND_PREFIX}_${layerId}`,
prompt: layer.negativePrompt,
style: layer.negativePrompt,
};
graph.nodes[regionalNegativeCondNode.id] = regionalNegativeCondNode;
// Connect the mask to the conditioning
graph.edges.push({
source: { node_id: maskToTensorNode.id, field: 'mask' },
destination: { node_id: regionalNegativeCondNode.id, field: 'mask' },
});
// Connect the conditioning to the collector
graph.edges.push({
source: { node_id: regionalNegativeCondNode.id, field: 'conditioning' },
destination: { node_id: negCondCollectNode.id, field: 'item' },
});
// Copy the connections to the "global" negative conditioning node to the regional cond
for (const edge of graph.edges) {
if (edge.destination.node_id === NEGATIVE_CONDITIONING && edge.destination.field !== 'prompt') {
graph.edges.push({
source: edge.source,
destination: { node_id: regionalNegativeCondNode.id, field: edge.destination.field },
});
}
} }
} }
// If we are using the "invert" auto-negative setting, we need to add an additional negative conditioning node // If we are using the "invert" auto-negative setting, we need to add an additional negative conditioning node
if (layer.autoNegative === 'invert') { if (layer.autoNegative === 'invert' && layer.positivePrompt) {
// 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'] = {