aboutsummaryrefslogtreecommitdiff
path: root/modules/api/api.py
diff options
context:
space:
mode:
authorBruno Seoane <brunoseoaneamarillo@gmail.com>2022-10-26 09:50:26 -0300
committerBruno Seoane <brunoseoaneamarillo@gmail.com>2022-10-26 09:50:26 -0300
commit8320963dcbc80e9c4cdef6124cb3cf0d246badd8 (patch)
tree8bd83cc282d2bb1ba72a06128f817412c2605439 /modules/api/api.py
parent2267498a8cae303ae3badc4556c61c0e84cac6ec (diff)
parent99d728b5b18829c8a6b7b2d69c9b9327dd257896 (diff)
Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui
Diffstat (limited to 'modules/api/api.py')
-rw-r--r--modules/api/api.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/api/api.py b/modules/api/api.py
index 67b783de..ca289d9f 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -54,7 +54,7 @@ class Api:
b64images = list(map(encode_pil_to_base64, processed.images))
- return TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.info)
+ return TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.js())
def img2imgapi(self, img2imgreq: StableDiffusionImg2ImgProcessingAPI):
sampler_index = sampler_to_index(img2imgreq.sampler_index)
@@ -93,8 +93,12 @@ class Api:
processed = process_images(p)
b64images = list(map(encode_pil_to_base64, processed.images))
+
+ if (not img2imgreq.include_init_images):
+ img2imgreq.init_images = None
+ img2imgreq.mask = None
- return ImageToImageResponse(images=b64images, parameters=vars(img2imgreq), info=processed.info)
+ return ImageToImageResponse(images=b64images, parameters=vars(img2imgreq), info=processed.js())
def extras_single_image_api(self, req: ExtrasSingleImageRequest):
reqDict = setUpscalers(req)