lllyasviel/stable-diffusion-webui-forge
1
0
Fork 0
mirror of https://github.com/lllyasviel/stable-diffusion-webui-forge.git synced 2026-04-30 19:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include Extra Images via API (#2066)

Browse Source
This commit is contained in:
altoiddealer
2024-10-15 08:52:08 -04:00
committed by GitHub
parent b4d2266dc6
commit cce30d3340
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/api/api.py
View File

@@ -21,7 +21,7 @@ from modules import sd_samplers, deepbooru, images, scripts, ui, postprocessing,
from modules.api import models from modules.api import models
from modules_forge import main_entry from modules_forge import main_entry
from modules.shared import opts from modules.shared import opts
from modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images from modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images, process_extra_images
from modules.textual_inversion.textual_inversion import create_embedding from modules.textual_inversion.textual_inversion import create_embedding
from PIL import PngImagePlugin from PIL import PngImagePlugin
from modules.realesrgan_model import get_realesrgan_models from modules.realesrgan_model import get_realesrgan_models
@@ -488,12 +488,13 @@ class Api:
else: else:
p.script_args = tuple(script_args) # Need to pass args as tuple here p.script_args = tuple(script_args) # Need to pass args as tuple here
processed = process_images(p) processed = process_images(p)
process_extra_images(processed)
finish_task(task_id) finish_task(task_id)
finally: finally:
shared.state.end() shared.state.end()
shared.total_tqdm.clear() shared.total_tqdm.clear()
b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else [] b64images = list(map(encode_pil_to_base64, processed.images + processed.extra_images)) if send_images else []
return models.TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.js()) return models.TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.js())
@@ -559,12 +560,13 @@ class Api:
else: else:
p.script_args = tuple(script_args) # Need to pass args as tuple here p.script_args = tuple(script_args) # Need to pass args as tuple here
processed = process_images(p) processed = process_images(p)
process_extra_images(processed)
finish_task(task_id) finish_task(task_id)
finally: finally:
shared.state.end() shared.state.end()
shared.total_tqdm.clear() shared.total_tqdm.clear()
b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else [] b64images = list(map(encode_pil_to_base64, processed.images + processed.extra_images)) if send_images else []
if not img2imgreq.include_init_images: if not img2imgreq.include_init_images:
img2imgreq.init_images = None img2imgreq.init_images = None

12
modules/processing.py
View File

@@ -1176,6 +1176,18 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
return res return res
def process_extra_images(processed:Processed):
"""used by API processing functions to ensure extra images are PIL image objects"""
extra_images = []
for img in processed.extra_images:
if isinstance(img, np.ndarray):
img = Image.fromarray(img)
if not Image.isImageType(img):
continue
extra_images.append(img)
processed.extra_images = extra_images
def old_hires_fix_first_pass_dimensions(width, height): def old_hires_fix_first_pass_dimensions(width, height):
"""old algorithm for auto-calculating first pass size""" """old algorithm for auto-calculating first pass size"""