change layout + adjust logic a bit

app.py

@@ -430,77 +430,78 @@ intro = """
 
 with gr.Blocks(css="style.css") as demo:
     gr.HTML(intro)
-    with gr.Row():
-        with gr.Column():
-            gr.Markdown("""<div style="text-align: justify;"> Click below to sample an identity-encoding model.""")
-            sample = gr.Button("Sample New Model")
-            gr.Markdown("""<div style="text-align: justify;"> Or upload an image below and click \"invert\". You can also optionally draw over the face to define a mask.""")
-            input_image = gr.Image(source='upload', elem_id="image_upload", tool='sketch', type='pil', label="Upload image and draw to define mask",
-                                        height=512, width=512, brush_color='#00FFFF', mask_opacity=0.6) 
-          
-            lr = gr.Number(value=1e-1, label="Learning Rate", interactive=True)
-            pcs = gr.Slider(label="# Principal Components", value=10000, step=1, minimum=1, maximum=10000, interactive=True)
-            with gr.Accordion("Advanced Options", open=False):
+    
+    gr.Markdown("""<div style="text-align: justify;"> Click below to sample an identity-encoding model, or upload an image below and click \"invert\". You can also optionally draw over the face to define a mask. To use model previously downloaded from this demo see \"Uplaoding a model\" in the Advanced options""")
+    with gr.Column():
+            with gr.Row():
                 with gr.Column():
-                    epochs = gr.Slider(label="Epochs", value=400, step=1, minimum=1, maximum=2000, interactive=True)
-                    weight_decay = gr.Number(value=1e-10, label="Weight Decay", interactive=True)
-     
-            invert_button = gr.Button("Invert")
-            
-            gr.Markdown("""<div style="text-align: justify;"> Or you can upload a model below downloaded from this demo.""")
+                    input_image = gr.Image(source='upload', elem_id="image_upload", tool='sketch', type='pil', label="Upload image and draw to define mask",
+                                            height=512, width=512, brush_color='#00FFFF', mask_opacity=0.6) 
+                    with gr.Row():
+                        sample = gr.Button("Sample New Model")
+                        invert_button = gr.Button("Invert")
+                with gr.Column():
+                    gallery1 = gr.Image(label="Identity from Original Model",height=512, width=512, interactive=False)
+                    
+            prompt1 = gr.Textbox(label="Prompt",
+                                            info="Make sure to include 'sks person'" ,
+                                            placeholder="sks person", 
+                                            value="sks person")
+                
+            # Editing 
+            with gr.Column():
+                #gallery2 = gr.Image(label="Identity from Edited Model", interactive=False, visible=False )
+                with gr.Row():
+                    a1 = gr.Slider(label="- Young +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)
+                    a2 = gr.Slider(label="- Pointy Nose +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)       
+                with gr.Row():        
+                    a3 = gr.Slider(label="- Curly Hair +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)
+                    a4 = gr.Slider(label="- Thick Eyebrows +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)
+#                 prompt2 = gr.Textbox(label="Prompt",
+#                                         info="Make sure to include 'sks person'" ,
+#                                         placeholder="sks person", 
+#                                         value="sks person", visible=False)
+#                 seed2 = gr.Number(value=5, label="Seed", precision=0, interactive=True, visible=False)
 
-            file_input = gr.File(label="Upload Model", container=True)
 
 
-            
-                
+#                 submit2 = gr.Button("Generate", visible=False)
 
-        with gr.Column():
-            gallery1 = gr.Image(label="Identity from Original Model", interactive=False)
-            prompt1 = gr.Textbox(label="Prompt",
-                                    info="Make sure to include 'sks person'" ,
-                                    placeholder="sks person", 
-                                    value="sks person")
-            seed1 = gr.Number(value=5, label="Seed", precision=0, interactive=True)
-                    
+            
+            
             with gr.Accordion("Advanced Options", open=False):
-                with gr.Column():     
-                        cfg1= gr.Slider(label="CFG", value=3.0, step=0.1, minimum=0, maximum=10, interactive=True)
-                        steps1 = gr.Slider(label="Inference Steps",  value=50, step=1, minimum=0, maximum=100, interactive=True)
-                        negative_prompt1 = gr.Textbox(label="Negative Prompt", placeholder="low quality, blurry, unfinished, nudity, weapon", value="low quality, blurry, unfinished, nudity, weapon")
+                with gr.Tab("Inversion"):
+                    with gr.Column():
+                        lr = gr.Number(value=1e-1, label="Learning Rate", interactive=True)
+                        pcs = gr.Slider(label="# Principal Components", value=10000, step=1, minimum=1, maximum=10000, interactive=True)
+                        epochs = gr.Slider(label="Epochs", value=400, step=1, minimum=1, maximum=2000, interactive=True)
+                        weight_decay = gr.Number(value=1e-10, label="Weight Decay", interactive=True)
+                with gr.Tab("Sampling"):
+                    with gr.Column():     
+                            cfg1= gr.Slider(label="CFG", value=3.0, step=0.1, minimum=0, maximum=10, interactive=True)
+                            steps1 = gr.Slider(label="Inference Steps",  value=50, step=1, minimum=0, maximum=100, interactive=True)
+                            negative_prompt1 = gr.Textbox(label="Negative Prompt", placeholder="low quality, blurry, unfinished, nudity, weapon", value="low quality, blurry, unfinished, nudity, weapon")
+                            seed1 = gr.Number(value=5, label="Seed", precision=0, interactive=True)
+                            injection_step = gr.Slider(label="Injection Step",  value=800, step=1, minimum=0, maximum=1000, interactive=True)
+                # with gr.Tab("Editing"):
+                #     with gr.Column():     
+                        # cfg2 = gr.Slider(label="CFG", value=3.0, step=0.1, minimum=0, maximum=10, interactive=True)
+                        # steps2 = gr.Slider(label="Inference Steps",  value=50, step=1, minimum=0, maximum=100, interactive=True)
+                        # injection_step = gr.Slider(label="Injection Step",  value=800, step=1, minimum=0, maximum=1000, interactive=True)
+                        # negative_prompt2 = gr.Textbox(label="Negative Prompt", placeholder="low quality, blurry, unfinished, nudity, weapon", value="low quality, blurry, unfinished, nudity, weapon")
+                with gr.Tab("Uploading a model"):
+                    gr.Markdown("""<div style="text-align: justify;">Upload a model below downloaded from this demo.""")
+
+                    file_input = gr.File(label="Upload Model", container=True)
 
             submit1 = gr.Button("Generate")
-
-            
-                
-        with gr.Column():
-            gallery2 = gr.Image(label="Identity from Edited Model", interactive=False )
-            with gr.Row():
-                a1 = gr.Slider(label="- Young +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)
-                a2 = gr.Slider(label="- Pointy Nose +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)       
-            with gr.Row():        
-                a3 = gr.Slider(label="- Curly Hair +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)
-                a4 = gr.Slider(label="- Thick Eyebrows +", value=0, step=0.001, minimum=-1, maximum=1, interactive=True)
-            prompt2 = gr.Textbox(label="Prompt",
-                                    info="Make sure to include 'sks person'" ,
-                                    placeholder="sks person", 
-                                    value="sks person")
-            seed2 = gr.Number(value=5, label="Seed", precision=0, interactive=True)
-            with gr.Accordion("Advanced Options", open=False):
-                with gr.Column():     
-                        cfg2 = gr.Slider(label="CFG", value=3.0, step=0.1, minimum=0, maximum=10, interactive=True)
-                        steps2 = gr.Slider(label="Inference Steps",  value=50, step=1, minimum=0, maximum=100, interactive=True)
-                        injection_step = gr.Slider(label="Injection Step",  value=800, step=1, minimum=0, maximum=1000, interactive=True)
-                        negative_prompt2 = gr.Textbox(label="Negative Prompt", placeholder="low quality, blurry, unfinished, nudity, weapon", value="low quality, blurry, unfinished, nudity, weapon")
-            
-            submit2 = gr.Button("Generate")
-            
+     
 
 
-    gr.Markdown("""<div style="text-align: justify;"> After sampling a new model or inverting, you can download the model below.""")
+    # gr.Markdown("""<div style="text-align: justify;"> After sampling a new model or inverting, you can download the model below.""")
 
     with gr.Row():
-        file_output = gr.File(label="Download Sampled Model", container=True, interactive=False)
+        file_output = gr.File(label="Download Sampled Model", container=True, interactive=False, info="After sampling a new model or inverting, you can download the model below")
         
 
 
@@ -513,12 +514,12 @@ with gr.Blocks(css="style.css") as demo:
             
         sample.click(fn=sample_then_run, outputs=[gallery1, file_output])
 
-        submit1.click(fn=inference,
-                    inputs=[prompt1, negative_prompt1, cfg1, steps1, seed1],
+        # submit1.click(fn=inference,
+        #             inputs=[prompt1, negative_prompt1, cfg1, steps1, seed1],
+        #             outputs=gallery1)
+        submit1.click(fn=edit_inference,
+                    inputs=[prompt1, negative_prompt1, cfg1, steps1, seed1, injection_step, a1, a2, a3, a4],
                     outputs=gallery1)
-        submit2.click(fn=edit_inference,
-                    inputs=[prompt2, negative_prompt2, cfg2, steps2, seed2, injection_step, a1, a2, a3, a4],
-                    outputs=gallery2)
         file_input.change(fn=file_upload, inputs=file_input, outputs = gallery1)