Update app.py

app.py

@@ -1,142 +1,71 @@
 import gradio as gr
-from PIL import Image, ImageDraw
+from PIL import Image
 import io
-from math import cos, radians, sin
-import numpy as np
 
-def create_gif(img1, img2, transition_type):
+def create_gif(editor_output):
+    background = editor_output["background"]
+    layers = editor_output["layers"]
+    composite = editor_output["composite"]
+    
+    # Use the composite image for GIF creation
+    img = composite.convert('RGBA')
+    
     frames = []
     duration = 100  # Duration for each frame in milliseconds
     total_frames = 18  # Total number of frames
 
-    try:
-        # Set size for the GIF
-        size = (256, 256)
-        img1 = Image.fromarray(img1).convert('RGBA').resize(size, Image.LANCZOS)
-        img2 = Image.fromarray(img2).convert('RGBA').resize(size, Image.LANCZOS)
-
-        if transition_type == "default":
-            # Default sliding transition
-            full_width = size[0]
-            step = full_width // (total_frames // 2)
-
-            for i in range(0, full_width, step):
-                frame = Image.new('RGBA', size)
-                frame.paste(img1, (0, 0))
-                frame.paste(img2.crop((i, 0, full_width, size[1])), (i, 0), mask=img2.crop((i, 0, full_width, size[1])))
-                draw = ImageDraw.Draw(frame)
-                draw.line((i, 0, i, size[1]), fill=(0, 255, 0), width=2)
-                frame = frame.convert('P', palette=Image.ADAPTIVE)
-                frames.append(frame)
-
-            for i in range(full_width, step, -step):
-                frame = Image.new('RGBA', size)
-                frame.paste(img1, (0, 0))
-                frame.paste(img2.crop((i, 0, full_width, size[1])), (i, 0), mask=img2.crop((i, 0, full_width, size[1])))
-                draw = ImageDraw.Draw(frame)
-                draw.line((i, 0, i, size[1]), fill=(0, 255, 0), width=2)
-                frame = frame.convert('P', palette=Image.ADAPTIVE)
-                frames.append(frame)
-
-        elif transition_type == "rotate":
-            # Rotating transition
-            mask_size = (size[0] * 2, size[1] * 2)
-            mask = Image.new('L', mask_size, 0)
-            draw = ImageDraw.Draw(mask)
-            draw.rectangle([size[0], 0, mask_size[0], mask_size[1]], fill=255)
-
-            center_x, center_y = size[0] // 2, size[1] // 2
-
-            for angle in range(0, 360, 360 // total_frames):
-                rotated_mask = mask.rotate(angle, center=(mask_size[0] // 2, mask_size[1] // 2), expand=False)
-                cropped_mask = rotated_mask.crop((size[0] // 2, size[1] // 2, size[0] // 2 + size[0], size[1] // 2 + size[1]))
-                frame = Image.composite(img1, img2, cropped_mask)
-
-                draw = ImageDraw.Draw(frame)
-                reverse_angle = -angle + 90
-                end_x1 = center_x + int(size[0] * 1.5 * cos(radians(reverse_angle)))
-                end_y1 = center_y + int(size[1] * 1.5 * sin(radians(reverse_angle)))
-                end_x2 = center_x - int(size[0] * 1.5 * cos(radians(reverse_angle)))
-                end_y2 = center_y - int(size[1] * 1.5 * sin(radians(reverse_angle)))
-                draw.line([center_x, center_y, end_x1, end_y1], fill=(0, 255, 0), width=3)
-                draw.line([center_x, center_y, end_x2, end_y2], fill=(0, 255, 0), width=3)
+    size = img.size
+    full_width = size[0]
+    step = full_width // (total_frames // 2)
 
-                frame = frame.convert('P', palette=Image.ADAPTIVE)
-                frames.append(frame)
+    # Create sliding transition
+    for i in range(0, full_width, step):
+        frame = Image.new('RGBA', size)
+        frame.paste(img.crop((0, 0, i, size[1])), (0, 0))
+        frame.paste(img.crop((i, 0, full_width, size[1])), (i, 0))
+        frames.append(frame.convert('P', palette=Image.ADAPTIVE))
 
-        # Save as GIF
-        output = io.BytesIO()
-        frames[0].save(output, format='GIF', save_all=True, append_images=frames[1:], duration=duration, loop=0, optimize=True)
-        output.seek(0)
+    for i in range(full_width, 0, -step):
+        frame = Image.new('RGBA', size)
+        frame.paste(img.crop((full_width - i, 0, full_width, size[1])), (0, 0))
+        frame.paste(img.crop((0, 0, full_width - i, size[1])), (i, 0))
+        frames.append(frame.convert('P', palette=Image.ADAPTIVE))
 
-        return output.getvalue()
-    except Exception as e:
-        raise ValueError(f"Error creating GIF: {e}")
+    # Save as GIF
+    output = io.BytesIO()
+    frames[0].save(output, format='GIF', save_all=True, append_images=frames[1:], duration=duration, loop=0, optimize=True)
+    output.seek(0)
 
-def create_gif_gradio(image1, image2, transition_type):
-    gif_data = create_gif(image1, image2, transition_type)
-    
     # Save the GIF to a temporary file
     temp_output_path = "output.gif"
     with open(temp_output_path, "wb") as f:
-        f.write(gif_data)
+        f.write(output.getvalue())
     
     return temp_output_path
 
-def crop_image(image, top, left, bottom, right):
-    if image is None:
-        return None
-    h, w = image.shape[:2]
-    return image[int(top*h):int((1-bottom)*h), int(left*w):int((1-right)*w)]
-
 # Gradio interface
 with gr.Blocks() as iface:
-    gr.Markdown("# GIF Generator with Image Cropping")
+    gr.Markdown("# Advanced GIF Generator with Image Editing")
     
     with gr.Row():
-        with gr.Column():
-            image1 = gr.Image(label="Image 1")
-            top1 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Top")
-            left1 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Left")
-            bottom1 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Bottom")
-            right1 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Right")
-            preview1 = gr.Image(label="Preview 1")
-
-        with gr.Column():
-            image2 = gr.Image(label="Image 2")
-            top2 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Top")
-            left2 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Left")
-            bottom2 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Bottom")
-            right2 = gr.Slider(0, 0.5, value=0, step=0.01, label="Crop Right")
-            preview2 = gr.Image(label="Preview 2")
-
-    transition_type = gr.Radio(["default", "rotate"], label="Transition Type", value="default")
+        image_editor = gr.ImageEditor(
+            label="Edit Your Image",
+            brush=gr.Brush(colors=["#ff0000", "#00ff00", "#0000ff"]),
+            eraser=gr.Eraser(default_size=10),
+            height=500,
+            width=500,
+            crop_size="1:1",
+            layers=True,
+            type="pil"
+        )
     
     generate_button = gr.Button("Generate GIF")
     output_gif = gr.Image(type="filepath", label="Generated GIF")
 
-    def update_preview1(image, top, left, bottom, right):
-        return crop_image(image, top, left, bottom, right)
-
-    def update_preview2(image, top, left, bottom, right):
-        return crop_image(image, top, left, bottom, right)
-
-    image1.change(update_preview1, inputs=[image1, top1, left1, bottom1, right1], outputs=preview1)
-    top1.change(update_preview1, inputs=[image1, top1, left1, bottom1, right1], outputs=preview1)
-    left1.change(update_preview1, inputs=[image1, top1, left1, bottom1, right1], outputs=preview1)
-    bottom1.change(update_preview1, inputs=[image1, top1, left1, bottom1, right1], outputs=preview1)
-    right1.change(update_preview1, inputs=[image1, top1, left1, bottom1, right1], outputs=preview1)
-
-    image2.change(update_preview2, inputs=[image2, top2, left2, bottom2, right2], outputs=preview2)
-    top2.change(update_preview2, inputs=[image2, top2, left2, bottom2, right2], outputs=preview2)
-    left2.change(update_preview2, inputs=[image2, top2, left2, bottom2, right2], outputs=preview2)
-    bottom2.change(update_preview2, inputs=[image2, top2, left2, bottom2, right2], outputs=preview2)
-    right2.change(update_preview2, inputs=[image2, top2, left2, bottom2, right2], outputs=preview2)
-
     generate_button.click(
-        create_gif_gradio,
-        inputs=[preview1, preview2, transition_type],
-        outputs=output_gif
+        create_gif,
+        inputs=[image_editor],
+        outputs=[output_gif]
     )
 
 # Launch the interface