interface update

app.py

@@ -16,27 +16,26 @@ PREDEFINED_EDITINGS_DATA = {
     "makeup": ([-10.0, 15.0], False),
     "eye_openness": ([-45.0, 30.0], True),
     "trimmed_beard": ([-30.0, 30.0], True),
-    "lipstick": ([-60.0, 60.0], False), # ??
     "face_roundness": ([-20.0, 15.0], False),
     "nose_length": ([-30.0, 30.0], True),
     "eyebrow_thickness": ([-20.0, 20.0], True),
     "displeased": ([-10.0, 10.0], False),
     "age": ([-10.0, 10.0], False),
     "rotation": ([-7.0, 7.0], False),
-    "afro": ([0.05, 0.14], False),
-    "angry": ([0.05, 0.14], False),
-    "bobcut": ([0.05, 0.18], False),
-    "bowlcut": ([0.05, 0.14], False),
-    "mohawk": ([0.05, 0.1], False),
-    "curly_hair": ([0.05, 0.12], False),
-    "purple_hair": ([0.05, 0.12], False),
-    "surprised": ([0.05, 0.1], False),
-    "beyonce": ([0.05, 0.12], False),
-    "hilary_clinton": ([0.05, 0.1], False),
-    "depp": ([0.05, 0.12], False),
-    "taylor_swift": ([0.05, 0.1], False),
-    "trump": ([0.05, 0.1], False),
-    "zuckerberg": ([0.05, 0.1], False),
+    "afro": ([0, 0.14], False),
+    "angry": ([0, 0.14], False),
+    "bobcut": ([0, 0.18], False),
+    "bowlcut": ([0, 0.14], False),
+    "mohawk": ([0, 0.1], False),
+    "curly_hair": ([0, 0.12], False),
+    "purple_hair": ([0, 0.12], False),
+    "surprised": ([0, 0.1], False),
+    "beyonce": ([0, 0.12], False),
+    "hilary_clinton": ([0, 0.1], False),
+    "depp": ([0, 0.12], False),
+    "taylor_swift": ([0, 0.1], False),
+    "trump": ([0, 0.1], False),
+    "zuckerberg": ([0, 0.1], False),
     "black hair": ([-7.0, 10.0], False),
     "blond hair": ([-7.0, 10.0], True),
     "grey hair": ([-7.0, 7.0], True),
@@ -44,14 +43,14 @@ PREDEFINED_EDITINGS_DATA = {
     "receding hairline": ([-10.0, 10.0], True),
     "sideburns": ([-7.0, 7.0], True),
     "goatee": ([-7.0, 7.0], True),
-    "earrings": ([-10.0, 15.0], False),
-    "gender": ([-10.0, 7.0], False)
+    "gender swap": ([-10.0, 7.0], False)
 }
 
 DIRECTIONS_NAME_SWAP = {
     "smile" : "fs_smiling",
     "glasses": "fs_glasses",
     "makeup": "fs_makeup",
+    "gender swap": "gender"
 }
 
 
@@ -165,16 +164,17 @@ def get_demo():
 
                         **Editing power** -- the greater the absolute value of this parameter, the more the selected edit will appear. Better use values in the range 7 - 13, lower values may not give the desired edit, higher values -- on the contrary -- may apply edit too much and create artefacts.
 
-                        **Editing effect** -- the effect applied to the image when positive editing power is used. If negative power is used, the effect is reversed. 
+                        **Positive effect** -- the effect applied to the image when positive editing power is used. 
+
+                        **Negative effect** -- the effect applied to the image when negative editing power is used. It is usually the opposite of the positive effect.
                             '''
                         )
 
-                        gr.Dataframe(value=editings_table, datatype=["markdown","markdown","markdown"], interactive=False, wrap=True, 
-                                     column_widths=["30px", "35px", "35px"], height=300)
+                        gr.Dataframe(value=editings_table, datatype=["markdown","markdown","markdown","markdown"], interactive=False, wrap=True, 
+                                     column_widths=["25px", "25px", "25px", "25px"], height=300) # 100
                     with gr.Row():
                         predef_editing_direction = gr.Dropdown(list(PREDEFINED_EDITINGS_DATA.keys()), label="Editing direction", value="smile")
-                        # predef_editing_power = gr.Number(value=7, label="Editing power")
-                        predef_editing_power = gr.Slider(-20, 20, value=10, step=0.1, label="Editing power")
+                        predef_editing_power = gr.Slider(-20, 20, value=7, step=0.1, label="Editing power")
                     btn_predef = gr.Button("Edit image")
 
                 with gr.Accordion("Text Prompt (StyleClip) Editings", open=False):
@@ -220,15 +220,38 @@ def get_demo():
                 error_message = gr.Textbox(label="⚠️ Error ⚠️", visible=False, elem_classes="error-message")
                 gr.Markdown("If artefacts appear during editing -- try lowering the editing power or using a mask.")
                 gr.Examples(
-                    label="Input Examples",
+                    label="Input Examples for editing",
+                    examples=[
+                    ["images/scarlet.jpg"], 
+                    ["images/gosling.jpg"],
+                    ["images/robert.png"],
+                    ["images/smith.jpg"],
+                    ["images/watson.jpeg"],
+                    ], 
+                    inputs=[input_image],
+                    examples_per_page=5      
+                )
+                gr.Examples(
+                    label="Mask Examples for editing",
+                    examples=[
+                    ["images/scarlet_mask.webp"], 
+                    ["images/gosling_mask.webp"],
+                    ["images/robert_mask.webp"],
+                    ["images/smith_mask.webp"],
+                    ["images/watson_mask.webp"],
+                    ], 
+                    inputs=[mask]        
+                )
+                gr.Examples(
+                    label="Input Examples for Mask generation",
                     examples=[
-                    ["images/scarlet.jpg", "images/scarlet.jpg"], 
-                    ["images/gosling.jpg", "images/gosling.jpg"],
-                    ["images/robert.png", "images/robert.png"],
-                    ["images/smith.jpg", "images/smith.jpg"],
-                    ["images/watson.jpeg", "images/watson.jpeg"],
+                    ["images/scarlet.jpg"], 
+                    ["images/gosling.jpg"],
+                    ["images/robert.png"],
+                    ["images/smith.jpg"],
+                    ["images/watson.jpeg"],
                     ], 
-                    inputs=[input_image, input_mask]        
+                    inputs=[input_mask]        
                 )
 
 

editings_table.csv

@@ -1,36 +1,34 @@
-Editing name,Editing effect,Additional comments
-glasses,add glasses,may open mouth
-smile,add smile,
-makeup,add make-up,bad works with men
-eye_openness,open  eyes,
-trimmed_beard,add beard,bad works with women
-lipstick,add lipstick,bad works with men
-face_roundness,make face rounder,
-nose_length,increase nose length,may open mouth
-eyebrow_thickness,increase eyebrow thickness,
-displeased,add sadness,
-age,increase age,
-rotation,turn  face right,
-afro,afro hairstyle,
-angry,make  angrier,cause background artefacts
-bobcut,bobcut hairstyle,cause background artefacts
-bowlcut,bowlcut hairstyle,cause background artefacts
-mohawk,mohawk hairstyle,cause background artefacts
-curly_hair,add curls,
-purple_hair,dye hair purple,
-surprised,make  more surprised,
-beyonce,make similar to beyonce,
-hilary_clinton,make similar to hilary clinton,
-depp,make similar to johnny depp,
-taylor_swift,make similar to taylor swift,
-trump,make similar to donald trump,
-zuckerberg,make similar to mark zuckerberg,
-black hair,darken  hair,
-blond hair,lighten  hair,
-grey hair,make hair grey,
-wavy hair,add hair length,
-receding hairline,add bald,
-sideburns,add sideburns,bad works with women
-goatee,add goatee,bad works with women
-earrings,add earrings,bad works with men
-gender,add femininity,better use global mapper
+Editing name,Positive effect,Negative effect,Additional comments
+glasses,add glasses,remove glasses,may open mouth
+smile,add smile,remove smile,
+makeup,add make-up,remove makeup,doesn't work well with men
+eye_openness,open  eyes,close eyes,
+trimmed_beard,add beard,remove beard,doesn't work well with women
+face_roundness,make face rounder,make face  narrower,
+nose_length,increase nose length,decrease nose length,may open mouth
+eyebrow_thickness,increase eyebrow thickness,decrease eyebrow thickness,
+displeased,add sadness,add smile,
+age,increase age,decrease age,
+rotation,turn  face right,turn  face left,
+afro,afro hairstyle,None,
+angry,make  angrier,None,cause background artefacts
+bobcut,bobcut hairstyle,None,cause background artefacts
+bowlcut,bowlcut hairstyle,None,cause background artefacts
+mohawk,mohawk hairstyle,None,cause background artefacts
+curly_hair,add curls,None,
+purple_hair,dye hair purple,None,
+surprised,make  more surprised,None,
+beyonce,make similar to beyonce,None,
+hilary_clinton,make similar to hilary clinton,None,
+depp,make similar to johnny depp,None,
+taylor_swift,make similar to taylor swift,None,
+trump,make similar to donald trump,None,
+zuckerberg,make similar to mark zuckerberg,None,
+black hair,darken  hair,lighten  hair,
+blond hair,lighten  hair,darken  hair,
+grey hair,make hair grey,make hair brown,
+wavy hair,increase hair length,decrease hair length,
+receding hairline,add bald,remove bald,
+sideburns,add sideburns,remove sideburns,doesn't work well with women
+goatee,add goatee,remove goatee,doesn't work well with women
+gender swap,swap to woman,swap to man,better use global mapper