Hr separate prompt test

3 files changed, 36 insertions, 3 deletions

diff --git a/modules/processing.py b/modules/processing.py
index a873498b..f407e175 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -516,6 +516,23 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
     else:

         p.all_negative_prompts = p.batch_size * p.n_iter * [shared.prompt_styles.apply_negative_styles_to_prompt(p.negative_prompt, p.styles)]

 

+    if type(p) == StableDiffusionProcessingTxt2Img:

+        if p.hr_enabled and p.is_hr_pass:

+            if p.hr_prompt:

+                if type(p.prompt) == list:

+                    p.all_prompts = [shared.prompt_styles.apply_styles_to_prompt(x, p.styles) for x in p.hr_prompt]

+                else:

+                    p.all_prompts = p.batch_size * p.n_iter * [

+                        shared.prompt_styles.apply_styles_to_prompt(p.hr_prompt, p.styles)]

+

+            if p.hr_negative_prompt:

+                if type(p.negative_prompt) == list:

+                    p.all_negative_prompts = [shared.prompt_styles.apply_negative_styles_to_prompt(x, p.styles) for x in

+                                              p.hr_negative_prompt]

+                else:

+                    p.all_negative_prompts = p.batch_size * p.n_iter * [

+                        shared.prompt_styles.apply_negative_styles_to_prompt(p.hr_negative_prompt, p.styles)]

+

     if type(seed) == list:

         p.all_seeds = seed

     else:

@@ -710,7 +727,7 @@ def old_hires_fix_first_pass_dimensions(width, height):
 class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):

     sampler = None

 

-    def __init__(self, enable_hr: bool = False, denoising_strength: float = 0.75, firstphase_width: int = 0, firstphase_height: int = 0, hr_scale: float = 2.0, hr_upscaler: str = None, hr_second_pass_steps: int = 0, hr_resize_x: int = 0, hr_resize_y: int = 0, hr_sampler: str = '---', **kwargs):

+    def __init__(self, enable_hr: bool = False, denoising_strength: float = 0.75, firstphase_width: int = 0, firstphase_height: int = 0, hr_scale: float = 2.0, hr_upscaler: str = None, hr_second_pass_steps: int = 0, hr_resize_x: int = 0, hr_resize_y: int = 0, hr_sampler: str = '---', hr_prompt: str = '', hr_negative_prompt: str = '', **kwargs):

         super().__init__(**kwargs)

         self.enable_hr = enable_hr

         self.denoising_strength = denoising_strength

@@ -722,6 +739,9 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         self.hr_upscale_to_x = hr_resize_x

         self.hr_upscale_to_y = hr_resize_y

         self.hr_sampler = hr_sampler

+        self.hr_prompt = hr_prompt if hr_prompt != '' else self.prompt

+        self.hr_negative_prompt = hr_negative_prompt if hr_negative_prompt != '' else self.negative_prompt

+        self.is_hr_pass = False

 

         if firstphase_width != 0 or firstphase_height != 0:

             self.hr_upscale_to_x = self.width

@@ -808,6 +828,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         if not self.enable_hr:

             return samples

 

+        self.is_hr_pass = True

         target_width = self.hr_upscale_to_x

         target_height = self.hr_upscale_to_y

 

diff --git a/modules/txt2img.py b/modules/txt2img.py
index 2eb41f3d..c06f9f9d 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -8,7 +8,7 @@ import modules.processing as processing
 from modules.ui import plaintext_to_html

 

 

-def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, denoising_strength: float, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, hr_sampler_index: int, *args):

+def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, denoising_strength: float, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, hr_sampler_index: int, hr_prompt: str, hr_negative_prompt, *args):

     p = StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

@@ -38,7 +38,9 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step
         hr_second_pass_steps=hr_second_pass_steps,

         hr_resize_x=hr_resize_x,

         hr_resize_y=hr_resize_y,

-        hr_sampler=sd_samplers.samplers_for_img2img[hr_sampler_index - 1].name if hr_sampler_index != 0 else '---'

+        hr_sampler=sd_samplers.samplers_for_img2img[hr_sampler_index - 1].name if hr_sampler_index != 0 else '---',

+        hr_prompt=hr_prompt,

+        hr_negative_prompt=hr_negative_prompt

     )

 

     p.scripts = modules.scripts.scripts_txt2img

diff --git a/modules/ui.py b/modules/ui.py
index b408379f..e0a9e40b 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -675,6 +675,14 @@ def create_ui():
                             with FormRow(elem_id="txt2img_hires_fix_row3", variant="compact"):

                                 hr_sampler_index = gr.Dropdown(label='Hires sampling method', elem_id=f"hr_sampler", choices=["---"] + [x.name for x in samplers_for_img2img], value="---", type="index")

 

+                            with FormRow(elem_id="txt2img_hires_fix_row4", variant="compact"):

+                                with gr.Column(scale=80):

+                                    with gr.Row():

+                                        hr_prompt = gr.Textbox(label="Prompt", elem_id=f"hires_prompt", show_label=False, lines=3, placeholder="Prompt that will be used for hires fix pass")

+                                with gr.Column(scale=80):

+                                    with gr.Row():

+                                        hr_negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"hires_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt that will be used for hires fix pass")

+

                     elif category == "batch":

                         if not opts.dimensions_and_batch_together:

                             with FormRow(elem_id="txt2img_column_batch"):

@@ -734,6 +742,8 @@ def create_ui():
                     hr_resize_x,

                     hr_resize_y,

                     hr_sampler_index,

+                    hr_prompt,

+                    hr_negative_prompt,

                 ] + custom_inputs,

 

                 outputs=[