Update app.py

app.py

@@ -2,8 +2,6 @@ import io
 from PIL import Image
 import gradio as gr
 
-ALLOWED_EXTENSIONS = {"png", "jpg", "jpeg", "webp"}
-
 def get_file_size_label(size_bytes):
     if size_bytes < 1024 * 1024:
         return f"{size_bytes / 1024:.1f} KB"
@@ -13,7 +11,7 @@ def get_file_size_label(size_bytes):
 def compress_to_target(img, fmt, target_bytes):
     buf = io.BytesIO()
 
-    # ---- PNG handling ----
+    # ---- PNG (NO format change) ----
     if fmt == "PNG":
         for level in range(1, 10):
             buf = io.BytesIO()
@@ -22,14 +20,31 @@ def compress_to_target(img, fmt, target_bytes):
                 buf.seek(0)
                 return buf, "PNG"
 
-        # fallback to WEBP lossless
-        buf = io.BytesIO()
-        img.save(buf, format="WEBP", lossless=True, quality=100)
-        if buf.tell() <= target_bytes:
-            buf.seek(0)
-            return buf, "WEBP"
+        # If cannot reach target → return best effort PNG
+        buf.seek(0)
+        return buf, "PNG"
+
+    # ---- JPEG ----
+    elif fmt in ("JPEG", "JPG"):
+        for q in range(95, 74, -2):
+            buf = io.BytesIO()
+            img.save(
+                buf,
+                format="JPEG",
+                quality=q,
+                optimize=True,
+                subsampling=0 if q >= 85 else 2
+            )
+            if buf.tell() <= target_bytes:
+                buf.seek(0)
+                return buf, "JPEG"
+
+        buf.seek(0)
+        return buf, "JPEG"
 
-        for q in range(95, 79, -5):
+    # ---- WEBP ----
+    elif fmt == "WEBP":
+        for q in range(95, 74, -2):
             buf = io.BytesIO()
             img.save(buf, format="WEBP", quality=q, method=6)
             if buf.tell() <= target_bytes:
@@ -39,23 +54,18 @@ def compress_to_target(img, fmt, target_bytes):
         buf.seek(0)
         return buf, "WEBP"
 
-    # ---- JPEG / WEBP ----
-    save_fmt = "JPEG" if fmt in ("JPEG", "JPG") else "WEBP"
-
-    for q in range(95, 74, -2):
-        buf = io.BytesIO()
-        if save_fmt == "JPEG":
-            img.save(buf, format="JPEG", quality=q, optimize=True,
-                     subsampling=0 if q >= 85 else 2)
-        else:
-            img.save(buf, format="WEBP", quality=q, method=6)
-
-        if buf.tell() <= target_bytes:
-            buf.seek(0)
-            return buf, save_fmt
+    # ---- fallback ----
+    else:
+        img = img.convert("RGB")
+        for q in range(95, 74, -2):
+            buf = io.BytesIO()
+            img.save(buf, format="JPEG", quality=q, optimize=True)
+            if buf.tell() <= target_bytes:
+                buf.seek(0)
+                return buf, "JPEG"
 
-    buf.seek(0)
-    return buf, save_fmt
+        buf.seek(0)
+        return buf, "JPEG"
 
 
 def process_image(file, target_value, unit):
@@ -64,31 +74,44 @@ def process_image(file, target_value, unit):
 
     try:
         img = Image.open(file)
-        fmt = img.format or "JPEG"
+        fmt = (img.format or "JPEG").upper()
 
-        # normalize image mode
+        # Normalize mode
         if img.mode in ("RGBA", "LA", "P"):
             if fmt == "JPEG":
                 background = Image.new("RGB", img.size, (255, 255, 255))
                 if img.mode == "P":
                     img = img.convert("RGBA")
-                background.paste(img, mask=img.split()[-1] if img.mode in ("RGBA", "LA") else None)
+                background.paste(
+                    img,
+                    mask=img.split()[-1] if img.mode in ("RGBA", "LA") else None
+                )
                 img = background
         elif img.mode not in ("RGB", "L"):
             img = img.convert("RGB")
 
-        # original size
+        # Original size
         original_buf = io.BytesIO()
-        img.save(original_buf, format="PNG")
+        if fmt == "PNG":
+            img.save(original_buf, format="PNG")
+        elif fmt == "WEBP":
+            img.save(original_buf, format="WEBP")
+        else:
+            img.save(original_buf, format="JPEG", quality=95)
+
         original_size = original_buf.tell()
 
-        target_bytes = int(target_value * 1024) if unit == "KB" else int(target_value * 1024 * 1024)
+        target_bytes = (
+            int(target_value * 1024)
+            if unit == "KB"
+            else int(target_value * 1024 * 1024)
+        )
 
-        # already small
+        # If already small
         if target_bytes >= original_size:
             return img, f"✅ Already optimized: {get_file_size_label(original_size)}"
 
-        # compress
+        # Compress
         compressed_buf, out_fmt = compress_to_target(img, fmt, target_bytes)
         compressed_size = compressed_buf.getbuffer().nbytes
 
@@ -98,7 +121,8 @@ def process_image(file, target_value, unit):
         result_msg = (
             f"📦 Original: {get_file_size_label(original_size)}\n"
             f"🗜️ Compressed: {get_file_size_label(compressed_size)}\n"
-            f"💾 Saved: {pct:.1f}%"
+            f"💾 Saved: {pct:.1f}%\n"
+            f"📁 Format: {out_fmt}"
         )
 
         return Image.open(compressed_buf), result_msg
@@ -110,7 +134,7 @@ def process_image(file, target_value, unit):
 # ---- UI ----
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("# 🗜️ ImagePress — Smart Compressor")
-    gr.Markdown("Compress images to target size **without visible quality loss**")
+    gr.Markdown("✔ Preserves original format · ✔ No unwanted WEBP conversion")
 
     with gr.Row():
         input_img = gr.Image(type="filepath", label="Upload Image")