Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 8 insertions, 8 deletions

diff --git a/scripts/postprocessing_codeformer.py b/scripts/postprocessing_codeformer.py
index a7d80d40..e1e156dd 100644
--- a/scripts/postprocessing_codeformer.py
+++ b/scripts/postprocessing_codeformer.py
@@ -1,28 +1,28 @@
 from PIL import Image

 import numpy as np

 

-from modules import scripts_postprocessing, codeformer_model

+from modules import scripts_postprocessing, codeformer_model, ui_components

 import gradio as gr

 

-from modules.ui_components import FormRow

-

 

 class ScriptPostprocessingCodeFormer(scripts_postprocessing.ScriptPostprocessing):

     name = "CodeFormer"

     order = 3000

 

     def ui(self):

-        with FormRow():

-            codeformer_visibility = gr.Slider(minimum=0.0, maximum=1.0, step=0.001, label="CodeFormer visibility", value=0, elem_id="extras_codeformer_visibility")

-            codeformer_weight = gr.Slider(minimum=0.0, maximum=1.0, step=0.001, label="CodeFormer weight (0 = maximum effect, 1 = minimum effect)", value=0, elem_id="extras_codeformer_weight")

+        with ui_components.InputAccordion(False, label="CodeFormer") as enable:

+            with gr.Row():

+                codeformer_visibility = gr.Slider(minimum=0.0, maximum=1.0, step=0.001, label="Visibility", value=1.0, elem_id="extras_codeformer_visibility")

+                codeformer_weight = gr.Slider(minimum=0.0, maximum=1.0, step=0.001, label="Weight (0 = maximum effect, 1 = minimum effect)", value=0, elem_id="extras_codeformer_weight")

 

         return {

+            "enable": enable,

             "codeformer_visibility": codeformer_visibility,

             "codeformer_weight": codeformer_weight,

         }

 

-    def process(self, pp: scripts_postprocessing.PostprocessedImage, codeformer_visibility, codeformer_weight):

-        if codeformer_visibility == 0:

+    def process(self, pp: scripts_postprocessing.PostprocessedImage, enable, codeformer_visibility, codeformer_weight):

+        if codeformer_visibility == 0 or not enable:

             return

 

         restored_img = codeformer_model.codeformer.restore(np.array(pp.image, dtype=np.uint8), w=codeformer_weight)