diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2022-11-27 13:51:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 13:51:47 +0000 |
| commit | 554787231a6b96bd19d90462daccb8719c5793c2 (patch) | |
| tree | 8f88a54a75a30b23522aa15541fc1a9e75c45664 /modules/api/api.py | |
| parent | 8c8ad93bb5f01341513ce4b694f02d650edf0e80 (diff) | |
| parent | 06ada734c7f85e5e6e2e6ae78fb873be0222bfd5 (diff) | |
| download | stable-diffusion-webui-gfx803-554787231a6b96bd19d90462daccb8719c5793c2.tar.gz stable-diffusion-webui-gfx803-554787231a6b96bd19d90462daccb8719c5793c2.tar.bz2 stable-diffusion-webui-gfx803-554787231a6b96bd19d90462daccb8719c5793c2.zip | |
Merge pull request #5117 from aliencaocao/fix_api_sampler_name
Fix api ignoring sampler_name settings
Diffstat (limited to 'modules/api/api.py')
| -rw-r--r-- | modules/api/api.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/api/api.py b/modules/api/api.py index f959d473..1de3f98f 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -112,11 +112,13 @@ class Api: def text2imgapi(self, txt2imgreq: StableDiffusionTxt2ImgProcessingAPI): populate = txt2imgreq.copy(update={ # Override __init__ params "sd_model": shared.sd_model, - "sampler_name": validate_sampler_name(txt2imgreq.sampler_index), + "sampler_name": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index), "do_not_save_samples": True, "do_not_save_grid": True } ) + if populate.sampler_name: + populate.sampler_index = None # prevent a warning later on p = StableDiffusionProcessingTxt2Img(**vars(populate)) # Override object param @@ -142,12 +144,14 @@ class Api: populate = img2imgreq.copy(update={ # Override __init__ params "sd_model": shared.sd_model, - "sampler_name": validate_sampler_name(img2imgreq.sampler_index), + "sampler_name": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index), "do_not_save_samples": True, "do_not_save_grid": True, "mask": mask } ) + if populate.sampler_name: + populate.sampler_index = None # prevent a warning later on p = StableDiffusionProcessingImg2Img(**vars(populate)) imgs = [] |