From 57e719702daf741b98da54583eef51356a59fa08 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Sun, 25 Jun 2023 14:04:53 +1000 Subject: [PATCH] fix(ui): add missing ControlNetInvocation type; tidy schema-derived types --- .../frontend/web/src/services/api/types.d.ts | 97 +++++++++---------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/invokeai/frontend/web/src/services/api/types.d.ts b/invokeai/frontend/web/src/services/api/types.d.ts index a80343ea61..910e73d885 100644 --- a/invokeai/frontend/web/src/services/api/types.d.ts +++ b/invokeai/frontend/web/src/services/api/types.d.ts @@ -1,81 +1,78 @@ import { components } from './schema'; +type schemas = components['schemas']; + /** * Types from the API, re-exported from the types generated by `openapi-typescript`. */ // Images -export type ImageDTO = components['schemas']['ImageDTO']; -export type BoardDTO = components['schemas']['BoardDTO']; -export type BoardChanges = components['schemas']['BoardChanges']; -export type ImageChanges = components['schemas']['ImageRecordChanges']; -export type ImageCategory = components['schemas']['ImageCategory']; -export type ResourceOrigin = components['schemas']['ResourceOrigin']; -export type ImageField = components['schemas']['ImageField']; +export type ImageDTO = schemas['ImageDTO']; +export type BoardDTO = schemas['BoardDTO']; +export type BoardChanges = schemas['BoardChanges']; +export type ImageChanges = schemas['ImageRecordChanges']; +export type ImageCategory = schemas['ImageCategory']; +export type ResourceOrigin = schemas['ResourceOrigin']; +export type ImageField = schemas['ImageField']; export type OffsetPaginatedResults_BoardDTO_ = - components['schemas']['OffsetPaginatedResults_BoardDTO_']; + schemas['OffsetPaginatedResults_BoardDTO_']; export type OffsetPaginatedResults_ImageDTO_ = - components['schemas']['OffsetPaginatedResults_ImageDTO_']; + schemas['OffsetPaginatedResults_ImageDTO_']; // Models -export type ModelType = components['schemas']['ModelType']; -export type BaseModelType = components['schemas']['BaseModelType']; -export type PipelineModelField = components['schemas']['PipelineModelField']; -export type ModelsList = components['schemas']['ModelsList']; +export type ModelType = schemas['ModelType']; +export type BaseModelType = schemas['BaseModelType']; +export type PipelineModelField = schemas['PipelineModelField']; +export type ModelsList = schemas['ModelsList']; // Graphs -export type Graph = components['schemas']['Graph']; -export type Edge = components['schemas']['Edge']; -export type GraphExecutionState = components['schemas']['GraphExecutionState']; +export type Graph = schemas['Graph']; +export type Edge = schemas['Edge']; +export type GraphExecutionState = schemas['GraphExecutionState']; // General nodes -export type CollectInvocation = components['schemas']['CollectInvocation']; -export type IterateInvocation = components['schemas']['IterateInvocation']; -export type RangeInvocation = components['schemas']['RangeInvocation']; -export type RandomRangeInvocation = - components['schemas']['RandomRangeInvocation']; -export type RangeOfSizeInvocation = - components['schemas']['RangeOfSizeInvocation']; -export type InpaintInvocation = components['schemas']['InpaintInvocation']; -export type ImageResizeInvocation = - components['schemas']['ImageResizeInvocation']; -export type RandomIntInvocation = components['schemas']['RandomIntInvocation']; -export type CompelInvocation = components['schemas']['CompelInvocation']; +export type CollectInvocation = schemas['CollectInvocation']; +export type IterateInvocation = schemas['IterateInvocation']; +export type RangeInvocation = schemas['RangeInvocation']; +export type RandomRangeInvocation = schemas['RandomRangeInvocation']; +export type RangeOfSizeInvocation = schemas['RangeOfSizeInvocation']; +export type InpaintInvocation = schemas['InpaintInvocation']; +export type ImageResizeInvocation = schemas['ImageResizeInvocation']; +export type RandomIntInvocation = schemas['RandomIntInvocation']; +export type CompelInvocation = schemas['CompelInvocation']; // ControlNet Nodes +export type ControlNetInvocation = schemas['ControlNetInvocation']; export type CannyImageProcessorInvocation = - components['schemas']['CannyImageProcessorInvocation']; + schemas['CannyImageProcessorInvocation']; export type ContentShuffleImageProcessorInvocation = - components['schemas']['ContentShuffleImageProcessorInvocation']; + schemas['ContentShuffleImageProcessorInvocation']; export type HedImageProcessorInvocation = - components['schemas']['HedImageProcessorInvocation']; + schemas['HedImageProcessorInvocation']; export type LineartAnimeImageProcessorInvocation = - components['schemas']['LineartAnimeImageProcessorInvocation']; + schemas['LineartAnimeImageProcessorInvocation']; export type LineartImageProcessorInvocation = - components['schemas']['LineartImageProcessorInvocation']; + schemas['LineartImageProcessorInvocation']; export type MediapipeFaceProcessorInvocation = - components['schemas']['MediapipeFaceProcessorInvocation']; + schemas['MediapipeFaceProcessorInvocation']; export type MidasDepthImageProcessorInvocation = - components['schemas']['MidasDepthImageProcessorInvocation']; + schemas['MidasDepthImageProcessorInvocation']; export type MlsdImageProcessorInvocation = - components['schemas']['MlsdImageProcessorInvocation']; + schemas['MlsdImageProcessorInvocation']; export type NormalbaeImageProcessorInvocation = - components['schemas']['NormalbaeImageProcessorInvocation']; + schemas['NormalbaeImageProcessorInvocation']; export type OpenposeImageProcessorInvocation = - components['schemas']['OpenposeImageProcessorInvocation']; + schemas['OpenposeImageProcessorInvocation']; export type PidiImageProcessorInvocation = - components['schemas']['PidiImageProcessorInvocation']; + schemas['PidiImageProcessorInvocation']; export type ZoeDepthImageProcessorInvocation = - components['schemas']['ZoeDepthImageProcessorInvocation']; + schemas['ZoeDepthImageProcessorInvocation']; // Node Outputs -export type ImageOutput = components['schemas']['ImageOutput']; -export type MaskOutput = components['schemas']['MaskOutput']; -export type PromptOutput = components['schemas']['PromptOutput']; -export type IterateInvocationOutput = - components['schemas']['IterateInvocationOutput']; -export type CollectInvocationOutput = - components['schemas']['CollectInvocationOutput']; -export type LatentsOutput = components['schemas']['LatentsOutput']; -export type GraphInvocationOutput = - components['schemas']['GraphInvocationOutput']; +export type ImageOutput = schemas['ImageOutput']; +export type MaskOutput = schemas['MaskOutput']; +export type PromptOutput = schemas['PromptOutput']; +export type IterateInvocationOutput = schemas['IterateInvocationOutput']; +export type CollectInvocationOutput = schemas['CollectInvocationOutput']; +export type LatentsOutput = schemas['LatentsOutput']; +export type GraphInvocationOutput = schemas['GraphInvocationOutput'];