cleaned up

.gitignore

@@ -1,4 +1,4 @@
 .venv
 .gradio
 __pycache__
-**/.DS_Store
+**/.DS_Store

gradio_imager.py

@@ -5,7 +5,6 @@ import os
 from image_processor import process_image, save_image_with_format
 import io
 
-
 def apply_standard_settings(setting):
     """Returns the parameters for the selected standard setting."""
     settings_dict = {
@@ -18,8 +17,6 @@ def apply_standard_settings(setting):
     }
     return settings_dict.get(setting, (None, None, None, None, None))
 
-
-# Update settings description for simpler UI
 def settings_description(crop, remove_bg, resize, padding, background, quality):
     """Generate an HTML text description of the current settings."""
     description = f"""
@@ -35,72 +32,59 @@ def settings_description(crop, remove_bg, resize, padding, background, quality):
     return description
 
 
-
-def get_image_info(image):
-    """Get image dimensions and file size in a formatted string."""
-    import os
-    import io
-    
-    if image is None:
-        return ""
+def get_file_info(file):
+    """Get file info from the uploaded image file."""
+    if file is None:
+        return "No file uploaded."
     
-    # Extract original filename
-    original_name = "image"  # Default fallback
-    if isinstance(image, dict):  # Check if image is a dictionary (Gradio type='file')
-        if 'name' in image:
-            original_name = os.path.splitext(os.path.basename(image['name']))[0]
-        image = image.get('image')  # Extract actual image object
-    elif hasattr(image, 'filename') and image.filename:  # Check for filename attribute
-        original_name = os.path.splitext(os.path.basename(image.filename))[0]
-    
-    # Validate the image object
-    if not hasattr(image, 'size'):
-        return f"<p>Invalid image object provided.</p>"
-    
-    # Get image dimensions
-    width, height = image.size
-
-    # Calculate file size
-    buffer = io.BytesIO()
-    image.save(buffer, format='PNG')
-    size_bytes = buffer.tell()
-    size_kb = size_bytes / 1024
-
-    return f"""<div style="text-align: left; padding: 5px;">
-        <p>Original Name: {original_name}</p>
-        <p>Size: {width}x{height}px ({size_kb:.1f} KB)</p>
-    </div>"""
-
-
-def get_formatted_filename(original_name, width, height, format):
-    """Generate formatted filename with size."""
-    # Remove extension from original name
-    base_name = os.path.splitext(os.path.basename(original_name))[0]
-    return f"{base_name}_{width}x{height}.{format}"
-
-
-
-def gradio_interface(image, standard_settings, crop=False, remove_bg=False, 
+    try:
+        # For type="image", file is a dict with keys 'path' and 'name'
+        if isinstance(file, dict):
+            original_name = os.path.splitext(os.path.basename(file["name"]))[0]
+            file_path = file["path"]
+        else:
+            original_name = os.path.splitext(os.path.basename(file.name))[0]
+            file_path = file.name
+        
+        # Open the image file
+        image = Image.open(file_path)
+        
+        # Get image dimensions
+        width, height = image.size
+
+        # Calculate file size
+        size_bytes = os.path.getsize(file_path)
+        size_kb = size_bytes / 1024
+
+        return f"""<div style="text-align: left; padding: 5px;">
+            <p>Original Name: {original_name}</p>
+            <p>Size: {width}x{height}px ({size_kb:.1f} KB)</p>
+        </div>"""
+    except Exception as e:
+        return f"Error getting file info: {str(e)}"
+
+
+def gradio_interface(file, standard_settings, crop=False, remove_bg=False, 
                    resize=None, padding=0, background="white", 
                    quality=90):
     """Main interface function for the Gradio app."""
     quality = int(quality)
 
-    if image is None:
+    if file is None:
         standard_image_path = './data/examples/supermario.png'
-        image = Image.open(standard_image_path)
-
-    # Get original filename without extension
-    if isinstance(image, dict) and 'name' in image:  # Check if image contains metadata
-        original_name = os.path.splitext(image['name'])[0]
-    elif hasattr(image, 'filename') and image.filename:
-        original_name = os.path.splitext(os.path.basename(image.filename))[0]
+        file = standard_image_path
+        original_name = os.path.splitext(os.path.basename(standard_image_path))[0]
     else:
-        original_name = "image"  # Default name if no filename available
+        # Handle both dictionary (type="image") and file object cases
+        if isinstance(file, dict):
+            original_name = os.path.splitext(os.path.basename(file["name"]))[0]
+            file_path = file["path"]
+        else:
+            original_name = os.path.splitext(os.path.basename(file.name))[0]
+            file_path = file.name
 
-    print(f"Debug - Image info: {type(image)}")  # Debug line
-    if isinstance(image, dict):
-        print(f"Debug - Image dict: {image.keys()}")  # Debug line
+    # Open the image file
+    image = Image.open(file_path if isinstance(file, dict) else file)
 
     if standard_settings and standard_settings != "None":
         crop, remove_bg, resize, padding, background = apply_standard_settings(standard_settings)
@@ -123,6 +107,12 @@ def gradio_interface(image, standard_settings, crop=False, remove_bg=False,
         background=background
     )
 
+    # For preview, ensure we're working with RGB mode
+    preview_image = processed_image
+    if processed_image.mode in ('RGBA', 'LA'):
+        preview_image = Image.new('RGB', processed_image.size, 'white')
+        preview_image.paste(processed_image, mask=processed_image.split()[-1])
+
     # Get temp directory for saving files
     temp_dir = tempfile.gettempdir()
 
@@ -159,7 +149,8 @@ def gradio_interface(image, standard_settings, crop=False, remove_bg=False,
         crop, remove_bg, resize, padding, background, quality
     )
 
-    return (processed_image, 
+    # Return the preview image and downloads
+    return (preview_image,  # Return the actual image object for preview
             downloads['webp'], 
             downloads['png'], 
             downloads['jpg'], 
@@ -178,54 +169,105 @@ example_images = [
 ]
 
 
-with gr.Blocks(title="IMAGER ___ v0.2 Image Processor") as interface:
+def preview_and_info(f):
+    """Handle file preview and info, including None case"""
+    if f is None:
+        return None, "No file uploaded."
+    try:
+        return Image.open(f.name), get_file_info(f)
+    except Exception as e:
+        return None, f"Error loading image: {str(e)}"
+    
+
+with gr.Blocks(title="IMAGER ___ v0.2 Image Processing Tool") as demo:
     gr.Markdown("# 🖼️ IMAGER v0.2 - Image Processing Tool 🛠️")
     gr.Markdown("📤 Upload an image and select one of the processing options below to get started! 🚀")
-    with gr.Row():
+    
+    with gr.Row(equal_height=True):
         with gr.Column(scale=1):
-            # Input column
-            input_image = gr.Image(type="pil", label="Input Image")
-            input_info = gr.HTML(label="Input Image Information")  # For showing input image info
+            # Image Upload Section
+            with gr.Group():
+                input_image = gr.Image(type="pil", label="Image Preview", scale=2)
+                input_file = gr.File(label="Upload Image", scale=1)
+                input_info = gr.HTML(label="Image Information")
             
-            # Update image info when image changes
-            input_image.change(
-                fn=get_image_info,
-                inputs=[input_image],
-                outputs=[input_info]
-            )
-            
-            settings = gr.Radio(
-                choices=["None", "S light", "M light", "L light", "S dark", "M dark", "L dark"],
-                label="Settings",
-                value="None"
-            )
-            crop = gr.Checkbox(label="Crop")
-            remove_bg = gr.Checkbox(label="Remove Background")
-            resize = gr.Textbox(label="Resize (WxH)", placeholder="Example: 100x100")
-            padding = gr.Slider(minimum=0, maximum=200, label="Padding")
-            background = gr.Textbox(label="Background", placeholder="Color name or hex code")
-            quality = gr.Slider(
-                minimum=1,
-                maximum=95,
-                value=85,
-                step=1,
-                label="Image Quality %"
-            )
-
+            # Basic Settings Section
+            with gr.Group():
+                gr.Markdown("### Settings")
+                settings = gr.Radio(
+                    choices=["None", "S light", "M light", "L light", "S dark", "M dark", "L dark"],
+                    label="Preset Settings",
+                    value="None",
+                    container=True
+                )
+                with gr.Row():
+                    crop = gr.Checkbox(label="Crop", container=True)
+                    remove_bg = gr.Checkbox(label="Remove Background", container=True)
+                
+                # Size and Background Settings
+                with gr.Row():
+                    resize = gr.Textbox(
+                        label="Resize (WxH)", 
+                        placeholder="Example: 100x100",
+                        container=True
+                    )
+                    padding = gr.Slider(
+                        minimum=0, 
+                        maximum=200, 
+                        label="Padding",
+                        container=True
+                    )
+                background = gr.Textbox(
+                    label="Background", 
+                    placeholder="Color name or hex code",
+                    container=True
+                )
+                quality = gr.Slider(
+                    minimum=1,
+                    maximum=95,
+                    value=85,
+                    step=1,
+                    label="Image Quality %",
+                    container=True
+                )
+
+        # Output Section
         with gr.Column(scale=1):
-            # Output column
-            output_image = gr.Image(type="pil", label="Preview")
-            webp_download = gr.File(label="Download WebP")
-            png_download = gr.File(label="Download PNG")
-            jpg_download = gr.File(label="Download JPG")
-            settings_info = gr.HTML(label="Applied Settings")
-
-    # Process button
-    process_btn = gr.Button("Process Image")
+            with gr.Group():
+                gr.Markdown("### Preview and Downloads")
+                output_image = gr.Image(type="pil", label="Processed Image Preview")
+                settings_info = gr.HTML(label="Applied Settings")
+                
+                with gr.Row():
+                    webp_download = gr.File(label="WebP")
+                    png_download = gr.File(label="PNG")
+                    jpg_download = gr.File(label="JPG")
+
+    # Process Button
+    with gr.Row():
+        process_btn = gr.Button("Process Image", size="lg", variant="primary")
+
+    # Examples Section
+    with gr.Accordion("Examples", open=False):
+        gr.Examples(
+            examples=example_images,
+            inputs=[
+                input_file, settings, crop, remove_bg, resize, 
+                padding, background, quality
+            ]
+        )
+
+    # Wire up the events
+    input_file.change(
+        fn=preview_and_info,
+        inputs=[input_file],
+        outputs=[input_image, input_info]
+    )
+    
     process_btn.click(
         fn=gradio_interface,
         inputs=[
-            input_image, settings, crop, remove_bg, resize, 
+            input_file, settings, crop, remove_bg, resize, 
             padding, background, quality
         ],
         outputs=[
@@ -233,15 +275,5 @@ with gr.Blocks(title="IMAGER ___ v0.2 Image Processor") as interface:
         ]
     )
 
-    # Examples
-    gr.Examples(
-        examples=example_images,
-        inputs=[
-            input_image, settings, crop, remove_bg, resize, 
-            padding, background, quality
-        ]
-    )
-
-
 if __name__ == "__main__":
-    interface.launch()
+    demo.launch()

gradio_test.py

@@ -0,0 +1,47 @@
+import gradio as gr
+from PIL import Image
+import os
+import io
+
+def get_file_info(file):
+    """Get file info from the uploaded file."""
+    if file is None:
+        return "No file uploaded."
+    
+    # Extract original filename
+    original_name = os.path.splitext(os.path.basename(file.name))[0]
+    
+    # Open the image file
+    image = Image.open(file.name)
+    
+    # Get image dimensions
+    width, height = image.size
+
+    # Calculate file size
+    size_bytes = os.path.getsize(file.name)
+    size_kb = size_bytes / 1024
+
+    return f"""<div style="text-align: left; padding: 5px;">
+        <p>Original Name: {original_name}</p>
+        <p>Size: {width}x{height}px ({size_kb:.1f} KB)</p>
+    </div>"""
+
+with gr.Blocks(title="Gradio File Info Test") as interface:
+    gr.Markdown("# 🖼️ Gradio File Info Test 🛠️")
+    gr.Markdown("📤 Upload an image to test file info handling.")
+    
+    with gr.Row():
+        with gr.Column(scale=1):
+            # Input column
+            input_file = gr.File(label="Upload Image")
+            input_info = gr.HTML(label="Input Image Information")  # For showing input image info
+            
+            # Update image info when file changes
+            input_file.change(
+                fn=get_file_info,
+                inputs=[input_file],
+                outputs=[input_info]
+            )
+
+if __name__ == "__main__":
+    interface.launch()