From e37421131399e94c0b303478b9130df69e9731d5 Mon Sep 17 00:00:00 2001 From: blessedcoolant <54517381+blessedcoolant@users.noreply.github.com> Date: Sun, 18 Jun 2023 03:00:16 +1200 Subject: [PATCH] chore: Rebuild API with new Model API names --- invokeai/frontend/web/src/services/api/index.ts | 16 ++++++++++++---- .../src/services/api/models/LoraModelConfig.ts | 2 +- .../web/src/services/api/models/ModelsList.ts | 16 ++++++++++------ ... => StableDiffusion1ModelCheckpointConfig.ts} | 2 +- ...s => StableDiffusion1ModelDiffusersConfig.ts} | 2 +- ... => StableDiffusion2ModelCheckpointConfig.ts} | 2 +- ...s => StableDiffusion2ModelDiffusersConfig.ts} | 2 +- .../src/services/api/models/VAEModelConfig.ts | 2 +- 8 files changed, 28 insertions(+), 16 deletions(-) rename invokeai/frontend/web/src/services/api/models/{StableDiffusion1CheckpointModelConfig.ts => StableDiffusion1ModelCheckpointConfig.ts} (86%) rename invokeai/frontend/web/src/services/api/models/{StableDiffusion1DiffusersModelConfig.ts => StableDiffusion1ModelDiffusersConfig.ts} (86%) rename invokeai/frontend/web/src/services/api/models/{StableDiffusion2CheckpointModelConfig.ts => StableDiffusion2ModelCheckpointConfig.ts} (90%) rename invokeai/frontend/web/src/services/api/models/{StableDiffusion2DiffusersModelConfig.ts => StableDiffusion2ModelDiffusersConfig.ts} (90%) diff --git a/invokeai/frontend/web/src/services/api/index.ts b/invokeai/frontend/web/src/services/api/index.ts index f3aec17eb6..a738a9aafd 100644 --- a/invokeai/frontend/web/src/services/api/index.ts +++ b/invokeai/frontend/web/src/services/api/index.ts @@ -92,9 +92,13 @@ export type { LoraInfo } from './models/LoraInfo'; export type { LoraLoaderInvocation } from './models/LoraLoaderInvocation'; export type { LoraLoaderOutput } from './models/LoraLoaderOutput'; <<<<<<< HEAD +<<<<<<< HEAD ======= export type { LoraModelConfig } from './models/LoraModelConfig'; >>>>>>> 76dd749b1 (chore: Rebuild API) +======= +export type { LoRAModelConfig } from './models/LoRAModelConfig'; +>>>>>>> 0f3b7d2b3 (chore: Rebuild API with new Model API names) export type { MaskFromAlphaInvocation } from './models/MaskFromAlphaInvocation'; export type { MaskOutput } from './models/MaskOutput'; export type { MediapipeFaceProcessorInvocation } from './models/MediapipeFaceProcessorInvocation'; @@ -131,10 +135,10 @@ export type { SchedulerPredictionType } from './models/SchedulerPredictionType'; export type { SD1ModelLoaderInvocation } from './models/SD1ModelLoaderInvocation'; export type { SD2ModelLoaderInvocation } from './models/SD2ModelLoaderInvocation'; export type { ShowImageInvocation } from './models/ShowImageInvocation'; -export type { StableDiffusion1CheckpointModelConfig } from './models/StableDiffusion1CheckpointModelConfig'; -export type { StableDiffusion1DiffusersModelConfig } from './models/StableDiffusion1DiffusersModelConfig'; -export type { StableDiffusion2CheckpointModelConfig } from './models/StableDiffusion2CheckpointModelConfig'; -export type { StableDiffusion2DiffusersModelConfig } from './models/StableDiffusion2DiffusersModelConfig'; +export type { StableDiffusion1ModelCheckpointConfig } from './models/StableDiffusion1ModelCheckpointConfig'; +export type { StableDiffusion1ModelDiffusersConfig } from './models/StableDiffusion1ModelDiffusersConfig'; +export type { StableDiffusion2ModelCheckpointConfig } from './models/StableDiffusion2ModelCheckpointConfig'; +export type { StableDiffusion2ModelDiffusersConfig } from './models/StableDiffusion2ModelDiffusersConfig'; export type { StepParamEasingInvocation } from './models/StepParamEasingInvocation'; export type { SubModelType } from './models/SubModelType'; export type { SubtractInvocation } from './models/SubtractInvocation'; @@ -148,8 +152,12 @@ export type { TextualInversionModelConfig } from './models/TextualInversionModel export type { UNetField } from './models/UNetField'; export type { UpscaleInvocation } from './models/UpscaleInvocation'; export type { VaeField } from './models/VaeField'; +<<<<<<< HEAD export type { VAEModelConfig } from './models/VAEModelConfig'; >>>>>>> 76dd749b1 (chore: Rebuild API) +======= +export type { VaeModelConfig } from './models/VaeModelConfig'; +>>>>>>> 0f3b7d2b3 (chore: Rebuild API with new Model API names) export type { VaeRepo } from './models/VaeRepo'; export type { ValidationError } from './models/ValidationError'; export type { ZoeDepthImageProcessorInvocation } from './models/ZoeDepthImageProcessorInvocation'; diff --git a/invokeai/frontend/web/src/services/api/models/LoraModelConfig.ts b/invokeai/frontend/web/src/services/api/models/LoraModelConfig.ts index d5b3a02eff..a62d1a3f4b 100644 --- a/invokeai/frontend/web/src/services/api/models/LoraModelConfig.ts +++ b/invokeai/frontend/web/src/services/api/models/LoraModelConfig.ts @@ -4,7 +4,7 @@ import type { ModelError } from './ModelError'; -export type LoraModelConfig = { +export type LoRAModelConfig = { path: string; description?: string; format: ('lycoris' | 'diffusers'); diff --git a/invokeai/frontend/web/src/services/api/models/ModelsList.ts b/invokeai/frontend/web/src/services/api/models/ModelsList.ts index bd6e8bf4da..db41b33048 100644 --- a/invokeai/frontend/web/src/services/api/models/ModelsList.ts +++ b/invokeai/frontend/web/src/services/api/models/ModelsList.ts @@ -16,15 +16,19 @@ export type ModelsList = { models: Record>>; ======= import type { ControlNetModelConfig } from './ControlNetModelConfig'; -import type { LoraModelConfig } from './LoraModelConfig'; -import type { StableDiffusion1CheckpointModelConfig } from './StableDiffusion1CheckpointModelConfig'; -import type { StableDiffusion1DiffusersModelConfig } from './StableDiffusion1DiffusersModelConfig'; -import type { StableDiffusion2CheckpointModelConfig } from './StableDiffusion2CheckpointModelConfig'; -import type { StableDiffusion2DiffusersModelConfig } from './StableDiffusion2DiffusersModelConfig'; +import type { LoRAModelConfig } from './LoRAModelConfig'; +import type { StableDiffusion1ModelCheckpointConfig } from './StableDiffusion1ModelCheckpointConfig'; +import type { StableDiffusion1ModelDiffusersConfig } from './StableDiffusion1ModelDiffusersConfig'; +import type { StableDiffusion2ModelCheckpointConfig } from './StableDiffusion2ModelCheckpointConfig'; +import type { StableDiffusion2ModelDiffusersConfig } from './StableDiffusion2ModelDiffusersConfig'; import type { TextualInversionModelConfig } from './TextualInversionModelConfig'; -import type { VAEModelConfig } from './VAEModelConfig'; +import type { VaeModelConfig } from './VaeModelConfig'; export type ModelsList = { +<<<<<<< HEAD models: Record>>; >>>>>>> 76dd749b1 (chore: Rebuild API) +======= + models: Record>>; +>>>>>>> 0f3b7d2b3 (chore: Rebuild API with new Model API names) }; diff --git a/invokeai/frontend/web/src/services/api/models/StableDiffusion1CheckpointModelConfig.ts b/invokeai/frontend/web/src/services/api/models/StableDiffusion1ModelCheckpointConfig.ts similarity index 86% rename from invokeai/frontend/web/src/services/api/models/StableDiffusion1CheckpointModelConfig.ts rename to invokeai/frontend/web/src/services/api/models/StableDiffusion1ModelCheckpointConfig.ts index e9ed1bbfc2..7b3f90cd0a 100644 --- a/invokeai/frontend/web/src/services/api/models/StableDiffusion1CheckpointModelConfig.ts +++ b/invokeai/frontend/web/src/services/api/models/StableDiffusion1ModelCheckpointConfig.ts @@ -5,7 +5,7 @@ import type { ModelError } from './ModelError'; import type { ModelVariantType } from './ModelVariantType'; -export type StableDiffusion1CheckpointModelConfig = { +export type StableDiffusion1ModelCheckpointConfig = { path: string; description?: string; format: 'checkpoint'; diff --git a/invokeai/frontend/web/src/services/api/models/StableDiffusion1DiffusersModelConfig.ts b/invokeai/frontend/web/src/services/api/models/StableDiffusion1ModelDiffusersConfig.ts similarity index 86% rename from invokeai/frontend/web/src/services/api/models/StableDiffusion1DiffusersModelConfig.ts rename to invokeai/frontend/web/src/services/api/models/StableDiffusion1ModelDiffusersConfig.ts index db51f6c7b9..ec634b9692 100644 --- a/invokeai/frontend/web/src/services/api/models/StableDiffusion1DiffusersModelConfig.ts +++ b/invokeai/frontend/web/src/services/api/models/StableDiffusion1ModelDiffusersConfig.ts @@ -5,7 +5,7 @@ import type { ModelError } from './ModelError'; import type { ModelVariantType } from './ModelVariantType'; -export type StableDiffusion1DiffusersModelConfig = { +export type StableDiffusion1ModelDiffusersConfig = { path: string; description?: string; format: 'diffusers'; diff --git a/invokeai/frontend/web/src/services/api/models/StableDiffusion2CheckpointModelConfig.ts b/invokeai/frontend/web/src/services/api/models/StableDiffusion2ModelCheckpointConfig.ts similarity index 90% rename from invokeai/frontend/web/src/services/api/models/StableDiffusion2CheckpointModelConfig.ts rename to invokeai/frontend/web/src/services/api/models/StableDiffusion2ModelCheckpointConfig.ts index 74a341d861..bcf9801314 100644 --- a/invokeai/frontend/web/src/services/api/models/StableDiffusion2CheckpointModelConfig.ts +++ b/invokeai/frontend/web/src/services/api/models/StableDiffusion2ModelCheckpointConfig.ts @@ -6,7 +6,7 @@ import type { ModelError } from './ModelError'; import type { ModelVariantType } from './ModelVariantType'; import type { SchedulerPredictionType } from './SchedulerPredictionType'; -export type StableDiffusion2CheckpointModelConfig = { +export type StableDiffusion2ModelCheckpointConfig = { path: string; description?: string; format: 'checkpoint'; diff --git a/invokeai/frontend/web/src/services/api/models/StableDiffusion2DiffusersModelConfig.ts b/invokeai/frontend/web/src/services/api/models/StableDiffusion2ModelDiffusersConfig.ts similarity index 90% rename from invokeai/frontend/web/src/services/api/models/StableDiffusion2DiffusersModelConfig.ts rename to invokeai/frontend/web/src/services/api/models/StableDiffusion2ModelDiffusersConfig.ts index 1ac441b2a6..3f3142dae3 100644 --- a/invokeai/frontend/web/src/services/api/models/StableDiffusion2DiffusersModelConfig.ts +++ b/invokeai/frontend/web/src/services/api/models/StableDiffusion2ModelDiffusersConfig.ts @@ -6,7 +6,7 @@ import type { ModelError } from './ModelError'; import type { ModelVariantType } from './ModelVariantType'; import type { SchedulerPredictionType } from './SchedulerPredictionType'; -export type StableDiffusion2DiffusersModelConfig = { +export type StableDiffusion2ModelDiffusersConfig = { path: string; description?: string; format: 'diffusers'; diff --git a/invokeai/frontend/web/src/services/api/models/VAEModelConfig.ts b/invokeai/frontend/web/src/services/api/models/VAEModelConfig.ts index ffaba2f808..8d0d2e8304 100644 --- a/invokeai/frontend/web/src/services/api/models/VAEModelConfig.ts +++ b/invokeai/frontend/web/src/services/api/models/VAEModelConfig.ts @@ -4,7 +4,7 @@ import type { ModelError } from './ModelError'; -export type VAEModelConfig = { +export type VaeModelConfig = { path: string; description?: string; format: ('checkpoint' | 'diffusers');