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

fix(ui): check for metadata accumulator before connecting to it (#3751)

Browse Source
This commit is contained in:
blessedcoolant 2023-07-13 22:08:13 +12:00 committed by GitHub
commit 059e427457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
invokeai/frontend/web/src/features/nodes/util/graphBuilders/addControlNetToLinearGraph.ts
View File

@ -19,9 +19,9 @@ export const addControlNetToLinearGraph = (
const validControlNets = getValidControlNets(controlNets); const validControlNets = getValidControlNets(controlNets);
const metadataAccumulator = graph.nodes[ const metadataAccumulator = graph.nodes[METADATA_ACCUMULATOR] as
METADATA_ACCUMULATOR | MetadataAccumulatorInvocation
] as MetadataAccumulatorInvocation; | undefined;
if (isControlNetEnabled && Boolean(validControlNets.length)) { if (isControlNetEnabled && Boolean(validControlNets.length)) {
if (validControlNets.length) { if (validControlNets.length) {
@ -79,13 +79,15 @@ export const addControlNetToLinearGraph = (
graph.nodes[controlNetNode.id] = controlNetNode; graph.nodes[controlNetNode.id] = controlNetNode;
// metadata accumulator only needs a control field - not the whole node if (metadataAccumulator) {
// extract what we need and add to the accumulator // metadata accumulator only needs a control field - not the whole node
const controlField = omit(controlNetNode, [ // extract what we need and add to the accumulator
'id', const controlField = omit(controlNetNode, [
'type', 'id',
]) as ControlField; 'type',
metadataAccumulator.controlnets.push(controlField); ]) as ControlField;
metadataAccumulator.controlnets.push(controlField);
}
graph.edges.push({ graph.edges.push({
source: { node_id: controlNetNode.id, field: 'control' }, source: { node_id: controlNetNode.id, field: 'control' },

14
invokeai/frontend/web/src/features/nodes/util/graphBuilders/addDynamicPromptsToGraph.ts
View File

@ -32,9 +32,9 @@ export const addDynamicPromptsToGraph = (
maxPrompts, maxPrompts,
} = state.dynamicPrompts; } = state.dynamicPrompts;
const metadataAccumulator = graph.nodes[ const metadataAccumulator = graph.nodes[METADATA_ACCUMULATOR] as
METADATA_ACCUMULATOR | MetadataAccumulatorInvocation
] as MetadataAccumulatorInvocation; | undefined;
if (isDynamicPromptsEnabled) { if (isDynamicPromptsEnabled) {
// iteration is handled via dynamic prompts // iteration is handled via dynamic prompts
@ -116,11 +116,15 @@ export const addDynamicPromptsToGraph = (
(graph.nodes[NOISE] as NoiseInvocation).seed = seed; (graph.nodes[NOISE] as NoiseInvocation).seed = seed;
// hook up seed to metadata // hook up seed to metadata
metadataAccumulator.seed = seed; if (metadataAccumulator) {
metadataAccumulator.seed = seed;
}
} }
} else { } else {
// no dynamic prompt - hook up positive prompt // no dynamic prompt - hook up positive prompt
metadataAccumulator.positive_prompt = positivePrompt; if (metadataAccumulator) {
metadataAccumulator.positive_prompt = positivePrompt;
}
const rangeOfSizeNode: RangeOfSizeInvocation = { const rangeOfSizeNode: RangeOfSizeInvocation = {
id: RANGE_OF_SIZE, id: RANGE_OF_SIZE,

10
invokeai/frontend/web/src/features/nodes/util/graphBuilders/addLoRAsToGraph.ts
View File

@ -30,9 +30,9 @@ export const addLoRAsToGraph = (
const { loras } = state.lora; const { loras } = state.lora;
const loraCount = size(loras); const loraCount = size(loras);
const metadataAccumulator = graph.nodes[ const metadataAccumulator = graph.nodes[METADATA_ACCUMULATOR] as
METADATA_ACCUMULATOR | MetadataAccumulatorInvocation
] as MetadataAccumulatorInvocation; | undefined;
if (loraCount > 0) { if (loraCount > 0) {
// Remove MAIN_MODEL_LOADER unet connection to feed it to LoRAs // Remove MAIN_MODEL_LOADER unet connection to feed it to LoRAs
@ -70,7 +70,9 @@ export const addLoRAsToGraph = (
}; };
// add the lora to the metadata accumulator // add the lora to the metadata accumulator
metadataAccumulator.loras.push({ lora: loraField, weight }); if (metadataAccumulator) {
metadataAccumulator.loras.push({ lora: loraField, weight });
}
// add to graph // add to graph
graph.nodes[currentLoraNodeId] = loraLoaderNode; graph.nodes[currentLoraNodeId] = loraLoaderNode;

8
invokeai/frontend/web/src/features/nodes/util/graphBuilders/addVAEToGraph.ts
View File

@ -22,9 +22,9 @@ export const addVAEToGraph = (
const vae_model = modelIdToVAEModelField(vae?.id || ''); const vae_model = modelIdToVAEModelField(vae?.id || '');
const isAutoVae = !vae; const isAutoVae = !vae;
const metadataAccumulator = graph.nodes[ const metadataAccumulator = graph.nodes[METADATA_ACCUMULATOR] as
METADATA_ACCUMULATOR | MetadataAccumulatorInvocation
] as MetadataAccumulatorInvocation; | undefined;
if (!isAutoVae) { if (!isAutoVae) {
graph.nodes[VAE_LOADER] = { graph.nodes[VAE_LOADER] = {
@ -73,7 +73,7 @@ export const addVAEToGraph = (
}); });
} }
if (vae) { if (vae && metadataAccumulator) {
metadataAccumulator.vae = vae_model; metadataAccumulator.vae = vae_model;
} }
}; };