Restore to commit bdf29090e1ff324b34841a86e871cc6942e06551

ai_runtime_patch_fast.py

@@ -176,116 +176,76 @@ def _split_into_segments(text, max_segments=10, min_len=30):
 # ======================================================================
 # FRAME CREATION — with Vietnamese font support
 # ======================================================================
+def _draw_vn_text(draw, text, font, x, y, max_width, max_lines=6, fill=(255,255,255)):
+    """Draw text with word wrapping, handling Vietnamese characters."""
+    if font is None:
+        return y
+    
+    words = text.split()
+    lines = []
+    current_line = []
+    
+    for w in words:
+        test_line = ' '.join(current_line + [w])
+        try:
+            w_px = font.getlength(test_line)
+        except:
+            try:
+                w_px = draw.textbbox((0,0), test_line, font=font)[2]
+            except:
+                w_px = len(test_line) * 22
+        
+        if w_px <= max_width:
+            current_line.append(w)
+        else:
+            if current_line:
+                lines.append(' '.join(current_line))
+            current_line = [w]
+            if len(lines) >= max_lines:
+                break
+    
+    if current_line and len(lines) < max_lines:
+        lines.append(' '.join(current_line))
+    
+    for ln in lines[:max_lines]:
+        draw.text((x, y), ln, fill=fill, font=font)
+        y += 55
+    
+    return y
 
-
-def _make_frame(post, seg, idx, total, img_path, downloaded, frame_path):
-    """Create a single frame with Vietnamese text support - matching original layout."""
+def _make_frame(post, seg, idx, img_path, downloaded, frame_path):
+    """Create a single frame with Vietnamese text support."""
     from PIL import Image, ImageDraw
     _find_vn_fonts()
     
-    W, H = 1080, 1920
-    hero_h = 760
-    bg = Image.new('RGB', (W, H), (12, 12, 12))
+    sz = (1080, 1920)
+    bg = Image.new('RGB', sz, (15, 23, 38))
     draw = ImageDraw.Draw(bg)
     
-    # Background image (hero)
+    # Background image
     if downloaded:
         try:
             im = Image.open(img_path).convert('RGB')
-            ratio = im.width / max(1, im.height)
-            tr = W / hero_h
-            if ratio > tr:
-                nh = hero_h; nw = int(nh * ratio)
-            else:
-                nw = W; nh = int(nw / ratio)
-            im = im.resize((nw, nh))
-            left = (nw - W) // 2
-            top = (nh - hero_h) // 2
-            bg.paste(im.crop((left, top, left + W, top + hero_h)), (0, 0))
+            im = im.resize((1080, 760))
+            bg.paste(im, (0, 0))
+            overlay = Image.new('RGBA', (1080, 400), (0, 0, 0, 180))
+            bg.paste(overlay, (0, 720), overlay)
         except Exception as e:
             _log.warning(f"paste img: {e}")
     
-    try:
-        fb = ImageFont.truetype('/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf', 58)
-    except:
-        fb = None
-    
-    # Source badge on top image corner
-    badge = 'Nguồn: ' + _source_badge_url_first(post)
-    try:
-        b = draw.textbbox((0, 0), badge, font=fb); bw = b[2] - b[0]; bh = b[3] - b[1]
-    except:
-        bw = len(badge) * 16; bh = 34
-    bx = W - bw - 42; by = 24
-    draw.rounded_rectangle((bx - 16, by - 8, W - 24, by + bh + 14), radius=18, fill=(0, 0, 0, 170))
-    draw.text((bx, by), badge, fill=(255, 255, 255), font=fb)
-    
-    # Bottom text area
-    draw.rectangle((0, hero_h - 20, W, H), fill=(12, 12, 12))
-    
-    # Progress bars centered
-    total = max(1, total)
-    total_w = total * 38 - 14
-    start = (W - total_w) // 2
-    for i in range(total):
-        fill = (92, 184, 122) if i == idx else (70, 70, 70)
-        draw.rounded_rectangle((start + i * 38, 820, start + i * 38 + 24, 832), radius=6, fill=fill)
-    
-    brand = 'VNEWS AI SHORT'
-    try:
-        bb = draw.textbbox((0, 0), brand, font=fb); tx = (W - (bb[2] - bb[0])) // 2
-    except:
-        tx = 360
-    draw.text((tx, 870), brand, fill=(110, 231, 143), font=fb)
-    
-    seg_text = _strip_bullet_prefix(seg)
-    lines = wrap_text_vn(draw, seg_text, fb, W - 120, 8) if fb else [seg_text[:80]]
-    block_h = len(lines) * 74
-    y = max(980, 1250 - block_h // 2)
-    _draw_center(draw, lines, fb, y, (255, 255, 255), W, 74)
+    # Title bar
+    draw.rectangle([0, 0, sz[0], 100], fill=(25, 118, 210))
+    ttl = post.get('title', '')[:50]
+    if _FONT_BOLD:
+        draw.text((sz[0]//2, 50), ttl, fill='white', font=_FONT_BOLD, anchor='mm')
     
-    title_lines = wrap_text_vn(draw, _strip_bullet_prefix(post.get('title', '')), fb, W - 120, 3) if fb else []
-    y2 = 1640
-    draw.line((80, y2 - 26, W - 80, y2 - 26), fill=(70, 70, 70), width=2)
-    _draw_center(draw, title_lines, fb, y2, (220, 220, 220), W, 42)
+    # Segment text
+    seg_text = seg[:200]
+    _draw_vn_text(draw, seg_text, _FONT_REGULAR, 80, 820, 920, max_lines=8)
     
-    bg.save(frame_path, quality=92)
+    bg.save(frame_path, quality=88)
     return True
 
-
-def _source_badge_url_first(post):
-    d = _domain(post.get('url', ''))
-    if d:
-        return d
-    for s in post.get('sources') or []:
-        d = _domain(s.get('url', ''))
-        if d:
-            return d
-    return 'VNEWS'
-
-
-def wrap_text_vn(draw, text, font, maxw, max_lines):
-    words = _clean(text).split()
-    lines = []
-    cur = ''
-    for w in words:
-        test = (cur + ' ' + w).strip()
-        try:
-            width = draw.textbbox((0, 0), test, font=font)[2]
-        except:
-            width = len(test) * 22
-        if width <= maxw:
-            cur = test
-        else:
-            if cur:
-                lines.append(cur)
-            cur = w
-        if len(lines) >= max_lines:
-            break
-    if cur and len(lines) < max_lines:
-        lines.append(cur)
-    return lines
-
 # ======================================================================
 # SHORT VIDEO GENERATOR — FULLY ROBUST
 # ======================================================================
@@ -369,7 +329,7 @@ def _gen_short_sync(post) -> str:
         frame_ok = False
         if has_pil:
             try:
-                _make_frame(post, seg, idx, len(segments), img_path, downloaded, frame_path)
+                _make_frame(post, seg, idx, img_path, downloaded, frame_path)
                 if os.path.exists(frame_path) and os.path.getsize(frame_path) > 1000:
                     frame_ok = True
                 else: