cropping update

gradio_imager.py

@@ -201,7 +201,7 @@ with gr.Blocks(title="IMAGER ___ v0.2 Image Processing Tool") as demo:
                     container=True
                 )
                 with gr.Row():
-                    crop = gr.Checkbox(label="Crop", container=True)
+                    crop = gr.Checkbox(label="Crop on Object", container=True)
                     remove_bg = gr.Checkbox(label="Remove Background", container=True)
                 
                 # Size and Background Settings

image_processor.py

@@ -44,6 +44,38 @@ def add_background(image, background, default_color="#FFFFFF"):
     return final_img
 
 
+def cropnontrans(image, padding=0):
+    """
+    crops a nontransparent image
+
+    Args:
+    - image (PIL.Image.Image): Image to be cropped.
+
+    Returns:
+    - PIL.Image.Image: The autocropped image.
+    """
+    # first, 
+    # Convert the PIL Image to bytes
+    img_byte_arr = io.BytesIO()
+    image.save(img_byte_arr, format='PNG')
+    img_byte_arr = img_byte_arr.getvalue()
+     # Use rembg to remove the background
+    result_bytes = remove(img_byte_arr)
+
+    # Convert the result bytes back to a PIL Image
+    transparent_image = Image.open(io.BytesIO(result_bytes))
+    bbox = transparent_image.getbbox()
+    # add padding area to the original bbox
+    if bbox:
+        bbox = (bbox[0]-padding, bbox[1]-padding, bbox[2]+padding, bbox[3]+padding)
+        #delimig the bbox to the image size
+        bbox = (max(0, bbox[0]), max(0, bbox[1]), min(transparent_image.width, bbox[2]), min(transparent_image.height, bbox[3]))
+        print(f"Bounding box: {bbox}")
+        return image.crop(bbox)
+    return image
+
+
+
 def autocrop_image(image):
     """
     Autocrops an image, focusing on the non-transparent pixels.
@@ -55,6 +87,7 @@ def autocrop_image(image):
     - PIL.Image.Image: The autocropped image.
     """
     bbox = image.getbbox()
+    print(f"Bounding box: {bbox}")
     if bbox:
         return image.crop(bbox)
     return image
@@ -102,8 +135,10 @@ def process_image(img, crop=False, remove_bg=False, resize=None, padding=0, back
     if remove_bg:
         img = remove_bg_func(img)
     
-    if crop:
+    if crop and remove_bg:
         img = autocrop_image(img)
+    if crop and not remove_bg:
+        img = cropnontrans(img, padding)
         
     if resize:
         img = resize_and_pad_image(img, resize, padding)
@@ -114,41 +149,6 @@ def process_image(img, crop=False, remove_bg=False, resize=None, padding=0, back
     return img
 
 
-def process_image2(image_data, crop=False, remove_bg=False, resize=None, padding=0, background=None):
-    """
-    Processes a single image based on the provided options.
-
-    Args:
-    - image_data (PIL.Image.Image): The input image.
-    - crop (bool): Whether to autocrop the image.
-    - remove_bg (bool): Whether to remove the background of the image.
-    - resize (tuple): Optional dimensions (width, height) to resize the image.
-    - padding (int): Number of padding pixels to add around the image.
-    - background (str): Optional background color (hex code or name) or path to an image file to set as the background.
-
-    Returns:
-    - PIL.Image.Image: The processed image.
-    """
-    # Assume image_data is a PIL.Image.Image object
-
-    if remove_bg:
-        # Assuming remove_bg function returns a PIL image
-        image_data = remove_bg_func(image_data)
-
-    if crop:
-        # Assuming autocrop_image function modifies the image in place or returns a new PIL image
-        image_data = autocrop_image(image_data)
-
-    if resize:
-        # Assuming resize_and_pad_image function modifies the image in place or returns a new PIL image
-        image_data = resize_and_pad_image(image_data, resize, padding)
-
-    if background:
-        # Assuming add_background function modifies the image in place or returns a new PIL image
-        image_data = add_background(image_data, background)
-
-    return image_data
-
 
 def resize_and_pad_image(image, dimensions, padding=0):
     """
@@ -235,47 +235,6 @@ def generate_output_filename(input_path, remove_bg=False, crop=False, resize=Non
 # Ensure to pass the crop argument to process_image and adjust the output filename generation accordingly
 
 
-def process_images2(input_dir="./input", output_dir="./output", crop=False, remove_bg=False, resize=None, padding=0, background=None):
-    """
-    Processes images in the specified directory based on the provided options.
-
-    Args:
-    - input_dir (str): Directory containing the images to be processed.
-    - output_dir (str): Directory where processed images will be saved.
-    - crop (bool): Whether to crop the images.
-    - remove_bg (bool): Whether to remove the background of the images.
-    - resize (tuple): Optional dimensions (width, height) to resize the image.
-    - padding (int): Number of padding pixels to add around the image.
-    - background (str): Optional background color (hex code or name) or path to an image file to set as the background.
-    """
-    processed_input_dir = os.path.join(input_dir, "processed")
-    os.makedirs(processed_input_dir, exist_ok=True)
-    os.makedirs(output_dir, exist_ok=True)
-
-    inputs = [os.path.join(input_dir, f) for f in os.listdir(
-        input_dir) if os.path.isfile(os.path.join(input_dir, f))]
-
-    # if images are not in the input directory, print a message and return
-    if not inputs:
-        print("No images found in the input directory.")
-        return
-
-    for i, input_path in enumerate(inputs, start=1):
-        filename = os.path.basename(input_path)
-        output_filename = generate_output_filename(
-            input_path, remove_bg=remove_bg, crop=crop, resize=resize, background=background)
-        output_path = os.path.join(output_dir, output_filename)
-        print(f"Processing image {i}/{len(inputs)}...{filename}")
-
-        # Update the call to process_image with all parameters including background
-        process_image(input_path, output_path, crop=crop, remove_bg=remove_bg,
-                      resize=resize, padding=padding, background=background)
-
-        shutil.move(input_path, os.path.join(processed_input_dir, filename))
-
-    print("All images have been processed.")
-
-
 def process_images(input_dir="./input", output_dir="./output", crop=False, remove_bg=False, resize=None, padding=0, background=None):
     """
     Processes images in the specified directory based on the provided options.
@@ -370,92 +329,3 @@ def save_image_with_format(image, output_path, format='webp', quality=90, custom
         raise ValueError(f"Unsupported format: {format}")
     
     return final_path
-
-    """
-    Saves the image in the specified format with appropriate settings.
-    
-    Args:
-    - image (PIL.Image.Image): The image to save
-    - output_path (str): Base path for the output file (without extension)
-    - format (str): 'webp', 'png', 'png-transparent', or 'jpg'
-    - quality (int): Quality setting for compression (1-100)
-    - custom_filename (str): Optional custom filename for the output
-    """
-    # Get image dimensions for filename
-    width, height = image.size
-    
-    # Generate the complete filename with path
-    if custom_filename:
-        base_dir = os.path.dirname(output_path)
-        final_path = os.path.join(base_dir, f"{custom_filename}_{width}x{height}")
-    else:
-        final_path = output_path
-
-    if format == 'webp':
-        final_path = f"{final_path}.webp"
-        image.save(final_path, 'webp', quality=quality)
-    elif format == 'png-transparent':
-        final_path = f"{final_path}.png"
-        image.save(final_path, 'PNG', optimize=True)
-    elif format == 'png':
-        final_path = f"{final_path}.png"
-        if image.mode in ('RGBA', 'LA'):
-            background = Image.new('RGB', image.size, 'white')
-            background.paste(image, mask=image.split()[-1])
-            background.save(final_path, 'PNG', optimize=True)
-        else:
-            image.save(final_path, 'PNG', optimize=True)
-    elif format == 'jpg':
-        final_path = f"{final_path}.jpg"
-        if image.mode in ('RGBA', 'LA'):
-            background = Image.new('RGB', image.size, 'white')
-            background.paste(image, mask=image.split()[-1])
-            background.save(final_path, 'JPEG', quality=quality, optimize=True)
-        else:
-            image.convert('RGB').save(final_path, 'JPEG', quality=quality, optimize=True)
-    else:
-        raise ValueError(f"Unsupported format: {format}")
-    
-    return final_path
-
-    """
-    Saves the image in the specified format with appropriate settings.
-    
-    Args:
-    - image (PIL.Image.Image): The image to save
-    - output_path (str): Base path for the output file (without extension)
-    - format (str): 'webp', 'png', 'png-transparent', or 'jpg'
-    - quality (int): Quality setting for compression (1-100)
-    """
-    if format == 'webp':
-        # Save as WebP with specified quality
-        final_path = f"{output_path}.webp"
-        image.save(final_path, 'webp', quality=quality)
-    elif format == 'png-transparent':
-        # Save as PNG with transparency
-        final_path = f"{output_path}.png"
-        image.save(final_path, 'PNG', optimize=True)
-    elif format == 'png':
-        # Save as PNG without transparency, with white background
-        final_path = f"{output_path}.png"
-        if image.mode in ('RGBA', 'LA'):
-            background = Image.new('RGB', image.size, 'white')
-            background.paste(image, mask=image.split()[-1])
-            background.save(final_path, 'PNG', optimize=True)
-        else:
-            image.save(final_path, 'PNG', optimize=True)
-    elif format == 'jpg':
-        # Save as JPG with white background
-        final_path = f"{output_path}.jpg"
-        if image.mode in ('RGBA', 'LA'):
-            # Convert transparent background to white for JPG
-            background = Image.new('RGB', image.size, 'white')
-            background.paste(image, mask=image.split()[-1])
-            background.save(final_path, 'JPEG', quality=quality, optimize=True)
-        else:
-            # Save directly if no transparency
-            image.convert('RGB').save(final_path, 'JPEG', quality=quality, optimize=True)
-    else:
-        raise ValueError(f"Unsupported format: {format}")
-    
-    return final_path