Update app.py

app.py

@@ -181,72 +181,284 @@ current_pipe = None
 model_lock = threading.Lock()
 
 # =============================================
-# ADDED: Infographic Layout Generator Class
+# ENHANCED: Infographic Layout Generator Class
 # =============================================
 class InfographicLayoutGenerator:
     def __init__(self):
-        self.title_color = (41, 128, 185)  # Blue
-        self.background_color = (255, 255, 255)  # White
-        self.text_color = (44, 62, 80)  # Dark gray
+        # Warm, earthy color palette
+        self.title_color = (139, 69, 19)  # Saddle brown
+        self.text_color = (101, 67, 33)   # Dark brown
+        self.accent_color = (205, 133, 63)  # Peru brown
+        self.border_color = (160, 82, 45)   # Sienna
+        
+    def create_paper_texture(self, width, height):
+        """Create old paper background texture"""
+        # Base color - cream/old paper
+        base_color = (245, 235, 210)
+        paper = Image.new('RGB', (width, height), base_color)
+        draw = ImageDraw.Draw(paper)
+        
+        # Add noise for texture
+        for _ in range(width * height // 100):
+            x = random.randint(0, width-1)
+            y = random.randint(0, height-1)
+            # Random dark/light spots
+            noise = random.randint(-15, 15)
+            r = max(0, min(255, base_color[0] + noise))
+            g = max(0, min(255, base_color[1] + noise))
+            b = max(0, min(255, base_color[2] + noise))
+            paper.putpixel((x, y), (r, g, b))
+        
+        # Add subtle brown stains
+        for _ in range(30):
+            x = random.randint(0, width-1)
+            y = random.randint(0, height-1)
+            radius = random.randint(30, 80)
+            for dx in range(-radius, radius):
+                for dy in range(-radius, radius):
+                    if dx*dx + dy*dy <= radius*radius:
+                        nx, ny = x + dx, y + dy
+                        if 0 <= nx < width and 0 <= ny < height:
+                            r, g, b = paper.getpixel((nx, ny))
+                            # Add subtle brown tint
+                            r = max(0, min(255, r - 8))
+                            g = max(0, min(255, g - 5))
+                            b = max(0, min(255, b - 3))
+                            paper.putpixel((nx, ny), (r, g, b))
+        
+        return paper
+    
+    def remove_background(self, image):
+        """Simple background removal - makes white/light backgrounds transparent"""
+        # Convert to RGBA if not already
+        if image.mode != 'RGBA':
+            image = image.convert('RGBA')
+        
+        data = image.getdata()
+        new_data = []
+        
+        # Threshold for white/light background
+        threshold = 240
+        
+        for item in data:
+            # If pixel is very light (likely background), make transparent
+            if item[0] > threshold and item[1] > threshold and item[2] > threshold:
+                new_data.append((255, 255, 255, 0))  # Transparent
+            else:
+                new_data.append(item)
+        
+        image.putdata(new_data)
+        return image
+    
+    def get_font(self, size, bold=False):
+        """Get font with Chinese/English support"""
+        font_paths = [
+            # Windows Chinese fonts
+            "C:/Windows/Fonts/msyh.ttc",  # Microsoft YaHei
+            "C:/Windows/Fonts/simhei.ttf",  # SimHei
+            "C:/Windows/Fonts/simsun.ttc",  # SimSun
+            # Linux Chinese fonts
+            "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
+            "/usr/share/fonts/truetype/arphic/uming.ttc",
+            # Mac Chinese fonts
+            "/System/Library/Fonts/PingFang.ttc",
+            # Android fonts
+            "/system/fonts/NotoSansCJK-Regular.ttc",
+            # Linux fallback
+            "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
+            # Windows fallback
+            "arial.ttf",
+        ]
+        
+        if bold:
+            bold_paths = [
+                "C:/Windows/Fonts/msyhbd.ttc",  # Microsoft YaHei Bold
+                "C:/Windows/Fonts/simhei.ttf",
+                "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
+                "/System/Library/Fonts/PingFang.ttc",
+            ]
+            font_paths = bold_paths + font_paths
+        
+        for font_path in font_paths:
+            try:
+                return ImageFont.truetype(font_path, size)
+            except:
+                continue
+        
+        return ImageFont.load_default()
+    
+    def create_icon_from_image(self, image, size, bg_removal=True):
+        """Convert image to icon with optional background removal"""
+        if bg_removal:
+            image = self.remove_background(image)
+        else:
+            if image.mode != 'RGBA':
+                image = image.convert('RGBA')
+        
+        # Resize maintaining aspect ratio
+        image.thumbnail((size, size), Image.Resampling.LANCZOS)
+        
+        # Create square canvas with transparency
+        icon = Image.new('RGBA', (size, size), (0, 0, 0, 0))
+        
+        # Center the image
+        x = (size - image.width) // 2
+        y = (size - image.height) // 2
+        icon.paste(image, (x, y), image)
         
+        return icon
+    
     def create_food_infographic(self, title, items_with_prompts, generated_images):
         """
-        Create an infographic with title and multiple food items
+        Create a beautiful 9:16 portrait infographic with old paper texture and icons
         """
-        # Calculate dimensions
-        num_items = len(items_with_prompts)
-        item_height = 300
-        title_height = 120
-        margin = 50
-        
-        width = 1200
-        height = title_height + (num_items * item_height) + (num_items * margin)
+        # 9:16 portrait dimensions
+        width = 1080
+        height = 1920
         
-        # Create base canvas
-        canvas = Image.new('RGB', (width, height), self.background_color)
+        # Create old paper background
+        canvas = self.create_paper_texture(width, height)
         draw = ImageDraw.Draw(canvas)
         
-        # Try to load fonts, use default if not available
-        try:
-            title_font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf", 60)
-            item_font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 40)
-        except:
-            try:
-                title_font = ImageFont.truetype("arial.ttf", 60)
-                item_font = ImageFont.truetype("arial.ttf", 40)
-            except:
-                title_font = ImageFont.load_default()
-                item_font = ImageFont.load_default()
+        # Layout constants
+        top_margin = 140
+        bottom_margin = 100
+        side_margin = 60
+        title_height = 200
+        icon_size = 140
+        row_height = 180
+        columns = 2  # Two columns layout
+        
+        # Calculate number of rows needed
+        num_items = len(items_with_prompts)
+        rows_per_column = (num_items + columns - 1) // columns
+        
+        # Draw decorative border
+        border_padding = 20
+        # Outer border
+        draw.rectangle(
+            [border_padding, border_padding, width-border_padding, height-border_padding],
+            outline=self.border_color,
+            width=3
+        )
+        # Inner border
+        draw.rectangle(
+            [border_padding+10, border_padding+10, width-border_padding-10, height-border_padding-10],
+            outline=self.accent_color,
+            width=1
+        )
+        
+        # Draw title area with decorative elements
+        title_font = self.get_font(70, bold=True)
         
-        # Draw title
+        # Title background
+        title_bg_y = top_margin - 30
+        draw.rectangle(
+            [side_margin, title_bg_y, width-side_margin, title_bg_y+150],
+            fill=(255, 255, 255, 220),
+            outline=self.border_color,
+            width=2
+        )
+        
+        # Title text (supports Chinese)
         title_bbox = draw.textbbox((0, 0), title, font=title_font)
         title_width = title_bbox[2] - title_bbox[0]
         title_x = (width - title_width) // 2
-        title_y = 40
+        title_y = top_margin
         draw.text((title_x, title_y), title, font=title_font, fill=self.title_color)
         
-        # Draw separator line
-        line_y = title_y + 80
-        draw.line([(100, line_y), (width-100, line_y)], fill=(200, 200, 200), width=3)
-        
-        # Place images for each point
-        y_offset = line_y + 40
-        
+        # Draw decorative elements around title
+        # Left decoration
+        draw.line([side_margin+20, title_y+40, side_margin+100, title_y+40], 
+                 fill=self.accent_color, width=3)
+        # Right decoration
+        draw.line([width-side_margin-100, title_y+40, width-side_margin-20, title_y+40], 
+                 fill=self.accent_color, width=3)
+        
+        # Draw subtitle (English/Chinese)
+        subtitle_font = self.get_font(30)
+        subtitle = "Healthy Foods  ·  健康食品"
+        subtitle_bbox = draw.textbbox((0, 0), subtitle, font=subtitle_font)
+        subtitle_width = subtitle_bbox[2] - subtitle_bbox[0]
+        subtitle_x = (width - subtitle_width) // 2
+        subtitle_y = title_y + 80
+        draw.text((subtitle_x, subtitle_y), subtitle, font=subtitle_font, fill=self.text_color)
+        
+        # Starting Y position for first row
+        start_y = top_margin + title_height + 40
+        
+        # Place items in two columns
         for i, ((food_name, _), img) in enumerate(zip(items_with_prompts, generated_images)):
-            # Image position
-            img_x = 100
-            img_y = y_offset + (i * (item_height + margin))
-            img_size = 200
+            column = i // rows_per_column
+            row = i % rows_per_column
+            
+            # Calculate position
+            if column == 0:
+                x_offset = side_margin + 30
+            else:
+                x_offset = width // 2 + 30
+            
+            y_offset = start_y + (row * (row_height + 40))
+            
+            # Create icon from image
+            icon = self.create_icon_from_image(img, icon_size, bg_removal=True)
+            
+            # Draw decorative background for icon
+            icon_bg_size = icon_size + 20
+            icon_bg_x = x_offset - 10
+            icon_bg_y = y_offset - 10
+            
+            # Draw circular background with subtle shadow
+            draw.ellipse(
+                [icon_bg_x+5, icon_bg_y+5, icon_bg_x+icon_bg_size+5, icon_bg_y+icon_bg_size+5],
+                fill=(0, 0, 0, 40)
+            )
+            draw.ellipse(
+                [icon_bg_x, icon_bg_y, icon_bg_x+icon_bg_size, icon_bg_y+icon_bg_size],
+                fill=(255, 255, 255, 240),
+                outline=self.accent_color,
+                width=2
+            )
             
-            # Resize and paste image
-            if img:
-                img_resized = img.resize((img_size, img_size))
-                canvas.paste(img_resized, (img_x, img_y))
+            # Paste icon (with transparency)
+            canvas.paste(icon, (x_offset, y_offset), icon)
             
-            # Draw food name with bullet point
-            text_x = img_x + img_size + 40
-            text_y = img_y + (img_size // 2) - 20
-            draw.text((text_x, text_y), f"• {food_name}", font=item_font, fill=self.text_color)
+            # Draw food name with Chinese/English support
+            name_font = self.get_font(38, bold=True)
+            name_x = x_offset + icon_size + 25
+            name_y = y_offset + (icon_size // 2) - 35
+            
+            # Food name
+            draw.text((name_x, name_y), food_name, font=name_font, fill=self.text_color)
+            
+            # Draw number indicator
+            number_font = self.get_font(22)
+            number_text = f"#{i+1:02d}"
+            draw.text((name_x, name_y + 45), number_text, font=number_font, fill=self.accent_color)
+            
+            # Draw small decorative line
+            line_y = name_y + 75
+            draw.line([name_x, line_y, name_x+70, line_y], fill=self.accent_color, width=2)
+        
+        # Draw footer
+        footer_font = self.get_font(28)
+        footer_text = "·  Fresh & Healthy  ·  Made with Love  ·"
+        footer_bbox = draw.textbbox((0, 0), footer_text, font=footer_font)
+        footer_width = footer_bbox[2] - footer_bbox[0]
+        footer_x = (width - footer_width) // 2
+        footer_y = height - bottom_margin + 10
+        draw.text((footer_x, footer_y), footer_text, font=footer_font, fill=self.border_color)
+        
+        # Add corner decorations
+        decoration_positions = [
+            (border_padding+15, border_padding+15),  # Top-left
+            (width-border_padding-45, border_padding+15),  # Top-right
+            (border_padding+15, height-border_padding-45),  # Bottom-left
+            (width-border_padding-45, height-border_padding-45)  # Bottom-right
+        ]
+        
+        for x, y in decoration_positions:
+            draw.arc([x, y, x+30, y+30], 0, 90, fill=self.accent_color, width=2)
         
         return canvas
 
@@ -891,9 +1103,15 @@ def generate_infographic_background(job_id: str):
             try:
                 print(f"🖼️ Generating image for: {item.name}")
                 
+                # Enhanced prompt for object on white background (easier to remove)
+                enhanced_prompt = f"professional food photography, {item.prompt}, " \
+                                 f"isolated on white background, studio lighting, " \
+                                 f"cut out, transparent background style, " \
+                                 f"high resolution, food magazine quality"
+                
                 # Generate image using your existing function
                 image = generate_image_simple(
-                    item.prompt,
+                    enhanced_prompt,
                     "dreamshaper-8",  # Use default model
                     "food_photography",  # Use food photography style
                     i + 1,
@@ -1154,10 +1372,10 @@ async def get_local_images():
     return get_local_storage_info()
 
 # =============================================
-# ADDED: Test Functions for Gradio
+# ENHANCED: Test Functions for Gradio
 # =============================================
 def test_infographic(title, items_text):
-    """Test function for infographic generation in Gradio"""
+    """Enhanced test function for infographic generation with icon-style images"""
     try:
         # Parse items (format: "name:prompt;name2:prompt2")
         items = []
@@ -1169,21 +1387,41 @@ def test_infographic(title, items_text):
         if not items:
             return None, "❌ Please enter at least one item"
         
-        # Generate images
+        print(f"🎨 Generating infographic with {len(items)} items...")
+        
+        # Generate images with prompts optimized for transparent objects
         generated_images = []
         for i, item in enumerate(items):
-            enhanced_prompt = f"{item['prompt']}, high quality, appetizing"
-            img = generate_image_simple(enhanced_prompt, "dreamshaper-8", "food_photography", i+1, None)
+            print(f"  🖼️ Generating image {i+1}/{len(items)}: {item['name']}")
+            
+            # Enhanced prompt for object on white background (easier to remove)
+            enhanced_prompt = f"professional food photography, {item['prompt']}, " \
+                             f"isolated on white background, studio lighting, " \
+                             f"cut out, transparent background style, " \
+                             f"high resolution, food magazine quality"
+            
+            img = generate_image_simple(
+                enhanced_prompt, 
+                "dreamshaper-8", 
+                "food_photography", 
+                i+1, 
+                None
+            )
             generated_images.append(img)
         
-        # Create infographic
+        print("  📐 Creating beautiful layout with old paper texture...")
+        
+        # Create enhanced infographic
         layout_gen = InfographicLayoutGenerator()
         items_with_prompts = [(item['name'], item['prompt']) for item in items]
         infographic = layout_gen.create_food_infographic(title, items_with_prompts, generated_images)
         
-        return infographic, f"✅ Generated infographic with {len(items)} items"
+        return infographic, f"✅ Created beautiful infographic with {len(items)} icon-style images on old paper"
         
     except Exception as e:
+        print(f"❌ Error: {str(e)}")
+        import traceback
+        traceback.print_exc()
         return None, f"❌ Error: {str(e)}"
 
 # GRADIO INTERFACE
@@ -1225,7 +1463,7 @@ def create_gradio_interface():
                     infographic_title = gr.Textbox(
                         label="Title",
                         value="肠道友好的 7种食物",
-                        placeholder="Enter infographic title..."
+                        placeholder="Enter infographic title (supports Chinese)..."
                     )
                     infographic_items = gr.Textbox(
                         label="Items (name:prompt;name2:prompt2)",
@@ -1236,7 +1474,7 @@ def create_gradio_interface():
                     infographic_btn = gr.Button("Generate Infographic", variant="primary")
                 
                 with gr.Column():
-                    infographic_output = gr.Image(label="Generated Infographic", height=600)
+                    infographic_output = gr.Image(label="Generated Infographic", height=700)
                     infographic_status = gr.Textbox(label="Status")
             
             infographic_btn.click(