Update app.py

app.py

@@ -410,19 +410,17 @@ def process_single_image(image_path, output_folder, bg_method, canvas_size_name,
         padding_left = 50
 
     filename = os.path.basename(image_path)
+    original_image = None  # Initialize original_image to prevent reference before assignment   
     try:
         print(f"Processing image: {filename}")
+        # Load the original image for watermarking
+        original_image = Image.open(image_path).convert("RGBA")
         if bg_method == 'rembg':
             image_with_no_bg = remove_background_rembg(image_path)  # Placeholder for existing function
         elif bg_method == 'bria':
             image_with_no_bg = remove_background_bria(image_path)  # Placeholder for existing function
-        # Memuat gambar watermark
-        watermark = Image.open(watermark_path).convert("RGBA")
-        
-        # Menambahkan watermark ke gambar asli
-        final_image = add_watermark(original_image, watermark, position=(50, 50), transparency=128)
-        
-        return final_image    
+        elif bg_method == 'none':
+            image_with_no_bg = original_image.copy()  # Load without removing background
         
         temp_image_path = os.path.join(output_folder, f"temp_{filename}")
         image_with_no_bg.save(temp_image_path, format='PNG')
@@ -451,11 +449,15 @@ def process_single_image(image_path, output_folder, bg_method, canvas_size_name,
         output_filename = f"{os.path.splitext(filename)[0]}.{output_ext}"
         output_path = os.path.join(output_folder, output_filename)
 
-        # Apply watermark if watermark_path is provided
+        # Add watermark if applicable
         if watermark_path:
             watermark = Image.open(watermark_path).convert("RGBA")
-            canvas.paste(watermark, (0, 0), watermark)
-            log.append({"action": "add_watermark"})
+            image_with_no_bg.paste(watermark, (0, 0), watermark)  # Add watermark on top of the image
+
+        # Save final image
+        output_ext = 'jpg' if output_format == 'JPG' else 'png'
+        output_filename = f"{os.path.splitext(filename)[0]}.{output_ext}"
+        output_path = os.path.join(output_folder, output_filename)
 
         if output_format == 'JPG':
             canvas.convert('RGB').save(output_path, format='JPEG')