Update app.py

app.py

@@ -47,7 +47,7 @@ model_repos = {
 interface_gan_map = {"None": None, "Masculine": ("gender", 1.0), "Feminine": ("gender", -1.0),
                      "Smiling": ("smile", 1.0),
                      "Frowning": ("smile", -1.0), "Young": ("age", -1.0), "Old": ("age", 1.0),
-                     "Short Hair": ("hair_length", -1.0), "Long Hair": ("hair_length", 1.0)}
+                     "Long Hair": ("hair_length", -1.0), "Short Hair": ("hair_length", 1.0)}
 
 
 def get_models():
@@ -152,13 +152,6 @@ class ImageEditor(object):
 
         return [self.generators[style] for style in output_styles]
 
-    def _pack_edits(func):
-        def inner(self,
-                  alter,
-                  *args):
-            return func(self, *args, alter)
-
-        return inner
 
 
     def get_target_latent(self, source_latent, alter, generators):
@@ -169,7 +162,6 @@ class ImageEditor(object):
         projected_code_np = project_code_by_edit_name(np_source_latent, edit[0], edit[1])
         return torch.from_numpy(projected_code_np).float().to(self.device)
 
-    @_pack_edits
     def edit_image(self, input, output_styles, edit_choices):
         return self.predict(input, output_styles, edit_choices=edit_choices)
 
@@ -238,10 +230,10 @@ with blocks:
 
     with gr.Row():
             img_output = gr.Gallery(label="Output Images")
+            img_output.style(grid=(3, 3, 4, 4, 6, 6))
 
-
-    img_button.click(fn=editor.edit_image, inputs=[alter, input_img, style_choice], outputs=img_output)
-    ex = gr.Examples(examples=[["Smiling", 'example1.jpg', editor.get_style_list()], ["Long Hair", 'example2.jpg', editor.get_style_list()]], fn=editor.edit_image, inputs=[alter, input_img, style_choice],
+    img_button.click(fn=editor.edit_image, inputs=[input_img, style_choice, alter], outputs=img_output)
+    ex = gr.Examples(examples=[['example1.jpg', editor.get_style_list(), "Smiling"], ['example2.jpg', editor.get_style_list(), "Long Hair"]], fn=editor.edit_image, inputs=[input_img, style_choice, alter],
                      outputs=[img_output], cache_examples=True,
                      run_on_click=True)
     ex.dataset.headers = [""]