mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
Feat (ui): Add VAE Model to Recall Parameters (#5073)
* adding VAE recall when using all parameters * adding VAE to the RecallParameters tab in ImageMetadataActions * checking for nil vae and casting to null if undefined * adding default VAE to recall actions list if VAE is nullish * fix(ui): use `lodash-es` for tree-shakeable imports --------- Co-authored-by: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
This commit is contained in:
parent
89a039460d
commit
71e298b722
@ -583,6 +583,7 @@
|
|||||||
"strength": "Image to image strength",
|
"strength": "Image to image strength",
|
||||||
"Threshold": "Noise Threshold",
|
"Threshold": "Noise Threshold",
|
||||||
"variations": "Seed-weight pairs",
|
"variations": "Seed-weight pairs",
|
||||||
|
"vae": "VAE",
|
||||||
"width": "Width",
|
"width": "Width",
|
||||||
"workflow": "Workflow"
|
"workflow": "Workflow"
|
||||||
},
|
},
|
||||||
|
@ -31,6 +31,7 @@ const ImageMetadataActions = (props: Props) => {
|
|||||||
recallCfgScale,
|
recallCfgScale,
|
||||||
recallModel,
|
recallModel,
|
||||||
recallScheduler,
|
recallScheduler,
|
||||||
|
recallVaeModel,
|
||||||
recallSteps,
|
recallSteps,
|
||||||
recallWidth,
|
recallWidth,
|
||||||
recallHeight,
|
recallHeight,
|
||||||
@ -72,6 +73,10 @@ const ImageMetadataActions = (props: Props) => {
|
|||||||
recallScheduler(metadata?.scheduler);
|
recallScheduler(metadata?.scheduler);
|
||||||
}, [metadata?.scheduler, recallScheduler]);
|
}, [metadata?.scheduler, recallScheduler]);
|
||||||
|
|
||||||
|
const handleRecallVaeModel = useCallback(() => {
|
||||||
|
recallVaeModel(metadata?.vae);
|
||||||
|
}, [metadata?.vae, recallVaeModel]);
|
||||||
|
|
||||||
const handleRecallSteps = useCallback(() => {
|
const handleRecallSteps = useCallback(() => {
|
||||||
recallSteps(metadata?.steps);
|
recallSteps(metadata?.steps);
|
||||||
}, [metadata?.steps, recallSteps]);
|
}, [metadata?.steps, recallSteps]);
|
||||||
@ -219,6 +224,11 @@ const ImageMetadataActions = (props: Props) => {
|
|||||||
onClick={handleRecallScheduler}
|
onClick={handleRecallScheduler}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
<ImageMetadataItem
|
||||||
|
label={t('metadata.vae')}
|
||||||
|
value={metadata.vae?.model_name ?? 'Default'}
|
||||||
|
onClick={handleRecallVaeModel}
|
||||||
|
/>
|
||||||
{metadata.steps && (
|
{metadata.steps && (
|
||||||
<ImageMetadataItem
|
<ImageMetadataItem
|
||||||
label={t('metadata.steps')}
|
label={t('metadata.steps')}
|
||||||
|
@ -36,6 +36,7 @@ import {
|
|||||||
setRefinerStart,
|
setRefinerStart,
|
||||||
setRefinerSteps,
|
setRefinerSteps,
|
||||||
} from 'features/sdxl/store/sdxlSlice';
|
} from 'features/sdxl/store/sdxlSlice';
|
||||||
|
import { isNil } from 'lodash-es';
|
||||||
import { useCallback } from 'react';
|
import { useCallback } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { ImageDTO } from 'services/api/types';
|
import { ImageDTO } from 'services/api/types';
|
||||||
@ -65,8 +66,10 @@ import {
|
|||||||
setSeed,
|
setSeed,
|
||||||
setSteps,
|
setSteps,
|
||||||
setWidth,
|
setWidth,
|
||||||
|
vaeSelected,
|
||||||
} from '../store/generationSlice';
|
} from '../store/generationSlice';
|
||||||
import {
|
import {
|
||||||
|
isValidBoolean,
|
||||||
isValidCfgScale,
|
isValidCfgScale,
|
||||||
isValidControlNetModel,
|
isValidControlNetModel,
|
||||||
isValidHeight,
|
isValidHeight,
|
||||||
@ -86,8 +89,8 @@ import {
|
|||||||
isValidSeed,
|
isValidSeed,
|
||||||
isValidSteps,
|
isValidSteps,
|
||||||
isValidStrength,
|
isValidStrength,
|
||||||
|
isValidVaeModel,
|
||||||
isValidWidth,
|
isValidWidth,
|
||||||
isValidBoolean,
|
|
||||||
} from '../types/parameterSchemas';
|
} from '../types/parameterSchemas';
|
||||||
|
|
||||||
const selector = createSelector(
|
const selector = createSelector(
|
||||||
@ -306,6 +309,25 @@ export const useRecallParameters = () => {
|
|||||||
[dispatch, parameterSetToast, parameterNotSetToast]
|
[dispatch, parameterSetToast, parameterNotSetToast]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recall vae model
|
||||||
|
*/
|
||||||
|
const recallVaeModel = useCallback(
|
||||||
|
(vae: unknown) => {
|
||||||
|
if (!isValidVaeModel(vae) && !isNil(vae)) {
|
||||||
|
parameterNotSetToast();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (isNil(vae)) {
|
||||||
|
dispatch(vaeSelected(null));
|
||||||
|
} else {
|
||||||
|
dispatch(vaeSelected(vae));
|
||||||
|
}
|
||||||
|
parameterSetToast();
|
||||||
|
},
|
||||||
|
[dispatch, parameterSetToast, parameterNotSetToast]
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recall steps with toast
|
* Recall steps with toast
|
||||||
*/
|
*/
|
||||||
@ -757,6 +779,7 @@ export const useRecallParameters = () => {
|
|||||||
positive_prompt,
|
positive_prompt,
|
||||||
negative_prompt,
|
negative_prompt,
|
||||||
scheduler,
|
scheduler,
|
||||||
|
vae,
|
||||||
seed,
|
seed,
|
||||||
steps,
|
steps,
|
||||||
width,
|
width,
|
||||||
@ -798,6 +821,13 @@ export const useRecallParameters = () => {
|
|||||||
if (isValidScheduler(scheduler)) {
|
if (isValidScheduler(scheduler)) {
|
||||||
dispatch(setScheduler(scheduler));
|
dispatch(setScheduler(scheduler));
|
||||||
}
|
}
|
||||||
|
if (isValidVaeModel(vae) || isNil(vae)) {
|
||||||
|
if (isNil(vae)) {
|
||||||
|
dispatch(vaeSelected(null));
|
||||||
|
} else {
|
||||||
|
dispatch(vaeSelected(vae));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (isValidSeed(seed)) {
|
if (isValidSeed(seed)) {
|
||||||
dispatch(setSeed(seed));
|
dispatch(setSeed(seed));
|
||||||
@ -932,6 +962,7 @@ export const useRecallParameters = () => {
|
|||||||
recallCfgScale,
|
recallCfgScale,
|
||||||
recallModel,
|
recallModel,
|
||||||
recallScheduler,
|
recallScheduler,
|
||||||
|
recallVaeModel,
|
||||||
recallSteps,
|
recallSteps,
|
||||||
recallWidth,
|
recallWidth,
|
||||||
recallHeight,
|
recallHeight,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user