aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-04-29 06:30:46 +0000
committerGitHub <noreply@github.com>2023-04-29 06:30:46 +0000
commit38f1c8183b4dee0e3dec0bef1b506b6cdda369aa (patch)
treedd4e0baa7eb4a256f2bd74dd917abd56e604a37a
parent7fc10e04456878ac4e0881dbfe56c8966e22f40d (diff)
parenta33d49cc572214494e1e5f1fdcc4f422b370eae1 (diff)
downloadstable-diffusion-webui-gfx803-38f1c8183b4dee0e3dec0bef1b506b6cdda369aa.tar.gz
stable-diffusion-webui-gfx803-38f1c8183b4dee0e3dec0bef1b506b6cdda369aa.tar.bz2
stable-diffusion-webui-gfx803-38f1c8183b4dee0e3dec0bef1b506b6cdda369aa.zip
Merge pull request #9513 from ilya-khadykin/fix_batch_processing
fix(extras): fix batch image processing on 'Extras\Batch Process' tab
-rw-r--r--modules/postprocessing.py6
-rw-r--r--modules/ui_postprocessing.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index ff055aae..9cb80957 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -1,4 +1,6 @@
import os
+import tempfile
+from typing import List
from PIL import Image
@@ -6,7 +8,7 @@ from modules import shared, images, devices, scripts, scripts_postprocessing, ui
from modules.shared import opts
-def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir, show_extras_results, *args, save_output: bool = True):
+def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemporaryFile], input_dir, output_dir, show_extras_results, *args, save_output: bool = True):
devices.torch_gc()
shared.state.begin()
@@ -22,7 +24,7 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
image = img
fn = ''
else:
- image = Image.open(img)
+ image = Image.open(os.path.abspath(img.name))
fn = os.path.splitext(img.orig_name)[0]
image_data.append(image)
diff --git a/modules/ui_postprocessing.py b/modules/ui_postprocessing.py
index b418d955..d278e1b6 100644
--- a/modules/ui_postprocessing.py
+++ b/modules/ui_postprocessing.py
@@ -13,7 +13,7 @@ def create_ui():
extras_image = gr.Image(label="Source", source="upload", interactive=True, type="pil", elem_id="extras_image")
with gr.TabItem('Batch Process', elem_id="extras_batch_process_tab") as tab_batch:
- image_batch = gr.File(label="Batch Process", file_count="multiple", interactive=True, type="file", elem_id="extras_image_batch")
+ image_batch = gr.Files(label="Batch Process", interactive=True, elem_id="extras_image_batch")
with gr.TabItem('Batch from Directory', elem_id="extras_batch_directory_tab") as tab_batch_dir:
extras_batch_input_dir = gr.Textbox(label="Input directory", **shared.hide_dirs, placeholder="A directory on the same machine where the server is running.", elem_id="extras_batch_input_dir")