From c725851c64ed3e8a0f88cf6f8c37acc48fc6b928 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Sun, 10 Mar 2024 19:54:50 +1100 Subject: [PATCH] chore(ui): tidy after rebase --- .../system/util/calculateStepPercentage.ts | 13 - .../frontend/web/src/services/api/schema.ts | 256 +++++++++--------- .../frontend/web/src/services/api/types.ts | 1 - .../frontend/web/src/services/events/types.ts | 13 +- 4 files changed, 136 insertions(+), 147 deletions(-) delete mode 100644 invokeai/frontend/web/src/features/system/util/calculateStepPercentage.ts diff --git a/invokeai/frontend/web/src/features/system/util/calculateStepPercentage.ts b/invokeai/frontend/web/src/features/system/util/calculateStepPercentage.ts deleted file mode 100644 index 70902e4a92..0000000000 --- a/invokeai/frontend/web/src/features/system/util/calculateStepPercentage.ts +++ /dev/null @@ -1,13 +0,0 @@ -export const calculateStepPercentage = (step: number, total_steps: number, order: number) => { - if (total_steps === 0) { - return 0; - } - - // we add one extra to step so that the progress bar will be full when denoise completes - - if (order === 2) { - return Math.floor((step + 1 + 1) / 2) / Math.floor((total_steps + 1) / 2); - } - - return (step + 1 + 1) / (total_steps + 1); -}; diff --git a/invokeai/frontend/web/src/services/api/schema.ts b/invokeai/frontend/web/src/services/api/schema.ts index 28b41b0472..d1e166087a 100644 --- a/invokeai/frontend/web/src/services/api/schema.ts +++ b/invokeai/frontend/web/src/services/api/schema.ts @@ -4273,7 +4273,7 @@ export type components = { * @description The nodes in this graph */ nodes: { - [key: string]: components["schemas"]["ImagePasteInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["CropLatentsCoreInvocation"] | components["schemas"]["StringInvocation"] | components["schemas"]["PairTileImageInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["MetadataItemInvocation"] | components["schemas"]["FaceMaskInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["MergeMetadataInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["StringJoinInvocation"] | components["schemas"]["ImageHueAdjustmentInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["CalculateImageTilesMinimumOverlapInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["CreateGradientMaskInvocation"] | components["schemas"]["FaceOffInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["ConditioningInvocation"] | components["schemas"]["FaceIdentifierInvocation"] | components["schemas"]["VAELoaderInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["DenoiseLatentsInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["FloatCollectionInvocation"] | components["schemas"]["DepthAnythingImageProcessorInvocation"] | components["schemas"]["RandomFloatInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["CreateDenoiseMaskInvocation"] | components["schemas"]["CalculateImageTilesInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["SDXLCompelPromptInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["CalculateImageTilesEvenSplitInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["DWOpenposeImageProcessorInvocation"] | components["schemas"]["BooleanInvocation"] | components["schemas"]["MetadataInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["RoundInvocation"] | components["schemas"]["TileToPropertiesInvocation"] | components["schemas"]["IPAdapterInvocation"] | components["schemas"]["CenterPadCropInvocation"] | components["schemas"]["StringReplaceInvocation"] | components["schemas"]["ImageChannelOffsetInvocation"] | components["schemas"]["T2IAdapterInvocation"] | components["schemas"]["ImageNSFWBlurInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ConditioningCollectionInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["SaveImageInvocation"] | components["schemas"]["ModelIdentifierInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["ColorInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["MergeTilesToImageInvocation"] | components["schemas"]["IntegerMathInvocation"] | components["schemas"]["BlendLatentsInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["SeamlessModeInvocation"] | components["schemas"]["ImageMaskToTensorInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["FreeUInvocation"] | components["schemas"]["StringJoinThreeInvocation"] | components["schemas"]["AlphaMaskToTensorInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["IntegerCollectionInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["UnsharpMaskInvocation"] | components["schemas"]["MaskFromIDInvocation"] | components["schemas"]["LatentsCollectionInvocation"] | components["schemas"]["SchedulerInvocation"] | components["schemas"]["CanvasPasteBackInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["ImageChannelMultiplyInvocation"] | components["schemas"]["CoreMetadataInvocation"] | components["schemas"]["FloatInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["MaskCombineInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LatentsInvocation"] | components["schemas"]["FloatMathInvocation"] | components["schemas"]["PromptsFromFileInvocation"] | components["schemas"]["MaskEdgeInvocation"] | components["schemas"]["IntegerInvocation"] | components["schemas"]["ColorCorrectInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["LaMaInfillInvocation"] | components["schemas"]["StringSplitInvocation"] | components["schemas"]["BooleanCollectionInvocation"] | components["schemas"]["StringCollectionInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["ImageWatermarkInvocation"] | components["schemas"]["LoRACollectionLoader"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["InvertTensorMaskInvocation"] | components["schemas"]["SDXLRefinerCompelPromptInvocation"] | components["schemas"]["SDXLModelLoaderInvocation"] | components["schemas"]["BlankImageInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["IdealSizeInvocation"] | components["schemas"]["LoRASelectorInvocation"] | components["schemas"]["SDXLRefinerModelLoaderInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ESRGANInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["FloatToIntegerInvocation"] | components["schemas"]["SDXLLoRACollectionLoader"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["CV2InfillInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["StringSplitNegInvocation"] | components["schemas"]["HeuristicResizeInvocation"] | components["schemas"]["RectangleMaskInvocation"] | components["schemas"]["ColorMapImageProcessorInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["LoRALoaderInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["CLIPSkipInvocation"] | components["schemas"]["SDXLLoRALoaderInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["ImageInvocation"]; + [key: string]: components["schemas"]["LaMaInfillInvocation"] | components["schemas"]["LatentsCollectionInvocation"] | components["schemas"]["PromptsFromFileInvocation"] | components["schemas"]["InvertTensorMaskInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["SchedulerInvocation"] | components["schemas"]["DenoiseLatentsInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["FloatMathInvocation"] | components["schemas"]["CreateDenoiseMaskInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["StringSplitNegInvocation"] | components["schemas"]["MetadataItemInvocation"] | components["schemas"]["ImageNSFWBlurInvocation"] | components["schemas"]["CV2InfillInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["CreateGradientMaskInvocation"] | components["schemas"]["SDXLModelLoaderInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["BlankImageInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["ColorMapImageProcessorInvocation"] | components["schemas"]["CoreMetadataInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["SeamlessModeInvocation"] | components["schemas"]["IPAdapterInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["FreeUInvocation"] | components["schemas"]["SDXLRefinerModelLoaderInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["RectangleMaskInvocation"] | components["schemas"]["IntegerCollectionInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["FloatToIntegerInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["SaveImageInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["ImageChannelOffsetInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["MaskCombineInvocation"] | components["schemas"]["SDXLCompelPromptInvocation"] | components["schemas"]["SDXLRefinerCompelPromptInvocation"] | components["schemas"]["HeuristicResizeInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["StringJoinInvocation"] | components["schemas"]["StringInvocation"] | components["schemas"]["BlendLatentsInvocation"] | components["schemas"]["MergeMetadataInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["ModelIdentifierInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["ESRGANInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["ImageInvocation"] | components["schemas"]["MaskEdgeInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["StringCollectionInvocation"] | components["schemas"]["UnsharpMaskInvocation"] | components["schemas"]["CanvasPasteBackInvocation"] | components["schemas"]["ImageChannelMultiplyInvocation"] | components["schemas"]["ImageWatermarkInvocation"] | components["schemas"]["ColorCorrectInvocation"] | components["schemas"]["DepthAnythingImageProcessorInvocation"] | components["schemas"]["PairTileImageInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["FloatInvocation"] | components["schemas"]["LoRACollectionLoader"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["SDXLLoRACollectionLoader"] | components["schemas"]["FaceMaskInvocation"] | components["schemas"]["ConditioningInvocation"] | components["schemas"]["MaskFromIDInvocation"] | components["schemas"]["LoRASelectorInvocation"] | components["schemas"]["SDXLLoRALoaderInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["DWOpenposeImageProcessorInvocation"] | components["schemas"]["MetadataInvocation"] | components["schemas"]["FaceIdentifierInvocation"] | components["schemas"]["CenterPadCropInvocation"] | components["schemas"]["RandomFloatInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["CalculateImageTilesMinimumOverlapInvocation"] | components["schemas"]["StringReplaceInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["LoRALoaderInvocation"] | components["schemas"]["ImageMaskToTensorInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["T2IAdapterInvocation"] | components["schemas"]["AlphaMaskToTensorInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["IdealSizeInvocation"] | components["schemas"]["RoundInvocation"] | components["schemas"]["TileToPropertiesInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ConditioningCollectionInvocation"] | components["schemas"]["IntegerInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["BooleanInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["FaceOffInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["StringJoinThreeInvocation"] | components["schemas"]["CalculateImageTilesEvenSplitInvocation"] | components["schemas"]["BooleanCollectionInvocation"] | components["schemas"]["CalculateImageTilesInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["CLIPSkipInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["CropLatentsCoreInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["FloatCollectionInvocation"] | components["schemas"]["IntegerMathInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["LatentsInvocation"] | components["schemas"]["ColorInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["VAELoaderInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["MergeTilesToImageInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["StringSplitInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["ImageHueAdjustmentInvocation"]; }; /** * Edges @@ -4310,7 +4310,7 @@ export type components = { * @description The results of node executions */ results: { - [key: string]: components["schemas"]["CLIPOutput"] | components["schemas"]["IPAdapterOutput"] | components["schemas"]["SDXLLoRALoaderOutput"] | components["schemas"]["SDXLModelLoaderOutput"] | components["schemas"]["LoRALoaderOutput"] | components["schemas"]["ImageOutput"] | components["schemas"]["IntegerOutput"] | components["schemas"]["ColorOutput"] | components["schemas"]["IdealSizeOutput"] | components["schemas"]["MetadataItemOutput"] | components["schemas"]["BooleanOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["IterateInvocationOutput"] | components["schemas"]["SchedulerOutput"] | components["schemas"]["StringPosNegOutput"] | components["schemas"]["LatentsCollectionOutput"] | components["schemas"]["MetadataOutput"] | components["schemas"]["SDXLRefinerModelLoaderOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["VAEOutput"] | components["schemas"]["LatentsOutput"] | components["schemas"]["ModelIdentifierOutput"] | components["schemas"]["IntegerCollectionOutput"] | components["schemas"]["FaceMaskOutput"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["ConditioningCollectionOutput"] | components["schemas"]["StringOutput"] | components["schemas"]["SeamlessModeOutput"] | components["schemas"]["ColorCollectionOutput"] | components["schemas"]["BooleanCollectionOutput"] | components["schemas"]["T2IAdapterOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["CLIPSkipInvocationOutput"] | components["schemas"]["LoRASelectorOutput"] | components["schemas"]["ConditioningOutput"] | components["schemas"]["FloatOutput"] | components["schemas"]["TileToPropertiesOutput"] | components["schemas"]["DenoiseMaskOutput"] | components["schemas"]["MaskOutput"] | components["schemas"]["PairTileImageOutput"] | components["schemas"]["StringCollectionOutput"] | components["schemas"]["GradientMaskOutput"] | components["schemas"]["CollectInvocationOutput"] | components["schemas"]["String2Output"] | components["schemas"]["CalculateImageTilesOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["FaceOffOutput"] | components["schemas"]["UNetOutput"]; + [key: string]: components["schemas"]["IterateInvocationOutput"] | components["schemas"]["StringPosNegOutput"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["ColorCollectionOutput"] | components["schemas"]["LoRALoaderOutput"] | components["schemas"]["UNetOutput"] | components["schemas"]["GradientMaskOutput"] | components["schemas"]["StringOutput"] | components["schemas"]["SDXLModelLoaderOutput"] | components["schemas"]["T2IAdapterOutput"] | components["schemas"]["VAEOutput"] | components["schemas"]["SeamlessModeOutput"] | components["schemas"]["CLIPSkipInvocationOutput"] | components["schemas"]["TileToPropertiesOutput"] | components["schemas"]["MetadataItemOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["CollectInvocationOutput"] | components["schemas"]["LoRASelectorOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["SDXLRefinerModelLoaderOutput"] | components["schemas"]["CLIPOutput"] | components["schemas"]["IntegerOutput"] | components["schemas"]["PairTileImageOutput"] | components["schemas"]["FaceMaskOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["IdealSizeOutput"] | components["schemas"]["BooleanCollectionOutput"] | components["schemas"]["ConditioningCollectionOutput"] | components["schemas"]["ModelIdentifierOutput"] | components["schemas"]["String2Output"] | components["schemas"]["IPAdapterOutput"] | components["schemas"]["CalculateImageTilesOutput"] | components["schemas"]["DenoiseMaskOutput"] | components["schemas"]["StringCollectionOutput"] | components["schemas"]["ImageOutput"] | components["schemas"]["FloatOutput"] | components["schemas"]["MetadataOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["LatentsCollectionOutput"] | components["schemas"]["IntegerCollectionOutput"] | components["schemas"]["SchedulerOutput"] | components["schemas"]["FaceOffOutput"] | components["schemas"]["SDXLLoRALoaderOutput"] | components["schemas"]["BooleanOutput"] | components["schemas"]["MaskOutput"] | components["schemas"]["ConditioningOutput"] | components["schemas"]["LatentsOutput"] | components["schemas"]["ColorOutput"]; }; /** * Errors @@ -11967,144 +11967,144 @@ export type components = { */ UIType: "MainModelField" | "SDXLMainModelField" | "SDXLRefinerModelField" | "ONNXModelField" | "VAEModelField" | "LoRAModelField" | "ControlNetModelField" | "IPAdapterModelField" | "T2IAdapterModelField" | "SchedulerField" | "AnyField" | "CollectionField" | "CollectionItemField" | "DEPRECATED_Boolean" | "DEPRECATED_Color" | "DEPRECATED_Conditioning" | "DEPRECATED_Control" | "DEPRECATED_Float" | "DEPRECATED_Image" | "DEPRECATED_Integer" | "DEPRECATED_Latents" | "DEPRECATED_String" | "DEPRECATED_BooleanCollection" | "DEPRECATED_ColorCollection" | "DEPRECATED_ConditioningCollection" | "DEPRECATED_ControlCollection" | "DEPRECATED_FloatCollection" | "DEPRECATED_ImageCollection" | "DEPRECATED_IntegerCollection" | "DEPRECATED_LatentsCollection" | "DEPRECATED_StringCollection" | "DEPRECATED_BooleanPolymorphic" | "DEPRECATED_ColorPolymorphic" | "DEPRECATED_ConditioningPolymorphic" | "DEPRECATED_ControlPolymorphic" | "DEPRECATED_FloatPolymorphic" | "DEPRECATED_ImagePolymorphic" | "DEPRECATED_IntegerPolymorphic" | "DEPRECATED_LatentsPolymorphic" | "DEPRECATED_StringPolymorphic" | "DEPRECATED_UNet" | "DEPRECATED_Vae" | "DEPRECATED_CLIP" | "DEPRECATED_Collection" | "DEPRECATED_CollectionItem" | "DEPRECATED_Enum" | "DEPRECATED_WorkflowField" | "DEPRECATED_IsIntermediate" | "DEPRECATED_BoardField" | "DEPRECATED_MetadataItem" | "DEPRECATED_MetadataItemCollection" | "DEPRECATED_MetadataItemPolymorphic" | "DEPRECATED_MetadataDict"; InvocationOutputMap: { - img_paste: components["schemas"]["ImageOutput"]; - pidi_image_processor: components["schemas"]["ImageOutput"]; - crop_latents: components["schemas"]["LatentsOutput"]; - string: components["schemas"]["StringOutput"]; - pair_tile_image: components["schemas"]["PairTileImageOutput"]; - canny_image_processor: components["schemas"]["ImageOutput"]; - metadata_item: components["schemas"]["MetadataItemOutput"]; - face_mask_detection: components["schemas"]["FaceMaskOutput"]; - infill_rgba: components["schemas"]["ImageOutput"]; - tomask: components["schemas"]["ImageOutput"]; - merge_metadata: components["schemas"]["MetadataOutput"]; - img_ilerp: components["schemas"]["ImageOutput"]; - img_chan: components["schemas"]["ImageOutput"]; - compel: components["schemas"]["ConditioningOutput"]; - mediapipe_face_processor: components["schemas"]["ImageOutput"]; - string_join: components["schemas"]["StringOutput"]; - img_hue_adjust: components["schemas"]["ImageOutput"]; - calculate_image_tiles_min_overlap: components["schemas"]["CalculateImageTilesOutput"]; - img_conv: components["schemas"]["ImageOutput"]; - leres_image_processor: components["schemas"]["ImageOutput"]; - create_gradient_mask: components["schemas"]["GradientMaskOutput"]; - face_off: components["schemas"]["FaceOffOutput"]; - collect: components["schemas"]["CollectInvocationOutput"]; - conditioning: components["schemas"]["ConditioningOutput"]; - face_identifier: components["schemas"]["ImageOutput"]; - vae_loader: components["schemas"]["VAEOutput"]; - cv_inpaint: components["schemas"]["ImageOutput"]; - segment_anything_processor: components["schemas"]["ImageOutput"]; - dynamic_prompt: components["schemas"]["StringCollectionOutput"]; + infill_lama: components["schemas"]["ImageOutput"]; + prompt_from_file: components["schemas"]["StringCollectionOutput"]; + latents_collection: components["schemas"]["LatentsCollectionOutput"]; + invert_tensor_mask: components["schemas"]["MaskOutput"]; + normalbae_image_processor: components["schemas"]["ImageOutput"]; + scheduler: components["schemas"]["SchedulerOutput"]; denoise_latents: components["schemas"]["LatentsOutput"]; - float_collection: components["schemas"]["FloatCollectionOutput"]; - depth_anything_image_processor: components["schemas"]["ImageOutput"]; - rand_float: components["schemas"]["FloatOutput"]; - mul: components["schemas"]["IntegerOutput"]; + img_conv: components["schemas"]["ImageOutput"]; + noise: components["schemas"]["NoiseOutput"]; + float_math: components["schemas"]["FloatOutput"]; create_denoise_mask: components["schemas"]["DenoiseMaskOutput"]; - calculate_image_tiles: components["schemas"]["CalculateImageTilesOutput"]; - content_shuffle_image_processor: components["schemas"]["ImageOutput"]; - range: components["schemas"]["IntegerCollectionOutput"]; + lineart_image_processor: components["schemas"]["ImageOutput"]; + string_split_neg: components["schemas"]["StringPosNegOutput"]; + metadata_item: components["schemas"]["MetadataItemOutput"]; + img_nsfw: components["schemas"]["ImageOutput"]; + infill_cv2: components["schemas"]["ImageOutput"]; + tile_image_processor: components["schemas"]["ImageOutput"]; + infill_rgba: components["schemas"]["ImageOutput"]; + create_gradient_mask: components["schemas"]["GradientMaskOutput"]; + sdxl_model_loader: components["schemas"]["SDXLModelLoaderOutput"]; + infill_patchmatch: components["schemas"]["ImageOutput"]; + blank_image: components["schemas"]["ImageOutput"]; + img_crop: components["schemas"]["ImageOutput"]; + color_map_image_processor: components["schemas"]["ImageOutput"]; + core_metadata: components["schemas"]["MetadataOutput"]; + canny_image_processor: components["schemas"]["ImageOutput"]; + img_paste: components["schemas"]["ImageOutput"]; + seamless: components["schemas"]["SeamlessModeOutput"]; + ip_adapter: components["schemas"]["IPAdapterOutput"]; + float_range: components["schemas"]["FloatCollectionOutput"]; + freeu: components["schemas"]["UNetOutput"]; + sdxl_refiner_model_loader: components["schemas"]["SDXLRefinerModelLoaderOutput"]; + rand_int: components["schemas"]["IntegerOutput"]; + img_lerp: components["schemas"]["ImageOutput"]; + rectangle_mask: components["schemas"]["MaskOutput"]; + integer_collection: components["schemas"]["IntegerCollectionOutput"]; + lscale: components["schemas"]["LatentsOutput"]; + float_to_int: components["schemas"]["IntegerOutput"]; + controlnet: components["schemas"]["ControlOutput"]; + save_image: components["schemas"]["ImageOutput"]; + collect: components["schemas"]["CollectInvocationOutput"]; + img_channel_offset: components["schemas"]["ImageOutput"]; + mediapipe_face_processor: components["schemas"]["ImageOutput"]; + i2l: components["schemas"]["LatentsOutput"]; + step_param_easing: components["schemas"]["FloatCollectionOutput"]; + mask_combine: components["schemas"]["ImageOutput"]; sdxl_compel_prompt: components["schemas"]["ConditioningOutput"]; - sub: components["schemas"]["IntegerOutput"]; - calculate_image_tiles_even_split: components["schemas"]["CalculateImageTilesOutput"]; - show_image: components["schemas"]["ImageOutput"]; - dw_openpose_image_processor: components["schemas"]["ImageOutput"]; - boolean: components["schemas"]["BooleanOutput"]; - metadata: components["schemas"]["MetadataOutput"]; + sdxl_refiner_compel_prompt: components["schemas"]["ConditioningOutput"]; + heuristic_resize: components["schemas"]["ImageOutput"]; + range: components["schemas"]["IntegerCollectionOutput"]; + string_join: components["schemas"]["StringOutput"]; + string: components["schemas"]["StringOutput"]; + lblend: components["schemas"]["LatentsOutput"]; + merge_metadata: components["schemas"]["MetadataOutput"]; + pidi_image_processor: components["schemas"]["ImageOutput"]; + leres_image_processor: components["schemas"]["ImageOutput"]; + model_identifier: components["schemas"]["ModelIdentifierOutput"]; + lresize: components["schemas"]["LatentsOutput"]; + esrgan: components["schemas"]["ImageOutput"]; infill_tile: components["schemas"]["ImageOutput"]; + image: components["schemas"]["ImageOutput"]; + mask_edge: components["schemas"]["ImageOutput"]; + dynamic_prompt: components["schemas"]["StringCollectionOutput"]; + image_collection: components["schemas"]["ImageCollectionOutput"]; + compel: components["schemas"]["ConditioningOutput"]; + string_collection: components["schemas"]["StringCollectionOutput"]; + unsharp_mask: components["schemas"]["ImageOutput"]; + canvas_paste_back: components["schemas"]["ImageOutput"]; + img_channel_multiply: components["schemas"]["ImageOutput"]; + img_watermark: components["schemas"]["ImageOutput"]; + color_correct: components["schemas"]["ImageOutput"]; + depth_anything_image_processor: components["schemas"]["ImageOutput"]; + pair_tile_image: components["schemas"]["PairTileImageOutput"]; + segment_anything_processor: components["schemas"]["ImageOutput"]; + float: components["schemas"]["FloatOutput"]; + lora_collection_loader: components["schemas"]["LoRALoaderOutput"]; + content_shuffle_image_processor: components["schemas"]["ImageOutput"]; + sdxl_lora_collection_loader: components["schemas"]["SDXLLoRALoaderOutput"]; + face_mask_detection: components["schemas"]["FaceMaskOutput"]; + conditioning: components["schemas"]["ConditioningOutput"]; + mask_from_id: components["schemas"]["ImageOutput"]; + lora_selector: components["schemas"]["LoRASelectorOutput"]; + sdxl_lora_loader: components["schemas"]["SDXLLoRALoaderOutput"]; + img_scale: components["schemas"]["ImageOutput"]; + dw_openpose_image_processor: components["schemas"]["ImageOutput"]; + metadata: components["schemas"]["MetadataOutput"]; + face_identifier: components["schemas"]["ImageOutput"]; + img_pad_crop: components["schemas"]["ImageOutput"]; + rand_float: components["schemas"]["FloatOutput"]; + img_resize: components["schemas"]["ImageOutput"]; + calculate_image_tiles_min_overlap: components["schemas"]["CalculateImageTilesOutput"]; + string_replace: components["schemas"]["StringOutput"]; + mul: components["schemas"]["IntegerOutput"]; + lora_loader: components["schemas"]["LoRALoaderOutput"]; + image_mask_to_tensor: components["schemas"]["MaskOutput"]; + img_blur: components["schemas"]["ImageOutput"]; + t2i_adapter: components["schemas"]["T2IAdapterOutput"]; + alpha_mask_to_tensor: components["schemas"]["MaskOutput"]; + cv_inpaint: components["schemas"]["ImageOutput"]; + ideal_size: components["schemas"]["IdealSizeOutput"]; round_float: components["schemas"]["FloatOutput"]; tile_to_properties: components["schemas"]["TileToPropertiesOutput"]; - ip_adapter: components["schemas"]["IPAdapterOutput"]; - img_pad_crop: components["schemas"]["ImageOutput"]; - string_replace: components["schemas"]["StringOutput"]; - img_channel_offset: components["schemas"]["ImageOutput"]; - t2i_adapter: components["schemas"]["T2IAdapterOutput"]; - img_nsfw: components["schemas"]["ImageOutput"]; - lscale: components["schemas"]["LatentsOutput"]; + l2i: components["schemas"]["ImageOutput"]; conditioning_collection: components["schemas"]["ConditioningCollectionOutput"]; - add: components["schemas"]["IntegerOutput"]; - save_image: components["schemas"]["ImageOutput"]; - model_identifier: components["schemas"]["ModelIdentifierOutput"]; - i2l: components["schemas"]["LatentsOutput"]; - color: components["schemas"]["ColorOutput"]; - step_param_easing: components["schemas"]["FloatCollectionOutput"]; - merge_tiles_to_image: components["schemas"]["ImageOutput"]; - integer_math: components["schemas"]["IntegerOutput"]; - lblend: components["schemas"]["LatentsOutput"]; - img_lerp: components["schemas"]["ImageOutput"]; - seamless: components["schemas"]["SeamlessModeOutput"]; - image_mask_to_tensor: components["schemas"]["MaskOutput"]; - lresize: components["schemas"]["LatentsOutput"]; - freeu: components["schemas"]["UNetOutput"]; - string_join_three: components["schemas"]["StringOutput"]; - alpha_mask_to_tensor: components["schemas"]["MaskOutput"]; - mlsd_image_processor: components["schemas"]["ImageOutput"]; - integer_collection: components["schemas"]["IntegerCollectionOutput"]; - div: components["schemas"]["IntegerOutput"]; - unsharp_mask: components["schemas"]["ImageOutput"]; - mask_from_id: components["schemas"]["ImageOutput"]; - latents_collection: components["schemas"]["LatentsCollectionOutput"]; - scheduler: components["schemas"]["SchedulerOutput"]; - canvas_paste_back: components["schemas"]["ImageOutput"]; - midas_depth_image_processor: components["schemas"]["ImageOutput"]; - img_channel_multiply: components["schemas"]["ImageOutput"]; - core_metadata: components["schemas"]["MetadataOutput"]; - float: components["schemas"]["FloatOutput"]; - lineart_anime_image_processor: components["schemas"]["ImageOutput"]; + integer: components["schemas"]["IntegerOutput"]; random_range: components["schemas"]["IntegerCollectionOutput"]; - mask_combine: components["schemas"]["ImageOutput"]; + sub: components["schemas"]["IntegerOutput"]; + boolean: components["schemas"]["BooleanOutput"]; + show_image: components["schemas"]["ImageOutput"]; + face_off: components["schemas"]["FaceOffOutput"]; + midas_depth_image_processor: components["schemas"]["ImageOutput"]; + string_join_three: components["schemas"]["StringOutput"]; + calculate_image_tiles_even_split: components["schemas"]["CalculateImageTilesOutput"]; + boolean_collection: components["schemas"]["BooleanCollectionOutput"]; + calculate_image_tiles: components["schemas"]["CalculateImageTilesOutput"]; + main_model_loader: components["schemas"]["ModelLoaderOutput"]; + clip_skip: components["schemas"]["CLIPSkipInvocationOutput"]; + img_ilerp: components["schemas"]["ImageOutput"]; + crop_latents: components["schemas"]["LatentsOutput"]; + img_mul: components["schemas"]["ImageOutput"]; + float_collection: components["schemas"]["FloatCollectionOutput"]; + integer_math: components["schemas"]["IntegerOutput"]; + add: components["schemas"]["IntegerOutput"]; hed_image_processor: components["schemas"]["ImageOutput"]; latents: components["schemas"]["LatentsOutput"]; - float_math: components["schemas"]["FloatOutput"]; - prompt_from_file: components["schemas"]["StringCollectionOutput"]; - mask_edge: components["schemas"]["ImageOutput"]; - integer: components["schemas"]["IntegerOutput"]; - color_correct: components["schemas"]["ImageOutput"]; + color: components["schemas"]["ColorOutput"]; + lineart_anime_image_processor: components["schemas"]["ImageOutput"]; + vae_loader: components["schemas"]["VAEOutput"]; + tomask: components["schemas"]["ImageOutput"]; range_of_size: components["schemas"]["IntegerCollectionOutput"]; - img_mul: components["schemas"]["ImageOutput"]; - zoe_depth_image_processor: components["schemas"]["ImageOutput"]; - main_model_loader: components["schemas"]["ModelLoaderOutput"]; - img_blur: components["schemas"]["ImageOutput"]; - img_scale: components["schemas"]["ImageOutput"]; - lineart_image_processor: components["schemas"]["ImageOutput"]; - img_resize: components["schemas"]["ImageOutput"]; - infill_lama: components["schemas"]["ImageOutput"]; - string_split: components["schemas"]["String2Output"]; - boolean_collection: components["schemas"]["BooleanCollectionOutput"]; - string_collection: components["schemas"]["StringCollectionOutput"]; iterate: components["schemas"]["IterateInvocationOutput"]; - img_watermark: components["schemas"]["ImageOutput"]; - lora_collection_loader: components["schemas"]["LoRALoaderOutput"]; - rand_int: components["schemas"]["IntegerOutput"]; - invert_tensor_mask: components["schemas"]["MaskOutput"]; - sdxl_refiner_compel_prompt: components["schemas"]["ConditioningOutput"]; - sdxl_model_loader: components["schemas"]["SDXLModelLoaderOutput"]; - blank_image: components["schemas"]["ImageOutput"]; - image_collection: components["schemas"]["ImageCollectionOutput"]; - ideal_size: components["schemas"]["IdealSizeOutput"]; - lora_selector: components["schemas"]["LoRASelectorOutput"]; - sdxl_refiner_model_loader: components["schemas"]["SDXLRefinerModelLoaderOutput"]; - tile_image_processor: components["schemas"]["ImageOutput"]; - img_crop: components["schemas"]["ImageOutput"]; - esrgan: components["schemas"]["ImageOutput"]; - normalbae_image_processor: components["schemas"]["ImageOutput"]; - float_to_int: components["schemas"]["IntegerOutput"]; - sdxl_lora_collection_loader: components["schemas"]["SDXLLoRALoaderOutput"]; - noise: components["schemas"]["NoiseOutput"]; - infill_cv2: components["schemas"]["ImageOutput"]; - l2i: components["schemas"]["ImageOutput"]; - string_split_neg: components["schemas"]["StringPosNegOutput"]; - heuristic_resize: components["schemas"]["ImageOutput"]; - rectangle_mask: components["schemas"]["MaskOutput"]; - color_map_image_processor: components["schemas"]["ImageOutput"]; - controlnet: components["schemas"]["ControlOutput"]; - lora_loader: components["schemas"]["LoRALoaderOutput"]; - infill_patchmatch: components["schemas"]["ImageOutput"]; - clip_skip: components["schemas"]["CLIPSkipInvocationOutput"]; - sdxl_lora_loader: components["schemas"]["SDXLLoRALoaderOutput"]; - float_range: components["schemas"]["FloatCollectionOutput"]; - image: components["schemas"]["ImageOutput"]; + mlsd_image_processor: components["schemas"]["ImageOutput"]; + merge_tiles_to_image: components["schemas"]["ImageOutput"]; + img_chan: components["schemas"]["ImageOutput"]; + zoe_depth_image_processor: components["schemas"]["ImageOutput"]; + string_split: components["schemas"]["String2Output"]; + div: components["schemas"]["IntegerOutput"]; + img_hue_adjust: components["schemas"]["ImageOutput"]; }; /** * InvocationStartedEvent diff --git a/invokeai/frontend/web/src/services/api/types.ts b/invokeai/frontend/web/src/services/api/types.ts index 1160a2bee5..acaa2de594 100644 --- a/invokeai/frontend/web/src/services/api/types.ts +++ b/invokeai/frontend/web/src/services/api/types.ts @@ -39,7 +39,6 @@ export type OffsetPaginatedResults_ImageDTO_ = S['OffsetPaginatedResults_ImageDT // Models export type ModelType = S['ModelType']; -export type SubModelType = S['SubModelType']; export type BaseModelType = S['BaseModelType']; // Model Configs diff --git a/invokeai/frontend/web/src/services/events/types.ts b/invokeai/frontend/web/src/services/events/types.ts index e5711b7ce4..8a534c8c83 100644 --- a/invokeai/frontend/web/src/services/events/types.ts +++ b/invokeai/frontend/web/src/services/events/types.ts @@ -19,8 +19,9 @@ export type ModelInstallErrorEvent = S['ModelInstallErrorEvent']; export type ModelInstallStartedEvent = S['ModelInstallStartedEvent']; export type ModelInstallCancelledEvent = S['ModelInstallCancelledEvent']; +type SessionStartedEvent = S['SessionStartedEvent']; export type SessionCompleteEvent = S['SessionCompleteEvent']; -export type SessionCanceledEvent = S['SessionCanceledEvent']; +type SessionCanceledEvent = S['SessionCanceledEvent']; export type QueueItemStatusChangedEvent = S['QueueItemStatusChangedEvent']; @@ -28,21 +29,23 @@ export type BulkDownloadStartedEvent = S['BulkDownloadStartedEvent']; export type BulkDownloadCompleteEvent = S['BulkDownloadCompleteEvent']; export type BulkDownloadFailedEvent = S['BulkDownloadErrorEvent']; -export type ClientEmitSubscribeQueue = { +type ClientEmitSubscribeQueue = { queue_id: string; }; -export type ClientEmitUnsubscribeQueue = ClientEmitSubscribeQueue; -export type ClientEmitSubscribeBulkDownload = { +type ClientEmitUnsubscribeQueue = ClientEmitSubscribeQueue; +type ClientEmitSubscribeBulkDownload = { bulk_download_id: string; }; -export type ClientEmitUnsubscribeBulkDownload = ClientEmitSubscribeBulkDownload; +type ClientEmitUnsubscribeBulkDownload = ClientEmitSubscribeBulkDownload; export type ServerToClientEvents = { invocation_denoise_progress: (payload: InvocationDenoiseProgressEvent) => void; invocation_complete: (payload: InvocationCompleteEvent) => void; invocation_error: (payload: InvocationErrorEvent) => void; invocation_started: (payload: InvocationStartedEvent) => void; + session_started: (payload: SessionStartedEvent) => void; session_complete: (payload: SessionCompleteEvent) => void; + session_canceled: (payload: SessionCanceledEvent) => void; model_load_started: (payload: ModelLoadStartedEvent) => void; model_install_started: (payload: ModelInstallStartedEvent) => void; model_install_download_progress: (payload: ModelInstallDownloadProgressEvent) => void;