Refactor elem_prefix as function elem_id

1 files changed, 11 insertions, 7 deletions

diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index c37bc238..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

 

@@ -129,15 +135,13 @@ class Script(scripts.Script):
         if not is_img2img:

             return None

 

-        elem_prefix = 'script_outpainting_mk_2_'

-        

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

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

-        direction = gr.CheckboxGroup(label="Outpainting direction", choices=['left', 'right', 'up', 'down'], value=['left', 'right', 'up', 'down'], elem_id=elem_prefix + "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=elem_prefix + "noise_q")

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

+        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]