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: IP Adapter method not being recalled

Browse Source
This commit is contained in:
blessedcoolant 2024-04-15 22:29:32 +05:30
parent 8426f1e7b2
commit cd76a31a8f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
invokeai/frontend/web/src/features/metadata/util/parsers.ts
View File

@ -369,6 +369,10 @@ const parseIPAdapter: MetadataParseFunc<IPAdapterConfigMetadata> = async (metada
.nullish() .nullish()
.catch(null) .catch(null)
.parse(await getProperty(metadataItem, 'weight')); .parse(await getProperty(metadataItem, 'weight'));
const method = zIPAdapterField.shape.method
.nullish()
.catch(null)
.parse(await getProperty(metadataItem, 'method'));
const begin_step_percent = zIPAdapterField.shape.begin_step_percent const begin_step_percent = zIPAdapterField.shape.begin_step_percent
.nullish() .nullish()
.catch(null) .catch(null)
@ -386,7 +390,7 @@ const parseIPAdapter: MetadataParseFunc<IPAdapterConfigMetadata> = async (metada
clipVisionModel: 'ViT-H', clipVisionModel: 'ViT-H',
controlImage: image?.image_name ?? null, controlImage: image?.image_name ?? null,
weight: weight ?? initialIPAdapter.weight, weight: weight ?? initialIPAdapter.weight,
method: 'full', method: method ?? initialIPAdapter.method,
beginStepPct: begin_step_percent ?? initialIPAdapter.beginStepPct, beginStepPct: begin_step_percent ?? initialIPAdapter.beginStepPct,
endStepPct: end_step_percent ?? initialIPAdapter.endStepPct, endStepPct: end_step_percent ?? initialIPAdapter.endStepPct,
}; };

1
invokeai/frontend/web/src/features/nodes/types/common.ts
View File

@ -109,6 +109,7 @@ export const zIPAdapterField = z.object({
image: zImageField, image: zImageField,
ip_adapter_model: zModelIdentifierField, ip_adapter_model: zModelIdentifierField,
weight: z.number(), weight: z.number(),
method: z.enum(['full', 'style', 'composition']),
begin_step_percent: z.number().optional(), begin_step_percent: z.number().optional(),
end_step_percent: z.number().optional(), end_step_percent: z.number().optional(),
}); });