Update app.py

app.py

@@ -134,7 +134,7 @@ class InfographicRequest(BaseModel):
     style: str = "food_photography"
     project_id: Optional[str] = None
     callback_url: Optional[str] = None
-    background_url: Optional[str] = None  # New field for custom background
+    background_url: Optional[str] = None
 
 class JobStatusResponse(BaseModel):
     job_id: str
@@ -182,239 +182,324 @@ current_pipe = None
 model_lock = threading.Lock()
 
 # =============================================
-# ENHANCED: Infographic Layout Generator with Custom Background Support
+# FIXED: Infographic Layout Generator with Responsive Design
 # =============================================
 class InfographicLayoutGenerator:
     def __init__(self):
-        # Warm, earthy color palette for text
-        self.title_color = (139, 69, 19)  # Saddle brown
-        self.text_color = (80, 60, 40)    # Dark brown
-        self.accent_color = (205, 133, 63) # Peru brown
-        self.custom_background = None
-        
-    def set_custom_background(self, background_image_path=None, background_image=None):
-        """Set a custom background image"""
-        if background_image_path and os.path.exists(background_image_path):
-            try:
-                self.custom_background = Image.open(background_image_path).convert('RGB')
-                print(f"✅ Loaded custom background: {background_image_path}")
-            except Exception as e:
-                print(f"❌ Failed to load background: {e}")
-                self.custom_background = None
-        elif background_image:
-            try:
-                if isinstance(background_image, Image.Image):
-                    self.custom_background = background_image.convert('RGB')
-                else:
-                    self.custom_background = Image.open(background_image).convert('RGB')
-                print(f"✅ Loaded custom background from image")
-            except Exception as e:
-                print(f"❌ Failed to load background: {e}")
-                self.custom_background = None
-    
+        # Clean, minimal color palette - NO RED OUTLINES
+        self.title_color = (60, 60, 60)      # Dark gray
+        self.text_color = (40, 40, 40)       # Almost black
+        self.accent_color = (200, 160, 120)  # Light brown (subtle)
+        self.border_color = (220, 220, 220)  # Very light gray
+        
     def get_font(self, size, bold=False):
-        """Get font with Chinese/English support"""
+        """Enhanced font loading with extensive Chinese font support"""
+        # Comprehensive list of fonts that support Chinese
         font_paths = [
-            # Windows Chinese fonts
-            "C:/Windows/Fonts/msyh.ttc",
-            "C:/Windows/Fonts/simhei.ttf",
-            "C:/Windows/Fonts/simsun.ttc",
-            # Linux Chinese fonts
+            # Windows fonts
+            "C:/Windows/Fonts/msyh.ttc",        # Microsoft YaHei
+            "C:/Windows/Fonts/msyhbd.ttc",      # Microsoft YaHei Bold
+            "C:/Windows/Fonts/simhei.ttf",      # SimHei
+            "C:/Windows/Fonts/simsun.ttc",      # SimSun
+            "C:/Windows/Fonts/STSONG.TTF",      # STSong
+            "C:/Windows/Fonts/STKAITI.TTF",     # STKaiti
+            # Linux fonts
             "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
+            "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
             "/usr/share/fonts/truetype/arphic/uming.ttc",
-            # Mac Chinese fonts
+            "/usr/share/fonts/truetype/arphic/ukai.ttc",
+            "/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc",
+            "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
+            # Mac fonts
             "/System/Library/Fonts/PingFang.ttc",
+            "/System/Library/Fonts/STHeiti Light.ttc",
+            "/System/Library/Fonts/STHeiti Medium.ttc",
             # Android fonts
             "/system/fonts/NotoSansCJK-Regular.ttc",
+            "/system/fonts/DroidSansFallback.ttf",
             # Fallback
             "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
             "arial.ttf",
         ]
         
         if bold:
-            bold_paths = [
+            bold_fonts = [
                 "C:/Windows/Fonts/msyhbd.ttc",
                 "C:/Windows/Fonts/simhei.ttf",
-                "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
+                "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
+                "/usr/share/fonts/truetype/noto/NotoSansCJK-Bold.ttc",
             ]
-            font_paths = bold_paths + font_paths
+            font_paths = bold_fonts + font_paths
         
+        # Try each font
         for font_path in font_paths:
             try:
-                return ImageFont.truetype(font_path, size)
+                if os.path.exists(font_path):
+                    return ImageFont.truetype(font_path, size)
             except:
                 continue
         
-        return ImageFont.load_default()
+        # Ultimate fallback - use default font but try to set encoding
+        try:
+            return ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", size)
+        except:
+            return ImageFont.load_default()
     
-    def resize_background_to_fit(self, bg_image, target_width, target_height):
-        """Resize background to fit target dimensions while maintaining aspect ratio"""
-        # Get original dimensions
-        bg_width, bg_height = bg_image.size
-        
-        # Calculate aspect ratios
-        target_ratio = target_width / target_height
-        bg_ratio = bg_width / bg_height
-        
-        if bg_ratio > target_ratio:
-            # Background is wider - match height
-            new_height = target_height
-            new_width = int(bg_width * (target_height / bg_height))
-        else:
-            # Background is taller - match width
-            new_width = target_width
-            new_height = int(bg_height * (target_width / bg_width))
-        
-        # Resize background
-        bg_resized = bg_image.resize((new_width, new_height), Image.Resampling.LANCZOS)
-        
-        # Create final canvas
-        canvas = Image.new('RGB', (target_width, target_height))
-        
-        # Calculate crop position (center)
-        left = (new_width - target_width) // 2
-        top = (new_height - target_height) // 2
+    def smart_remove_background(self, image):
+        """Intelligently remove background while keeping the main subject"""
+        try:
+            # Convert to RGBA
+            if image.mode != 'RGBA':
+                image = image.convert('RGBA')
+            
+            data = image.getdata()
+            new_data = []
+            
+            # Get image dimensions
+            width, height = image.size
+            
+            # Sample edges to determine background color
+            edge_samples = []
+            # Top edge
+            for x in range(0, width, 10):
+                edge_samples.append(data[x])
+            # Bottom edge
+            for x in range(0, width, 10):
+                edge_samples.append(data[(height-1) * width + x])
+            # Left edge
+            for y in range(0, height, 10):
+                edge_samples.append(data[y * width])
+            # Right edge
+            for y in range(0, height, 10):
+                edge_samples.append(data[y * width + (width-1)])
+            
+            # Calculate average background color from edges
+            avg_r = sum(s[0] for s in edge_samples) // len(edge_samples)
+            avg_g = sum(s[1] for s in edge_samples) // len(edge_samples)
+            avg_b = sum(s[2] for s in edge_samples) // len(edge_samples)
+            
+            # Threshold for background detection
+            threshold = 60
+            
+            for item in data:
+                # Calculate color distance from average background
+                distance = ((item[0] - avg_r) ** 2 + 
+                          (item[1] - avg_g) ** 2 + 
+                          (item[2] - avg_b) ** 2) ** 0.5
+                
+                # If pixel is close to background color, make transparent
+                if distance < threshold:
+                    new_data.append((255, 255, 255, 0))
+                else:
+                    new_data.append(item)
+            
+            image.putdata(new_data)
+            return image
+            
+        except Exception as e:
+            print(f"Background removal failed: {e}")
+            return image
+    
+    def create_responsive_layout(self, num_items):
+        """Calculate responsive layout based on number of items"""
+        # 9:16 dimensions
+        width = 900
+        height = 1600
         
-        # Crop to target size
-        canvas.paste(bg_resized.crop((left, top, left + target_width, top + target_height)))
+        # Responsive sizing
+        if num_items <= 3:
+            # Few items - larger icons
+            icon_size = 180
+            columns = 1
+            rows = num_items
+            vertical_spacing = 100
+        elif num_items <= 6:
+            # Medium items - medium icons
+            icon_size = 150
+            columns = 2
+            rows = (num_items + 1) // 2
+            vertical_spacing = 80
+        else:
+            # Many items - smaller icons
+            icon_size = 120
+            columns = 2
+            rows = (num_items + 1) // 2
+            vertical_spacing = 60
+        
+        # Calculate positions
+        positions = []
+        available_height = height - 300  # Leave space for title and footer
+        start_y = 200
+        
+        for i in range(num_items):
+            col = i % columns
+            row = i // columns
+            
+            if columns == 1:
+                x = (width - icon_size) // 2
+            else:
+                if col == 0:
+                    x = width // 4 - icon_size // 2
+                else:
+                    x = 3 * width // 4 - icon_size // 2
+            
+            # Distribute rows evenly
+            if rows > 1:
+                y = start_y + (row * (available_height // rows))
+            else:
+                y = start_y + (available_height - icon_size) // 2
+            
+            positions.append((x, y, icon_size))
         
-        return canvas
+        return positions, icon_size, columns
     
-    def create_food_infographic(self, title, items_with_prompts, generated_images, 
-                                background_image=None, background_path=None):
+    def create_food_infographic(self, title, items_with_prompts, generated_images, background_image=None):
         """
-        Create infographic with custom background
+        Create a responsive 9:16 infographic with proper Chinese text
         """
-        # 9:16 portrait dimensions
+        # 9:16 dimensions
         width = 900
         height = 1600
         
-        # Create or load background
-        if background_image is not None:
-            canvas = self.resize_background_to_fit(background_image, width, height)
-        elif background_path is not None and os.path.exists(background_path):
-            bg_image = Image.open(background_path).convert('RGB')
-            canvas = self.resize_background_to_fit(bg_image, width, height)
-            bg_image.close()
-        elif self.custom_background is not None:
-            canvas = self.resize_background_to_fit(self.custom_background, width, height)
+        # Create clean background
+        if background_image:
+            # Resize background to fit
+            bg = background_image.resize((width, height), Image.Resampling.LANCZOS)
+            canvas = bg.convert('RGB')
+        else:
+            # Clean white background
+            canvas = Image.new('RGB', (width, height), (255, 255, 255))
+            
+            # Add very subtle gray gradient at edges only
+            draw = ImageDraw.Draw(canvas)
+            for y in range(height):
+                if y < 20 or y > height-20:
+                    opacity = 10
+                    draw.line([(0, y), (width, y)], fill=(240, 240, 240))
         else:
-            # Default cream background
-            canvas = Image.new('RGB', (width, height), (250, 240, 220))
+            canvas = Image.new('RGB', (width, height), (255, 255, 255))
         
         draw = ImageDraw.Draw(canvas)
         
-        # Add semi-transparent overlay for better text readability
-        overlay = Image.new('RGBA', (width, height), (255, 255, 255, 180))
-        canvas_rgba = canvas.convert('RGBA')
-        canvas_rgba = Image.alpha_composite(canvas_rgba, overlay)
-        canvas = canvas_rgba.convert('RGB')
-        draw = ImageDraw.Draw(canvas)
+        num_items = len(items_with_prompts)
         
-        # Layout constants
-        top_margin = 100
-        side_margin = 40
-        icon_size = 120
-        columns = 2
+        # Get responsive layout
+        positions, icon_size, columns = self.create_responsive_layout(num_items)
         
-        # Draw decorative border
-        draw.rectangle([10, 10, width-10, height-10], outline=self.accent_color, width=3)
-        draw.rectangle([15, 15, width-15, height-15], outline=self.accent_color, width=1)
+        # Draw title with Chinese support
+        title_font = self.get_font(48, bold=True)
         
-        # Draw title with semi-transparent background
-        title_font = self.get_font(50, bold=True)
+        # Title with very light background
         title_bbox = draw.textbbox((0, 0), title, font=title_font)
         title_width = title_bbox[2] - title_bbox[0]
-        title_height = title_bbox[3] - title_bbox[1]
         title_x = (width - title_width) // 2
-        title_y = 30
-        
-        # Title background
-        draw.rectangle(
-            [title_x-20, title_y-10, title_x+title_width+20, title_y+title_height+10],
-            fill=(255, 255, 255, 200),
-            outline=self.accent_color,
-            width=2
+        title_y = 60
+        
+        # Very light gray background for title (NO RED)
+        draw.rounded_rectangle(
+            [title_x-20, title_y-10, title_x+title_width+20, title_y+60],
+            radius=20,
+            fill=(250, 250, 250),
+            outline=None  # NO OUTLINE
         )
         
-        # Draw title
+        # Draw title text
         draw.text((title_x, title_y), title, font=title_font, fill=self.title_color)
         
-        # Draw subtitle
-        subtitle_font = self.get_font(25)
-        subtitle = "Healthy Foods  ·  健康食品"
+        # Draw subtitle in both languages
+        subtitle_font = self.get_font(24)
+        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 + 60
-        draw.text((subtitle_x, subtitle_y), subtitle, font=subtitle_font, fill=self.text_color)
-        
-        # Calculate grid
-        num_items = len(items_with_prompts)
-        rows_per_column = (num_items + columns - 1) // columns
-        start_y = top_margin + 80
+        draw.text((subtitle_x, subtitle_y), subtitle, font=subtitle_font, fill=(120, 120, 120))
         
-        # Place items
+        # Process and place each item
         for i, ((food_name, _), img) in enumerate(zip(items_with_prompts, generated_images)):
-            column = i // rows_per_column
-            row = i % rows_per_column
-            
-            # Calculate position
-            if column == 0:
-                x_offset = side_margin
-            else:
-                x_offset = width // 2 + 20
-            
-            y_offset = start_y + (row * 160)
-            
-            # Item background for better readability
-            draw.rounded_rectangle(
-                [x_offset-5, y_offset-5, x_offset+icon_size+150, y_offset+icon_size+5],
-                radius=15,
-                fill=(255, 255, 255, 220),
-                outline=self.accent_color,
-                width=1
-            )
+            if i >= len(positions):
+                break
+                
+            x, y, size = positions[i]
             
-            # Process and paste image
+            # Create clean icon from image
             if img:
-                if img.mode != 'RGB':
-                    img = img.convert('RGB')
+                # Remove background
+                icon_img = self.smart_remove_background(img)
+                
+                # Resize maintaining aspect ratio
+                icon_img.thumbnail((size, size), Image.Resampling.LANCZOS)
+                
+                # Create circular mask for smooth edges
+                mask = Image.new('L', (size, size), 0)
+                mask_draw = ImageDraw.Draw(mask)
+                mask_draw.ellipse((0, 0, size, size), fill=255)
                 
-                # Add white background behind image
-                draw.rectangle(
-                    [x_offset, y_offset, x_offset+icon_size, y_offset+icon_size],
-                    fill=(255, 255, 255),
-                    outline=self.accent_color,
-                    width=2
+                # Create final icon with transparency
+                icon_final = Image.new('RGBA', (size, size), (0, 0, 0, 0))
+                
+                # Center the image
+                paste_x = (size - icon_img.width) // 2
+                paste_y = (size - icon_img.height) // 2
+                icon_final.paste(icon_img, (paste_x, paste_y), icon_img)
+                
+                # Very subtle circular background (NO RED OUTLINE)
+                circle_bg = Image.new('RGBA', (size+20, size+20), (0, 0, 0, 0))
+                circle_draw = ImageDraw.Draw(circle_bg)
+                circle_draw.ellipse(
+                    [5, 5, size+15, size+15],
+                    fill=(245, 245, 245),  # Very light gray
+                    outline=None  # NO OUTLINE
                 )
                 
-                img_resized = img.resize((icon_size-4, icon_size-4), Image.Resampling.LANCZOS)
-                canvas.paste(img_resized, (x_offset+2, y_offset+2))
-            
-            # Draw food name
-            name_font = self.get_font(28, bold=True)
-            name_x = x_offset + icon_size + 15
-            name_y = y_offset + (icon_size // 2) - 25
-            draw.text((name_x, name_y), food_name, font=name_font, fill=self.text_color)
+                # Paste circle background
+                canvas.paste(circle_bg, (x-10, y-10), circle_bg)
+                
+                # Paste icon
+                canvas.paste(icon_final, (x, y), icon_final)
             
-            # Draw number
-            number_font = self.get_font(20)
-            number_text = f"#{i+1:02d}"
-            draw.text((name_x, name_y + 35), number_text, font=number_font, fill=self.accent_color)
+            # Draw food name with Chinese support
+            name_font = self.get_font(28 if num_items > 6 else 32, bold=True)
             
-            # Decorative line
-            line_y = name_y + 60
-            draw.line([name_x, line_y, name_x+80, line_y], fill=self.accent_color, width=2)
-        
-        # Draw footer
-        footer_font = self.get_font(22)
-        footer_text = "·  Fresh & Healthy  ·  Made with Love  ·"
+            # Calculate name position based on layout
+            if columns == 1:
+                # Single column - name below icon
+                name_x = x + (size // 2)
+                name_y = y + size + 15
+                anchor = "mm"  # Center alignment
+                
+                # Draw name
+                draw.text((name_x, name_y), food_name, font=name_font, 
+                         fill=self.text_color, anchor=anchor)
+                
+                # Draw number below name
+                number_font = self.get_font(20)
+                number_text = f"#{i+1:02d}"
+                draw.text((name_x, name_y + 35), number_text, font=number_font,
+                         fill=(150, 150, 150), anchor=anchor)
+                
+            else:
+                # Two columns - name beside icon
+                name_x = x + size + 15
+                name_y = y + (size // 2) - 20
+                
+                # Draw name
+                draw.text((name_x, name_y), food_name, font=name_font, fill=self.text_color)
+                
+                # Draw number
+                number_font = self.get_font(18)
+                number_text = f"#{i+1:02d}"
+                draw.text((name_x, name_y + 30), number_text, font=number_font,
+                         fill=(150, 150, 150))
+        
+        # Draw simple footer (NO RED)
+        footer_font = self.get_font(20)
+        footer_text = "·  Fresh & Healthy  ·"
         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 - 60
-        draw.text((footer_x, footer_y), footer_text, font=footer_font, fill=self.text_color)
+        footer_y = height - 50
+        draw.text((footer_x, footer_y), footer_text, font=footer_font, fill=(150, 150, 150))
         
         return canvas
 
@@ -1022,10 +1107,10 @@ def generate_storybook_background(job_id: str):
         update_job_status(job_id, JobStatus.FAILED, 0, error_msg)
 
 # =============================================
-# MEMORY-OPTIMIZED: Infographic Background Task with Custom Background Support
+# FIXED: Infographic Background Task
 # =============================================
 def generate_infographic_background(job_id: str):
-    """Background task with custom background support"""
+    """Background task with responsive layout and proper Chinese support"""
     try:
         job_data = job_storage[job_id]
         request = InfographicRequest(**job_data["request"])
@@ -1076,8 +1161,10 @@ def generate_infographic_background(job_id: str):
             try:
                 print(f"🖼️ Generating image for: {item.name}")
                 
-                # Enhanced prompt for food photography
-                enhanced_prompt = f"food photography, {item.prompt}, white background, studio lighting, high quality"
+                # Enhanced prompt for better subject isolation
+                enhanced_prompt = f"professional food photography, {item.prompt}, " \
+                                 f"isolated on white background, cut out, transparent style, " \
+                                 f"sharp focus, studio lighting, clean edges"
                 
                 image = generate_image_simple(
                     enhanced_prompt,
@@ -1124,7 +1211,7 @@ def generate_infographic_background(job_id: str):
         
         update_job_status(job_id, JobStatus.PROCESSING, 85, "Creating infographic layout...")
         
-        # Create the infographic with custom background
+        # Create the infographic with responsive layout
         layout_generator = InfographicLayoutGenerator()
         items_with_prompts = [(item.name, item.prompt) for item in items]
         
@@ -1132,7 +1219,7 @@ def generate_infographic_background(job_id: str):
             request.title,
             items_with_prompts,
             generated_images,
-            background_image=background_image  # Pass custom background
+            background_image=background_image
         )
         
         # Save infographic
@@ -1360,10 +1447,10 @@ async def get_local_images():
     return get_local_storage_info()
 
 # =============================================
-# ENHANCED: Test Functions for Gradio with Background Upload
+# FIXED: Test Functions for Gradio
 # =============================================
 def test_infographic(title, items_text, background_image=None):
-    """Test function for infographic generation with optional background"""
+    """Test function with proper Chinese support and responsive layout"""
     try:
         # Parse items (format: "name:prompt;name2:prompt2")
         items = []
@@ -1388,7 +1475,9 @@ def test_infographic(title, items_text, background_image=None):
             for i, item in enumerate(items):
                 print(f"  🖼️ Generating image {i+1}/{len(items)}: {item['name']}")
                 
-                enhanced_prompt = f"food photography, {item['prompt']}, white background, studio lighting"
+                enhanced_prompt = f"professional food photography, {item['prompt']}, " \
+                                 f"isolated on white background, cut out, transparent style, " \
+                                 f"sharp focus, studio lighting, clean edges"
                 
                 img = generate_image_simple(
                     enhanced_prompt, 
@@ -1398,11 +1487,11 @@ def test_infographic(title, items_text, background_image=None):
                     None
                 )
                 generated_images.append(img)
-                time.sleep(0.5)  # Small delay to prevent overwhelming
+                time.sleep(0.5)
             
-            print("  📐 Creating layout...")
+            print("  📐 Creating responsive layout...")
             
-            # Create infographic with custom background if provided
+            # Create infographic with responsive layout
             layout_gen = InfographicLayoutGenerator()
             items_with_prompts = [(item['name'], item['prompt']) for item in items]
             
@@ -1410,10 +1499,10 @@ def test_infographic(title, items_text, background_image=None):
                 title, 
                 items_with_prompts, 
                 generated_images,
-                background_image=background_image  # Pass uploaded background
+                background_image=background_image
             )
             
-            return infographic, f"✅ Generated infographic with {len(items)} items"
+            return infographic, f"✅ Generated responsive infographic with {len(items)} items"
             
         finally:
             # Clean up
@@ -1464,13 +1553,13 @@ def create_gradio_interface():
             with gr.Row():
                 with gr.Column():
                     infographic_title = gr.Textbox(
-                        label="Title",
-                        value="肠道友好的 7种食物",
-                        placeholder="Enter infographic title (supports Chinese)..."
+                        label="Title (Supports Chinese)",
+                        value="7월의 맛 (Taste of July)",
+                        placeholder="Enter infographic title in Chinese/English..."
                     )
                     infographic_items = gr.Textbox(
                         label="Items (name:prompt;name2:prompt2)",
-                        value="酸奶:yogurt bowl with berries;燕麦:bowl of oatmeal;芦笋:fresh asparagus;姜:fresh ginger;Kimchi:korean kimchi;香蕉:bananas;bone broth:warm bone broth",
+                        value="酸菜 (Kimchi):traditional korean cabbage kimchi;萝卜 (Kkakdugi):korean radish kimchi, cubed;派 (Pa-kimchi):green onion kimchi",
                         lines=5,
                         placeholder="item1:prompt1;item2:prompt2"
                     )
@@ -1499,7 +1588,7 @@ def create_gradio_interface():
             - **Title**: Supports Chinese/English text
             - **Items**: Format as `name:prompt;name2:prompt2`
             - **Background**: Upload your own image for custom background
-            - **Limit**: Maximum 10 items for best performance
+            - **Responsive**: Layout adapts to number of items (1-10)
             """)
     
     return demo