GFPGAN Xintao

app.py

@@ -5,7 +5,7 @@ import gradio as gr
 from gradio_client import Client
 from huggingface_hub import hf_hub_download
 
-clientGFPGAN = Client("leonelhs/GFPGAN")
+clientGFPGAN = Client("Xintao/GFPGAN")
 clientSuperface = Client("leonelhs/superface")
 clientZeroScratches = Client("leonelhs/ZeroScratches")
 clientDeoldify = Client("leonelhs/deoldify")
@@ -23,8 +23,8 @@ def download(file):
     return list(Path(file).iterdir())
 
 
-def gfpgan_face(image):
-    return clientGFPGAN.predict(image, "v1.4", "2", api_name="/predict")[1]
+def gfpgan_face(image, version, scale):
+    return clientGFPGAN.predict(image, version, scale, fn_index=0)[0]
 
 
 def enhance_face(image, upsampler, face_enhancer, scale):
@@ -45,7 +45,7 @@ def enhance_light(image):
 
 def zero_background(image, new_bgr=None):
     # return clientZeroBackground.predict(image, new_bgr, api_name="/predict")[0]
-    # Fixme: cant find predict funciton by name
+    # Fixme: cant find predict function by name
     return clientZeroBackground.predict(image, new_bgr, fn_index=0)[1]
 
 
@@ -81,7 +81,7 @@ with gr.Blocks(title="Face Shine") as app:
         with gr.TabItem("Photo restorer", id=0):
             with gr.Row():
                 with gr.Column(scale=1):
-                    btn_hires = gr.Button(value="Enhance resolution")
+                    btn_hires = gr.Button(value="Enhance faces")
                     btn_eraser = gr.Button(value="Erase scratches")
                     btn_color = gr.Button(value="Colorize photo")
                     btn_light = gr.Button(value="Enhance light")
@@ -106,6 +106,13 @@ with gr.Blocks(title="Face Shine") as app:
 
         with gr.TabItem("Settings", id=2):
             with gr.Accordion("Image restoration settings", open=False):
+                enhancer = gr.Dropdown([
+                    'v1.2',
+                    'v1.3',
+                    'v1.4',
+                    'RestoreFormer'],
+                    type="value", value='RestoreFormer', label='GFPGAN face restoration algorithm',
+                    info="version")
                 restorer = gr.Dropdown([
                     'RealESRGAN_x2plus',
                     'RealESRGAN_x4plus',
@@ -115,22 +122,15 @@ with gr.Blocks(title="Face Shine") as app:
                     'RealESRGAN_x4plus_anime_6B',
                     'realesr-animevideov3',
                     'realesr-general-x4v3'],
-                    type="value", value='RealESRGAN_x4plus', label='General restoration algorithm', info="version")
-                enhancer = gr.Dropdown([
-                    'No additional face process',
-                    'GFPGANv1.2',
-                    'GFPGANv1.3',
-                    'GFPGANv1.4',
-                    'RestoreFormer'],
-                    type="value", value='No additional face process', label='Special face restoration algorithm',
-                    info="version")
+                    type="value", value='RealESRGAN_x4plus',
+                    label='Real-ESRGAN image restoration algorithm', info="version", visible=False)
                 rescale = gr.Dropdown(["1", "2", "3", "4"], type="value", value="2", label="Rescaling factor")
             with gr.Accordion("Logs info", open=False):
                 text_logger = gr.Textbox(label="login", lines=5, show_label=False)
             gr.Button("Save settings")
 
-    btn_hires.click(enhance_face, inputs=[img_input, restorer, enhancer, rescale],
-                    outputs=[img_output, text_logger])
+    # btn_hires.click(enhance_face, inputs=[img_input, restorer, enhancer, rescale], outputs=[img_output, text_logger])
+    btn_hires.click(gfpgan_face, inputs=[img_input, enhancer, rescale], outputs=[img_output])
     btn_eraser.click(zero_scratches, inputs=[img_input], outputs=[img_output])
     btn_color.click(colorize_photo, inputs=[img_input], outputs=[img_output])
     btn_light.click(enhance_light, inputs=[img_input], outputs=[img_output])