Update routers/news.py

routers/news.py

@@ -72,11 +72,10 @@ def resize_and_crop_to_fill(img: Image.Image, target_width: int, target_height:
     
     return img_resized.crop((left, top, right, bottom))
 
-def create_collage_background(image_urls: List[str], canvas_width: int, canvas_height: int, device: str, crop_position: str = "center") -> Image.Image:
+def create_collage_background(image_urls: List[str], canvas_width: int, canvas_height: int, crop_position: str = "center") -> Image.Image:
     """Cria uma colagem como fundo baseada na lista de URLs"""
     num_images = len(image_urls)
     border_size = 4 if num_images > 1 else 0  # Linha mais fina e elegante
-    is_web = device.lower() == "web"
     
     images = [download_image_from_url(url) for url in image_urls]
     canvas = Image.new("RGBA", (canvas_width, canvas_height), (255, 255, 255, 255))
@@ -85,151 +84,81 @@ def create_collage_background(image_urls: List[str], canvas_width: int, canvas_h
         img = resize_and_crop_to_fill(images[0], canvas_width, canvas_height, crop_position)
         canvas.paste(img, (0, 0))
     elif num_images == 2:
-        # Ambos dispositivos: lado a lado
+        # Lado a lado
         slot_width = (canvas_width - border_size) // 2
         img1 = resize_and_crop_to_fill(images[0], slot_width, canvas_height, crop_position)
         img2 = resize_and_crop_to_fill(images[1], slot_width, canvas_height, crop_position)
         canvas.paste(img1, (0, 0))
         canvas.paste(img2, (slot_width + border_size, 0))
     elif num_images == 3:
-        if is_web:
-            # Web: 1 grande à esquerda, 2 pequenas empilhadas à direita
-            left_width = (canvas_width - border_size) * 2 // 3
-            right_width = canvas_width - left_width - border_size
-            half_height = (canvas_height - border_size) // 2
-            
-            img1 = resize_and_crop_to_fill(images[0], left_width, canvas_height, crop_position)
-            img2 = resize_and_crop_to_fill(images[1], right_width, half_height, crop_position)
-            img3 = resize_and_crop_to_fill(images[2], right_width, half_height, crop_position)
-            
-            canvas.paste(img1, (0, 0))
-            canvas.paste(img2, (left_width + border_size, 0))
-            canvas.paste(img3, (left_width + border_size, half_height + border_size))
-        else:
-            # IG: layout original
-            half_height = (canvas_height - border_size) // 2
-            half_width = (canvas_width - border_size) // 2
-            
-            img1 = resize_and_crop_to_fill(images[0], half_width, half_height, crop_position)
-            img2 = resize_and_crop_to_fill(images[1], half_width, half_height, crop_position)
-            img3 = resize_and_crop_to_fill(images[2], canvas_width, half_height, crop_position)
-            
-            canvas.paste(img1, (0, 0))
-            canvas.paste(img2, (half_width + border_size, 0))
-            canvas.paste(img3, (0, half_height + border_size))
+        # Layout original IG
+        half_height = (canvas_height - border_size) // 2
+        half_width = (canvas_width - border_size) // 2
+        
+        img1 = resize_and_crop_to_fill(images[0], half_width, half_height, crop_position)
+        img2 = resize_and_crop_to_fill(images[1], half_width, half_height, crop_position)
+        img3 = resize_and_crop_to_fill(images[2], canvas_width, half_height, crop_position)
+        
+        canvas.paste(img1, (0, 0))
+        canvas.paste(img2, (half_width + border_size, 0))
+        canvas.paste(img3, (0, half_height + border_size))
     elif num_images == 4:
-        if is_web:
-            # Web: 4 imagens lado a lado horizontalmente
-            slot_width = (canvas_width - 3 * border_size) // 4
-            for i in range(4):
-                img = resize_and_crop_to_fill(images[i], slot_width, canvas_height, crop_position)
-                x_pos = i * (slot_width + border_size)
-                canvas.paste(img, (x_pos, 0))
-        else:
-            # IG: Layout 2x2
-            half_height = (canvas_height - border_size) // 2
-            half_width = (canvas_width - border_size) // 2
-            
-            img1 = resize_and_crop_to_fill(images[0], half_width, half_height, crop_position)
-            img2 = resize_and_crop_to_fill(images[1], half_width, half_height, crop_position)
-            img3 = resize_and_crop_to_fill(images[2], half_width, half_height, crop_position)
-            img4 = resize_and_crop_to_fill(images[3], half_width, half_height, crop_position)
-            
-            canvas.paste(img1, (0, 0))
-            canvas.paste(img2, (half_width + border_size, 0))
-            canvas.paste(img3, (0, half_height + border_size))
-            canvas.paste(img4, (half_width + border_size, half_height + border_size))
+        # Layout 2x2
+        half_height = (canvas_height - border_size) // 2
+        half_width = (canvas_width - border_size) // 2
+        
+        img1 = resize_and_crop_to_fill(images[0], half_width, half_height, crop_position)
+        img2 = resize_and_crop_to_fill(images[1], half_width, half_height, crop_position)
+        img3 = resize_and_crop_to_fill(images[2], half_width, half_height, crop_position)
+        img4 = resize_and_crop_to_fill(images[3], half_width, half_height, crop_position)
+        
+        canvas.paste(img1, (0, 0))
+        canvas.paste(img2, (half_width + border_size, 0))
+        canvas.paste(img3, (0, half_height + border_size))
+        canvas.paste(img4, (half_width + border_size, half_height + border_size))
     elif num_images == 5:
-        if is_web:
-            # Web: 3 em cima, 2 embaixo
-            top_height = (canvas_height - border_size) * 3 // 5
-            bottom_height = canvas_height - top_height - border_size
-            available_width = canvas_width - 2 * border_size
-            third_width = available_width // 3
-            third_width_last = canvas_width - (third_width * 2 + border_size * 2)
-            half_width = (canvas_width - border_size) // 2
-            
-            # 3 imagens em cima
-            img1 = resize_and_crop_to_fill(images[0], third_width, top_height, crop_position)
-            img2 = resize_and_crop_to_fill(images[1], third_width, top_height, crop_position)
-            img3 = resize_and_crop_to_fill(images[2], third_width_last, top_height, crop_position)
-            canvas.paste(img1, (0, 0))
-            canvas.paste(img2, (third_width + border_size, 0))
-            canvas.paste(img3, (third_width * 2 + border_size * 2, 0))
-            
-            # 2 imagens embaixo
-            y_offset = top_height + border_size
-            img4 = resize_and_crop_to_fill(images[3], half_width, bottom_height, crop_position)
-            img5 = resize_and_crop_to_fill(images[4], half_width, bottom_height, crop_position)
-            canvas.paste(img4, (0, y_offset))
-            canvas.paste(img5, (half_width + border_size, y_offset))
-        else:
-            # IG: layout original
-            top_height = (canvas_height - border_size) * 2 // 5
-            bottom_height = canvas_height - top_height - border_size
-            half_width = (canvas_width - border_size) // 2
-            
-            img1 = resize_and_crop_to_fill(images[0], half_width, top_height, crop_position)
-            img2 = resize_and_crop_to_fill(images[1], half_width, top_height, crop_position)
-            canvas.paste(img1, (0, 0))
-            canvas.paste(img2, (half_width + border_size, 0))
-            
-            y_offset = top_height + border_size
-            third_width = (canvas_width - 2 * border_size) // 3
-            third_width_last = canvas_width - (third_width * 2 + border_size * 2)
-            
-            img3 = resize_and_crop_to_fill(images[2], third_width, bottom_height, crop_position)
-            img4 = resize_and_crop_to_fill(images[3], third_width, bottom_height, crop_position)
-            img5 = resize_and_crop_to_fill(images[4], third_width_last, bottom_height, crop_position)
-            canvas.paste(img3, (0, y_offset))
-            canvas.paste(img4, (third_width + border_size, y_offset))
-            canvas.paste(img5, (third_width * 2 + border_size * 2, y_offset))
+        # Layout original IG
+        top_height = (canvas_height - border_size) * 2 // 5
+        bottom_height = canvas_height - top_height - border_size
+        half_width = (canvas_width - border_size) // 2
+        
+        img1 = resize_and_crop_to_fill(images[0], half_width, top_height, crop_position)
+        img2 = resize_and_crop_to_fill(images[1], half_width, top_height, crop_position)
+        canvas.paste(img1, (0, 0))
+        canvas.paste(img2, (half_width + border_size, 0))
+        
+        y_offset = top_height + border_size
+        third_width = (canvas_width - 2 * border_size) // 3
+        third_width_last = canvas_width - (third_width * 2 + border_size * 2)
+        
+        img3 = resize_and_crop_to_fill(images[2], third_width, bottom_height, crop_position)
+        img4 = resize_and_crop_to_fill(images[3], third_width, bottom_height, crop_position)
+        img5 = resize_and_crop_to_fill(images[4], third_width_last, bottom_height, crop_position)
+        canvas.paste(img3, (0, y_offset))
+        canvas.paste(img4, (third_width + border_size, y_offset))
+        canvas.paste(img5, (third_width * 2 + border_size * 2, y_offset))
     elif num_images == 6:
-        if is_web:
-            # Web: 3x2 (3 colunas, 2 linhas)
-            half_height = (canvas_height - border_size) // 2
-            available_width = canvas_width - 2 * border_size
-            third_width = available_width // 3
-            third_width_last = canvas_width - (third_width * 2 + border_size * 2)
-            
-            # Primeira linha
-            img1 = resize_and_crop_to_fill(images[0], third_width, half_height, crop_position)
-            img2 = resize_and_crop_to_fill(images[1], third_width, half_height, crop_position)
-            img3 = resize_and_crop_to_fill(images[2], third_width_last, half_height, crop_position)
-            canvas.paste(img1, (0, 0))
-            canvas.paste(img2, (third_width + border_size, 0))
-            canvas.paste(img3, (third_width * 2 + border_size * 2, 0))
-            
-            # Segunda linha
-            y_offset = half_height + border_size
-            img4 = resize_and_crop_to_fill(images[3], third_width, half_height, crop_position)
-            img5 = resize_and_crop_to_fill(images[4], third_width, half_height, crop_position)
-            img6 = resize_and_crop_to_fill(images[5], third_width_last, half_height, crop_position)
-            canvas.paste(img4, (0, y_offset))
-            canvas.paste(img5, (third_width + border_size, y_offset))
-            canvas.paste(img6, (third_width * 2 + border_size * 2, y_offset))
-        else:
-            # IG: layout original (3x2)
-            half_height = (canvas_height - border_size) // 2
-            third_width = (canvas_width - 2 * border_size) // 3
-            third_width_last = canvas_width - (third_width * 2 + border_size * 2)
-            
-            # Primeira linha
-            img1 = resize_and_crop_to_fill(images[0], third_width, half_height, crop_position)
-            img2 = resize_and_crop_to_fill(images[1], third_width, half_height, crop_position)
-            img3 = resize_and_crop_to_fill(images[2], third_width, half_height, crop_position)
-            canvas.paste(img1, (0, 0))
-            canvas.paste(img2, (third_width + border_size, 0))
-            canvas.paste(img3, (third_width * 2 + border_size * 2, 0))
-            
-            # Segunda linha
-            y_offset = half_height + border_size
-            img4 = resize_and_crop_to_fill(images[3], third_width, half_height, crop_position)
-            img5 = resize_and_crop_to_fill(images[4], third_width, half_height, crop_position)
-            img6 = resize_and_crop_to_fill(images[5], third_width_last, half_height, crop_position)
-            canvas.paste(img4, (0, y_offset))
-            canvas.paste(img5, (third_width + border_size, y_offset))
-            canvas.paste(img6, (third_width * 2 + border_size * 2, y_offset))
+        # Layout original IG (3x2)
+        half_height = (canvas_height - border_size) // 2
+        third_width = (canvas_width - 2 * border_size) // 3
+        third_width_last = canvas_width - (third_width * 2 + border_size * 2)
+        
+        # Primeira linha
+        img1 = resize_and_crop_to_fill(images[0], third_width, half_height, crop_position)
+        img2 = resize_and_crop_to_fill(images[1], third_width, half_height, crop_position)
+        img3 = resize_and_crop_to_fill(images[2], third_width, half_height, crop_position)
+        canvas.paste(img1, (0, 0))
+        canvas.paste(img2, (third_width + border_size, 0))
+        canvas.paste(img3, (third_width * 2 + border_size * 2, 0))
+        
+        # Segunda linha
+        y_offset = half_height + border_size
+        img4 = resize_and_crop_to_fill(images[3], third_width, half_height, crop_position)
+        img5 = resize_and_crop_to_fill(images[4], third_width, half_height, crop_position)
+        img6 = resize_and_crop_to_fill(images[5], third_width_last, half_height, crop_position)
+        canvas.paste(img4, (0, y_offset))
+        canvas.paste(img5, (third_width + border_size, y_offset))
+        canvas.paste(img6, (third_width * 2 + border_size * 2, y_offset))
     else:
         raise HTTPException(status_code=400, detail="Apenas até 6 imagens são suportadas.")
     
@@ -334,19 +263,6 @@ def get_responsive_font_and_lines(text: str, font_path: str, max_width: int, max
     lines = wrap_text(text, font, max_width, temp_draw)
     return font, lines, min_font_size
 
-def get_font_and_lines(text: str, font_path: str, font_size: int, max_width: int) -> tuple[ImageFont.FreeTypeFont, list[str]]:
-    """ Retorna a fonte e linhas com tamanho fixo de fonte. """
-    try:
-        font = ImageFont.truetype(font_path, font_size)
-    except Exception:
-        font = ImageFont.load_default()
-    
-    temp_img = Image.new("RGB", (1, 1))
-    temp_draw = ImageDraw.Draw(temp_img)
-    lines = wrap_text(text, font, max_width, temp_draw)
-    
-    return font, lines
-
 def get_text_color_rgb(text_color: str) -> tuple[int, int, int]:
     """ Converte o parâmetro text_color para RGB. """
     if text_color.lower() == "black":
@@ -354,28 +270,25 @@ def get_text_color_rgb(text_color: str) -> tuple[int, int, int]:
     else:  # white por padrão
         return (255, 255, 255)
 
-def get_device_dimensions(device: str) -> tuple[int, int]:
-    """Retorna as dimensões baseadas no dispositivo"""
-    if device.lower() == "web":
-        return (1280, 720)
-    else:  # Instagram por padrão
-        return (1080, 1350)
+def get_category_image_path(category: str) -> str:
+    """Retorna o caminho da imagem baseado na categoria"""
+    valid_categories = ["person", "movie", "series", "place", "event", "other"]
+    
+    if category.lower() in valid_categories:
+        return f"{category.lower()}.png"
+    else:
+        return "other.png"  # Default para other
 
-def create_canvas(image_url: Optional[Union[str, List[str]]], headline: Optional[str], device: str = "ig", text_position: str = "bottom", text_color: str = "white", crop_position: str = "center") -> BytesIO:
-    width, height = get_device_dimensions(device)
-    is_web = device.lower() == "web"
+def create_canvas(image_url: Optional[Union[str, List[str]]], headline: Optional[str], text_position: str = "bottom", text_color: str = "white", crop_position: str = "center", breaking_news: bool = False, category: str = "other") -> BytesIO:
+    # Dimensões fixas do Instagram
+    width, height = 1080, 1350
     text_rgb = get_text_color_rgb(text_color)
     
-    # Configurações específicas por dispositivo
-    if is_web:
-        padding_x = 40
-        logo_width, logo_height = 120, 22
-        logo_padding = 40
-    else:
-        padding_x = 60
-        bottom_padding = 80
-        top_padding = 60
-        logo_width, logo_height = 121, 23  # Novas dimensões: L:121, A:22.75 (arredondado para 23)
+    # Configurações do Instagram
+    padding_x = 60
+    bottom_padding = 80
+    top_padding = 60
+    logo_width, logo_height = 121, 23
     
     max_width = width - 2 * padding_x
     canvas = Image.new("RGBA", (width, height), color=(255, 255, 255, 255))
@@ -394,66 +307,95 @@ def create_canvas(image_url: Optional[Union[str, List[str]]], headline: Optional
                 canvas.paste(filled_img, (0, 0))
             else:
                 # Múltiplas imagens - criar colagem
-                canvas = create_collage_background(parsed_urls, width, height, device, crop_position)
+                canvas = create_collage_background(parsed_urls, width, height, crop_position)
+    
+    # Adicionar gradiente se o texto for branco
+    if text_color.lower() != "black":
+        gradient_overlay = create_gradient_overlay(width, height, text_position)
+        canvas = Image.alpha_composite(canvas, gradient_overlay)
     
-    # Para Instagram: adicionar gradiente e texto
-    if not is_web:
-        # Só aplicar gradiente se o texto for branco
-        if text_color.lower() != "black":
-            gradient_overlay = create_gradient_overlay(width, height, text_position)
-            canvas = Image.alpha_composite(canvas, gradient_overlay)
+    if headline:
+        draw = ImageDraw.Draw(canvas)
+        font_path = "fonts/AGaramondPro-Semibold.ttf"
+        line_height_factor = 1.05  # 105% da altura da linha
         
-        if headline:
-            draw = ImageDraw.Draw(canvas)
-            font_path = "fonts/AGaramondPro-Semibold.ttf"
-            line_height_factor = 1.05  # 105% da altura da linha
-            
-            try:
-                font, lines, font_size = get_responsive_font_and_lines(
-                    headline, font_path, max_width, max_lines=3, max_font_size=80, min_font_size=20
-                )
-                line_height = int(font_size * line_height_factor)
-            except Exception as e:
-                raise HTTPException(status_code=500, detail=f"Erro ao processar a fonte: {e}")
-            
-            total_text_height = len(lines) * line_height
+        try:
+            font, lines, font_size = get_responsive_font_and_lines(
+                headline, font_path, max_width, max_lines=3, max_font_size=80, min_font_size=20
+            )
+            line_height = int(font_size * line_height_factor)
+        except Exception as e:
+            raise HTTPException(status_code=500, detail=f"Erro ao processar a fonte: {e}")
+        
+        total_text_height = len(lines) * line_height
+        
+        # Calcular espaço necessário para imagem de categoria/breaking
+        category_img_height = 0
+        category_spacing = 0
+        if breaking_news or category:
+            category_img_height = 46  # altura da imagem
+            category_spacing = 38     # separação entre imagem e título
+        
+        # Posicionar texto baseado no parâmetro text_position
+        if text_position.lower() == "bottom":
+            # Posicionar texto 50px acima da logo (que está em Y:1274)
+            text_end_y = 1274 - 50
+            start_y = text_end_y - total_text_height
             
-            # Posicionar texto baseado no parâmetro text_position
-            if text_position.lower() == "bottom":
-                # Posicionar texto 50px acima da logo (que está em Y:1274)
-                text_end_y = 1274 - 50
-                start_y = text_end_y - total_text_height
-            else:  # text_position == "top"
-                # Posicionar texto no topo com padding
+            # Se há imagem de categoria, ajustar posição para dar espaço
+            if breaking_news or category:
+                category_y = start_y - category_spacing - category_img_height
+        else:  # text_position == "top"
+            # Posicionar texto no topo com padding
+            if breaking_news or category:
+                # Começar com imagem de categoria no topo
+                category_y = top_padding
+                start_y = category_y + category_img_height + category_spacing
+            else:
                 start_y = top_padding
-            
-            # Adicionar logo no canto inferior direito (posição fixa)
+        
+        # Adicionar imagem de categoria/breaking se necessário
+        if breaking_news or category:
             try:
-                logo_path = "recurve.png"
-                logo = Image.open(logo_path).convert("RGBA")
-                logo_resized = logo.resize((logo_width, logo_height))
+                if breaking_news:
+                    # Breaking news tem prioridade sobre category
+                    img_path = "breaking.png"
+                else:
+                    # Usar imagem da categoria
+                    img_path = get_category_image_path(category)
                 
-                # Aplicar opacidade de 42%
-                logo_with_opacity = Image.new("RGBA", logo_resized.size)
-                for x in range(logo_resized.width):
-                    for y in range(logo_resized.height):
-                        r, g, b, a = logo_resized.getpixel((x, y))
-                        new_alpha = int(a * 0.42)  # 42% de opacidade
-                        logo_with_opacity.putpixel((x, y), (r, g, b, new_alpha))
+                category_img = Image.open(img_path).convert("RGBA")
+                category_resized = category_img.resize((200, 46))
                 
-                # Posição fixa: X:891, Y:1274
-                canvas.paste(logo_with_opacity, (891, 1274), logo_with_opacity)
+                # Posicionar no canto esquerdo, alinhado com o início do título
+                category_x = padding_x
+                canvas.paste(category_resized, (category_x, category_y), category_resized)
             except Exception as e:
-                raise HTTPException(status_code=500, detail=f"Erro ao carregar a logo: {e}")
+                raise HTTPException(status_code=500, detail=f"Erro ao carregar a imagem de categoria: {e}")
+        
+        # Adicionar logo no canto inferior direito (posição fixa)
+        try:
+            logo_path = "recurve.png"
+            logo = Image.open(logo_path).convert("RGBA")
+            logo_resized = logo.resize((logo_width, logo_height))
             
-            # Adiciona texto com a cor especificada
-            for i, line in enumerate(lines):
-                y = start_y + i * line_height
-                draw.text((padding_x, y), line, font=font, fill=text_rgb)
-    
-    # Para web: apenas logo no canto inferior direito
-    else:
-        pass
+            # Aplicar opacidade de 42%
+            logo_with_opacity = Image.new("RGBA", logo_resized.size)
+            for x in range(logo_resized.width):
+                for y in range(logo_resized.height):
+                    r, g, b, a = logo_resized.getpixel((x, y))
+                    new_alpha = int(a * 0.42)  # 42% de opacidade
+                    logo_with_opacity.putpixel((x, y), (r, g, b, new_alpha))
+            
+            # Posição fixa: X:891, Y:1274
+            canvas.paste(logo_with_opacity, (891, 1274), logo_with_opacity)
+        except Exception as e:
+            raise HTTPException(status_code=500, detail=f"Erro ao carregar a logo: {e}")
+        
+        # Adiciona texto com a cor especificada
+        for i, line in enumerate(lines):
+            y = start_y + i * line_height
+            draw.text((padding_x, y), line, font=font, fill=text_rgb)
     
     buffer = BytesIO()
     canvas.convert("RGB").save(buffer, format="PNG")
@@ -463,14 +405,15 @@ def create_canvas(image_url: Optional[Union[str, List[str]]], headline: Optional
 @router.get("/cover/news")
 def get_news_image(
     image_url: Optional[Union[str, List[str]]] = Query(None, description="URL da imagem ou lista de URLs separadas por vírgula para colagem (máximo 6)"),
-    headline: Optional[str] = Query(None, description="Texto do título (opcional para IG, ignorado para web)"),
-    device: str = Query("ig", description="Dispositivo: 'ig' para Instagram (1080x1350) ou 'web' para Web (1280x720)"),
+    headline: Optional[str] = Query(None, description="Texto do título"),
     text_position: str = Query("bottom", description="Posição do texto: 'top' para topo ou 'bottom' para parte inferior"),
     text_color: str = Query("white", description="Cor do texto: 'white' (padrão) ou 'black'. Se 'black', remove o gradiente de fundo"),
-    crop_position: str = Query("center", description="Posição do enquadramento da imagem: 'center' (padrão), 'top', 'bottom', 'left', 'right'")
+    crop_position: str = Query("center", description="Posição do enquadramento da imagem: 'center' (padrão), 'top', 'bottom', 'left', 'right'"),
+    breaking_news: bool = Query(False, description="Se true, mostra a imagem breaking.png acima do título (tem prioridade sobre category)"),
+    category: str = Query("other", description="Categoria da notícia: 'person', 'movie', 'series', 'place', 'event', 'other' (padrão)")
 ):
     try:
-        buffer = create_canvas(image_url, headline, device, text_position, text_color, crop_position)
+        buffer = create_canvas(image_url, headline, text_position, text_color, crop_position, breaking_news, category)
         return StreamingResponse(buffer, media_type="image/png")
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"Erro ao gerar imagem: {str(e)}")