update app.py - add contour as an option

color conversion is different ()
Handles both 6-digit (#RRGGBB) and 3-digit (#RGB) hex formats

app.py

@@ -71,7 +71,7 @@ def process_uploaded_image(image):
     return image, "Image uploaded successfully!", image
 
 # Text Overlay Functions
-def add_text_to_image(img, pattern, line1, line2, line3, font_size, color):
+def add_text_to_image(img, pattern, line1, line2, line3, font_size, color, add_outline):
     """Overlay 2- or 3-line text on the image in a preset layout."""
     print("=== DEBUG: add_text_to_image called ===")
     print(f"Input image: {type(img)}")
@@ -79,6 +79,7 @@ def add_text_to_image(img, pattern, line1, line2, line3, font_size, color):
     print(f"Lines: [{line1!r}, {line2!r}, {line3!r}]")
     print(f"Font size: {font_size}")
     print(f"Color: {color!r}")
+    print(f"Add outline: {add_outline}")
     
     if img is None:
         print("ERROR: No image provided")
@@ -92,7 +93,7 @@ def add_text_to_image(img, pattern, line1, line2, line3, font_size, color):
         draw = ImageDraw.Draw(image)
         print("ImageDraw created successfully")
 
-        # More robust font loading with better fallbacks
+        # Font loading (same as before)
         font = None
         font_paths = [
             "DejaVuSans-Bold.ttf",
@@ -112,7 +113,6 @@ def add_text_to_image(img, pattern, line1, line2, line3, font_size, color):
                 print(f"FAILED: Font {font_path} - {e}")
                 continue
         
-        # Final fallback to default font
         if font is None:
             try:
                 font = ImageFont.load_default()
@@ -144,22 +144,46 @@ def add_text_to_image(img, pattern, line1, line2, line3, font_size, color):
             
         print(f"Text positions calculated: {positions}")
 
-        # Convert hex color to RGB tuple if needed
+        # FIXED: Better color conversion
         original_color = color
-        if isinstance(color, str) and color.startswith('#'):
-            print(f"Converting hex color {color}")
-            color = color.lstrip('#')
-            if len(color) == 6:
-                color = tuple(int(color[i:i+2], 16) for i in (0, 2, 4))
-                print(f"Converted to RGB: {color}")
+        final_color = (255, 255, 255)  # Default white
+        
+        if isinstance(color, str):
+            if color.startswith('#'):
+                print(f"Converting hex color {color}")
+                hex_color = color.lstrip('#')
+                if len(hex_color) == 6:
+                    try:
+                        final_color = tuple(int(hex_color[i:i+2], 16) for i in (0, 2, 4))
+                        print(f"Successfully converted hex {color} to RGB: {final_color}")
+                    except ValueError as e:
+                        print(f"Invalid hex color {color}: {e}, using white")
+                        final_color = (255, 255, 255)
+                elif len(hex_color) == 3:
+                    # Short hex format #RGB -> #RRGGBB
+                    try:
+                        final_color = tuple(int(hex_color[i]*2, 16) for i in range(3))
+                        print(f"Successfully converted short hex {color} to RGB: {final_color}")
+                    except ValueError as e:
+                        print(f"Invalid short hex color {color}: {e}, using white")
+                        final_color = (255, 255, 255)
+                else:
+                    print(f"Invalid hex color length {color}, using white")
+                    final_color = (255, 255, 255)
             else:
-                print("Invalid hex color, using white")
-                color = (255, 255, 255)
-        elif isinstance(color, str):
-            print(f"Non-hex color string: {color}, using white")
-            color = (255, 255, 255)
+                # Try to parse as named color or other format
+                print(f"Non-hex color string: {color}, attempting to use directly")
+                final_color = color  # Let PIL try to handle it
+        elif isinstance(color, (tuple, list)) and len(color) >= 3:
+            final_color = tuple(color[:3])
+            print(f"Using tuple/list color: {final_color}")
+        else:
+            print(f"Unrecognized color format: {color}, using white")
+            final_color = (255, 255, 255)
+        
+        print(f"Final color for drawing: {final_color}")
         
-        # Draw text with better visibility
+        # Draw text
         lines = [line1, line2, line3][:len(positions)]
         print(f"Active lines: {lines}")
         text_drawn = False
@@ -168,71 +192,70 @@ def add_text_to_image(img, pattern, line1, line2, line3, font_size, color):
             if txt and txt.strip():
                 print(f"Drawing line {i+1}: '{txt}' at position ({x}, {y})")
                 
-                # Add text stroke/outline for better visibility
-                stroke_width = max(1, font_size // 20)
-                print(f"Using stroke width: {stroke_width}")
-                
-                try:
+                # Optional outline/stroke
+                if add_outline:
+                    stroke_width = max(1, font_size // 20)
+                    print(f"Adding outline with stroke width: {stroke_width}")
+                    
                     # Draw text outline (black)
                     for dx in [-stroke_width, 0, stroke_width]:
                         for dy in [-stroke_width, 0, stroke_width]:
                             if dx != 0 or dy != 0:
                                 try:
                                     draw.text((x + dx, y + dy), txt, fill=(0, 0, 0), font=font, anchor="mm")
-                                except TypeError as e:
-                                    print(f"Anchor not supported: {e}, using fallback")
-                                    # Fallback for older PIL versions without anchor
+                                except TypeError:
+                                    # Fallback for older PIL versions
                                     try:
                                         bbox = draw.textbbox((0, 0), txt, font=font)
                                         text_w = bbox[2] - bbox[0]
                                         text_h = bbox[3] - bbox[1]
                                         draw.text((x - text_w//2 + dx, y - text_h//2 + dy), txt, fill=(0, 0, 0), font=font)
-                                    except Exception as bbox_e:
-                                        print(f"Textbbox also failed: {bbox_e}, using basic positioning")
+                                    except Exception:
                                         draw.text((x + dx, y + dy), txt, fill=(0, 0, 0), font=font)
-                    
-                    # Draw main text
+                else:
+                    print("Skipping outline (disabled)")
+                
+                # Draw main text
+                try:
+                    draw.text((x, y), txt, fill=final_color, font=font, anchor="mm")
+                    print(f"Main text drawn with color {final_color} at ({x}, {y})")
+                except TypeError:
+                    # Fallback for older PIL versions
                     try:
-                        draw.text((x, y), txt, fill=color, font=font, anchor="mm")
-                        print(f"Main text drawn with anchor at ({x}, {y})")
-                    except TypeError as e:
-                        print(f"Anchor not supported for main text: {e}, using fallback")
-                        # Fallback for older PIL versions
-                        try:
-                            bbox = draw.textbbox((0, 0), txt, font=font)
-                            text_w = bbox[2] - bbox[0]
-                            text_h = bbox[3] - bbox[1]
-                            fallback_x = x - text_w//2
-                            fallback_y = y - text_h//2
-                            draw.text((fallback_x, fallback_y), txt, fill=color, font=font)
-                            print(f"Fallback text drawn at ({fallback_x}, {fallback_y})")
-                        except Exception as bbox_e:
-                            print(f"Textbbox also failed: {bbox_e}, using basic positioning")
-                            draw.text((x, y), txt, fill=color, font=font)
-                    
-                    text_drawn = True
-                    print(f"Successfully drew line {i+1}")
-                    
+                        bbox = draw.textbbox((0, 0), txt, font=font)
+                        text_w = bbox[2] - bbox[0]
+                        text_h = bbox[3] - bbox[1]
+                        fallback_x = x - text_w//2
+                        fallback_y = y - text_h//2
+                        draw.text((fallback_x, fallback_y), txt, fill=final_color, font=font)
+                        print(f"Fallback text drawn with color {final_color} at ({fallback_x}, {fallback_y})")
+                    except Exception:
+                        draw.text((x, y), txt, fill=final_color, font=font)
+                        print(f"Basic text drawn with color {final_color} at ({x}, {y})")
                 except Exception as e:
-                    print(f"ERROR drawing text line {i+1}: {e}")
-                    import traceback
-                    traceback.print_exc()
-            else:
-                print(f"Skipping empty line {i+1}")
+                    print(f"ERROR drawing main text: {e}")
+                    # Try with string color as last resort
+                    try:
+                        draw.text((x, y), txt, fill=original_color, font=font, anchor="mm")
+                        print(f"Drew text with original color string: {original_color}")
+                    except Exception as e2:
+                        print(f"Even original color failed: {e2}")
+                
+                text_drawn = True
+                print(f"Successfully drew line {i+1}")
 
         if not text_drawn:
             print("No text was drawn")
-            return img, "No text to add (all lines were empty)", None
+            return img, "No text to add (all lines were empty)"
         
         print("=== Text drawing completed ===")
-        print(f"Returning image with mode: {image.mode}, size: {image.size}")
-        return image, f"Text added! Pattern: {pattern}, Font: {font_size}px, Color: {original_color}, Lines drawn: {sum(1 for line in lines if line and line.strip())}", None
+        return image, f"Text added! Color: {original_color} -> {final_color}, Outline: {add_outline}"
         
     except Exception as e:
         print(f"CRITICAL ERROR in add_text_to_image: {e}")
         import traceback
         traceback.print_exc()
-        return None, f"Error adding text: {str(e)}", None
+        return None, f"Error adding text: {str(e)}"
 
 def test_text_overlay():
     """Test function to verify text overlay works"""
@@ -388,6 +411,13 @@ with gr.Blocks(title="AI Image Generator & Text Overlay") as demo:
                         value="#FFFFFF"
                     )
                 
+                # NEW: Add outline option
+                add_outline = gr.Checkbox(
+                    label="Add black outline",
+                    value=True,
+                    info="Adds black outline for better text visibility"
+                )
+                
                 add_text_btn = gr.Button("✨ Add Text to Image", variant="primary")
             
             with gr.Column():
@@ -397,7 +427,7 @@ with gr.Blocks(title="AI Image Generator & Text Overlay") as demo:
         # Event handler for Tab 2
         add_text_btn.click(
             add_text_to_image,
-            inputs=[current_image, pattern, line1_inp, line2_inp, line3_inp, font_size, color],
+            inputs=[current_image, pattern, line1_inp, line2_inp, line3_inp, font_size, color, add_outline],
             outputs=[text_image, status_message]
         )