Update app.py

app.py

@@ -3,131 +3,156 @@ 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
-    # 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 apply grayscale
-def apply_grayscale(image):
-    return image.convert('L')
-
-# Function to adjust brightness
-def adjust_brightness(image, factor):
-    enhancer = ImageEnhance.Brightness(image)
-    return enhancer.enhance(factor)
-
-# Function to adjust contrast
-def adjust_contrast(image, factor):
-    enhancer = ImageEnhance.Contrast(image)
-    return enhancer.enhance(factor)
-
-# Function to apply blur
-def apply_blur(image, 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
-    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":
-        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)
-
-# Main function to handle Streamlit app
+
+# Abstract Class for Image Editor
+class ImageEditor:
+    def __init__(self, image):
+        self.image = image
+
+    def apply(self):
+        raise NotImplementedError("Subclasses should implement this method")
+
+
+# Grayscale Filter Class
+class GrayscaleFilter(ImageEditor):
+    def apply(self):
+        return self.image.convert("L")
+
+
+# Brightness Adjustment Class
+class BrightnessFilter(ImageEditor):
+    def __init__(self, image, factor):
+        super().__init__(image)
+        self.factor = factor
+
+    def apply(self):
+        enhancer = ImageEnhance.Brightness(self.image)
+        return enhancer.enhance(self.factor)
+
+
+# Contrast Adjustment Class
+class ContrastFilter(ImageEditor):
+    def __init__(self, image, factor):
+        super().__init__(image)
+        self.factor = factor
+
+    def apply(self):
+        enhancer = ImageEnhance.Contrast(self.image)
+        return enhancer.enhance(self.factor)
+
+
+# Blur Effect Class
+class BlurFilter(ImageEditor):
+    def __init__(self, image, radius):
+        super().__init__(image)
+        self.radius = radius
+
+    def apply(self):
+        return self.image.filter(ImageFilter.GaussianBlur(self.radius))
+
+
+# Border Class
+class Border:
+    def __init__(self, image, border_type, color, thickness):
+        self.image = image
+        self.border_type = border_type
+        self.color = color
+        self.thickness = thickness
+
+    def add_border(self):
+        try:
+            border_color = self.hex_to_rgb(self.color)
+        except ValueError:
+            st.error("Invalid color format. Please use Hex color.")
+            return self.image
+
+        if self.border_type == "Solid Color":
+            return ImageOps.expand(self.image, border=self.thickness, fill=border_color)
+        # Add other border types if needed
+
+        return self.image
+
+    @staticmethod
+    def hex_to_rgb(hex_color):
+        hex_color = hex_color.lstrip('#')
+        if len(hex_color) == 6:
+            return tuple(int(hex_color[i:i + 2], 16) for i in (0, 2, 4))
+        else:
+            raise ValueError("Invalid hex color format")
+
+
+# Main Application Class
+class ImageApp:
+    def __init__(self):
+        self.image = None
+        self.stored_image = None
+
+    def load_image(self):
+        uploaded_image = st.file_uploader("Choose an image...", type=["jpg", "jpeg", "png"])
+        if uploaded_image:
+            self.image = Image.open(uploaded_image)
+            self.stored_image = self.image.copy()
+
+    def apply_filters(self):
+        if self.image:
+            # Sidebar Filters
+            filter_option = st.sidebar.selectbox("Choose a filter", ["None", "Grayscale", "Brightness", "Contrast", "Blur"])
+            if filter_option == "Grayscale":
+                self.image = GrayscaleFilter(self.image).apply()
+            elif filter_option == "Brightness":
+                brightness_factor = st.sidebar.slider("Adjust Brightness", 0.1, 2.0, 1.0)
+                self.image = BrightnessFilter(self.image, brightness_factor).apply()
+            elif filter_option == "Contrast":
+                contrast_factor = st.sidebar.slider("Adjust Contrast", 0.1, 2.0, 1.0)
+                self.image = ContrastFilter(self.image, contrast_factor).apply()
+            elif filter_option == "Blur":
+                blur_radius = st.sidebar.slider("Blur Radius", 1, 10, 2)
+                self.image = BlurFilter(self.image, blur_radius).apply()
+
+    def add_border(self):
+        if self.image:
+            border_type = st.sidebar.selectbox("Choose Border Type", ["None", "Solid Color"])
+            if border_type != "None":
+                border_color = st.sidebar.color_picker("Select Border Color", "#b33c3c")
+                border_thickness = st.sidebar.slider("Border Thickness", 1, 20, 5)
+                border = Border(self.image, border_type, border_color, border_thickness)
+                self.image = border.add_border()
+
+    def display_images(self):
+        if self.image:
+            col1, col2 = st.columns(2)
+            with col1:
+                st.image(self.stored_image, caption="Original Image", use_container_width=True)
+            with col2:
+                st.image(self.image, caption="Edited Image", use_container_width=True)
+
+    def download_button(self):
+        if self.image:
+            buffered = BytesIO()
+            self.image.save(buffered, format="PNG")
+            buffered.seek(0)
+            st.sidebar.download_button("Download Edited Image", buffered, "edited_image.png", "image/png")
+
+
+# Main function to run the app
 def main():
-    st.title("Image Editor")
-
-    # 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)
-
-        # 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)
-        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("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 original and edited images side by side
-        col1, col2 = st.columns(2)
-
-        with col1:
-            st.image(uploaded_image, caption='Original Image', use_container_width=True)
-
-        with col2:
-            st.image(image, caption='Edited Image', use_container_width=True)
-
-        # Download button for edited image
-        buffered = BytesIO()
-        image.save(buffered, format="PNG")
-        buffered.seek(0)
-        st.sidebar.download_button("Download Edited Image", buffered, "edited_image.png", "image/png")
+    st.title("Modern Image Editor")
+    app = ImageApp()
+
+    # Load the image
+    app.load_image()
+
+    # Apply filters
+    app.apply_filters()
+
+    # Add borders if selected
+    app.add_border()
+
+    # Display images side by side
+    app.display_images()
+
+    # Provide download option
+    app.download_button()
 
 
 if __name__ == "__main__":