chore: rebase conflicts

This commit is contained in:
psychedelicious
2023-10-06 15:22:25 +11:00
committed by Kent Keirsey
parent f50f95a81d
commit d1fce4b70b
2 changed files with 59 additions and 40 deletions

View File

@ -2679,6 +2679,12 @@ export type components = {
* @default 400
*/
tile_size?: number;
/**
* Tile Size
* @description Tile size for tiled ESRGAN upscaling (0=tiling disabled)
* @default 400
*/
tile_size?: number;
/**
* Type
* @default esrgan
@ -3351,6 +3357,9 @@ export type components = {
| components['schemas']['ColorInvocation']
| components['schemas']['ConditioningInvocation']
| components['schemas']['ConditioningCollectionInvocation']
| components['schemas']['FaceOffInvocation']
| components['schemas']['FaceMaskInvocation']
| components['schemas']['FaceIdentifierInvocation']
| components['schemas']['ControlNetInvocation']
| components['schemas']['ImageProcessorInvocation']
| components['schemas']['MainModelLoaderInvocation']
@ -3360,8 +3369,9 @@ export type components = {
| components['schemas']['SeamlessModeInvocation']
| components['schemas']['SDXLModelLoaderInvocation']
| components['schemas']['SDXLRefinerModelLoaderInvocation']
| components['schemas']['MetadataAccumulatorInvocation']
| components['schemas']['IPAdapterInvocation']
| components['schemas']['MetadataAccumulatorInvocation']
| components['schemas']['T2IAdapterInvocation']
| components['schemas']['CompelInvocation']
| components['schemas']['SDXLCompelPromptInvocation']
| components['schemas']['SDXLRefinerCompelPromptInvocation']
@ -3410,6 +3420,7 @@ export type components = {
| components['schemas']['MultiplyInvocation']
| components['schemas']['DivideInvocation']
| components['schemas']['RandomIntInvocation']
| components['schemas']['RandomFloatInvocation']
| components['schemas']['FloatToIntegerInvocation']
| components['schemas']['RoundInvocation']
| components['schemas']['IntegerMathInvocation']
@ -3516,8 +3527,9 @@ export type components = {
| components['schemas']['SeamlessModeOutput']
| components['schemas']['SDXLModelLoaderOutput']
| components['schemas']['SDXLRefinerModelLoaderOutput']
| components['schemas']['MetadataAccumulatorOutput']
| components['schemas']['IPAdapterOutput']
| components['schemas']['MetadataAccumulatorOutput']
| components['schemas']['T2IAdapterOutput']
| components['schemas']['ClipSkipInvocationOutput']
| components['schemas']['SchedulerOutput']
| components['schemas']['ONNXModelLoaderOutput']
@ -3526,7 +3538,9 @@ export type components = {
| components['schemas']['String2Output']
| components['schemas']['GraphInvocationOutput']
| components['schemas']['IterateInvocationOutput']
| components['schemas']['CollectInvocationOutput'];
| components['schemas']['CollectInvocationOutput']
| components['schemas']['FaceMaskOutput']
| components['schemas']['FaceOffOutput'];
};
/**
* Errors
@ -10208,30 +10222,6 @@ export type components = {
/** Ui Order */
ui_order?: number;
};
/**
* StableDiffusion1ModelFormat
* @description An enumeration.
* @enum {string}
*/
T2IAdapterModelFormat: 'diffusers';
/**
* ControlNetModelFormat
* @description An enumeration.
* @enum {string}
*/
ControlNetModelFormat: 'checkpoint' | 'diffusers';
/**
* StableDiffusion2ModelFormat
* @description An enumeration.
* @enum {string}
*/
StableDiffusion2ModelFormat: 'checkpoint' | 'diffusers';
/**
* StableDiffusionXLModelFormat
* @description An enumeration.
* @enum {string}
*/
T2IAdapterModelFormat: 'diffusers';
/**
* StableDiffusionXLModelFormat
* @description An enumeration.
@ -10249,25 +10239,37 @@ export type components = {
* @description An enumeration.
* @enum {string}
*/
StableDiffusion1ModelFormat: 'checkpoint' | 'diffusers';
ControlNetModelFormat: 'checkpoint' | 'diffusers';
/**
* StableDiffusionOnnxModelFormat
* @description An enumeration.
* @enum {string}
*/
StableDiffusionOnnxModelFormat: 'olive' | 'onnx';
/**
* StableDiffusion1ModelFormat
* @description An enumeration.
* @enum {string}
*/
StableDiffusion1ModelFormat: 'checkpoint' | 'diffusers';
/**
* T2IAdapterModelFormat
* @description An enumeration.
* @enum {string}
*/
T2IAdapterModelFormat: 'diffusers';
/**
* CLIPVisionModelFormat
* @description An enumeration.
* @enum {string}
*/
CLIPVisionModelFormat: 'diffusers';
/**
* StableDiffusion2ModelFormat
* @description An enumeration.
* @enum {string}
*/
StableDiffusion2ModelFormat: 'checkpoint' | 'diffusers';
/**
* ControlNetModelFormat
* @description An enumeration.
* @enum {string}
*/
ControlNetModelFormat: 'checkpoint' | 'diffusers';
};
responses: never;
parameters: never;
@ -10409,6 +10411,9 @@ export type operations = {
| components['schemas']['ColorInvocation']
| components['schemas']['ConditioningInvocation']
| components['schemas']['ConditioningCollectionInvocation']
| components['schemas']['FaceOffInvocation']
| components['schemas']['FaceMaskInvocation']
| components['schemas']['FaceIdentifierInvocation']
| components['schemas']['ControlNetInvocation']
| components['schemas']['ImageProcessorInvocation']
| components['schemas']['MainModelLoaderInvocation']
@ -10418,8 +10423,9 @@ export type operations = {
| components['schemas']['SeamlessModeInvocation']
| components['schemas']['SDXLModelLoaderInvocation']
| components['schemas']['SDXLRefinerModelLoaderInvocation']
| components['schemas']['MetadataAccumulatorInvocation']
| components['schemas']['IPAdapterInvocation']
| components['schemas']['MetadataAccumulatorInvocation']
| components['schemas']['T2IAdapterInvocation']
| components['schemas']['CompelInvocation']
| components['schemas']['SDXLCompelPromptInvocation']
| components['schemas']['SDXLRefinerCompelPromptInvocation']
@ -10468,6 +10474,7 @@ export type operations = {
| components['schemas']['MultiplyInvocation']
| components['schemas']['DivideInvocation']
| components['schemas']['RandomIntInvocation']
| components['schemas']['RandomFloatInvocation']
| components['schemas']['FloatToIntegerInvocation']
| components['schemas']['RoundInvocation']
| components['schemas']['IntegerMathInvocation']
@ -10563,6 +10570,9 @@ export type operations = {
| components['schemas']['ColorInvocation']
| components['schemas']['ConditioningInvocation']
| components['schemas']['ConditioningCollectionInvocation']
| components['schemas']['FaceOffInvocation']
| components['schemas']['FaceMaskInvocation']
| components['schemas']['FaceIdentifierInvocation']
| components['schemas']['ControlNetInvocation']
| components['schemas']['ImageProcessorInvocation']
| components['schemas']['MainModelLoaderInvocation']
@ -10572,8 +10582,9 @@ export type operations = {
| components['schemas']['SeamlessModeInvocation']
| components['schemas']['SDXLModelLoaderInvocation']
| components['schemas']['SDXLRefinerModelLoaderInvocation']
| components['schemas']['MetadataAccumulatorInvocation']
| components['schemas']['IPAdapterInvocation']
| components['schemas']['MetadataAccumulatorInvocation']
| components['schemas']['T2IAdapterInvocation']
| components['schemas']['CompelInvocation']
| components['schemas']['SDXLCompelPromptInvocation']
| components['schemas']['SDXLRefinerCompelPromptInvocation']
@ -10622,6 +10633,7 @@ export type operations = {
| components['schemas']['MultiplyInvocation']
| components['schemas']['DivideInvocation']
| components['schemas']['RandomIntInvocation']
| components['schemas']['RandomFloatInvocation']
| components['schemas']['FloatToIntegerInvocation']
| components['schemas']['RoundInvocation']
| components['schemas']['IntegerMathInvocation']