Update app.py

app.py

@@ -1,86 +1,48 @@
 import streamlit as st
-from PIL import Image, ImageEnhance, ImageFilter, ImageOps
+from PIL import Image, ImageEnhance, ImageOps, ImageFilter
 import numpy as np
 from io import BytesIO
 
 # Function to convert hex color to RGB
 def hex_to_rgb(hex_color):
     hex_color = hex_color.lstrip('#')  # Remove the '#' if present
-    return tuple(int(hex_color[i:i+2], 16) for i in (0, 2, 4))  # Convert to RGB
+    # Check if hex color length is 6 (for #RRGGBB format)
+    if len(hex_color) == 6:
+        return tuple(int(hex_color[i:i+2], 16) for i in (0, 2, 4))  # Convert to RGB
+    else:
+        raise ValueError("Invalid hex color format")
 
-# Function to add border to image
-def add_border(image, border_type, color, thickness):
-    width, height = image.size
-    border_color = hex_to_rgb(color)  # Convert hex color to RGB tuple
-    
-    if border_type == "Solid Color":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Dotted":
-        # Use dotted pattern (this is a simple approximation)
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Dashed":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Double":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Inset":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Outset":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Rounded Corner":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Shadowed":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Polaroid":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Metallic":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Wooden":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Textured":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Neon":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Polka Dots":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Stripe":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Sketch":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-    elif border_type == "Lace":
-        return ImageOps.expand(image, border=thickness, fill=border_color)
-
-
-# Function to apply grayscale filter
+# Function to apply grayscale
 def apply_grayscale(image):
-    return image.convert("L")
+    return image.convert('L')
 
-# Function to apply brightness adjustment
-def apply_brightness(image, factor):
+# Function to adjust brightness
+def adjust_brightness(image, factor):
     enhancer = ImageEnhance.Brightness(image)
     return enhancer.enhance(factor)
 
-# Function to apply contrast adjustment
-def apply_contrast(image, factor):
+# Function to adjust contrast
+def adjust_contrast(image, factor):
     enhancer = ImageEnhance.Contrast(image)
     return enhancer.enhance(factor)
 
-# Function to apply sharpness adjustment
-def apply_sharpness(image, factor):
-    enhancer = ImageEnhance.Sharpness(image)
-    return enhancer.enhance(factor)
-
-# Function to apply blur filter
+# Function to apply blur
 def apply_blur(image, blur_radius):
-    return image.filter(ImageFilter.GaussianBlur(radius=blur_radius))
+    return image.filter(ImageFilter.GaussianBlur(blur_radius))
 
 # Function to add border to image
 def add_border(image, border_type, color, thickness):
     width, height = image.size
-    border_color = tuple(int(c) for c in color.split(','))
+    try:
+        border_color = hex_to_rgb(color)  # Convert hex color to RGB tuple
+    except ValueError as e:
+        st.error(f"Error with the border color: {e}")
+        return image
+
+    # Applying the border based on the selected type
     if border_type == "Solid Color":
         return ImageOps.expand(image, border=thickness, fill=border_color)
     elif border_type == "Dotted":
-        # Use dotted pattern
         return ImageOps.expand(image, border=thickness, fill=border_color)
     elif border_type == "Dashed":
         return ImageOps.expand(image, border=thickness, fill=border_color)
@@ -113,66 +75,55 @@ def add_border(image, border_type, color, thickness):
     elif border_type == "Lace":
         return ImageOps.expand(image, border=thickness, fill=border_color)
 
+# Main function to handle Streamlit app
 def main():
     st.title("Image Editor")
-    st.sidebar.title("Enhance Image")
-
-    # Upload Image
-    uploaded_image = st.sidebar.file_uploader("Upload an image", type=["png", "jpg", "jpeg"])
 
+    # Upload image
+    uploaded_image = st.file_uploader("Choose an image...", type=["jpg", "jpeg", "png"])
+    
     if uploaded_image is not None:
         image = Image.open(uploaded_image)
-
-        # Show original image
-        st.image(image, caption="Original Image", use_container_width=True)
-
-        # Grayscale option
-        grayscale = st.sidebar.checkbox("Apply Grayscale")
-        if grayscale:
+        st.image(image, caption='Uploaded Image', use_container_width=True)
+        
+        # Sidebar options
+        st.sidebar.title("Image Editing Options")
+
+        # Filter Options
+        filter_option = st.sidebar.selectbox("Choose a filter", ["None", "Grayscale", "Brightness", "Contrast", "Blur"])
+        
+        if filter_option == "Grayscale":
             image = apply_grayscale(image)
-
-        # Brightness adjustment
-        brightness_factor = st.sidebar.slider("Adjust Brightness", 0.0, 2.0, 1.0)
-        image = apply_brightness(image, brightness_factor)
-
-        # Contrast adjustment
-        contrast_factor = st.sidebar.slider("Adjust Contrast", 0.0, 2.0, 1.0)
-        image = apply_contrast(image, contrast_factor)
-
-        # Sharpness adjustment
-        sharpness_factor = st.sidebar.slider("Adjust Sharpness", 0.0, 2.0, 1.0)
-        image = apply_sharpness(image, sharpness_factor)
-
-        # Blur effect
-        blur_radius = st.sidebar.slider("Blur Radius", 0, 10, 0)
-        if blur_radius > 0:
+        elif filter_option == "Brightness":
+            brightness_factor = st.sidebar.slider("Adjust Brightness", 0.1, 2.0, 1.0)
+            image = adjust_brightness(image, brightness_factor)
+        elif filter_option == "Contrast":
+            contrast_factor = st.sidebar.slider("Adjust Contrast", 0.1, 2.0, 1.0)
+            image = adjust_contrast(image, contrast_factor)
+        elif filter_option == "Blur":
+            blur_radius = st.sidebar.slider("Blur Radius", 1, 10, 2)
             image = apply_blur(image, blur_radius)
 
         # Border options
-        border_type = st.sidebar.selectbox("Select Border Type", [
-            "Solid Color", "Dotted", "Dashed", "Double", "Inset", "Outset", "Rounded Corner",
-            "Shadowed", "Polaroid", "Metallic", "Wooden", "Textured", "Neon", "Polka Dots",
-            "Stripe", "Sketch", "Lace"])
-
-        border_color = st.sidebar.color_picker("Pick a Border Color", "#000000")
-        border_thickness = st.sidebar.slider("Select Border Thickness", 0, 50, 10)
-
-        image = add_border(image, border_type, border_color[1:], border_thickness)
-
-        # Display the modified image
-        st.image(image, caption="Modified Image", use_container_width=True)
-
-        # Download button
+        border_type = st.sidebar.selectbox("Choose Border Type", [
+            "None", "Solid Color", "Dotted", "Dashed", "Double", "Inset", "Outset", 
+            "Rounded Corner", "Shadowed", "Polaroid", "Metallic", "Wooden", "Textured", 
+            "Neon", "Polka Dots", "Stripe", "Sketch", "Lace"
+        ])
+        if border_type != "None":
+            border_color = st.sidebar.color_picker("Select Border Color", "#b33c3c")
+            border_thickness = st.sidebar.slider("Border Thickness", 1, 20, 5)
+            image = add_border(image, border_type, border_color, border_thickness)
+
+        # Display the edited image
+        st.image(image, caption='Edited Image', use_container_width=True)
+
+        # Download button for edited image
         buffered = BytesIO()
-        image.save(buffered, format="JPEG")
+        image.save(buffered, format="PNG")
         buffered.seek(0)
+        st.sidebar.download_button("Download Edited Image", buffered, "edited_image.png", "image/png")
 
-        st.sidebar.download_button(
-            label="Download Edited Image",
-            data=buffered,
-            file_name="edited_image.jpg",
-            mime="image/jpeg"
-        )
 
 if __name__ == "__main__":
     main()