Refactor elem_prefix as function elem_id

1 files changed, 10 insertions, 6 deletions

diff --git a/scripts/sd_upscale.py b/scripts/sd_upscale.py
index 2aeeb106..247e755b 100644
--- a/scripts/sd_upscale.py
+++ b/scripts/sd_upscale.py
@@ -7,22 +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):

-        elem_prefix = 'script_sd_upscale_'

-        

+    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, elem_id=elem_prefix + "overlap")

-        scale_factor = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label='Scale Factor', value=2.0, elem_id=elem_prefix + "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=elem_prefix + "upscaler_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]