Update app.py

app.py

@@ -98,94 +98,80 @@ class JobStatus(str, Enum):
     FAILED = "failed"
 
 # =============================================
-# Style and Size Configuration
+# Style Configuration (NO SIZE DEFAULTS)
 # =============================================
 
-# Available image styles with their prompts
+# Available image styles with their prompts (size removed)
 STYLE_CONFIGS = {
     "childrens_book": {
         "name": "Children's Book Style",
         "description": "Soft, whimsical watercolor illustration style",
         "prompt_prefix": "children's book illustration, watercolor style, soft colors, whimsical, magical, storybook art, professional illustration, cute",
-        "negative": "photorealistic, dark, scary, adult content, violent",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "photorealistic, dark, scary, adult content, violent"
     },
     "realistic": {
         "name": "Realistic Style",
         "description": "Photorealistic, lifelike images",
         "prompt_prefix": "photorealistic, ultra realistic, detailed, natural lighting, professional photography, 8k, sharp focus",
-        "negative": "cartoon, anime, painting, illustration, blurry, low quality",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "cartoon, anime, painting, illustration, blurry, low quality"
     },
     "anime": {
         "name": "Anime Style",
         "description": "Japanese animation style",
         "prompt_prefix": "anime style, Japanese animation, vibrant colors, detailed artwork, high quality, studio ghibli inspired",
-        "negative": "photorealistic, 3d render, realistic, ugly, blurry",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "photorealistic, 3d render, realistic, ugly, blurry"
     },
     "fantasy": {
         "name": "Fantasy Style",
         "description": "Magical, ethereal fantasy art",
         "prompt_prefix": "fantasy art, magical, ethereal, digital painting, concept art, epic, mystical, dreamlike",
-        "negative": "realistic, modern, mundane, blurry, low quality",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "realistic, modern, mundane, blurry, low quality"
     },
     "pixel_art": {
         "name": "Pixel Art Style",
         "description": "Retro video game pixel art",
         "prompt_prefix": "pixel art, retro video game style, 16-bit, detailed pixels, vibrant colors, game sprite",
-        "negative": "realistic, smooth, 3d, blurry, high resolution",
-        "default_width": 512,
-        "default_height": 512
+        "negative": "realistic, smooth, 3d, blurry, high resolution"
     },
     "oil_painting": {
         "name": "Oil Painting Style",
         "description": "Classic oil painting aesthetic",
         "prompt_prefix": "oil painting, classic art, renaissance style, detailed brushstrokes, masterpiece, canvas texture",
-        "negative": "digital art, cartoon, anime, photograph, modern",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "digital art, cartoon, anime, photograph, modern"
     },
     "sketch": {
         "name": "Sketch Style",
         "description": "Hand-drawn pencil sketch",
         "prompt_prefix": "pencil sketch, hand drawn, detailed drawing, artistic sketch, charcoal drawing, monochrome",
-        "negative": "color, painting, digital, photograph, realistic colors",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "color, painting, digital, photograph, realistic colors"
     },
     "cyberpunk": {
         "name": "Cyberpunk Style",
         "description": "Futuristic cyberpunk aesthetic",
         "prompt_prefix": "cyberpunk style, neon lights, futuristic, sci-fi, dark atmosphere, vibrant neon colors, blade runner aesthetic",
-        "negative": "vintage, pastel, bright daylight, natural, realistic",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "vintage, pastel, bright daylight, natural, realistic"
     },
     "minimalist": {
         "name": "Minimalist Style",
         "description": "Clean, simple minimalist design",
         "prompt_prefix": "minimalist style, simple, clean design, flat illustration, geometric, pastel colors, modern art",
-        "negative": "detailed, complex, photorealistic, cluttered, busy",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "detailed, complex, photorealistic, cluttered, busy"
     },
     "watercolor": {
         "name": "Watercolor Style",
         "description": "Soft watercolor painting",
         "prompt_prefix": "watercolor painting, soft colors, artistic, flowing, delicate, wet on wet technique, traditional art",
-        "negative": "digital, sharp lines, photorealistic, heavy texture",
-        "default_width": 768,
-        "default_height": 1024
+        "negative": "digital, sharp lines, photorealistic, heavy texture"
+    },
+    "news": {
+        "name": "News Style",
+        "description": "Realistic news photography style",
+        "prompt_prefix": "professional news photography, photojournalism style, documentary photography, realistic, detailed, natural lighting, high resolution",
+        "negative": "cartoon, anime, painting, illustration, blurry, low quality, staged"
     }
 }
 
-# Size presets with valid dimensions (divisible by 8)
+# Size presets (independent from style)
 SIZE_PRESETS = {
     "square": {"width": 768, "height": 768, "description": "1:1 Square"},
     "portrait": {"width": 768, "height": 1024, "description": "3:4 Portrait"},
@@ -229,7 +215,7 @@ class InfographicItem(BaseModel):
 class InfographicRequest(BaseModel):
     title: str
     items: List[InfographicItem]
-    style: str = "food_photography"
+    style: str = "realistic"
     image_size: str = "story"
     custom_width: Optional[int] = None
     custom_height: Optional[int] = None
@@ -275,44 +261,64 @@ current_pipe = None
 model_lock = threading.Lock()
 
 # =============================================
-# HELPER FUNCTIONS WITH DIMENSION VALIDATION
+# HELPER FUNCTIONS WITH SEPARATE SIZE CONTROL
 # =============================================
 
 def validate_dimensions(width, height):
     """Ensure dimensions are compatible with Stable Diffusion (divisible by 8)"""
-    # SD models require dimensions divisible by 8
     width = (width // 8) * 8
     height = (height // 8) * 8
     
     # Minimum and maximum constraints
-    width = max(256, min(1024, width))
-    height = max(256, min(1024, height))
+    width = max(256, min(1920, width))
+    height = max(256, min(2048, height))
     
     return width, height
 
 def get_image_dimensions(size_preset, custom_width=None, custom_height=None):
-    """Get image dimensions based on preset or custom values with validation"""
-    if size_preset == "custom" and custom_width and custom_height:
+    """Get image dimensions based on preset - COMPLETELY INDEPENDENT OF STYLE"""
+    
+    print(f"📐 Getting dimensions for preset: {size_preset}")
+    
+    # Handle size presets
+    if size_preset == "story":
+        width, height = 1080, 1920
+    elif size_preset == "square":
+        width, height = 768, 768
+    elif size_preset == "portrait":
+        width, height = 768, 1024
+    elif size_preset == "landscape":
+        width, height = 1024, 768
+    elif size_preset == "wide":
+        width, height = 1280, 720
+    elif size_preset == "ultrawide":
+        width, height = 1920, 768
+    elif size_preset == "instagram":
+        width, height = 1080, 1080
+    elif size_preset == "facebook":
+        width, height = 1200, 632
+    elif size_preset == "twitter":
+        width, height = 1600, 896
+    elif size_preset == "custom" and custom_width and custom_height:
         width, height = custom_width, custom_height
-    elif size_preset in SIZE_PRESETS:
-        preset = SIZE_PRESETS[size_preset]
-        width, height = preset["width"], preset["height"]
     else:
         # Default to portrait
         width, height = 768, 1024
     
     # Validate dimensions
     width, height = validate_dimensions(width, height)
+    
+    print(f"📐 Final dimensions: {width}x{height}")
     return width, height
 
 def get_style_config(style_name):
-    """Get style configuration or return default"""
+    """Get style configuration (NO SIZE INFO)"""
     if style_name in STYLE_CONFIGS:
         return STYLE_CONFIGS[style_name]
     return STYLE_CONFIGS["childrens_book"]
 
 def enhance_prompt_with_style(scene_visual, style="childrens_book", custom_style_prompt=None):
-    """Enhanced prompt with style configuration"""
+    """Enhanced prompt with style configuration - NO SIZE"""
     if custom_style_prompt:
         style_prefix = custom_style_prompt
     else:
@@ -349,6 +355,8 @@ def generate_image_with_settings(prompt, model_choice, style, scene_number, cons
         generator = torch.Generator(device="cpu")
         generator.manual_seed(scene_seed)
         
+        print(f"🎨 Generating: {style} style, {width}x{height}")
+        
         image = pipe(
             prompt=enhanced_prompt,
             negative_prompt=negative_prompt,
@@ -622,6 +630,7 @@ def generate_storybook_background(job_id: str):
         
         project_id = story_request.project_id or story_request.story_title.replace(' ', '_').lower()
         
+        # Get dimensions based on size preset (independent of style)
         width, height = get_image_dimensions(
             story_request.image_size,
             story_request.custom_width,
@@ -682,7 +691,7 @@ def generate_storybook_background(job_id: str):
         }
         
         if project_id and image_urls:
-            report_to_tracker(project_id, "image", "completed", image_urls)
+            report_to_tracker(project_id, "storybook", "completed", image_urls)
         
         update_job_status(job_id, JobStatus.COMPLETED, 100, "Storybook completed!", result)
         
@@ -755,11 +764,8 @@ class InfographicLayoutGenerator:
         except Exception as e:
             return image
     
-    def create_responsive_layout(self, num_items):
+    def create_responsive_layout(self, num_items, width=900, height=1600):
         """Calculate responsive layout"""
-        width = 900
-        height = 1600
-        
         if num_items <= 3:
             icon_size = 180
             columns = 1
@@ -808,7 +814,7 @@ class InfographicLayoutGenerator:
         
         draw = ImageDraw.Draw(canvas)
         num_items = len(items_with_prompts)
-        positions, icon_size, columns = self.create_responsive_layout(num_items)
+        positions, icon_size, columns = self.create_responsive_layout(num_items, width, height)
         
         # Draw title
         title_font = self.get_font(48, bold=True)
@@ -895,6 +901,7 @@ def generate_infographic_background(job_id: str):
         request = InfographicRequest(**job_data["request"])
         project_id = request.project_id or f"infographic_{int(time.time())}"
         
+        # Get dimensions based on size preset (independent of style)
         width, height = get_image_dimensions(
             request.image_size,
             request.custom_width,
@@ -920,18 +927,24 @@ def generate_infographic_background(job_id: str):
         image_urls = []
         items_data = []
         
+        # Use a standard size for individual item images (not the infographic size)
+        item_width = 768
+        item_height = 768
+        
         for i, item in enumerate(items):
             progress = 10 + int(((i + 1) / len(items)) * 70)
             update_job_status(job_id, JobStatus.PROCESSING, progress, f"Generating {item.name}")
             
             try:
+                # Generate individual item images at standard size
                 image = generate_image_with_settings(
                     item.prompt,
                     "dreamshaper-8",
-                    "realistic",
+                    request.style,
                     i + 1,
                     None,
-                    768, 1024
+                    item_width,
+                    item_height
                 )
                 generated_images.append(image)
                 
@@ -950,6 +963,7 @@ def generate_infographic_background(job_id: str):
                 })
                 
             except Exception as e:
+                print(f"❌ Failed for {item.name}: {e}")
                 placeholder = Image.new('RGB', (512, 512), (240, 240, 240))
                 generated_images.append(placeholder)
             
@@ -957,6 +971,7 @@ def generate_infographic_background(job_id: str):
         
         update_job_status(job_id, JobStatus.PROCESSING, 85, "Creating layout...")
         
+        # Create infographic with the specified dimensions
         layout_generator = InfographicLayoutGenerator()
         items_with_prompts = [(item.name, item.prompt) for item in items]
         infographic = layout_generator.create_food_infographic(
@@ -997,7 +1012,7 @@ def generate_infographic_background(job_id: str):
 async def generate_storybook(request: dict, background_tasks: BackgroundTasks):
     """Main endpoint with style and size options"""
     try:
-        print(f"📥 Received storybook request - Style: {request.get('style', 'childrens_book')}")
+        print(f"📥 Received storybook request")
         
         if 'consistency_seed' not in request:
             request['consistency_seed'] = random.randint(1000, 9999)
@@ -1012,6 +1027,7 @@ async def generate_storybook(request: dict, background_tasks: BackgroundTasks):
         job_id = create_job(story_request)
         background_tasks.add_task(generate_storybook_background, job_id)
         
+        # Get dimensions for response
         width, height = get_image_dimensions(
             request.get('image_size', 'portrait'),
             request.get('custom_width'),
@@ -1034,17 +1050,20 @@ async def generate_storybook(request: dict, background_tasks: BackgroundTasks):
 async def generate_infographic(request: dict, background_tasks: BackgroundTasks):
     """Generate infographic with style and size options"""
     try:
-        print(f"📥 Received infographic request - Style: {request.get('style', 'food_photography')}")
+        print(f"📥 Received infographic request")
         
         if 'project_id' not in request:
             request['project_id'] = f"infographic_{int(time.time())}"
         if 'image_size' not in request:
             request['image_size'] = 'story'
+        if 'style' not in request:
+            request['style'] = 'realistic'
         
         infographic_request = InfographicRequest(**request)
         job_id = create_job(infographic_request)
         background_tasks.add_task(generate_infographic_background, job_id)
         
+        # Get dimensions for response
         width, height = get_image_dimensions(
             request.get('image_size', 'story'),
             request.get('custom_width'),
@@ -1068,8 +1087,7 @@ async def get_available_styles():
     """Get all available image styles"""
     styles = {key: {
         "name": config["name"],
-        "description": config["description"],
-        "default_size": f"{config['default_width']}x{config['default_height']}"
+        "description": config["description"]
     } for key, config in STYLE_CONFIGS.items()}
     return {"styles": styles}
 
@@ -1175,8 +1193,7 @@ def create_gradio_interface():
             styles_md = ""
             for key, config in STYLE_CONFIGS.items():
                 styles_md += f"### **{config['name']}** (`{key}`)\n"
-                styles_md += f"{config['description']}\n"
-                styles_md += f"*Default size: {config['default_width']}x{config['default_height']}*\n\n"
+                styles_md += f"{config['description']}\n\n"
             gr.Markdown(styles_md)
             
             gr.Markdown("## Available Size Presets")
@@ -1194,7 +1211,7 @@ demo = create_gradio_interface()
 async def root():
     return {
         "message": "Enhanced Image Generator API",
-        "version": "2.0",
+        "version": "3.0",
         "available_styles": list(STYLE_CONFIGS.keys()),
         "available_sizes": list(SIZE_PRESETS.keys()),
         "endpoints": {