From 4556b573824cf12bd396878b7678757b144287d3 Mon Sep 17 00:00:00 2001 From: Brandon Rising Date: Mon, 12 Aug 2024 14:06:17 -0400 Subject: [PATCH] Remove changes to v1 workflow --- .../web/src/features/nodes/types/v1/fieldTypeMap.ts | 5 ----- .../web/src/features/nodes/types/v1/workflowV1.ts | 9 +-------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/invokeai/frontend/web/src/features/nodes/types/v1/fieldTypeMap.ts b/invokeai/frontend/web/src/features/nodes/types/v1/fieldTypeMap.ts index 719063cf68..f1d4e61300 100644 --- a/invokeai/frontend/web/src/features/nodes/types/v1/fieldTypeMap.ts +++ b/invokeai/frontend/web/src/features/nodes/types/v1/fieldTypeMap.ts @@ -114,11 +114,6 @@ const FIELD_TYPE_V1_TO_STATEFUL_FIELD_TYPE_V2: { isCollection: false, isCollectionOrScalar: false, }, - FluxMainModelField: { - name: 'FluxMainModelField', - isCollection: false, - isCollectionOrScalar: false, - }, SDXLMainModelField: { name: 'SDXLMainModelField', isCollection: false, diff --git a/invokeai/frontend/web/src/features/nodes/types/v1/workflowV1.ts b/invokeai/frontend/web/src/features/nodes/types/v1/workflowV1.ts index b4ec9cd94e..c7a50b20e4 100644 --- a/invokeai/frontend/web/src/features/nodes/types/v1/workflowV1.ts +++ b/invokeai/frontend/web/src/features/nodes/types/v1/workflowV1.ts @@ -27,7 +27,7 @@ const zScheduler = z.enum([ 'kdpm_2_a', 'lcm', ]); -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 zMainModel = z.object({ model_name: z.string().min(1), base_model: zBaseModel, @@ -89,7 +89,6 @@ const zFieldTypeV1 = z.enum([ 'ONNXModelField', 'Scheduler', 'SDXLMainModelField', - 'FluxMainModelField', 'SDXLRefinerModelField', 'string', 'StringCollection', @@ -418,11 +417,6 @@ const zSDXLMainModelInputFieldValue = zInputFieldValueBase.extend({ value: zMainOrOnnxModel.optional(), }); -const zFluxMainModelInputFieldValue = zInputFieldValueBase.extend({ - type: z.literal('FluxMainModelField'), - value: zMainModel.optional(), -}); - const zSDXLRefinerModelInputFieldValue = zInputFieldValueBase.extend({ type: z.literal('SDXLRefinerModelField'), value: zMainOrOnnxModel.optional(), // TODO: should narrow this down to a refiner model @@ -578,7 +572,6 @@ const zInputFieldValue = z.discriminatedUnion('type', [ zMainModelInputFieldValue, zSchedulerInputFieldValue, zSDXLMainModelInputFieldValue, - zFluxMainModelInputFieldValue, zSDXLRefinerModelInputFieldValue, zStringCollectionInputFieldValue, zStringPolymorphicInputFieldValue,