From e02a55745434c84bcc398f15cd8e38602670f796 Mon Sep 17 00:00:00 2001 From: Ryan Dick Date: Thu, 14 Sep 2023 16:43:43 -0400 Subject: [PATCH] Fix frontend typescript errors. --- .../web/src/features/parameters/types/constants.ts | 6 ++++++ .../web/src/features/parameters/types/parameterSchemas.ts | 8 +++++++- invokeai/frontend/web/src/services/api/types.ts | 5 ++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/invokeai/frontend/web/src/features/parameters/types/constants.ts b/invokeai/frontend/web/src/features/parameters/types/constants.ts index dd0e738eeb..4494d235af 100644 --- a/invokeai/frontend/web/src/features/parameters/types/constants.ts +++ b/invokeai/frontend/web/src/features/parameters/types/constants.ts @@ -1,6 +1,7 @@ import { components } from 'services/api/schema'; export const MODEL_TYPE_MAP = { + any: 'Any', 'sd-1': 'Stable Diffusion 1.x', 'sd-2': 'Stable Diffusion 2.x', sdxl: 'Stable Diffusion XL', @@ -8,6 +9,7 @@ export const MODEL_TYPE_MAP = { }; export const MODEL_TYPE_SHORT_MAP = { + any: 'Any', 'sd-1': 'SD1', 'sd-2': 'SD2', sdxl: 'SDXL', @@ -15,6 +17,10 @@ export const MODEL_TYPE_SHORT_MAP = { }; export const clipSkipMap = { + any: { + maxClip: 0, + markers: [], + }, 'sd-1': { maxClip: 12, markers: [0, 1, 2, 3, 4, 8, 12], diff --git a/invokeai/frontend/web/src/features/parameters/types/parameterSchemas.ts b/invokeai/frontend/web/src/features/parameters/types/parameterSchemas.ts index 63e4883e6b..fa3d7b22fe 100644 --- a/invokeai/frontend/web/src/features/parameters/types/parameterSchemas.ts +++ b/invokeai/frontend/web/src/features/parameters/types/parameterSchemas.ts @@ -210,7 +210,13 @@ export type HeightParam = z.infer; export const isValidHeight = (val: unknown): val is HeightParam => zHeight.safeParse(val).success; -export const zBaseModel = z.enum(['sd-1', 'sd-2', 'sdxl', 'sdxl-refiner']); +export const zBaseModel = z.enum([ + 'any', + 'sd-1', + 'sd-2', + 'sdxl', + 'sdxl-refiner', +]); export type BaseModelParam = z.infer; diff --git a/invokeai/frontend/web/src/services/api/types.ts b/invokeai/frontend/web/src/services/api/types.ts index 23db4dae66..0c6d2ad1c4 100644 --- a/invokeai/frontend/web/src/services/api/types.ts +++ b/invokeai/frontend/web/src/services/api/types.ts @@ -74,9 +74,8 @@ export type ControlNetModelDiffusersConfig = export type ControlNetModelConfig = | ControlNetModelCheckpointConfig | ControlNetModelDiffusersConfig; -export type IPAdapterModelCheckpointConfig = - s['IPAdapterModelCheckpointConfig']; -export type IPAdapterModelConfig = IPAdapterModelCheckpointConfig; +export type IPAdapterModelInvokeAIConfig = s['IPAdapterModelInvokeAIConfig']; +export type IPAdapterModelConfig = IPAdapterModelInvokeAIConfig; export type TextualInversionModelConfig = s['TextualInversionModelConfig']; export type DiffusersModelConfig = | s['StableDiffusion1ModelDiffusersConfig']