diff --git a/docs/nodes/defaultNodes.md b/docs/nodes/defaultNodes.md index 103bdb0cb8..f62332da24 100644 --- a/docs/nodes/defaultNodes.md +++ b/docs/nodes/defaultNodes.md @@ -81,7 +81,7 @@ their descriptions. | ONNX Text to Latents | Generates latents from conditionings. | | ONNX Model Loader | Loads a main model, outputting its submodels. | | OpenCV Inpaint | Simple inpaint using opencv. | -| DWPose Processor | Applies Openpose processing to image | +| DW Openpose Processor | Applies Openpose processing to image | | PIDI Processor | Applies PIDI processing to image | | Prompts from File | Loads prompts from a text file | | Random Integer | Outputs a single random integer. | diff --git a/invokeai/app/invocations/controlnet_image_processors.py b/invokeai/app/invocations/controlnet_image_processors.py index 237eff9b97..1f9342985a 100644 --- a/invokeai/app/invocations/controlnet_image_processors.py +++ b/invokeai/app/invocations/controlnet_image_processors.py @@ -30,7 +30,7 @@ from invokeai.app.invocations.util import validate_begin_end_step, validate_weig from invokeai.app.services.image_records.image_records_common import ImageCategory, ResourceOrigin from invokeai.app.shared.fields import FieldDescriptions from invokeai.backend.image_util.depth_anything import DepthAnythingDetector -from invokeai.backend.image_util.dwpose import DWPoseDetector +from invokeai.backend.image_util.dw_openpose import DWOpenposeDetector from ...backend.model_management import BaseModelType from .baseinvocation import ( @@ -611,13 +611,13 @@ class DepthAnythingImageProcessorInvocation(ImageProcessorInvocation): @invocation( - "dwpose_image_processor", - title="DWPose Image Processor", + "dw_openpose_image_processor", + title="DW Openpose Image Processor", tags=["controlnet", "dwpose", "openpose"], category="controlnet", version="1.0.0", ) -class DWPoseImageProcessorInvocation(ImageProcessorInvocation): +class DWOpenposeImageProcessorInvocation(ImageProcessorInvocation): """Generates an openpose pose from an image using DWPose""" draw_body: bool = InputField(default=True) @@ -626,8 +626,8 @@ class DWPoseImageProcessorInvocation(ImageProcessorInvocation): image_resolution: int = InputField(default=512, ge=0, description=FieldDescriptions.image_res) def run_processor(self, image): - dwpose = DWPoseDetector() - processed_image = dwpose( + dw_openpose = DWOpenposeDetector() + processed_image = dw_openpose( image, draw_face=self.draw_face, draw_hands=self.draw_hands, diff --git a/invokeai/backend/image_util/dwpose/__init__.py b/invokeai/backend/image_util/dw_openpose/__init__.py similarity index 89% rename from invokeai/backend/image_util/dwpose/__init__.py rename to invokeai/backend/image_util/dw_openpose/__init__.py index 133bf05936..c258ef2c78 100644 --- a/invokeai/backend/image_util/dwpose/__init__.py +++ b/invokeai/backend/image_util/dw_openpose/__init__.py @@ -3,8 +3,8 @@ import torch from controlnet_aux.util import resize_image from PIL import Image -from invokeai.backend.image_util.dwpose.utils import draw_bodypose, draw_facepose, draw_handpose -from invokeai.backend.image_util.dwpose.wholebody import Wholebody +from invokeai.backend.image_util.dw_openpose.utils import draw_bodypose, draw_facepose, draw_handpose +from invokeai.backend.image_util.dw_openpose.wholebody import Wholebody def draw_pose(pose, H, W, draw_face=True, draw_body=True, draw_hands=True, resolution=512): @@ -33,9 +33,9 @@ def draw_pose(pose, H, W, draw_face=True, draw_body=True, draw_hands=True, resol return dwpose_image -class DWPoseDetector: +class DWOpenposeDetector: """ - Code from the original implementation of the DWPose Detector. + Code from the original implementation of the DW Openpose Detector. Credits: https://github.com/IDEA-Research/DWPose """ diff --git a/invokeai/backend/image_util/dwpose/onnxdet.py b/invokeai/backend/image_util/dw_openpose/onnxdet.py similarity index 100% rename from invokeai/backend/image_util/dwpose/onnxdet.py rename to invokeai/backend/image_util/dw_openpose/onnxdet.py diff --git a/invokeai/backend/image_util/dwpose/onnxpose.py b/invokeai/backend/image_util/dw_openpose/onnxpose.py similarity index 100% rename from invokeai/backend/image_util/dwpose/onnxpose.py rename to invokeai/backend/image_util/dw_openpose/onnxpose.py diff --git a/invokeai/backend/image_util/dwpose/utils.py b/invokeai/backend/image_util/dw_openpose/utils.py similarity index 100% rename from invokeai/backend/image_util/dwpose/utils.py rename to invokeai/backend/image_util/dw_openpose/utils.py diff --git a/invokeai/backend/image_util/dwpose/wholebody.py b/invokeai/backend/image_util/dw_openpose/wholebody.py similarity index 100% rename from invokeai/backend/image_util/dwpose/wholebody.py rename to invokeai/backend/image_util/dw_openpose/wholebody.py diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json index 43a3b42832..0fe833db39 100644 --- a/invokeai/frontend/web/public/locales/en.json +++ b/invokeai/frontend/web/public/locales/en.json @@ -264,8 +264,8 @@ "noneDescription": "No processing applied", "normalBae": "Normal BAE", "normalBaeDescription": "Normal BAE processing", - "dwPose": "DWPose", - "dwPoseDescription": "Human pose estimation using DWPose", + "dwOpenpose": "DW Openpose", + "dwOpenposeDescription": "Human pose estimation using DW Openpose", "pidi": "PIDI", "pidiDescription": "PIDI image processing", "processor": "Processor", diff --git a/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx index b36c566e31..8679e7aff3 100644 --- a/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/ControlAdapterProcessorComponent.tsx @@ -6,7 +6,7 @@ import CannyProcessor from './processors/CannyProcessor'; import ColorMapProcessor from './processors/ColorMapProcessor'; import ContentShuffleProcessor from './processors/ContentShuffleProcessor'; import DepthAnyThingProcessor from './processors/DepthAnyThingProcessor'; -import DWPoseProcessor from './processors/DWPoseProcessor'; +import DWOpenposeProcessor from './processors/DWOpenposeProcessor'; import HedProcessor from './processors/HedProcessor'; import LineartAnimeProcessor from './processors/LineartAnimeProcessor'; import LineartProcessor from './processors/LineartProcessor'; @@ -73,8 +73,8 @@ const ControlAdapterProcessorComponent = ({ id }: Props) => { return ; } - if (processorNode.type === 'dwpose_image_processor') { - return ; + if (processorNode.type === 'dw_openpose_image_processor') { + return ; } if (processorNode.type === 'pidi_image_processor') { diff --git a/invokeai/frontend/web/src/features/controlAdapters/components/processors/DWPoseProcessor.tsx b/invokeai/frontend/web/src/features/controlAdapters/components/processors/DWOpenposeProcessor.tsx similarity index 89% rename from invokeai/frontend/web/src/features/controlAdapters/components/processors/DWPoseProcessor.tsx rename to invokeai/frontend/web/src/features/controlAdapters/components/processors/DWOpenposeProcessor.tsx index e0e94012ce..6d9064af39 100644 --- a/invokeai/frontend/web/src/features/controlAdapters/components/processors/DWPoseProcessor.tsx +++ b/invokeai/frontend/web/src/features/controlAdapters/components/processors/DWOpenposeProcessor.tsx @@ -1,22 +1,23 @@ import { CompositeNumberInput, CompositeSlider, Flex, FormControl, FormLabel, Switch } from '@invoke-ai/ui-library'; import { useProcessorNodeChanged } from 'features/controlAdapters/components/hooks/useProcessorNodeChanged'; import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants'; -import type { RequiredDWPoseImageProcessorInvocation } from 'features/controlAdapters/store/types'; +import type { RequiredDWOpenposeImageProcessorInvocation } from 'features/controlAdapters/store/types'; import type { ChangeEvent } from 'react'; import { memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import ProcessorWrapper from './common/ProcessorWrapper'; -const DEFAULTS = CONTROLNET_PROCESSORS.dwpose_image_processor.default as RequiredDWPoseImageProcessorInvocation; +const DEFAULTS = CONTROLNET_PROCESSORS.dw_openpose_image_processor + .default as RequiredDWOpenposeImageProcessorInvocation; type Props = { controlNetId: string; - processorNode: RequiredDWPoseImageProcessorInvocation; + processorNode: RequiredDWOpenposeImageProcessorInvocation; isEnabled: boolean; }; -const DWPoseProcessor = (props: Props) => { +const DWOpenposeProcessor = (props: Props) => { const { controlNetId, processorNode, isEnabled } = props; const { image_resolution, draw_body, draw_face, draw_hands } = processorNode; const processorChanged = useProcessorNodeChanged(); @@ -88,4 +89,4 @@ const DWPoseProcessor = (props: Props) => { ); }; -export default memo(DWPoseProcessor); +export default memo(DWOpenposeProcessor); diff --git a/invokeai/frontend/web/src/features/controlAdapters/store/constants.ts b/invokeai/frontend/web/src/features/controlAdapters/store/constants.ts index 712f4d470f..01c7d4217f 100644 --- a/invokeai/frontend/web/src/features/controlAdapters/store/constants.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/store/constants.ts @@ -205,17 +205,17 @@ export const CONTROLNET_PROCESSORS: ControlNetProcessorsDict = { image_resolution: 512, }, }, - dwpose_image_processor: { - type: 'dwpose_image_processor', + dw_openpose_image_processor: { + type: 'dw_openpose_image_processor', get label() { - return i18n.t('controlnet.dwPose'); + return i18n.t('controlnet.dwOpenpose'); }, get description() { - return i18n.t('controlnet.dwPoseDescription'); + return i18n.t('controlnet.dwOpenposeDescription'); }, default: { - id: 'dwpose_image_processor', - type: 'dwpose_image_processor', + id: 'dw_openpose_image_processor', + type: 'dw_openpose_image_processor', image_resolution: 512, draw_body: true, draw_face: false, @@ -267,7 +267,7 @@ export const CONTROLNET_MODEL_DEFAULT_PROCESSORS: { lineart_anime: 'lineart_anime_image_processor', softedge: 'hed_image_processor', shuffle: 'content_shuffle_image_processor', - openpose: 'dwpose_image_processor', + openpose: 'dw_openpose_image_processor', mediapipe: 'mediapipe_face_processor', pidi: 'pidi_image_processor', zoe: 'zoe_depth_image_processor', diff --git a/invokeai/frontend/web/src/features/controlAdapters/store/types.ts b/invokeai/frontend/web/src/features/controlAdapters/store/types.ts index 3be7ccebd1..d7fac2a0f8 100644 --- a/invokeai/frontend/web/src/features/controlAdapters/store/types.ts +++ b/invokeai/frontend/web/src/features/controlAdapters/store/types.ts @@ -11,7 +11,7 @@ import type { ColorMapImageProcessorInvocation, ContentShuffleImageProcessorInvocation, DepthAnythingImageProcessorInvocation, - DWPoseImageProcessorInvocation, + DWOpenposeImageProcessorInvocation, HedImageProcessorInvocation, LineartAnimeImageProcessorInvocation, LineartImageProcessorInvocation, @@ -40,7 +40,7 @@ export type ControlAdapterProcessorNode = | MidasDepthImageProcessorInvocation | MlsdImageProcessorInvocation | NormalbaeImageProcessorInvocation - | DWPoseImageProcessorInvocation + | DWOpenposeImageProcessorInvocation | PidiImageProcessorInvocation | ZoeDepthImageProcessorInvocation; @@ -143,10 +143,10 @@ export type RequiredNormalbaeImageProcessorInvocation = O.Required< >; /** - * The DWPose processor node, with parameters flagged as required + * The DW Openpose processor node, with parameters flagged as required */ -export type RequiredDWPoseImageProcessorInvocation = O.Required< - DWPoseImageProcessorInvocation, +export type RequiredDWOpenposeImageProcessorInvocation = O.Required< + DWOpenposeImageProcessorInvocation, 'type' | 'image_resolution' | 'draw_body' | 'draw_face' | 'draw_hands' >; @@ -179,7 +179,7 @@ export type RequiredControlAdapterProcessorNode = | RequiredMidasDepthImageProcessorInvocation | RequiredMlsdImageProcessorInvocation | RequiredNormalbaeImageProcessorInvocation - | RequiredDWPoseImageProcessorInvocation + | RequiredDWOpenposeImageProcessorInvocation | RequiredPidiImageProcessorInvocation | RequiredZoeDepthImageProcessorInvocation, 'id' @@ -299,10 +299,10 @@ export const isNormalbaeImageProcessorInvocation = (obj: unknown): obj is Normal }; /** - * Type guard for DWPoseImageProcessorInvocation + * Type guard for DWOpenposeImageProcessorInvocation */ -export const isDWPoseImageProcessorInvocation = (obj: unknown): obj is DWPoseImageProcessorInvocation => { - if (isObject(obj) && 'type' in obj && obj.type === 'dwpose_image_processor') { +export const isDWOpenposeImageProcessorInvocation = (obj: unknown): obj is DWOpenposeImageProcessorInvocation => { + if (isObject(obj) && 'type' in obj && obj.type === 'dw_openpose_image_processor') { return true; } return false; diff --git a/invokeai/frontend/web/src/services/api/schema.ts b/invokeai/frontend/web/src/services/api/schema.ts index bcbcd4f3e2..da036b6d40 100644 --- a/invokeai/frontend/web/src/services/api/schema.ts +++ b/invokeai/frontend/web/src/services/api/schema.ts @@ -3473,10 +3473,10 @@ export type components = { type: "cv_inpaint"; }; /** - * DWPose Image Processor + * DW Openpose Image Processor * @description Generates an openpose pose from an image using DWPose */ - DWPoseImageProcessorInvocation: { + DWOpenposeImageProcessorInvocation: { /** @description Optional metadata to be saved with the image */ metadata?: components["schemas"]["MetadataField"] | null; /** @@ -3521,10 +3521,10 @@ export type components = { image_resolution?: number; /** * type - * @default dwpose_image_processor + * @default dw_openpose_image_processor * @constant */ - type: "dwpose_image_processor"; + type: "dw_openpose_image_processor"; }; /** DeleteBoardResult */ DeleteBoardResult: { @@ -4663,7 +4663,7 @@ export type components = { * @description The nodes in this graph */ nodes?: { - [key: string]: components["schemas"]["ConditioningCollectionInvocation"] | components["schemas"]["IntegerMathInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["SaveImageInvocation"] | components["schemas"]["IdealSizeInvocation"] | components["schemas"]["ImageBlendInvocation"] | components["schemas"]["SDXLRefinerCompelPromptInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["OnnxModelLoaderInvocation"] | components["schemas"]["MergeTilesToImageInvocation"] | components["schemas"]["LatentsInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["HandDepthMeshGraphormerProcessor"] | components["schemas"]["FaceMaskInvocation"] | components["schemas"]["PromptsFromFileInvocation"] | components["schemas"]["ImageOffsetInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["TextMaskInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["BriaRemoveBackgroundInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["MetadataItemInvocation"] | components["schemas"]["FlattenHistogramMono"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["LatentsCollectionInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["DepthAnythingImageProcessorInvocation"] | components["schemas"]["FreeUInvocation"] | components["schemas"]["MaskEdgeInvocation"] | components["schemas"]["EquivalentAchromaticLightnessInvocation"] | components["schemas"]["CalculateImageTilesInvocation"] | components["schemas"]["IPAdapterInvocation"] | components["schemas"]["ImageCompositorInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["CreateDenoiseMaskInvocation"] | components["schemas"]["InfillColorInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["FaceOffInvocation"] | components["schemas"]["FloatInvocation"] | components["schemas"]["AdjustImageHuePlusInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["StringInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["ONNXPromptInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["FloatMathInvocation"] | components["schemas"]["ImageNSFWBlurInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["ESRGANInvocation"] | components["schemas"]["ImageChannelOffsetInvocation"] | components["schemas"]["ImageValueThresholdsInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["ColorInvocation"] | components["schemas"]["RoundInvocation"] | components["schemas"]["CalculateImageTilesEvenSplitInvocation"] | components["schemas"]["SDXLModelLoaderInvocation"] | components["schemas"]["IntegerCollectionInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["ShadowsHighlightsMidtonesMaskInvocation"] | components["schemas"]["LatentConsistencyInvocation"] | components["schemas"]["CMYKMergeInvocation"] | components["schemas"]["IntegerInvocation"] | components["schemas"]["CoreMetadataInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["ColorCorrectInvocation"] | components["schemas"]["CV2InfillInvocation"] | components["schemas"]["ConditioningInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["MetadataInvocation"] | components["schemas"]["ImageDilateOrErodeInvocation"] | components["schemas"]["TileToPropertiesInvocation"] | components["schemas"]["ImageEnhanceInvocation"] | components["schemas"]["SDXLLoraLoaderInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["FaceIdentifierInvocation"] | components["schemas"]["CMYKColorSeparationInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["ONNXTextToLatentsInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["ImageInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["FloatCollectionInvocation"] | components["schemas"]["T2IAdapterInvocation"] | components["schemas"]["CenterPadCropInvocation"] | components["schemas"]["ONNXLatentsToImageInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["CalculateImageTilesMinimumOverlapInvocation"] | components["schemas"]["BlankImageInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["MaskCombineInvocation"] | components["schemas"]["BlendLatentsInvocation"] | components["schemas"]["RandomFloatInvocation"] | components["schemas"]["StringJoinThreeInvocation"] | components["schemas"]["StringSplitInvocation"] | components["schemas"]["TextToMaskClipsegInvocation"] | components["schemas"]["PairTileImageInvocation"] | components["schemas"]["MaskedBlendLatentsInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["ImageChannelMultiplyInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["LaMaInfillInvocation"] | components["schemas"]["OffsetLatentsInvocation"] | components["schemas"]["NoiseImage2DInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["BooleanCollectionInvocation"] | components["schemas"]["StringCollectionInvocation"] | components["schemas"]["SDXLCompelPromptInvocation"] | components["schemas"]["DWPoseImageProcessorInvocation"] | components["schemas"]["DenoiseLatentsInvocation"] | components["schemas"]["ImageWatermarkInvocation"] | components["schemas"]["BooleanInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["ColorMapImageProcessorInvocation"] | components["schemas"]["CropLatentsCoreInvocation"] | components["schemas"]["StringSplitNegInvocation"] | components["schemas"]["CMYKSplitInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["StringReplaceInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["SchedulerInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["FloatToIntegerInvocation"] | components["schemas"]["StringJoinInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["TextToMaskClipsegAdvancedInvocation"] | components["schemas"]["SDXLRefinerModelLoaderInvocation"] | components["schemas"]["LinearUIOutputInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["MergeMetadataInvocation"] | components["schemas"]["UnsharpMaskInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["SeamlessModeInvocation"] | components["schemas"]["ImageHueAdjustmentInvocation"] | components["schemas"]["NoiseSpectralInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["ImageRotateInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"]; + [key: string]: components["schemas"]["ImageDilateOrErodeInvocation"] | components["schemas"]["ImageChannelMultiplyInvocation"] | components["schemas"]["StringInvocation"] | components["schemas"]["SchedulerInvocation"] | components["schemas"]["ImageScaleInvocation"] | components["schemas"]["ConditioningInvocation"] | components["schemas"]["ResizeLatentsInvocation"] | components["schemas"]["MaskCombineInvocation"] | components["schemas"]["HandDepthMeshGraphormerProcessor"] | components["schemas"]["MergeMetadataInvocation"] | components["schemas"]["TextToMaskClipsegInvocation"] | components["schemas"]["MetadataItemInvocation"] | components["schemas"]["SegmentAnythingProcessorInvocation"] | components["schemas"]["LinearUIOutputInvocation"] | components["schemas"]["RandomIntInvocation"] | components["schemas"]["MaskEdgeInvocation"] | components["schemas"]["OffsetLatentsInvocation"] | components["schemas"]["FaceIdentifierInvocation"] | components["schemas"]["ImageCropInvocation"] | components["schemas"]["FloatLinearRangeInvocation"] | components["schemas"]["StringJoinThreeInvocation"] | components["schemas"]["FreeUInvocation"] | components["schemas"]["CMYKColorSeparationInvocation"] | components["schemas"]["NoiseImage2DInvocation"] | components["schemas"]["BooleanCollectionInvocation"] | components["schemas"]["DenoiseLatentsInvocation"] | components["schemas"]["EquivalentAchromaticLightnessInvocation"] | components["schemas"]["ImageInverseLerpInvocation"] | components["schemas"]["DepthAnythingImageProcessorInvocation"] | components["schemas"]["CompelInvocation"] | components["schemas"]["SubtractInvocation"] | components["schemas"]["ImageChannelInvocation"] | components["schemas"]["ImageBlendInvocation"] | components["schemas"]["FloatMathInvocation"] | components["schemas"]["TileResamplerProcessorInvocation"] | components["schemas"]["RangeInvocation"] | components["schemas"]["LoraLoaderInvocation"] | components["schemas"]["ImageRotateInvocation"] | components["schemas"]["ShadowsHighlightsMidtonesMaskInvocation"] | components["schemas"]["ONNXLatentsToImageInvocation"] | components["schemas"]["CV2InfillInvocation"] | components["schemas"]["BriaRemoveBackgroundInvocation"] | components["schemas"]["IntegerInvocation"] | components["schemas"]["PromptsFromFileInvocation"] | components["schemas"]["MainModelLoaderInvocation"] | components["schemas"]["ImageValueThresholdsInvocation"] | components["schemas"]["ImageLerpInvocation"] | components["schemas"]["ESRGANInvocation"] | components["schemas"]["StringJoinInvocation"] | components["schemas"]["ONNXPromptInvocation"] | components["schemas"]["LatentsInvocation"] | components["schemas"]["IPAdapterInvocation"] | components["schemas"]["NoiseSpectralInvocation"] | components["schemas"]["TextMaskInvocation"] | components["schemas"]["MlsdImageProcessorInvocation"] | components["schemas"]["RandomFloatInvocation"] | components["schemas"]["MaskedBlendLatentsInvocation"] | components["schemas"]["CreateDenoiseMaskInvocation"] | components["schemas"]["CMYKMergeInvocation"] | components["schemas"]["CannyImageProcessorInvocation"] | components["schemas"]["ColorMapImageProcessorInvocation"] | components["schemas"]["TextToMaskClipsegAdvancedInvocation"] | components["schemas"]["HedImageProcessorInvocation"] | components["schemas"]["BlendLatentsInvocation"] | components["schemas"]["UnsharpMaskInvocation"] | components["schemas"]["MetadataInvocation"] | components["schemas"]["ZoeDepthImageProcessorInvocation"] | components["schemas"]["FloatToIntegerInvocation"] | components["schemas"]["CalculateImageTilesInvocation"] | components["schemas"]["LineartImageProcessorInvocation"] | components["schemas"]["PairTileImageInvocation"] | components["schemas"]["ImageBlurInvocation"] | components["schemas"]["NoiseInvocation"] | components["schemas"]["CoreMetadataInvocation"] | components["schemas"]["SDXLModelLoaderInvocation"] | components["schemas"]["SeamlessModeInvocation"] | components["schemas"]["ImageMultiplyInvocation"] | components["schemas"]["ImageCompositorInvocation"] | components["schemas"]["StepParamEasingInvocation"] | components["schemas"]["ImageInvocation"] | components["schemas"]["FlattenHistogramMono"] | components["schemas"]["AdjustImageHuePlusInvocation"] | components["schemas"]["FloatCollectionInvocation"] | components["schemas"]["T2IAdapterInvocation"] | components["schemas"]["LatentsToImageInvocation"] | components["schemas"]["RoundInvocation"] | components["schemas"]["ImageToLatentsInvocation"] | components["schemas"]["ImageCollectionInvocation"] | components["schemas"]["ControlNetInvocation"] | components["schemas"]["SDXLRefinerCompelPromptInvocation"] | components["schemas"]["CMYKSplitInvocation"] | components["schemas"]["ImageNSFWBlurInvocation"] | components["schemas"]["FloatInvocation"] | components["schemas"]["StringReplaceInvocation"] | components["schemas"]["ColorInvocation"] | components["schemas"]["MediapipeFaceProcessorInvocation"] | components["schemas"]["SDXLCompelPromptInvocation"] | components["schemas"]["ImageHueAdjustmentInvocation"] | components["schemas"]["NormalbaeImageProcessorInvocation"] | components["schemas"]["ImageResizeInvocation"] | components["schemas"]["StringSplitNegInvocation"] | components["schemas"]["LeresImageProcessorInvocation"] | components["schemas"]["RandomRangeInvocation"] | components["schemas"]["InfillTileInvocation"] | components["schemas"]["CropLatentsCoreInvocation"] | components["schemas"]["ColorCorrectInvocation"] | components["schemas"]["BooleanInvocation"] | components["schemas"]["CalculateImageTilesEvenSplitInvocation"] | components["schemas"]["FaceOffInvocation"] | components["schemas"]["AddInvocation"] | components["schemas"]["IdealSizeInvocation"] | components["schemas"]["BlankImageInvocation"] | components["schemas"]["DWOpenposeImageProcessorInvocation"] | components["schemas"]["ConditioningCollectionInvocation"] | components["schemas"]["ShowImageInvocation"] | components["schemas"]["IntegerMathInvocation"] | components["schemas"]["ScaleLatentsInvocation"] | components["schemas"]["RangeOfSizeInvocation"] | components["schemas"]["ImageChannelOffsetInvocation"] | components["schemas"]["LatentsCollectionInvocation"] | components["schemas"]["TileToPropertiesInvocation"] | components["schemas"]["ImageEnhanceInvocation"] | components["schemas"]["IntegerCollectionInvocation"] | components["schemas"]["PidiImageProcessorInvocation"] | components["schemas"]["SDXLLoraLoaderInvocation"] | components["schemas"]["CvInpaintInvocation"] | components["schemas"]["MaskFromAlphaInvocation"] | components["schemas"]["InfillPatchMatchInvocation"] | components["schemas"]["StringCollectionInvocation"] | components["schemas"]["VaeLoaderInvocation"] | components["schemas"]["ImagePasteInvocation"] | components["schemas"]["LatentConsistencyInvocation"] | components["schemas"]["MergeTilesToImageInvocation"] | components["schemas"]["ImageWatermarkInvocation"] | components["schemas"]["DynamicPromptInvocation"] | components["schemas"]["CollectInvocation"] | components["schemas"]["ContentShuffleImageProcessorInvocation"] | components["schemas"]["ClipSkipInvocation"] | components["schemas"]["FaceMaskInvocation"] | components["schemas"]["CenterPadCropInvocation"] | components["schemas"]["LaMaInfillInvocation"] | components["schemas"]["DivideInvocation"] | components["schemas"]["OnnxModelLoaderInvocation"] | components["schemas"]["MidasDepthImageProcessorInvocation"] | components["schemas"]["SaveImageInvocation"] | components["schemas"]["MultiplyInvocation"] | components["schemas"]["ImageOffsetInvocation"] | components["schemas"]["GraphInvocation"] | components["schemas"]["StringSplitInvocation"] | components["schemas"]["IterateInvocation"] | components["schemas"]["LineartAnimeImageProcessorInvocation"] | components["schemas"]["CalculateImageTilesMinimumOverlapInvocation"] | components["schemas"]["SDXLRefinerModelLoaderInvocation"] | components["schemas"]["ImageConvertInvocation"] | components["schemas"]["ONNXTextToLatentsInvocation"] | components["schemas"]["InfillColorInvocation"]; }; /** * Edges @@ -4700,7 +4700,7 @@ export type components = { * @description The results of node executions */ results: { - [key: string]: components["schemas"]["LatentsCollectionOutput"] | components["schemas"]["CollectInvocationOutput"] | components["schemas"]["IntegerCollectionOutput"] | components["schemas"]["ShadowsHighlightsMidtonesMasksOutput"] | components["schemas"]["StringOutput"] | components["schemas"]["FaceOffOutput"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["ConditioningCollectionOutput"] | components["schemas"]["CalculateImageTilesOutput"] | components["schemas"]["FloatOutput"] | components["schemas"]["ColorCollectionOutput"] | components["schemas"]["ConditioningOutput"] | components["schemas"]["SDXLLoraLoaderOutput"] | components["schemas"]["MetadataOutput"] | components["schemas"]["LoraLoaderOutput"] | components["schemas"]["DenoiseMaskOutput"] | components["schemas"]["IPAdapterOutput"] | components["schemas"]["IntegerOutput"] | components["schemas"]["ColorOutput"] | components["schemas"]["SDXLRefinerModelLoaderOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["HandDepthOutput"] | components["schemas"]["StringCollectionOutput"] | components["schemas"]["PairTileImageOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["BooleanOutput"] | components["schemas"]["ImageOutput"] | components["schemas"]["String2Output"] | components["schemas"]["SeamlessModeOutput"] | components["schemas"]["BooleanCollectionOutput"] | components["schemas"]["SchedulerOutput"] | components["schemas"]["StringPosNegOutput"] | components["schemas"]["IterateInvocationOutput"] | components["schemas"]["TileToPropertiesOutput"] | components["schemas"]["CMYKSplitOutput"] | components["schemas"]["GraphInvocationOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["VAEOutput"] | components["schemas"]["FaceMaskOutput"] | components["schemas"]["UNetOutput"] | components["schemas"]["IdealSizeOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["MetadataItemOutput"] | components["schemas"]["ONNXModelLoaderOutput"] | components["schemas"]["T2IAdapterOutput"] | components["schemas"]["SDXLModelLoaderOutput"] | components["schemas"]["CMYKSeparationOutput"] | components["schemas"]["CLIPOutput"] | components["schemas"]["ClipSkipInvocationOutput"] | components["schemas"]["LatentsOutput"]; + [key: string]: components["schemas"]["LoraLoaderOutput"] | components["schemas"]["ColorOutput"] | components["schemas"]["ModelLoaderOutput"] | components["schemas"]["SeamlessModeOutput"] | components["schemas"]["IPAdapterOutput"] | components["schemas"]["StringOutput"] | components["schemas"]["UNetOutput"] | components["schemas"]["IntegerCollectionOutput"] | components["schemas"]["CMYKSplitOutput"] | components["schemas"]["LatentsCollectionOutput"] | components["schemas"]["StringPosNegOutput"] | components["schemas"]["TileToPropertiesOutput"] | components["schemas"]["FloatOutput"] | components["schemas"]["CollectInvocationOutput"] | components["schemas"]["LatentsOutput"] | components["schemas"]["SDXLModelLoaderOutput"] | components["schemas"]["CMYKSeparationOutput"] | components["schemas"]["String2Output"] | components["schemas"]["BooleanCollectionOutput"] | components["schemas"]["MetadataOutput"] | components["schemas"]["ImageCollectionOutput"] | components["schemas"]["VAEOutput"] | components["schemas"]["IterateInvocationOutput"] | components["schemas"]["ImageOutput"] | components["schemas"]["ControlOutput"] | components["schemas"]["FaceOffOutput"] | components["schemas"]["T2IAdapterOutput"] | components["schemas"]["IdealSizeOutput"] | components["schemas"]["StringCollectionOutput"] | components["schemas"]["MetadataItemOutput"] | components["schemas"]["PairTileImageOutput"] | components["schemas"]["CLIPOutput"] | components["schemas"]["ClipSkipInvocationOutput"] | components["schemas"]["ConditioningOutput"] | components["schemas"]["CalculateImageTilesOutput"] | components["schemas"]["ConditioningCollectionOutput"] | components["schemas"]["FaceMaskOutput"] | components["schemas"]["GraphInvocationOutput"] | components["schemas"]["IntegerOutput"] | components["schemas"]["SDXLLoraLoaderOutput"] | components["schemas"]["NoiseOutput"] | components["schemas"]["DenoiseMaskOutput"] | components["schemas"]["ONNXModelLoaderOutput"] | components["schemas"]["FloatCollectionOutput"] | components["schemas"]["HandDepthOutput"] | components["schemas"]["ShadowsHighlightsMidtonesMasksOutput"] | components["schemas"]["SDXLRefinerModelLoaderOutput"] | components["schemas"]["SchedulerOutput"] | components["schemas"]["BooleanOutput"] | components["schemas"]["ColorCollectionOutput"]; }; /** * Errors @@ -13103,30 +13103,6 @@ export type components = { * @enum {string} */ T2IAdapterModelFormat: "diffusers"; - /** - * StableDiffusion1ModelFormat - * @description An enumeration. - * @enum {string} - */ - StableDiffusion1ModelFormat: "checkpoint" | "diffusers"; - /** - * ControlNetModelFormat - * @description An enumeration. - * @enum {string} - */ - ControlNetModelFormat: "checkpoint" | "diffusers"; - /** - * StableDiffusionOnnxModelFormat - * @description An enumeration. - * @enum {string} - */ - StableDiffusionOnnxModelFormat: "olive" | "onnx"; - /** - * StableDiffusion2ModelFormat - * @description An enumeration. - * @enum {string} - */ - StableDiffusion2ModelFormat: "checkpoint" | "diffusers"; /** * IPAdapterModelFormat * @description An enumeration. @@ -13139,12 +13115,36 @@ export type components = { * @enum {string} */ StableDiffusionXLModelFormat: "checkpoint" | "diffusers"; + /** + * StableDiffusionOnnxModelFormat + * @description An enumeration. + * @enum {string} + */ + StableDiffusionOnnxModelFormat: "olive" | "onnx"; /** * CLIPVisionModelFormat * @description An enumeration. * @enum {string} */ CLIPVisionModelFormat: "diffusers"; + /** + * StableDiffusion2ModelFormat + * @description An enumeration. + * @enum {string} + */ + StableDiffusion2ModelFormat: "checkpoint" | "diffusers"; + /** + * StableDiffusion1ModelFormat + * @description An enumeration. + * @enum {string} + */ + StableDiffusion1ModelFormat: "checkpoint" | "diffusers"; + /** + * ControlNetModelFormat + * @description An enumeration. + * @enum {string} + */ + ControlNetModelFormat: "checkpoint" | "diffusers"; }; responses: never; parameters: never; diff --git a/invokeai/frontend/web/src/services/api/types.ts b/invokeai/frontend/web/src/services/api/types.ts index 2d20033b79..1382fbe275 100644 --- a/invokeai/frontend/web/src/services/api/types.ts +++ b/invokeai/frontend/web/src/services/api/types.ts @@ -156,7 +156,7 @@ export type MediapipeFaceProcessorInvocation = s['MediapipeFaceProcessorInvocati export type MidasDepthImageProcessorInvocation = s['MidasDepthImageProcessorInvocation']; export type MlsdImageProcessorInvocation = s['MlsdImageProcessorInvocation']; export type NormalbaeImageProcessorInvocation = s['NormalbaeImageProcessorInvocation']; -export type DWPoseImageProcessorInvocation = s['DWPoseImageProcessorInvocation']; +export type DWOpenposeImageProcessorInvocation = s['DWOpenposeImageProcessorInvocation']; export type PidiImageProcessorInvocation = s['PidiImageProcessorInvocation']; export type ZoeDepthImageProcessorInvocation = s['ZoeDepthImageProcessorInvocation'];