aboutsummaryrefslogtreecommitdiffstats
path: root/modules/api/api.py
diff options
context:
space:
mode:
authornoodleanon <122053346+noodleanon@users.noreply.github.com>2023-01-07 14:21:31 +0000
committerGitHub <noreply@github.com>2023-01-07 14:21:31 +0000
commitd38ede71d5330958f4bbac5f99c1be3c146b506a (patch)
treef9e70b6551eae06a60b7e0b78564b4c6f0609ca2 /modules/api/api.py
parent50e25362794d46cd9a55c70e953a8b4126fd42f7 (diff)
downloadstable-diffusion-webui-gfx803-d38ede71d5330958f4bbac5f99c1be3c146b506a.tar.gz
stable-diffusion-webui-gfx803-d38ede71d5330958f4bbac5f99c1be3c146b506a.tar.bz2
stable-diffusion-webui-gfx803-d38ede71d5330958f4bbac5f99c1be3c146b506a.zip
Added script support in txt2img endpoint
Diffstat (limited to 'modules/api/api.py')
-rw-r--r--modules/api/api.py22
1 files changed, 19 insertions, 3 deletions
diff --git a/modules/api/api.py b/modules/api/api.py
index aa62a42e..0e8ea263 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -149,6 +149,14 @@ class Api:
raise HTTPException(status_code=401, detail="Incorrect username or password", headers={"WWW-Authenticate": "Basic"})
def text2imgapi(self, txt2imgreq: StableDiffusionTxt2ImgProcessingAPI):
+ if txt2imgreq.script_name is not None:
+ if scripts.scripts_txt2img.scripts == []:
+ scripts.scripts_txt2img.initialize_scripts(True)
+ ui.create_ui()
+
+ script_idx = script_name_to_index(txt2imgreq.script_name, scripts.scripts_txt2img.selectable_scripts)
+ script = scripts.scripts_txt2img.selectable_scripts[script_idx]
+
populate = txt2imgreq.copy(update={ # Override __init__ params
"sampler_name": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index),
"do_not_save_samples": True,
@@ -158,11 +166,20 @@ class Api:
if populate.sampler_name:
populate.sampler_index = None # prevent a warning later on
+ args = vars(populate)
+ args.pop('script_name', None)
+
with self.queue_lock:
- p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **vars(populate))
+ p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)
shared.state.begin()
- processed = process_images(p)
+ if 'script' in locals():
+ p.outpath_grids = opts.outdir_txt2img_grids
+ p.outpath_samples = opts.outdir_txt2img_samples
+ p.script_args = [script_idx + 1] + [None] * (script.args_from - 1) + p.script_args
+ processed = scripts.scripts_txt2img.run(p, *p.script_args)
+ else:
+ processed = process_images(p)
shared.state.end()
@@ -213,7 +230,6 @@ class Api:
processed = scripts.scripts_img2img.run(p, *p.script_args)
else:
processed = process_images(p)
-
shared.state.end()
b64images = list(map(encode_pil_to_base64, processed.images))