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
49f4b4be
Commit
49f4b4be
authored
Jun 01, 2023
by
Artem Kotov
Committed by
GitHub
Jun 01, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add subdir support for images, masks and output; search mask only in subdir
parent
23314a6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
12 deletions
+25
-12
modules/img2img.py
modules/img2img.py
+25
-12
No files found.
modules/img2img.py
View file @
49f4b4be
...
...
@@ -17,11 +17,12 @@ import modules.scripts
def
process_batch
(
p
,
input_dir
,
output_dir
,
inpaint_mask_dir
,
args
,
to_scale
=
False
,
scale_by
=
1.0
):
processing
.
fix_seed
(
p
)
images
=
shared
.
listfiles
(
input_dir
)
allowed_extensions
=
[
ext
for
ext
,
f
in
Image
.
registered_extensions
()
.
items
()
if
f
in
Image
.
OPEN
]
images
=
list
(
shared
.
walk_files
(
input_dir
,
allowed_extensions
=
allowed_extensions
))
is_inpaint_batch
=
False
if
inpaint_mask_dir
:
inpaint_masks
=
shared
.
listfiles
(
inpaint_mask_dir
)
inpaint_masks
=
list
(
shared
.
walk_files
(
inpaint_mask_dir
,
allowed_extensions
=
allowed_extensions
)
)
is_inpaint_batch
=
len
(
inpaint_masks
)
>
0
if
is_inpaint_batch
:
print
(
f
"
\n
Inpaint batch is enabled. {len(inpaint_masks)} masks found."
)
...
...
@@ -57,16 +58,28 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
p
.
init_images
=
[
img
]
*
p
.
batch_size
image_path
=
Path
(
image
)
if
image_path
.
parent
==
Path
(
input_dir
):
image_subpath
=
""
else
:
image_subpath
=
str
(
image_path
.
parent
)
.
replace
(
f
"{input_dir}/"
,
""
)
if
is_inpaint_batch
:
# try to find corresponding mask for an image using simple filename matching
path
=
Path
(
os
.
path
.
join
(
inpaint_mask_dir
,
os
.
path
.
basename
(
image
)))
mask_image_path
=
list
(
path
.
parent
.
glob
(
f
"**/{path.stem}*"
))
if
len
(
mask_image_path
)
>
0
:
mask_image_path
=
str
(
mask_image_path
[
0
])
# if not found use first one ("same mask for all images" use-case)
if
mask_image_path
not
in
inpaint_masks
:
if
len
(
inpaint_masks
)
==
1
:
mask_image_path
=
inpaint_masks
[
0
]
else
:
# try to find corresponding mask for an image using simple filename matching
mask_image_dir
=
Path
(
inpaint_mask_dir
)
.
joinpath
(
image_subpath
)
masks_found
=
list
(
mask_image_dir
.
glob
(
f
"{image_path.stem}.*"
))
if
len
(
masks_found
)
==
0
:
raise
ValueError
(
f
"Mask is not found for {image_path} in {mask_image_dir}"
)
# it should contain only 1 matching mask
# otherwise user has many masks with the same name but different extensions
mask_image_path
=
masks_found
[
0
]
mask_image
=
Image
.
open
(
mask_image_path
)
p
.
image_mask
=
mask_image
...
...
@@ -75,17 +88,17 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
proc
=
process_images
(
p
)
for
n
,
processed_image
in
enumerate
(
proc
.
images
):
filename
=
os
.
path
.
basename
(
image
)
filename
=
image_path
.
name
if
n
>
0
:
left
,
right
=
os
.
path
.
splitext
(
filename
)
filename
=
f
"{left}-{n}{right}"
if
not
save_normally
:
os
.
makedirs
(
o
utput_dir
,
exist_ok
=
True
)
os
.
makedirs
(
o
s
.
path
.
join
(
output_dir
,
image_subpath
)
,
exist_ok
=
True
)
if
processed_image
.
mode
==
'RGBA'
:
processed_image
=
processed_image
.
convert
(
"RGB"
)
processed_image
.
save
(
os
.
path
.
join
(
output_dir
,
filename
))
processed_image
.
save
(
os
.
path
.
join
(
output_dir
,
image_subpath
,
filename
))
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
,
*
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