Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for ComfyUI #254

Merged
merged 9 commits into from
Jun 16, 2024
Merged

feat: add support for ComfyUI #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c1a2bb
feat: add support for ComfyUI
MieMieMieeeee Jun 13, 2024
ec08cc3
fix: correct formatting
MieMieMieeeee Jun 16, 2024
c741c38
Apply suggestions from code review
MieMieMieeeee Jun 16, 2024
5553d37
fix: correct formatting
MieMieMieeeee Jun 16, 2024
66bdd52
fix: resolve file paths for readFile
MieMieMieeeee Jun 16, 2024
4cb3b4c
chore: add required to sampler of comfyui
MieMieMieeeee Jun 16, 2024
7183546
Apply suggestions from code review
MieMieMieeeee Jun 16, 2024
dd6011a
feat: support for different image MIME types in comfyui
MieMieMieeeee Jun 16, 2024
aac203c
Apply suggestions from code review
shigma Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 122 additions & 0 deletions data/default-comfyui-i2i-wf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"3": {
"inputs": {
"seed": 1,
"steps": 20,
"cfg": 8,
"sampler_name": "euler",
"scheduler": "normal",
"denoise": 0.87,
"model": [
"14",
0
],
"positive": [
"6",
0
],
"negative": [
"7",
0
],
"latent_image": [
"12",
0
]
},
"class_type": "KSampler",
"_meta": {
"title": "KSampler"
}
},
"6": {
"inputs": {
"text": "",
"clip": [
"14",
1
]
},
"class_type": "CLIPTextEncode",
"_meta": {
"title": "CLIP Text Encode (Prompt)"
}
},
"7": {
"inputs": {
"text": "",
"clip": [
"14",
1
]
},
"class_type": "CLIPTextEncode",
"_meta": {
"title": "CLIP Text Encode (Prompt)"
}
},
"8": {
"inputs": {
"samples": [
"3",
0
],
"vae": [
"14",
2
]
},
"class_type": "VAEDecode",
"_meta": {
"title": "VAE Decode"
}
},
"9": {
"inputs": {
"filename_prefix": "ComfyUI",
"images": [
"8",
0
]
},
"class_type": "SaveImage",
"_meta": {
"title": "Save Image"
}
},
"10": {
"inputs": {
"image": "example.png",
"upload": "image"
},
"class_type": "LoadImage",
"_meta": {
"title": "Load Image"
}
},
"12": {
"inputs": {
"pixels": [
"10",
0
],
"vae": [
"14",
2
]
},
"class_type": "VAEEncode",
"_meta": {
"title": "VAE Encode"
}
},
"14": {
"inputs": {
"ckpt_name": ""
},
"class_type": "CheckpointLoaderSimple",
"_meta": {
"title": "Load Checkpoint"
}
}
}
107 changes: 107 additions & 0 deletions data/default-comfyui-t2i-wf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"3": {
"inputs": {
"seed": 1,
"steps": 20,
"cfg": 8,
"sampler_name": "euler",
"scheduler": "normal",
"denoise": 0.87,
"model": [
"14",
0
],
"positive": [
"6",
0
],
"negative": [
"7",
0
],
"latent_image": [
"16",
0
]
},
"class_type": "KSampler",
"_meta": {
"title": "KSampler"
}
},
"6": {
"inputs": {
"text": "",
"clip": [
"14",
1
]
},
"class_type": "CLIPTextEncode",
"_meta": {
"title": "CLIP Text Encode (Prompt)"
}
},
"7": {
"inputs": {
"text": "",
"clip": [
"14",
1
]
},
"class_type": "CLIPTextEncode",
"_meta": {
"title": "CLIP Text Encode (Prompt)"
}
},
"8": {
"inputs": {
"samples": [
"3",
0
],
"vae": [
"14",
2
]
},
"class_type": "VAEDecode",
"_meta": {
"title": "VAE Decode"
}
},
"9": {
"inputs": {
"filename_prefix": "ComfyUI",
"images": [
"8",
0
]
},
"class_type": "SaveImage",
"_meta": {
"title": "Save Image"
}
},
"14": {
"inputs": {
"ckpt_name": ""
},
"class_type": "CheckpointLoaderSimple",
"_meta": {
"title": "Load Checkpoint"
}
},
"16": {
"inputs": {
"width": 512,
"height": 800,
"batch_size": 1
},
"class_type": "EmptyLatentImage",
"_meta": {
"title": "Empty Latent Image"
}
}
}
51 changes: 50 additions & 1 deletion src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type Orient = keyof typeof orientMap
export const models = Object.keys(modelMap) as Model[]
export const orients = Object.keys(orientMap) as Orient[]
export const scheduler = ['native', 'karras', 'exponential', 'polyexponential'] as const
export const schedulerComfyUI = ['normal', 'karras', 'exponential', 'sgm_uniform', 'simple', 'ddim_uniform'] as const

export namespace sampler {
export const nai = {
Expand Down Expand Up @@ -87,6 +88,31 @@ export namespace sampler {
DDIM_ka: 'DDIM Karras',
}

export const comfyui = {
euler: 'Euler',
euler_ancestral: 'Euler ancestral',
heun: 'Heun',
heunpp2: 'Heun++ 2',
dpm_2: 'DPM 2',
dpm_2_ancestral: 'DPM 2 ancestral',
lms: 'LMS',
dpm_fast: 'DPM fast',
dpm_adaptive: 'DPM adaptive',
dpmpp_2s_ancestral: 'DPM++ 2S ancestral',
dpmpp_sde: 'DPM++ SDE',
dpmpp_sde_gpu: 'DPM++ SDE GPU',
dpmpp_2m: 'DPM++ 2M',
dpmpp_2m_sde: 'DPM++ 2M SDE',
dpmpp_2m_sde_gpu: 'DPM++ 2M SDE GPU',
dpmpp_3m_sde: 'DPM++ 3M SDE',
dpmpp_3m_sde_gpu: 'DPM++ 3M SDE GPU',
ddpm: 'DDPM',
lcm: 'LCM',
ddim: 'DDIM',
uni_pc: 'UniPC',
uni_pc_bh2: 'UniPC BH2',
}

export function createSchema(map: Dict<string>) {
return Schema.union(Object.entries(map).map(([key, value]) => {
return Schema.const(key).description(value)
Expand Down Expand Up @@ -201,7 +227,7 @@ interface ParamConfig {
}

export interface Config extends PromptConfig, ParamConfig {
type: 'token' | 'login' | 'naifu' | 'sd-webui' | 'stable-horde'
type: 'token' | 'login' | 'naifu' | 'sd-webui' | 'stable-horde' | 'comfyui'
token?: string
email?: string
password?: string
Expand All @@ -220,6 +246,8 @@ export interface Config extends PromptConfig, ParamConfig {
maxConcurrency?: number
pollInterval?: number
trustedWorkers?: boolean
workflowText2Image?: string
workflowImage2Image?: string
}

export const Config = Schema.intersect([
Expand All @@ -230,6 +258,7 @@ export const Config = Schema.intersect([
Schema.const('naifu').description('naifu'),
Schema.const('sd-webui').description('sd-webui'),
Schema.const('stable-horde').description('Stable Horde'),
Schema.const('comfyui').description('ComfyUI'),
]).default('token').description('登录方式。'),
}).description('登录设置'),

Expand Down Expand Up @@ -278,6 +307,12 @@ export const Config = Schema.intersect([
trustedWorkers: Schema.boolean().description('是否只请求可信任工作节点。').default(false),
pollInterval: Schema.number().role('time').description('轮询进度间隔时长。').default(Time.second),
}),
Schema.object({
type: Schema.const('comfyui'),
endpoint: Schema.string().description('API 服务器地址。').required(),
headers: Schema.dict(String).role('table').description('要附加的额外请求头。'),
pollInterval: Schema.number().role('time').description('轮询进度间隔时长。').default(Time.second),
}),
]),

Schema.object({
Expand Down Expand Up @@ -322,6 +357,20 @@ export const Config = Schema.intersect([
type: Schema.const('naifu').required(),
sampler: sampler.createSchema(sampler.nai),
}),
Schema.object({
type: Schema.const('comfyui').required(),
sampler: sampler.createSchema(sampler.comfyui).description('默认的采样器。').required(),
model: Schema.string().description('默认的生成模型的文件名。').required(),
workflowText2Image: Schema.path({
filters: [{ name: '', extensions: ['.json'] }],
allowCreate: true,
}).description('API 格式的文本到图像工作流。'),
workflowImage2Image: Schema.path({
filters: [{ name: '', extensions: ['.json'] }],
allowCreate: true,
}).description('API 格式的图像到图像工作流。'),
scheduler: Schema.union(schedulerComfyUI).description('默认的调度器。').default('normal'),
}),
Schema.intersect([
Schema.object({
model: Schema.union(models).loose().description('默认的生成模型。').default('nai-v3'),
Expand Down
Loading
Loading