From 1f9bdd1a9a3f158e24c688c93da7d281265b79e6 Mon Sep 17 00:00:00 2001 From: Brandon Rising Date: Wed, 21 Aug 2024 15:44:38 -0400 Subject: [PATCH] Undo changes to the v2 dir of frontend types --- .../web/src/features/nodes/types/v2/common.ts | 2 +- .../web/src/features/nodes/types/v2/field.ts | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/invokeai/frontend/web/src/features/nodes/types/v2/common.ts b/invokeai/frontend/web/src/features/nodes/types/v2/common.ts index 64d4db0451..8613076132 100644 --- a/invokeai/frontend/web/src/features/nodes/types/v2/common.ts +++ b/invokeai/frontend/web/src/features/nodes/types/v2/common.ts @@ -44,7 +44,7 @@ export const zSchedulerField = z.enum([ // #endregion // #region Model-related schemas -const zBaseModel = z.enum(['any', 'sd-1', 'sd-2', 'sdxl', 'sdxl-refiner', 'flux']); +const zBaseModel = z.enum(['any', 'sd-1', 'sd-2', 'sdxl', 'sdxl-refiner']); const zModelName = z.string().min(3); export const zModelIdentifier = z.object({ model_name: zModelName, diff --git a/invokeai/frontend/web/src/features/nodes/types/v2/field.ts b/invokeai/frontend/web/src/features/nodes/types/v2/field.ts index a02a998508..4b680d1de3 100644 --- a/invokeai/frontend/web/src/features/nodes/types/v2/field.ts +++ b/invokeai/frontend/web/src/features/nodes/types/v2/field.ts @@ -203,20 +203,6 @@ const zSDXLMainModelFieldOutputInstance = zFieldOutputInstanceBase.extend({ }); // #endregion -// #region FluxMainModelField -const zFluxMainModelFieldType = zFieldTypeBase.extend({ - name: z.literal('FluxMainModelField'), -}); -const zFluxMainModelFieldValue = zMainModelFieldValue; // TODO: Narrow to SDXL models only. -const zFluxMainModelFieldInputInstance = zFieldInputInstanceBase.extend({ - type: zFluxMainModelFieldType, - value: zFluxMainModelFieldValue, -}); -const zFluxMainModelFieldOutputInstance = zFieldOutputInstanceBase.extend({ - type: zFluxMainModelFieldType, -}); -// #endregion - // #region SDXLRefinerModelField const zSDXLRefinerModelFieldType = zFieldTypeBase.extend({ name: z.literal('SDXLRefinerModelField'), @@ -352,7 +338,6 @@ const zStatefulFieldType = z.union([ zBoardFieldType, zMainModelFieldType, zSDXLMainModelFieldType, - zFluxMainModelFieldType, zSDXLRefinerModelFieldType, zVAEModelFieldType, zLoRAModelFieldType, @@ -392,7 +377,6 @@ const zStatefulFieldInputInstance = z.union([ zBoardFieldInputInstance, zMainModelFieldInputInstance, zSDXLMainModelFieldInputInstance, - zFluxMainModelFieldInputInstance, zSDXLRefinerModelFieldInputInstance, zVAEModelFieldInputInstance, zLoRAModelFieldInputInstance, @@ -417,7 +401,6 @@ const zStatefulFieldOutputInstance = z.union([ zBoardFieldOutputInstance, zMainModelFieldOutputInstance, zSDXLMainModelFieldOutputInstance, - zFluxMainModelFieldOutputInstance, zSDXLRefinerModelFieldOutputInstance, zVAEModelFieldOutputInstance, zLoRAModelFieldOutputInstance,