Added better preprocessing logic

app.py

@@ -12,16 +12,18 @@ def transition(image_files, duration, fps, method, align_resize, order_images, g
     is_dlib = method == "Dlib"
 
     debug_messages = []
+    print(f"Properties: Duration: {duration}, FPS: {fps}, Method: {method}, Align and Resize: {align_resize}, Order Images: {order_images}, Guideline: {guideline}")
 
     try:
+        # Sort images by age
+        if order_images:
+            image_files = sort_images(image_files)
+
         # Align and resize images
         if align_resize:
             aligned_dir = "aligned_images"
             image_files =  align_images(image_files, aligned_dir)
 
-        # Sort images by age
-        if order_images:
-            image_files = sort_images(image_files)
             
         morph(image_files, duration, fps, output_name, guideline, is_dlib)
         debug_messages.append("Video generation successful")
@@ -48,7 +50,14 @@ if __name__ == "__main__":
         ],
         outputs=[gr.Video(), gr.Textbox(label="Output Message")],
         examples=[
-            [["examples/1.png", "examples/2.png", "examples/3.png"], 3, 30, "Dlib", False, False, False]
+            [["examples/1.png", "examples/2.png", "examples/3.png"], 3, 30, "Dlib", False, False, False],
+            [["examples/1.png", "examples/2.png", "examples/3.png"], 5, 30, "MediaPipe", False, False, True],
+            [["examples/1.jpg", "examples/2.jpg", "examples/3.jpg", 
+              "examples/4.jpg", "examples/5.jpg", "examples/6.jpg", "examples/7.jpg", 
+              "examples/8.jpg", "examples/9.jpg", "examples/10.jpg"], 3, 20, "Dlib", True, True, False],
+            # [["examples/big_1.png", "examples/big_2.png", "examples/big_3.png",
+            #   "examples/big_4.png", "examples/big_5.png", "examples/big_6.png"], 3, 30, "Dlib", False, False, False]
+
         ],
         title="Face Morphing",
         description="Upload multiple images containing faces to create a transition video between them."

src/utils/align_images.py

@@ -1,6 +1,5 @@
 import os
 
-import argparse
 from src.utils.face_alignment import image_align
 from src.landmark_detector import LandmarksDetector
 
@@ -21,27 +20,26 @@ def align_images(img_files, aligned_dir, output_size=1024, x_scale=1, y_scale=1,
             os.remove(os.path.join(ALIGNED_IMAGES_DIR, file))
 
     landmarks_detector = LandmarksDetector()
-    for img_path in img_files:
+    for idx, img_path in enumerate(img_files, start=1):
         img_name = os.path.basename(img_path)
         print('Aligning %s ...' % img_name)
         try:
             raw_img_path = img_path
-            fn = face_img_name = '%s_%02d.png' % (os.path.splitext(img_name)[0], 1)
-            if os.path.isfile(fn):
+            fn = face_img_name = f'{idx:04d}_{os.path.splitext(img_name)[0]}_01.png'
+            if os.path.isfile(os.path.join(ALIGNED_IMAGES_DIR, fn)):
                 continue
             print('Getting landmarks...')
-            
             for i, face_landmarks in enumerate(landmarks_detector.get_landmarks(raw_img_path), start=1):
                 try:
                     print('Starting face alignment...')
-                    face_img_name = '%s_%02d.png' % (os.path.splitext(img_name)[0], i)
+                    face_img_name = f'{idx:04d}_{os.path.splitext(img_name)[0]}_{i:02d}.png'
                     aligned_face_path = os.path.join(ALIGNED_IMAGES_DIR, face_img_name)
                     image_align(raw_img_path, aligned_face_path, face_landmarks, output_size=output_size, x_scale=x_scale, y_scale=y_scale, em_scale=em_scale, alpha=use_alpha)
                     print('Wrote result %s\n' % aligned_face_path)
                 except Exception as e:
-                    raise Exception("Exception in face alignment!", e)
-        except:
-            raise Exception("Exception in landmark detection!")
+                    print(f"Exception in face alignment for {img_name}: {e}")
+        except Exception as e:
+            print(f"Exception in landmark detection for {img_name}: {e}")
         
     # return absolute paths of aligned images
-    return [os.path.join(ALIGNED_IMAGES_DIR, img) for img in os.listdir(ALIGNED_IMAGES_DIR)]
+    return [os.path.join(ALIGNED_IMAGES_DIR, img) for img in os.listdir(ALIGNED_IMAGES_DIR)]