Update app.py

app.py

@@ -4,59 +4,54 @@ from rembg import remove
 import tempfile
 
 MAX_MP = 100_000_000  # 100 Megapixels
-MIN_MP = 4_000_000    # 4 Megapixels
 
-def resize_to_target_mp(img, target_mp):
-    orig_w, orig_h = img.size
-    orig_pixels = orig_w * orig_h
+def limit_to_max_mp(img, target_mp):
+    max_pixels = int(target_mp * 1_000_000)
+    w, h = img.size
+    total_pixels = w * h
 
-    target_pixels = target_mp
-    if orig_pixels == target_pixels:
-        return img  # already matches
+    if total_pixels > max_pixels:
+        scale = (max_pixels / total_pixels) ** 0.5
+        new_size = (int(w * scale), int(h * scale))
+        return img.resize(new_size, Image.LANCZOS)
+    return img
 
-    scale = (target_pixels / orig_pixels) ** 0.5
-    new_size = (int(orig_w * scale), int(orig_h * scale))
-
-    # If new size is too big, cap it at MAX_MP
-    final_pixels = new_size[0] * new_size[1]
-    if final_pixels > MAX_MP:
-        scale = (MAX_MP / orig_pixels) ** 0.5
-        new_size = (int(orig_w * scale), int(orig_h * scale))
-
-    return img.resize(new_size, Image.LANCZOS)
-
-def process_image(image, target_mp):
+def process_image(image, scale_factor, target_mp):
     target_pixels = int(target_mp * 1_000_000)
 
-    # JPG: original bg
-    resized_jpg = resize_to_target_mp(image, target_pixels)
+    # Step 1: Scale original image
+    w, h = image.size
+    new_w, new_h = int(w * scale_factor), int(h * scale_factor)
+
+    upscaled_img = image.resize((new_w, new_h), Image.BICUBIC)
+    transparent_img = remove(image).resize((new_w, new_h), Image.LANCZOS)
 
-    # PNG: remove bg then resize
-    transparent = remove(image)
-    resized_png = resize_to_target_mp(transparent, target_pixels)
+    # Step 2: Enforce max MP
+    final_jpg = limit_to_max_mp(upscaled_img, target_mp)
+    final_png = limit_to_max_mp(transparent_img, target_mp)
 
-    # Save PNG
+    # Step 3: Save PNG (transparent)
     png_file = tempfile.NamedTemporaryFile(suffix=".png", delete=False)
-    resized_png.save(png_file.name, format="PNG")
+    final_png.save(png_file.name, format="PNG")
 
-    # Save JPG
+    # Step 4: Save JPG (original bg)
     jpg_file = tempfile.NamedTemporaryFile(suffix=".jpg", delete=False)
-    resized_jpg.convert("RGB").save(jpg_file.name, format="JPEG", quality=95)
+    final_jpg.convert("RGB").save(jpg_file.name, format="JPEG", quality=95)
 
     return png_file.name, jpg_file.name
 
-title = "Background Remover + Upscaler by Megapixel (4MP–100MP)"
+title = "Image Upscaler + Background Remover (2x–8x & 4–100MP)"
 description = (
-    "Upload an image (JPG or PNG). Select desired resolution in Megapixels (MP). "
-    "You'll get 2 downloads: a transparent PNG (background removed) and a JPG with original background. "
-    "Maximum allowed output: 100 Megapixels."
+    "Upload an image. Select upscale factor (2x to 8x) and max resolution (in Megapixels). "
+    "You'll get 2 files: Transparent PNG (BG removed) and JPG (original background)."
 )
 
 interface = gr.Interface(
     fn=process_image,
     inputs=[
         gr.Image(type="pil", label="Upload Image"),
-        gr.Slider(4, 100, step=1, label="Target Resolution (in Megapixels)")
+        gr.Slider(2, 8, step=1, label="Upscale Factor (2x to 8x)"),
+        gr.Slider(4, 100, step=1, label="Maximum Output Resolution (in Megapixels)")
     ],
     outputs=[
         gr.File(label="Download Transparent PNG"),