Merge pull request #6329 from Kryptortio/add_even_more_element_ids

Add additional elem_id/HTML ids (again)

10 files changed, 105 insertions, 53 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 04091e67..bb64fe20 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -560,7 +560,7 @@ Requested path was: {f}
             generation_info = None

             with gr.Column():

                 with gr.Row(elem_id=f"image_buttons_{tabname}"):

-                    open_folder_button = gr.Button(folder_symbol, elem_id="hidden_element" if shared.cmd_opts.hide_ui_dir_config else 'open_folder')

+                    open_folder_button = gr.Button(folder_symbol, elem_id="hidden_element" if shared.cmd_opts.hide_ui_dir_config else f'open_folder_{tabname}')

 

                     if tabname != "extras":

                         save = gr.Button('Save', elem_id=f'save_{tabname}')

@@ -576,13 +576,13 @@ Requested path was: {f}
 

                 if tabname != "extras":

                     with gr.Row():

-                        download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False)

+                        download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False, elem_id=f'download_files_{tabname}')

 

                     with gr.Group():

-                        html_info = gr.HTML()

-                        html_log = gr.HTML()

+                        html_info = gr.HTML(elem_id=f'html_info_{tabname}')

+                        html_log = gr.HTML(elem_id=f'html_log_{tabname}')

 

-                        generation_info = gr.Textbox(visible=False)

+                        generation_info = gr.Textbox(visible=False, elem_id=f'generation_info_{tabname}')

                         if tabname == 'txt2img' or tabname == 'img2img':

                             generation_info_button = gr.Button(visible=False, elem_id=f"{tabname}_generation_info_button")

                             generation_info_button.click(

@@ -624,9 +624,9 @@ Requested path was: {f}
                         )

 

                 else:

-                    html_info_x = gr.HTML()

-                    html_info = gr.HTML()

-                    html_log = gr.HTML()

+                    html_info_x = gr.HTML(elem_id=f'html_info_x_{tabname}')

+                    html_info = gr.HTML(elem_id=f'html_info_{tabname}')

+                    html_log = gr.HTML(elem_id=f'html_log_{tabname}')

 

                 parameters_copypaste.bind_buttons(buttons, result_gallery, "txt2img" if tabname == "txt2img" else None)

                 return result_gallery, generation_info if tabname != "extras" else html_info_x, html_info, html_log

diff --git a/scripts/custom_code.py b/scripts/custom_code.py
index 22e7b77a..9ce1f650 100644
--- a/scripts/custom_code.py
+++ b/scripts/custom_code.py
@@ -3,18 +3,23 @@ import gradio as gr
 

 from modules.processing import Processed

 from modules.shared import opts, cmd_opts, state

+import re

 

 class Script(scripts.Script):

 

     def title(self):

         return "Custom code"

 

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

 

     def show(self, is_img2img):

         return cmd_opts.allow_code

 

     def ui(self, is_img2img):

-        code = gr.Textbox(label="Python code", lines=1)

+        code = gr.Textbox(label="Python code", lines=1, elem_id=self.elem_id("code"))

 

         return [code]

 

diff --git a/scripts/img2imgalt.py b/scripts/img2imgalt.py
index 1229f61b..7555e874 100644
--- a/scripts/img2imgalt.py
+++ b/scripts/img2imgalt.py
@@ -16,6 +16,7 @@ import k_diffusion as K
 from PIL import Image

 from torch import autocast

 from einops import rearrange, repeat

+import re

 

 

 def find_noise_for_image(p, cond, uncond, cfg_scale, steps):

@@ -122,28 +123,33 @@ class Script(scripts.Script):
     def title(self):

         return "img2img alternative test"

 

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

+

     def show(self, is_img2img):

         return is_img2img

 

-    def ui(self, is_img2img):

+    def ui(self, is_img2img):     

         info = gr.Markdown('''

         * `CFG Scale` should be 2 or lower.

         ''')

 

-        override_sampler = gr.Checkbox(label="Override `Sampling method` to Euler?(this method is built for it)", value=True)

+        override_sampler = gr.Checkbox(label="Override `Sampling method` to Euler?(this method is built for it)", value=True, elem_id=self.elem_id("override_sampler"))

 

-        override_prompt = gr.Checkbox(label="Override `prompt` to the same value as `original prompt`?(and `negative prompt`)", value=True)

-        original_prompt = gr.Textbox(label="Original prompt", lines=1)

-        original_negative_prompt = gr.Textbox(label="Original negative prompt", lines=1)

+        override_prompt = gr.Checkbox(label="Override `prompt` to the same value as `original prompt`?(and `negative prompt`)", value=True, elem_id=self.elem_id("override_prompt"))

+        original_prompt = gr.Textbox(label="Original prompt", lines=1, elem_id=self.elem_id("original_prompt"))

+        original_negative_prompt = gr.Textbox(label="Original negative prompt", lines=1, elem_id=self.elem_id("original_negative_prompt"))

 

-        override_steps = gr.Checkbox(label="Override `Sampling Steps` to the same value as `Decode steps`?", value=True)

-        st = gr.Slider(label="Decode steps", minimum=1, maximum=150, step=1, value=50)

+        override_steps = gr.Checkbox(label="Override `Sampling Steps` to the same value as `Decode steps`?", value=True, elem_id=self.elem_id("override_steps"))

+        st = gr.Slider(label="Decode steps", minimum=1, maximum=150, step=1, value=50, elem_id=self.elem_id("st"))

 

-        override_strength = gr.Checkbox(label="Override `Denoising strength` to 1?", value=True)

+        override_strength = gr.Checkbox(label="Override `Denoising strength` to 1?", value=True, elem_id=self.elem_id("override_strength"))

 

-        cfg = gr.Slider(label="Decode CFG scale", minimum=0.0, maximum=15.0, step=0.1, value=1.0)

-        randomness = gr.Slider(label="Randomness", minimum=0.0, maximum=1.0, step=0.01, value=0.0)

-        sigma_adjustment = gr.Checkbox(label="Sigma adjustment for finding noise for image", value=False)

+        cfg = gr.Slider(label="Decode CFG scale", minimum=0.0, maximum=15.0, step=0.1, value=1.0, elem_id=self.elem_id("cfg"))

+        randomness = gr.Slider(label="Randomness", minimum=0.0, maximum=1.0, step=0.01, value=0.0, elem_id=self.elem_id("randomness"))

+        sigma_adjustment = gr.Checkbox(label="Sigma adjustment for finding noise for image", value=False, elem_id=self.elem_id("sigma_adjustment"))

 

         return [

             info, 

diff --git a/scripts/loopback.py b/scripts/loopback.py
index d8c68af8..4df7b73f 100644
--- a/scripts/loopback.py
+++ b/scripts/loopback.py
@@ -8,17 +8,24 @@ from modules import processing, shared, sd_samplers, images
 from modules.processing import Processed

 from modules.sd_samplers import samplers

 from modules.shared import opts, cmd_opts, state

+import re

+

 

 class Script(scripts.Script):

     def title(self):

         return "Loopback"

 

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

+

     def show(self, is_img2img):

         return is_img2img

 

-    def ui(self, is_img2img):

-        loops = gr.Slider(minimum=1, maximum=32, step=1, label='Loops', value=4)

-        denoising_strength_change_factor = gr.Slider(minimum=0.9, maximum=1.1, step=0.01, label='Denoising strength change factor', value=1)

+    def ui(self, is_img2img):        

+        loops = gr.Slider(minimum=1, maximum=32, step=1, label='Loops', value=4, elem_id=self.elem_id("loops"))

+        denoising_strength_change_factor = gr.Slider(minimum=0.9, maximum=1.1, step=0.01, label='Denoising strength change factor', value=1, elem_id=self.elem_id("denoising_strength_change_factor"))

 

         return [loops, denoising_strength_change_factor]

 

diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index cf71cb92..b4a0dc73 100644
--- a/scripts/outpainting_mk_2.py
+++ b/scripts/outpainting_mk_2.py
@@ -10,6 +10,7 @@ from PIL import Image, ImageDraw
 from modules import images, processing, devices

 from modules.processing import Processed, process_images

 from modules.shared import opts, cmd_opts, state

+import re

 

 

 # this function is taken from https://github.com/parlance-zz/g-diffuser-bot

@@ -122,6 +123,11 @@ class Script(scripts.Script):
     def title(self):

         return "Outpainting mk2"

 

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

+

     def show(self, is_img2img):

         return is_img2img

 

@@ -131,11 +137,11 @@ class Script(scripts.Script):
 

         info = gr.HTML("<p style=\"margin-bottom:0.75em\">Recommended settings: Sampling Steps: 80-100, Sampler: Euler a, Denoising strength: 0.8</p>")

 

-        pixels = gr.Slider(label="Pixels to expand", minimum=8, maximum=256, step=8, value=128)

-        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=8)

-        direction = gr.CheckboxGroup(label="Outpainting direction", choices=['left', 'right', 'up', 'down'], value=['left', 'right', 'up', 'down'])

-        noise_q = gr.Slider(label="Fall-off exponent (lower=higher detail)", minimum=0.0, maximum=4.0, step=0.01, value=1.0)

-        color_variation = gr.Slider(label="Color variation", minimum=0.0, maximum=1.0, step=0.01, value=0.05)

+        pixels = gr.Slider(label="Pixels to expand", minimum=8, maximum=256, step=8, value=128, elem_id=self.elem_id("pixels"))

+        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=8, elem_id=self.elem_id("mask_blur"))

+        direction = gr.CheckboxGroup(label="Outpainting direction", choices=['left', 'right', 'up', 'down'], value=['left', 'right', 'up', 'down'], elem_id=self.elem_id("direction"))

+        noise_q = gr.Slider(label="Fall-off exponent (lower=higher detail)", minimum=0.0, maximum=4.0, step=0.01, value=1.0, elem_id=self.elem_id("noise_q"))

+        color_variation = gr.Slider(label="Color variation", minimum=0.0, maximum=1.0, step=0.01, value=0.05, elem_id=self.elem_id("color_variation"))

 

         return [info, pixels, mask_blur, direction, noise_q, color_variation]

 

diff --git a/scripts/poor_mans_outpainting.py b/scripts/poor_mans_outpainting.py
index ea45beb0..1c7dc467 100644
--- a/scripts/poor_mans_outpainting.py
+++ b/scripts/poor_mans_outpainting.py
@@ -7,24 +7,29 @@ from PIL import Image, ImageDraw
 from modules import images, processing, devices

 from modules.processing import Processed, process_images

 from modules.shared import opts, cmd_opts, state

-

+import re

 

 

 class Script(scripts.Script):

     def title(self):

         return "Poor man's outpainting"

 

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

+

     def show(self, is_img2img):

         return is_img2img

 

     def ui(self, is_img2img):

         if not is_img2img:

             return None

-

-        pixels = gr.Slider(label="Pixels to expand", minimum=8, maximum=256, step=8, value=128)

-        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=4)

-        inpainting_fill = gr.Radio(label='Masked content', choices=['fill', 'original', 'latent noise', 'latent nothing'], value='fill', type="index")

-        direction = gr.CheckboxGroup(label="Outpainting direction", choices=['left', 'right', 'up', 'down'], value=['left', 'right', 'up', 'down'])

+        

+        pixels = gr.Slider(label="Pixels to expand", minimum=8, maximum=256, step=8, value=128, elem_id=self.elem_id("pixels"))

+        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=4, elem_id=self.elem_id("mask_blur"))

+        inpainting_fill = gr.Radio(label='Masked content', choices=['fill', 'original', 'latent noise', 'latent nothing'], value='fill', type="index", elem_id=self.elem_id("inpainting_fill"))

+        direction = gr.CheckboxGroup(label="Outpainting direction", choices=['left', 'right', 'up', 'down'], value=['left', 'right', 'up', 'down'], elem_id=self.elem_id("direction"))

 

         return [pixels, mask_blur, inpainting_fill, direction]

 

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 4c79eaef..278d2e68 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -10,6 +10,7 @@ from modules import images
 from modules.processing import process_images, Processed

 from modules.shared import opts, cmd_opts, state

 import modules.sd_samplers

+import re

 

 

 def draw_xy_grid(xs, ys, x_label, y_label, cell):

@@ -44,9 +45,14 @@ class Script(scripts.Script):
     def title(self):

         return "Prompt matrix"

 

-    def ui(self, is_img2img):

-        put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False)

-        different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False)

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

+

+    def ui(self, is_img2img):        

+        put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=self.elem_id("put_at_start"))

+        different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=self.elem_id("different_seeds"))

 

         return [put_at_start, different_seeds]

 

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index e8386ed2..5c84c3e9 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -13,6 +13,7 @@ from modules import sd_samplers
 from modules.processing import Processed, process_images

 from PIL import Image

 from modules.shared import opts, cmd_opts, state

+import re

 

 

 def process_string_tag(tag):

@@ -111,12 +112,17 @@ class Script(scripts.Script):
     def title(self):

         return "Prompts from file or textbox"

 

-    def ui(self, is_img2img):

-        checkbox_iterate = gr.Checkbox(label="Iterate seed every line", value=False)

-        checkbox_iterate_batch = gr.Checkbox(label="Use same random seed for all lines", value=False)

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

 

-        prompt_txt = gr.Textbox(label="List of prompt inputs", lines=1)

-        file = gr.File(label="Upload prompt inputs", type='bytes')

+    def ui(self, is_img2img):       

+        checkbox_iterate = gr.Checkbox(label="Iterate seed every line", value=False, elem_id=self.elem_id("checkbox_iterate"))

+        checkbox_iterate_batch = gr.Checkbox(label="Use same random seed for all lines", value=False, elem_id=self.elem_id("checkbox_iterate_batch"))

+

+        prompt_txt = gr.Textbox(label="List of prompt inputs", lines=1, elem_id=self.elem_id("prompt_txt"))

+        file = gr.File(label="Upload prompt inputs", type='bytes', elem_id=self.elem_id("file"))

 

         file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt])

 

diff --git a/scripts/sd_upscale.py b/scripts/sd_upscale.py
index 9739545c..247e755b 100644
--- a/scripts/sd_upscale.py
+++ b/scripts/sd_upscale.py
@@ -7,20 +7,26 @@ from PIL import Image
 from modules import processing, shared, sd_samplers, images, devices

 from modules.processing import Processed

 from modules.shared import opts, cmd_opts, state

+import re

 

 

 class Script(scripts.Script):

     def title(self):

         return "SD upscale"

 

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

+

     def show(self, is_img2img):

         return is_img2img

 

-    def ui(self, is_img2img):

+    def ui(self, is_img2img):        

         info = gr.HTML("<p style=\"margin-bottom:0.75em\">Will upscale the image by the selected scale factor; use width and height sliders to set tile size</p>")

-        overlap = gr.Slider(minimum=0, maximum=256, step=16, label='Tile overlap', value=64)

-        scale_factor = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label='Scale Factor', value=2.0)

-        upscaler_index = gr.Radio(label='Upscaler', choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name, type="index")

+        overlap = gr.Slider(minimum=0, maximum=256, step=16, label='Tile overlap', value=64, elem_id=self.elem_id("overlap"))

+        scale_factor = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label='Scale Factor', value=2.0, elem_id=self.elem_id("scale_factor"))

+        upscaler_index = gr.Radio(label='Upscaler', choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name, type="index", elem_id=self.elem_id("upscaler_index"))

 

         return [info, overlap, upscaler_index, scale_factor]

 

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 78ff12c5..b277a439 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -290,20 +290,25 @@ class Script(scripts.Script):
     def title(self):

         return "X/Y plot"

 

+    def elem_id(self, item_id):

+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id

+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)

+        return gen_elem_id

+

     def ui(self, is_img2img):

         current_axis_options = [x for x in axis_options if type(x) == AxisOption or type(x) == AxisOptionImg2Img and is_img2img]

 

         with gr.Row():

-            x_type = gr.Dropdown(label="X type", choices=[x.label for x in current_axis_options], value=current_axis_options[1].label, type="index", elem_id="x_type")

-            x_values = gr.Textbox(label="X values", lines=1)

+            x_type = gr.Dropdown(label="X type", choices=[x.label for x in current_axis_options], value=current_axis_options[1].label, type="index", elem_id=self.elem_id("x_type"))

+            x_values = gr.Textbox(label="X values", lines=1, elem_id=self.elem_id("x_values"))

 

         with gr.Row():

-            y_type = gr.Dropdown(label="Y type", choices=[x.label for x in current_axis_options], value=current_axis_options[0].label, type="index", elem_id="y_type")

-            y_values = gr.Textbox(label="Y values", lines=1)

+            y_type = gr.Dropdown(label="Y type", choices=[x.label for x in current_axis_options], value=current_axis_options[0].label, type="index", elem_id=self.elem_id("y_type"))

+            y_values = gr.Textbox(label="Y values", lines=1, elem_id=self.elem_id("y_values"))

         

-        draw_legend = gr.Checkbox(label='Draw legend', value=True)

-        include_lone_images = gr.Checkbox(label='Include Separate Images', value=False)

-        no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False)

+        draw_legend = gr.Checkbox(label='Draw legend', value=True, elem_id=self.elem_id("draw_legend"))

+        include_lone_images = gr.Checkbox(label='Include Separate Images', value=False, elem_id=self.elem_id("include_lone_images"))

+        no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False, elem_id=self.elem_id("no_fixed_seeds"))

 

         return [x_type, x_values, y_type, y_values, draw_legend, include_lone_images, no_fixed_seeds]