clean and refactor

.gitattributes

@@ -18,3 +18,7 @@ latent_vectors/green_purple.pt filter=lfs diff=lfs merge=lfs -text
 latent_vectors/lipvector.pt filter=lfs diff=lfs merge=lfs -text
 model_checkpoints filter=lfs diff=lfs merge=lfs -text
 visualizations filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.gif filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text

animation.py

@@ -12,17 +12,17 @@ def create_gif(
     total_duration, extend_frames, folder="./img_history", gif_name="face_edit.gif"
 ):
     images = []
-    paths = glob.glob(folder + "/*")
+    paths = list(sorted(glob.glob(folder + "/*")))
+    print(paths)
     frame_duration = total_duration / len(paths)
     print(len(paths), "frame dur", frame_duration)
     durations = [frame_duration] * len(paths)
     if extend_frames:
         durations[0] = 1.5
         durations[-1] = 3
-    for file_name in os.listdir(folder):
+    for file_name in paths:
         if file_name.endswith(".png"):
-            file_path = os.path.join(folder, file_name)
-            images.append(imageio.imread(file_path))
+            images.append(imageio.imread(file_name))
     imageio.mimsave(gif_name, images, duration=durations)
     return gif_name
 

app.py

@@ -85,10 +85,17 @@ with gr.Blocks(css="styles.css") as demo:
                     with gr.Row():
                         base_img = gr.Image(label="Base Image", type="filepath")
                         blend_img = gr.Image(label="Image for face blending (optional)", type="filepath")
+                        blend_weight = gr.Slider(
+                            label="Blend faces: 0 is base image, 1 is the second img",
+                            minimum=-0.,
+                            value=0,
+                            maximum=1.,
+                            step=0.1,
+                        )
                 with gr.Accordion(label="Add Mask", open=False):
                     mask = gr.Image(tool="sketch", interactive=True)
-                    gr.Markdown(value="Note: You must clear the mask using the rewind button every time you want to change the mask (this is a gradio issue)")
                     set_mask = gr.Button(value="Set mask")
+                    gr.Markdown(value="Note: You must clear the mask using the rewind button every time you want to change the mask (this is a gradio issue)")
                     gr.Text(value="this image shows the mask passed to the model when you press set mask (debugging purposes)")
                     testim = gr.Image()
             with gr.Row():
@@ -120,13 +127,6 @@ with gr.Blocks(css="styles.css") as demo:
                 maximum=1.9,
                 step=0.1,
             )
-            blend_weight = gr.Slider(
-                label="Blend faces: 0 is base image, 1 is the second img",
-                minimum=-0.,
-                value=0,
-                maximum=1.,
-                step=0.1,
-            )
             asian_weight = gr.Slider(
                 minimum=-2.,
                 value=0,