Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
63a8861c
Commit
63a8861c
authored
Jul 30, 2023
by
AUTOMATIC1111
Committed by
GitHub
Jul 30, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12164 from AUTOMATIC1111/rework-img2img-batch-image-save
Rework img2img batch image save
parents
6f0abbb7
fb448381
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
21 deletions
+9
-21
modules/img2img.py
modules/img2img.py
+9
-21
No files found.
modules/img2img.py
View file @
63a8861c
...
...
@@ -10,7 +10,6 @@ from modules import sd_samplers, images as imgutil
from
modules.generation_parameters_copypaste
import
create_override_settings_dict
,
parse_generation_parameters
from
modules.processing
import
Processed
,
StableDiffusionProcessingImg2Img
,
process_images
from
modules.shared
import
opts
,
state
from
modules.images
import
save_image
import
modules.shared
as
shared
import
modules.processing
as
processing
from
modules.ui
import
plaintext_to_html
...
...
@@ -18,6 +17,7 @@ import modules.scripts
def
process_batch
(
p
,
input_dir
,
output_dir
,
inpaint_mask_dir
,
args
,
to_scale
=
False
,
scale_by
=
1.0
,
use_png_info
=
False
,
png_info_props
=
None
,
png_info_dir
=
None
):
output_dir
=
output_dir
.
strip
()
processing
.
fix_seed
(
p
)
images
=
list
(
shared
.
walk_files
(
input_dir
,
allowed_extensions
=
(
".png"
,
".jpg"
,
".jpeg"
,
".webp"
,
".tif"
,
".tiff"
)))
...
...
@@ -32,11 +32,6 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
print
(
f
"Will process {len(images)} images, creating {p.n_iter * p.batch_size} new images for each."
)
save_normally
=
output_dir
==
''
p
.
do_not_save_grid
=
True
p
.
do_not_save_samples
=
not
save_normally
state
.
job_count
=
len
(
images
)
*
p
.
n_iter
# extract "default" params to use in case getting png info fails
...
...
@@ -111,21 +106,14 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
proc
=
modules
.
scripts
.
scripts_img2img
.
run
(
p
,
*
args
)
if
proc
is
None
:
proc
=
process_images
(
p
)
for
n
,
processed_image
in
enumerate
(
proc
.
images
):
filename
=
image_path
.
stem
infotext
=
proc
.
infotext
(
p
,
n
)
relpath
=
os
.
path
.
dirname
(
os
.
path
.
relpath
(
image
,
input_dir
))
if
n
>
0
:
filename
+=
f
"-{n}"
if
not
save_normally
:
os
.
makedirs
(
os
.
path
.
join
(
output_dir
,
relpath
),
exist_ok
=
True
)
if
processed_image
.
mode
==
'RGBA'
:
processed_image
=
processed_image
.
convert
(
"RGB"
)
save_image
(
processed_image
,
os
.
path
.
join
(
output_dir
,
relpath
),
None
,
extension
=
opts
.
samples_format
,
info
=
infotext
,
forced_filename
=
filename
,
save_to_dirs
=
False
)
if
output_dir
:
p
.
outpath_samples
=
output_dir
p
.
override_settings
[
'save_to_dirs'
]
=
False
if
p
.
n_iter
>
1
or
p
.
batch_size
>
1
:
p
.
override_settings
[
'samples_filename_pattern'
]
=
f
'{image_path.stem}-[generation_number]'
else
:
p
.
override_settings
[
'samples_filename_pattern'
]
=
f
'{image_path.stem}'
process_images
(
p
)
def
img2img
(
id_task
:
str
,
mode
:
int
,
prompt
:
str
,
negative_prompt
:
str
,
prompt_styles
,
init_img
,
sketch
,
init_img_with_mask
,
inpaint_color_sketch
,
inpaint_color_sketch_orig
,
init_img_inpaint
,
init_mask_inpaint
,
steps
:
int
,
sampler_index
:
int
,
mask_blur
:
int
,
mask_alpha
:
float
,
inpainting_fill
:
int
,
restore_faces
:
bool
,
tiling
:
bool
,
n_iter
:
int
,
batch_size
:
int
,
cfg_scale
:
float
,
image_cfg_scale
:
float
,
denoising_strength
:
float
,
seed
:
int
,
subseed
:
int
,
subseed_strength
:
float
,
seed_resize_from_h
:
int
,
seed_resize_from_w
:
int
,
seed_enable_extras
:
bool
,
selected_scale_tab
:
int
,
height
:
int
,
width
:
int
,
scale_by
:
float
,
resize_mode
:
int
,
inpaint_full_res
:
bool
,
inpaint_full_res_padding
:
int
,
inpainting_mask_invert
:
int
,
img2img_batch_input_dir
:
str
,
img2img_batch_output_dir
:
str
,
img2img_batch_inpaint_mask_dir
:
str
,
override_settings_texts
,
img2img_batch_use_png_info
:
bool
,
img2img_batch_png_info_props
:
list
,
img2img_batch_png_info_dir
:
str
,
request
:
gr
.
Request
,
*
args
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment