Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: add erode or dilate and mask invert to enhance mask inpaint settings

Browse Source
This commit is contained in:
Manuel Schmid
2024-06-18 21:39:27 +02:00
parent 229ff81738
commit c0f7c3a8ee
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+12 -5
View File
@@ -128,6 +128,8 @@ class AsyncTask:
enhance_inpaint_engine = args.pop() enhance_inpaint_engine = args.pop()
enhance_inpaint_strength = args.pop() enhance_inpaint_strength = args.pop()
enhance_inpaint_respective_field = args.pop() enhance_inpaint_respective_field = args.pop()
enhance_inpaint_erode_or_dilate = args.pop()
enhance_mask_invert = args.pop()
if enhance_enabled: if enhance_enabled:
self.enhance_ctrls.append([ self.enhance_ctrls.append([
enhance_mask_dino_prompt_text, enhance_mask_dino_prompt_text,
@@ -141,7 +143,9 @@ class AsyncTask:
enhance_inpaint_disable_initial_latent, enhance_inpaint_disable_initial_latent,
enhance_inpaint_engine, enhance_inpaint_engine,
enhance_inpaint_strength, enhance_inpaint_strength,
enhance_inpaint_respective_field enhance_inpaint_respective_field,
enhance_inpaint_erode_or_dilate,
enhance_mask_invert
]) ])
@@ -1160,7 +1164,7 @@ def worker():
current_task_id = -1 current_task_id = -1
for imgs in generated_imgs.values(): for imgs in generated_imgs.values():
for img in imgs: for img in imgs:
for enhance_mask_dino_prompt_text, enhance_prompt, enhance_negative_prompt, enhance_mask_model, enhance_mask_sam_model, enhance_mask_text_threshold, enhance_mask_box_threshold, enhance_mask_sam_max_detections, enhance_inpaint_disable_initial_latent, enhance_inpaint_engine, enhance_inpaint_strength, enhance_inpaint_respective_field in async_task.enhance_ctrls: for enhance_mask_dino_prompt_text, enhance_prompt, enhance_negative_prompt, enhance_mask_model, enhance_mask_sam_model, enhance_mask_text_threshold, enhance_mask_box_threshold, enhance_mask_sam_max_detections, enhance_inpaint_disable_initial_latent, enhance_inpaint_engine, enhance_inpaint_strength, enhance_inpaint_respective_field, enhance_inpaint_erode_or_dilate, enhance_mask_invert in async_task.enhance_ctrls:
current_task_id += 1 current_task_id += 1
current_progress = int(base_progress + (100 - preparation_steps) * float(current_task_id * async_task.steps) / float(all_steps)) current_progress = int(base_progress + (100 - preparation_steps) * float(current_task_id * async_task.steps) / float(all_steps))
progressbar(async_task, current_progress, f'Preparing enhancement {current_task_id + 1}/{total_count} ...') progressbar(async_task, current_progress, f'Preparing enhancement {current_task_id + 1}/{total_count} ...')
@@ -1177,13 +1181,16 @@ def worker():
dino_erode_or_dilate=async_task.dino_erode_or_dilate, dino_erode_or_dilate=async_task.dino_erode_or_dilate,
dino_debug=async_task.debugging_dino, dino_debug=async_task.debugging_dino,
max_detections=enhance_mask_sam_max_detections, max_detections=enhance_mask_sam_max_detections,
model_type=enhance_mask_sam_model model_type=enhance_mask_sam_model,
)) ))
if len(mask.shape) == 3: if len(mask.shape) == 3:
mask = mask[:, :, 0] mask = mask[:, :, 0]
if int(async_task.inpaint_erode_or_dilate) != 0: if int(enhance_inpaint_erode_or_dilate) != 0:
mask = erode_or_dilate(mask, async_task.inpaint_erode_or_dilate) mask = erode_or_dilate(mask, enhance_inpaint_erode_or_dilate)
if enhance_mask_invert:
mask = 255 - mask
if async_task.debugging_enhance_masks_checkbox: if async_task.debugging_enhance_masks_checkbox:
async_task.yields.append(['preview', (current_progress, 'Loading ...', mask)]) async_task.yields.append(['preview', (current_progress, 'Loading ...', mask)])
webui.py
+15 -7
View File
@@ -258,7 +258,7 @@ with shared.gradio_root:
inpaint_mask_sam_model = gr.Dropdown(label='SAM model', choices=flags.inpaint_mask_sam_model, value=modules.config.default_inpaint_mask_sam_model) inpaint_mask_sam_model = gr.Dropdown(label='SAM model', choices=flags.inpaint_mask_sam_model, value=modules.config.default_inpaint_mask_sam_model)
inpaint_mask_box_threshold = gr.Slider(label="Box Threshold", minimum=0.0, maximum=1.0, value=0.3, step=0.05) inpaint_mask_box_threshold = gr.Slider(label="Box Threshold", minimum=0.0, maximum=1.0, value=0.3, step=0.05)
inpaint_mask_text_threshold = gr.Slider(label="Text Threshold", minimum=0.0, maximum=1.0, value=0.25, step=0.05) inpaint_mask_text_threshold = gr.Slider(label="Text Threshold", minimum=0.0, maximum=1.0, value=0.25, step=0.05)
inpaint_mask_sam_num_boxes = gr.Slider(label="Maximum number of detections", info="Set to 0 to detect all", minimum=0, maximum=10, value=modules.config.default_sam_max_detections, step=1, interactive=True) inpaint_mask_sam_max_detections = gr.Slider(label="Maximum number of detections", info="Set to 0 to detect all", minimum=0, maximum=10, value=modules.config.default_sam_max_detections, step=1, interactive=True)
generate_mask_button = gr.Button(value='Generate mask from image') generate_mask_button = gr.Button(value='Generate mask from image')
def generate_mask(image, mask_model, cloth_category, dino_prompt_text, sam_model, box_threshold, text_threshold, sam_max_detections, dino_erode_or_dilate, dino_debug): def generate_mask(image, mask_model, cloth_category, dino_prompt_text, sam_model, box_threshold, text_threshold, sam_max_detections, dino_erode_or_dilate, dino_debug):
@@ -389,7 +389,6 @@ with shared.gradio_root:
with gr.Accordion("Inpaint", visible=True, open=False): with gr.Accordion("Inpaint", visible=True, open=False):
enhance_inpaint_mode = gr.Dropdown(choices=modules.flags.inpaint_options, enhance_inpaint_mode = gr.Dropdown(choices=modules.flags.inpaint_options,
value=modules.flags.inpaint_option_default, value=modules.flags.inpaint_option_default,
# TODO test
label='Method', interactive=True) label='Method', interactive=True)
enhance_inpaint_disable_initial_latent = gr.Checkbox( enhance_inpaint_disable_initial_latent = gr.Checkbox(
label='Disable initial latent in inpaint', value=False) label='Disable initial latent in inpaint', value=False)
@@ -411,6 +410,12 @@ with shared.gradio_root:
'Value 1 is same as "Whole Image" in A1111. ' 'Value 1 is same as "Whole Image" in A1111. '
'Only used in inpaint, not used in outpaint. ' 'Only used in inpaint, not used in outpaint. '
'(Outpaint always use 1.0)') '(Outpaint always use 1.0)')
enhance_inpaint_erode_or_dilate = gr.Slider(label='Mask Erode or Dilate',
minimum=-64, maximum=64, step=1, value=0,
info='Positive value will make white area in the mask larger, '
'negative value will make white area smaller. '
'(default is 0, always processed before any mask invert)')
enhance_mask_invert = gr.Checkbox(label='Invert Mask', value=False)
enhance_ctrls += [ enhance_ctrls += [
enhance_enabled, enhance_enabled,
@@ -425,7 +430,9 @@ with shared.gradio_root:
enhance_inpaint_disable_initial_latent, enhance_inpaint_disable_initial_latent,
enhance_inpaint_engine, enhance_inpaint_engine,
enhance_inpaint_strength, enhance_inpaint_strength,
enhance_inpaint_respective_field enhance_inpaint_respective_field,
enhance_inpaint_erode_or_dilate,
enhance_mask_invert
] ]
enhance_inpaint_mode.input(inpaint_mode_change, inputs=enhance_inpaint_mode, outputs=[ enhance_inpaint_mode.input(inpaint_mode_change, inputs=enhance_inpaint_mode, outputs=[
@@ -737,12 +744,13 @@ with shared.gradio_root:
inpaint_erode_or_dilate = gr.Slider(label='Mask Erode or Dilate', inpaint_erode_or_dilate = gr.Slider(label='Mask Erode or Dilate',
minimum=-64, maximum=64, step=1, value=0, minimum=-64, maximum=64, step=1, value=0,
info='Positive value will make white area in the mask larger, ' info='Positive value will make white area in the mask larger, '
'negative value will make white area smaller.' 'negative value will make white area smaller. '
'(default is 0, always process before any mask invert)') '(default is 0, always processed before any mask invert)')
dino_erode_or_dilate = gr.Slider(label='GroundingDINO Box Erode or Dilate', dino_erode_or_dilate = gr.Slider(label='GroundingDINO Box Erode or Dilate',
minimum=-64, maximum=64, step=1, value=0, minimum=-64, maximum=64, step=1, value=0,
info='Positive value will make white area in the mask larger, ' info='Positive value will make white area in the mask larger, '
'negative value will make white area smaller.') 'negative value will make white area smaller. '
'(default is 0, processed before SAM)')
inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False) inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False)
invert_mask_checkbox = gr.Checkbox(label='Invert Mask', value=False) invert_mask_checkbox = gr.Checkbox(label='Invert Mask', value=False)
@@ -869,7 +877,7 @@ with shared.gradio_root:
inputs=[inpaint_input_image, inpaint_mask_model, inpaint_mask_cloth_category, inputs=[inpaint_input_image, inpaint_mask_model, inpaint_mask_cloth_category,
inpaint_mask_dino_prompt_text, inpaint_mask_sam_model, inpaint_mask_dino_prompt_text, inpaint_mask_sam_model,
inpaint_mask_box_threshold, inpaint_mask_text_threshold, inpaint_mask_box_threshold, inpaint_mask_text_threshold,
inpaint_mask_sam_num_boxes, dino_erode_or_dilate, debugging_dino], inpaint_mask_sam_max_detections, dino_erode_or_dilate, debugging_dino],
outputs=inpaint_mask_image, show_progress=True, queue=True) outputs=inpaint_mask_image, show_progress=True, queue=True)
ctrls = [currentTask, generate_image_grid] ctrls = [currentTask, generate_image_grid]