From ff580ebca92e7e7e0f0d7f9336e63002c2c6768a Mon Sep 17 00:00:00 2001 From: Judongsung <57513715+Judongsung@users.noreply.github.com> Date: Wed, 22 Feb 2023 21:35:32 +0900 Subject: [PATCH 1/3] Update ddetailer.py add inpaint prompt to t2i script ui --- scripts/ddetailer.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/scripts/ddetailer.py b/scripts/ddetailer.py index 7841d8e..11ab801 100644 --- a/scripts/ddetailer.py +++ b/scripts/ddetailer.py @@ -80,6 +80,13 @@ def ui(self, is_img2img): else: info = gr.HTML("") with gr.Group(): + if not is_img2img: + with gr.Row(): + dd_prompt = gr.Textbox(label="dd_prompt", elem_id="t2i_dd_prompt", show_label=False, lines=3, placeholder="Ddetailer Prompt") + + with gr.Row(): + dd_neg_prompt = gr.Textbox(label="dd_neg_prompt", elem_id="t2i_dd_neg_prompt", show_label=False, lines=2, placeholder="Ddetailer Negative prompt") + with gr.Row(): dd_model_a = gr.Dropdown(label="Primary detection model (A)", choices=model_list,value = "None", visible=True, type="value") @@ -144,7 +151,7 @@ def ui(self, is_img2img): outputs =[dd_preprocess_b, dd_bitwise_op, dd_conf_b, dd_dilation_factor_b, dd_offset_x_b, dd_offset_y_b] ) - return [info, + ret = [info, dd_model_a, dd_conf_a, dd_dilation_factor_a, dd_offset_x_a, dd_offset_y_a, @@ -156,6 +163,10 @@ def ui(self, is_img2img): dd_mask_blur, dd_denoising_strength, dd_inpaint_full_res, dd_inpaint_full_res_padding ] + if not is_img2img: + ret += [dd_prompt, dd_neg_prompt] + + return ret def run(self, p, info, dd_model_a, @@ -167,7 +178,8 @@ def run(self, p, info, dd_conf_b, dd_dilation_factor_b, dd_offset_x_b, dd_offset_y_b, dd_mask_blur, dd_denoising_strength, - dd_inpaint_full_res, dd_inpaint_full_res_padding): + dd_inpaint_full_res, dd_inpaint_full_res_padding, + dd_prompt=None, dd_neg_prompt=None): processing.fix_seed(p) initial_info = None @@ -195,8 +207,8 @@ def run(self, p, info, sd_model=p_txt.sd_model, outpath_samples=p_txt.outpath_samples, outpath_grids=p_txt.outpath_grids, - prompt=p_txt.prompt, - negative_prompt=p_txt.negative_prompt, + prompt=p_txt.prompt if not dd_prompt else dd_prompt, + negative_prompt=p_txt.negative_prompt if not dd_neg_prompt else dd_neg_prompt, styles=p_txt.styles, seed=p_txt.seed, subseed=p_txt.subseed, @@ -213,6 +225,8 @@ def run(self, p, info, ) p.do_not_save_grid = True p.do_not_save_samples = True + p.raw_prompt = p_txt.prompt + p.raw_neg_prompt = p_txt.negative_prompt output_images = [] state.job_count = ddetail_count for n in range(ddetail_count): @@ -533,4 +547,10 @@ def inference_mmdet_bbox(image, modelname, conf_thres, label): return results +def on_before_image_saved(params): + p = params.p + pnginfo = params.pnginfo + pnginfo['parameters'] += f', Raw prompt: {p.raw_prompt}, Raw negative prompt: {p.raw_neg_prompt}' + +script_callbacks.on_before_image_saved(on_before_image_saved) script_callbacks.on_ui_settings(on_ui_settings) From 724872a5e38917e6418f94a41296f2d58dc8b24d Mon Sep 17 00:00:00 2001 From: Judongsung <57513715+Judongsung@users.noreply.github.com> Date: Sat, 25 Feb 2023 04:54:32 +0900 Subject: [PATCH 2/3] Update ddetailer.py Fixed an error that occurred when this script was not selected. --- scripts/ddetailer.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/ddetailer.py b/scripts/ddetailer.py index 11ab801..276f9b6 100644 --- a/scripts/ddetailer.py +++ b/scripts/ddetailer.py @@ -225,8 +225,6 @@ def run(self, p, info, ) p.do_not_save_grid = True p.do_not_save_samples = True - p.raw_prompt = p_txt.prompt - p.raw_neg_prompt = p_txt.negative_prompt output_images = [] state.job_count = ddetail_count for n in range(ddetail_count): @@ -330,6 +328,8 @@ def run(self, p, info, processed = processing.process_images(p) if initial_info is None: initial_info = processed.info + if is_txt2img: + initial_info += f", raw prompt: {p_txt.prompt}, raw negative prompt: {p_txt.negative_prompt}" p.seed = processed.seed + 1 p.init_images = processed.images @@ -547,10 +547,4 @@ def inference_mmdet_bbox(image, modelname, conf_thres, label): return results -def on_before_image_saved(params): - p = params.p - pnginfo = params.pnginfo - pnginfo['parameters'] += f', Raw prompt: {p.raw_prompt}, Raw negative prompt: {p.raw_neg_prompt}' - -script_callbacks.on_before_image_saved(on_before_image_saved) script_callbacks.on_ui_settings(on_ui_settings) From 692cf06b84ebd6bea7817ac34b2991aedd94589a Mon Sep 17 00:00:00 2001 From: Judongsung <57513715+Judongsung@users.noreply.github.com> Date: Sun, 26 Feb 2023 18:13:53 +0900 Subject: [PATCH 3/3] Update ddetailer.py fixed bug when occured sending parameters on pnginfo tab --- scripts/ddetailer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ddetailer.py b/scripts/ddetailer.py index 276f9b6..0b3a991 100644 --- a/scripts/ddetailer.py +++ b/scripts/ddetailer.py @@ -329,7 +329,7 @@ def run(self, p, info, if initial_info is None: initial_info = processed.info if is_txt2img: - initial_info += f", raw prompt: {p_txt.prompt}, raw negative prompt: {p_txt.negative_prompt}" + initial_info += f", raw prompt: \"{p_txt.prompt}\", raw negative prompt: \"{p_txt.negative_prompt}\"".replace("\n", " ") p.seed = processed.seed + 1 p.init_images = processed.images