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

change model store to object, update main model and vae dropdowns

Browse Source
This commit is contained in:
Mary Hipp
2023-07-06 11:54:16 -04:00
committed by psychedelicious
parent 909fe047e4
commit 6356dc335f
10 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
invokeai/frontend/web/src/features/parameters/store/generationSlice.ts
View File

@ -16,7 +16,6 @@ import {
SeedParam,
StepsParam,
StrengthParam,
VAEParam,
WidthParam,
} from './parameterZodSchemas';
@ -50,7 +49,7 @@ export interface GenerationState {
horizontalSymmetrySteps: number;
verticalSymmetrySteps: number;
model: ModelParam;
vae: VAEParam;
vae: ModelParam;
seamlessXAxis: boolean;
seamlessYAxis: boolean;
clipSkip: number;
@ -84,8 +83,8 @@ export const initialGenerationState: GenerationState = {
shouldUseSymmetry: false,
horizontalSymmetrySteps: 0,
verticalSymmetrySteps: 0,
model: '',
vae: '',
model: null,
vae: null,
seamlessXAxis: false,
seamlessYAxis: false,
clipSkip: 0,
@ -216,16 +215,17 @@ export const generationSlice = createSlice({
state.initialImage = { imageName: image_name, width, height };
},
modelSelected: (state, action: PayloadAction<string>) => {
state.model = action.payload;
const [base_model, type, name] = action.payload.split('/');
// Clamp ClipSkip Based On Selected Model
const clipSkipMax =
clipSkipMap[action.payload.split('/')[0] as keyof typeof clipSkipMap]
.maxClip;
state.clipSkip = clamp(state.clipSkip, 0, clipSkipMax);
const { maxClip } = clipSkipMap[base_model as keyof typeof clipSkipMap];
state.clipSkip = clamp(state.clipSkip, 0, maxClip);
state.model = { id: action.payload, base_model, name, type };
},
vaeSelected: (state, action: PayloadAction<string>) => {
state.vae = action.payload;
const [base_model, type, name] = action.payload.split('/');
state.vae = { id: action.payload, base_model, name, type };
},
setClipSkip: (state, action: PayloadAction<number>) => {
state.clipSkip = action.payload;
@ -235,7 +235,13 @@ export const generationSlice = createSlice({
builder.addCase(configChanged, (state, action) => {
const defaultModel = action.payload.sd?.defaultModel;
if (defaultModel && !state.model) {
state.model = defaultModel;
const [base_model, model_type, model_name] = defaultModel.split('/');
state.model = {
id: defaultModel,
name: model_name,
type: model_type,
base_model: base_model,
};
}
});
builder.addCase(setShouldShowAdvancedOptions, (state, action) => {

17
invokeai/frontend/web/src/features/parameters/store/parameterZodSchemas.ts
View File

@ -130,20 +130,21 @@ export const isValidHeight = (val: unknown): val is HeightParam =>
* Zod schema for model parameter
* TODO: Make this a dynamically generated enum?
*/
export const zModel = z.string();
const zModel = z.object({
id: z.string(),
name: z.string(),
type: z.string(),
base_model: z.string(),
});
/**
* Type alias for model parameter, inferred from its zod schema
*/
export type ModelParam = z.infer<typeof zModel>;
/**
* Zod schema for VAE parameter
* TODO: Make this a dynamically generated enum?
*/
export const zVAE = z.string();
export type ModelParam = z.infer<typeof zModel> | null;
/**
* Type alias for model parameter, inferred from its zod schema
*/
export type VAEParam = z.infer<typeof zVAE>;
export type VAEParam = z.infer<typeof zModel> | null;
/**
* Validates/type-guards a value as a model parameter
*/