Merge remote-tracking branch 'origin2/dev' into soft-inpainting

# Conflicts:
#	modules/processing.py

1 files changed, 6 insertions, 7 deletions

diff --git a/scripts/postprocessing_gfpgan.py b/scripts/postprocessing_gfpgan.py
index d854f3f7..6e756605 100644
--- a/scripts/postprocessing_gfpgan.py
+++ b/scripts/postprocessing_gfpgan.py
@@ -1,26 +1,25 @@
 from PIL import Image

 import numpy as np

 

-from modules import scripts_postprocessing, gfpgan_model

+from modules import scripts_postprocessing, gfpgan_model, ui_components

 import gradio as gr

 

-from modules.ui_components import FormRow

-

 

 class ScriptPostprocessingGfpGan(scripts_postprocessing.ScriptPostprocessing):

     name = "GFPGAN"

     order = 2000

 

     def ui(self):

-        with FormRow():

-            gfpgan_visibility = gr.Slider(minimum=0.0, maximum=1.0, step=0.001, label="GFPGAN visibility", value=0, elem_id="extras_gfpgan_visibility")

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

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

 

         return {

+            "enable": enable,

             "gfpgan_visibility": gfpgan_visibility,

         }

 

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

-        if gfpgan_visibility == 0:

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

+        if gfpgan_visibility == 0 or not enable:

             return

 

         restored_img = gfpgan_model.gfpgan_fix_faces(np.array(pp.image, dtype=np.uint8))