Merge branch 'dev' into fix_batch_processing (a33d49cc) · Commits · github_fork / Stable Diffusion Webui

modules/api/api.py

+3 −9

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ import uvicorn
		import gradio as gr
		from threading import Lock
		from io import BytesIO
		from gradio.processing_utils import decode_base64_to_file
		from fastapi import APIRouter, Depends, FastAPI, Request, Response
		from fastapi.security import HTTPBasic, HTTPBasicCredentials
		from fastapi.exceptions import HTTPException
		@@ -395,16 +394,11 @@ class Api:
		def extras_batch_images_api(self, req: ExtrasBatchImagesRequest):
		reqDict = setUpscalers(req)

		def prepareFiles(file):
		file = decode_base64_to_file(file.data, file_path=file.name)
		file.orig_name = file.name
		return file

		reqDict['image_folder'] = list(map(prepareFiles, reqDict['imageList']))
		reqDict.pop('imageList')
		image_list = reqDict.pop('imageList', [])
		image_folder = [decode_base64_to_image(x.data) for x in image_list]

		with self.queue_lock:
		result = postprocessing.run_extras(extras_mode=1, image="", input_dir="", output_dir="", save_output=False, **reqDict)
		result = postprocessing.run_extras(extras_mode=1, image_folder=image_folder, image="", input_dir="", output_dir="", save_output=False, **reqDict)

		return ExtrasBatchImagesResponse(images=list(map(encode_pil_to_base64, result[0])), html_info=result[1])

+8 −2

Original line number	Diff line number	Diff line
		@@ -20,9 +20,15 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp

		if extras_mode == 1:
		for img in image_folder:
		if isinstance(img, Image.Image):
		image = img
		fn = ''
		else:
		image = Image.open(os.path.abspath(img.name))
		fn = os.path.splitext(img.orig_name)[0]

		image_data.append(image)
		image_names.append(os.path.splitext(img.orig_name)[0])
		image_names.append(fn)
		elif extras_mode == 2:
		assert not shared.cmd_opts.hide_ui_dir_config, '--hide-ui-dir-config option must be disabled'
		assert input_dir, 'input directory not selected'

+1 −1

Original line number	Diff line number	Diff line
		@@ -1204,7 +1204,7 @@ def create_ui():

		with gr.Column(elem_id='ti_gallery_container'):
		ti_output = gr.Text(elem_id="ti_output", value="", show_label=False)
		ti_gallery = gr.Gallery(label='Output', show_label=False, elem_id='ti_gallery').style(grid=4)
		ti_gallery = gr.Gallery(label='Output', show_label=False, elem_id='ti_gallery').style(columns=4)
		ti_progress = gr.HTML(elem_id="ti_progress", value="")
		ti_outcome = gr.HTML(elem_id="ti_error", value="")

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ Requested path was: {f}

		with gr.Column(variant='panel', elem_id=f"{tabname}_results"):
		with gr.Group(elem_id=f"{tabname}_gallery_container"):
		result_gallery = gr.Gallery(label='Output', show_label=False, elem_id=f"{tabname}_gallery").style(grid=4)
		result_gallery = gr.Gallery(label='Output', show_label=False, elem_id=f"{tabname}_gallery").style(columns=4)

		generation_info = None
		with gr.Column():

+1 −1