Upload ai_runtime_patch_fast.py

ai_runtime_patch_fast.py

@@ -1,9 +1,16 @@
-"""Final patch v2: fix topic rewrite, remove duplicate short slide, full short interaction buttons."""
-import re, threading, time, json, os, asyncio
+"""Final patch v6: FIXED short video generation — Vietnamese fonts, robust text splitting, no silent errors."""
+import re, threading, time, json, os, asyncio, hashlib, subprocess, requests, sys, logging
 import ai_runtime_final6 as f6
 from ai_runtime_final6 import app, rt, f5, HTMLResponse, JSONResponse, Request, Query
+from fastapi.responses import FileResponse
 import html as html_lib
 from urllib.parse import urlparse
+from datetime import datetime, timezone, timedelta
+
+_log = logging.getLogger("patch_fast")
+_log.setLevel(logging.INFO)
+if not _log.handlers:
+    _log.addHandler(logging.StreamHandler(sys.stderr))
 
 def clean(s):return re.sub(r"\s+"," ",html_lib.unescape(str(s or ""))).strip()
 def _domain(u):
@@ -13,6 +20,8 @@ DATA_DIR="/data" if os.path.isdir('/data') else "/app/data"
 os.makedirs(DATA_DIR,exist_ok=True)
 SHORT_COMMENTS_FILE=os.path.join(DATA_DIR,'short_comments.json')
 TTL_24H=86400;HAS_PERSISTENT=os.path.isdir('/data')
+SHORTS_DIR = os.path.join(DATA_DIR, 'ai_shorts')
+os.makedirs(SHORTS_DIR, exist_ok=True)
 def _lj(p,d):
     try:
         if os.path.exists(p):return json.load(open(p,'r',encoding='utf-8'))
@@ -27,6 +36,413 @@ def _cleanup():
 def _scrape(url,mc=8000):
     try:d=f5.base.scrape_any_url(url);return(d.get('title',''),((d.get('summary','')+'\n'+d.get('text','')).strip())[:mc],d.get('image') or d.get('og_image') or '')
     except:return('','','')
+
+# ======================================================================
+# VIETNAMESE FONT DETECTION — find ANY font that supports Vietnamese
+# ======================================================================
+_FONT_REGULAR = None
+_FONT_BOLD = None
+_FONT_REGULAR_PATH = None
+_FONT_BOLD_PATH = None
+
+def _find_vn_fonts():
+    """Find fonts that support Vietnamese diacritics (ấ, ắ, ỗ, ệ, ỷ, etc.)."""
+    global _FONT_REGULAR, _FONT_BOLD, _FONT_REGULAR_PATH, _FONT_BOLD_PATH
+    if _FONT_REGULAR is not None:
+        return True
+    
+    from PIL import ImageFont
+    
+    # Priority 1: Noto Sans (full Vietnamese support)
+    candidates_regular = [
+        "/usr/share/fonts/truetype/noto/NotoSans-Regular.ttf",
+        "/usr/share/fonts/truetype/noto/NotoSans-Variable.ttf",
+        "/usr/share/fonts/truetype/vn/VNFont.ttf",
+        "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
+        "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf",
+        "/usr/share/fonts/truetype/freefont/FreeSans.ttf",
+    ]
+    candidates_bold = [
+        "/usr/share/fonts/truetype/noto/NotoSans-Bold.ttf",
+        "/usr/share/fonts/truetype/noto/NotoSans-Variable.ttf",
+        "/usr/share/fonts/truetype/vn/VNFont-Bold.ttf",
+        "/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
+        "/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf",
+        "/usr/share/fonts/truetype/freefont/FreeSans.ttf",
+    ]
+    
+    try:
+        result = subprocess.run(
+            ['find', '/usr/share/fonts', '-name', '*.ttf', '-type', 'f'],
+            capture_output=True, text=True, timeout=10
+        )
+        all_ttf = result.stdout.strip().split('\n')
+        for key in ['noto', 'dejavu', 'liberation', 'freefont', 'vn']:
+            for path in all_ttf:
+                if key in path.lower():
+                    if 'bold' in path.lower() and _FONT_BOLD_PATH is None:
+                        _FONT_BOLD_PATH = path
+                    elif 'regular' in path.lower() and _FONT_REGULAR_PATH is None:
+                        _FONT_REGULAR_PATH = path
+    except:
+        pass
+    
+    for path in candidates_regular:
+        if os.path.exists(path):
+            try:
+                _FONT_REGULAR = ImageFont.truetype(path, 40)
+                _FONT_REGULAR_PATH = path
+                _log.info(f"Font regular: {path}")
+                break
+            except:
+                continue
+    
+    for path in candidates_bold:
+        if os.path.exists(path):
+            try:
+                _FONT_BOLD = ImageFont.truetype(path, 52)
+                _FONT_BOLD_PATH = path
+                _log.info(f"Font bold: {path}")
+                break
+            except:
+                continue
+    
+    if _FONT_REGULAR is None:
+        _FONT_REGULAR = ImageFont.load_default()
+        _FONT_BOLD = _FONT_REGULAR
+        _log.warning("No TrueType font found! Using PIL default (may not show Vietnamese)")
+    if _FONT_BOLD is None:
+        _FONT_BOLD = _FONT_REGULAR
+    
+    return True
+
+def _split_into_segments(text, max_segments=10, min_len=30):
+    """Split text into segments for short video, handling any format."""
+    text = clean(text)
+    if not text:
+        return []
+    
+    # Strategy 1: Try bullet points
+    lines = text.split('\n')
+    segmented = []
+    for line in lines:
+        line = clean(line)
+        if not line:
+            continue
+        line_clean = re.sub(r'^[•\-\*\d\.\)\s]+', '', line).strip()
+        if len(line_clean) > min_len:
+            segmented.append(line_clean)
+        elif len(line) > min_len:
+            segmented.append(line)
+    
+    # Strategy 2: If no bullet points found, split by sentences
+    if len(segmented) < 2:
+        sents = re.split(r'(?<=[.!?])\s+(?=[A-Z0-9À-ỸĐ])', text)
+        for s in sents:
+            s = clean(s)
+            if len(s) > min_len:
+                segmented.append(s)
+    
+    # Strategy 3: If still no good segments, split by character chunks
+    if not segmented:
+        words = text.split()
+        chunk = []
+        char_count = 0
+        for w in words:
+            chunk.append(w)
+            char_count += len(w) + 1
+            if char_count > 150:
+                segmented.append(' '.join(chunk))
+                chunk = []
+                char_count = 0
+        if chunk:
+            segmented.append(' '.join(chunk))
+    
+    # Strategy 4: Last resort
+    if not segmented:
+        segmented = [text[:300]]
+    
+    return segmented[:max_segments]
+
+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, img_path, downloaded, frame_path):
+    """Create a single frame with Vietnamese text support."""
+    from PIL import Image, ImageDraw
+    _find_vn_fonts()
+    
+    sz = (1080, 1920)
+    bg = Image.new('RGB', sz, (15, 23, 38))
+    draw = ImageDraw.Draw(bg)
+    
+    # Background image
+    if downloaded:
+        try:
+            im = Image.open(img_path).convert('RGB')
+            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}")
+    
+    # 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')
+    
+    # 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=88)
+    return True
+
+def _gen_short_sync(post) -> str:
+    """Generate short video NOW. Returns video URL or empty string on failure."""
+    post_id = post.get('id', '')
+    if not post_id:
+        _log.error("_gen_short_sync: no post_id")
+        return ''
+    
+    text = post.get('text', '') or post.get('title', '')
+    if len(text) < 100:
+        _log.warning(f"_gen_short_sync: text too short ({len(text)})")
+        return ''
+    
+    segments = _split_into_segments(text, max_segments=10, min_len=30)
+    if not segments:
+        _log.error("_gen_short_sync: no segments after splitting")
+        return ''
+    
+    _log.info(f"Segments: {len(segments)} (first: '{segments[0][:50]}...')")
+    
+    seg_hash = hashlib.md5(('|'.join(segments) + 'nu' + 'neutral' + '1.0').encode('utf-8')).hexdigest()[:8]
+    suffix = f"_nu_neutral_1p0_{seg_hash}_scenes_nosub"
+    out_name = f5.base._safe_name(post_id + suffix) + '.mp4'
+    out_mp4 = os.path.join(SHORTS_DIR, out_name)
+    video_url = '/api/ai/short-file/' + post_id + suffix
+    
+    if os.path.exists(out_mp4):
+        _log.info(f"_gen_short_sync: already exists {out_mp4}")
+        return video_url
+    
+    work = os.path.join(SHORTS_DIR, f5.base._safe_name(post_id + suffix))
+    os.makedirs(work, exist_ok=True)
+    
+    # Download image
+    img_path = os.path.join(work, 'image.jpg')
+    downloaded = False
+    try:
+        img_url = post.get('img', '')
+        if img_url and img_url.startswith('http'):
+            r = requests.get(img_url, headers={'User-Agent': 'Mozilla/5.0'}, timeout=15)
+            if r.status_code == 200:
+                with open(img_path, 'wb') as f:
+                    f.write(r.content)
+                downloaded = True
+    except Exception as e:
+        _log.warning(f"download image: {e}")
+    
+    try:
+        from PIL import Image, ImageDraw, ImageFont
+        has_pil = True
+    except Exception as e:
+        _log.warning(f"PIL import: {e}")
+        has_pil = False
+    
+    try:
+        subprocess.run(['ffmpeg', '-version'], capture_output=True, timeout=5)
+    except:
+        _log.error("ffmpeg not found!")
+        return ''
+    
+    try:
+        from gtts import gTTS
+        has_tts = True
+    except Exception as e:
+        _log.warning(f"gTTS: {e}, using silent video")
+        has_tts = False
+    
+    part_files = []
+    errors = []
+    
+    for idx, seg in enumerate(segments[:10]):
+        frame_path = os.path.join(work, f'frame_{idx:02d}.jpg')
+        audio_path = os.path.join(work, f'voice_{idx:02d}.mp3')
+        audio_fast = os.path.join(work, f'voice_{idx:02d}_fast.mp3')
+        part_path = os.path.join(work, f'part_{idx:02d}.mp4')
+        
+        # ----- Frame -----
+        frame_ok = False
+        if has_pil:
+            try:
+                _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:
+                    _log.warning(f"frame {idx}: file too small or missing")
+            except Exception as e:
+                _log.error(f"frame {idx} creation: {e}")
+                errors.append(f"frame{idx}: {e}")
+        
+        if not frame_ok:
+            try:
+                subprocess.run(['ffmpeg', '-y', '-f', 'lavfi', '-i', 'color=c=0x0f1726:s=1080x1920:d=1',
+                    '-frames:v', '1', frame_path], capture_output=True, timeout=30)
+                frame_ok = os.path.exists(frame_path)
+            except:
+                continue
+        
+        # ----- Audio -----
+        dur = 10.0
+        if has_tts:
+            try:
+                tts_text = re.sub(r'^[•\-\*\d\.\)\s]+', '', seg).strip()[:300]
+                if tts_text:
+                    gTTS(tts_text, lang='vi', slow=False).save(audio_path)
+                    subprocess.run(['ffmpeg', '-y', '-i', audio_path, '-vn', '-c:a', 'libmp3lame', audio_fast],
+                        check=True, capture_output=True, timeout=90)
+                    pr = subprocess.run(['ffprobe', '-v', 'error', '-show_entries', 'format=duration',
+                        '-of', 'default=noprint_wrappers=1:no_key=1', audio_fast],
+                        capture_output=True, timeout=20)
+                    dur = max(6.0, float((pr.stdout or b'').decode().strip() or 10.0)) + 1.0
+                else:
+                    dur = 8.0
+            except Exception as e:
+                _log.warning(f"TTS part {idx}: {e}")
+                errors.append(f"tts{idx}: {e}")
+                dur = 8.0
+        
+        # ----- Combine frame + audio -----
+        try:
+            cmd = ['ffmpeg', '-y', '-loop', '1', '-t', str(dur), '-i', frame_path]
+            if has_tts and os.path.exists(audio_fast):
+                cmd += ['-i', audio_fast, '-shortest']
+            else:
+                cmd += ['-f', 'lavfi', '-i', 'anullsrc=r=44100:cl=mono', '-shortest']
+            cmd += ['-c:v', 'libx264', '-tune', 'stillimage', '-pix_fmt', 'yuv420p',
+                    '-c:a', 'aac', '-b:a', '128k', 
+                    '-preset', 'fast', '-crf', '23',
+                    part_path]
+            subprocess.run(cmd, check=True, capture_output=True, timeout=150)
+            if os.path.exists(part_path) and os.path.getsize(part_path) > 5000:
+                part_files.append(part_path)
+                _log.info(f"Part {idx}: {os.path.getsize(part_path)} bytes")
+            else:
+                _log.warning(f"Part {idx}: file too small or missing")
+        except Exception as e:
+            _log.warning(f"ffmpeg part {idx}: {e}")
+            errors.append(f"part{idx}: {e}")
+    
+    if part_files:
+        try:
+            concat_file = os.path.join(work, 'concat.txt')
+            with open(concat_file, 'w', encoding='utf-8') as f:
+                for p in part_files:
+                    f.write("file '" + p.replace("'", "'\\''") + "'\n")
+            subprocess.run(['ffmpeg', '-y', '-f', 'concat', '-safe', '0', '-i', concat_file, '-c', 'copy', out_mp4],
+                check=True, capture_output=True, timeout=180)
+            _log.info(f"Short video generated: {out_mp4} ({len(part_files)} parts, {os.path.getsize(out_mp4)} bytes)")
+            
+            post['video'] = video_url
+            post['short_voice'] = 'nu'
+            post['short_emotion'] = 'neutral'
+            post['short_speed'] = 1.0
+            post['short_segments'] = segments
+            post['short_subtitles'] = False
+            
+            wall = f5.base._load_ai_wall()
+            for i, p in enumerate(wall):
+                if p.get('id') == post_id:
+                    wall[i] = post
+                    break
+            f5.base._save_ai_wall(wall)
+            return video_url
+        except Exception as e:
+            _log.error(f"concat: {e}")
+            errors.append(f"concat: {e}")
+    else:
+        _log.error(f"No part files generated! Errors: {'; '.join(errors)}")
+    return ''
+
+# ===== Auto Scheduler Trigger =====
+_AUTO_SCHEDULER_RUNNING = False
+_AUTO_SCHEDULER_LAST = 0
+_AUTO_SCHEDULER_RESULTS = []
+
+def _run_scheduler_now():
+    """Trigger auto_scheduler._run_scheduled_posting() safely."""
+    global _AUTO_SCHEDULER_RUNNING, _AUTO_SCHEDULER_LAST, _AUTO_SCHEDULER_RESULTS
+    if _AUTO_SCHEDULER_RUNNING:
+        _log.warning("Scheduler already running!")
+        return {"status": "running", "message": "Scheduler đang chạy, vui lòng đợi."}
+    _AUTO_SCHEDULER_RUNNING = True
+    try:
+        import auto_scheduler as _as
+        _as.LOG.info("Triggered manually via API")
+        _as._run_scheduled_posting()
+        _AUTO_SCHEDULER_LAST = time.time()
+        _AUTO_SCHEDULER_RESULTS = [{'time': datetime.now().strftime('%H:%M %d/%m/%Y'), 'status': 'done'}]
+        _log.info("Auto scheduler completed successfully")
+        return {"status": "done", "message": "Đã đăng 3 bài tự động thành công!"}
+    except Exception as e:
+        _log.error(f"Auto scheduler failed: {e}", exc_info=True)
+        return {"status": "error", "message": f"Lỗi: {e}"}
+    finally:
+        _AUTO_SCHEDULER_RUNNING = False
+
+@app.post('/api/auto/schedule')
+async def _api_auto_schedule():
+    _log.info("POST /api/auto/schedule triggered")
+    result = await asyncio.get_event_loop().run_in_executor(None, _run_scheduler_now)
+    return JSONResponse(result)
+
+@app.get('/api/auto/status')
+async def _api_auto_status():
+    return JSONResponse({
+        'running': _AUTO_SCHEDULER_RUNNING,
+        'last_run': _AUTO_SCHEDULER_LAST,
+        'last_run_str': datetime.fromtimestamp(_AUTO_SCHEDULER_LAST).strftime('%H:%M %d/%m/%Y') if _AUTO_SCHEDULER_LAST else 'never',
+        'results': _AUTO_SCHEDULER_RESULTS
+    })
+
 _bg_home={"t":0,"d":[]};_bg_shorts={"t":0,"d":[]};_bg_lock=False
 def _bg():
     global _bg_lock
@@ -43,7 +459,7 @@ def _bg():
 @app.on_event("startup")
 async def _s():threading.Thread(target=_bg,daemon=True).start()
 threading.Thread(target=lambda:[time.sleep(600) or _bg() for _ in iter(int,1)],daemon=True).start()
-app.router.routes=[r for r in app.router.routes if not (getattr(r,'path',None) in ('/api/homepage','/api/shorts','/api/ai_wall','/api/topic_post','/api/article/ask','/api/topic/rewrite','/api/rewrite_share','/api/url_wall','/api/short/comments','/api/short/comment','/api/storage_status','/') and any(m in getattr(r,'methods',set()) for m in ('GET','POST')))]
+app.router.routes=[r for r in app.router.routes if not (getattr(r,'path',None) in ('/api/homepage','/api/shorts','/api/ai_wall','/api/topic_post','/api/article/ask','/api/topic/rewrite','/api/rewrite_share','/api/url_wall','/api/short/comments','/api/short/comment','/api/storage_status','/api/ai/short/{post_id}','/api/ai/short-file/{file_id}','/api/auto/schedule','/api/auto/status','/') and any(m in getattr(r,'methods',set()) for m in ('GET','POST')))]
 @app.get('/api/homepage')
 def _h():
     n=time.time()
@@ -75,6 +491,48 @@ async def _ask(request:Request):
     if not raw:raw=ctx[:12000]
     ans=await f5.base.qwen_generate(f'Bạn là VNEWS AI. Nội dung: "{title}"\n{raw[:9000]}\n\nHỏi: "{q}"\n\nTrả lời tự nhiên bằng tiếng Việt.',max_tokens=1200)
     return JSONResponse({'answer':ans or 'Chưa trả lời được.','title':title})
+
+# ===== SHORT VIDEO ENDPOINT (SYNCHRONOUS) =====
+@app.post('/api/ai/short/{post_id}')
+async def api_ai_short_generate(post_id: str, request: Request):
+    wall = f5.base._load_ai_wall()
+    post = None
+    for p in wall:
+        if p.get('id') == post_id:
+            post = p
+            break
+    if not post:
+        return JSONResponse({'error': 'Post not found'}, status_code=404)
+    if post.get('video'):
+        return JSONResponse({'post': post, 'video': post['video'], 'status': 'done'})
+    _log.info(f"Generating short for post {post_id}...")
+    loop = asyncio.get_event_loop()
+    video_url = await loop.run_in_executor(None, _gen_short_sync, post)
+    if video_url:
+        _log.info(f"Short generated: {video_url}")
+        return JSONResponse({'post': post, 'video': video_url, 'status': 'done'})
+    else:
+        _log.error(f"Short generation FAILED for {post_id}")
+        return JSONResponse({'error': 'Không thể tạo video. Kiểm tra logs Space để biết chi tiết.'}, status_code=500)
+
+@app.get('/api/ai/short-file/{file_id:path}')
+async def api_ai_short_file(file_id: str):
+    safe_name = f5.base._safe_name(file_id)
+    fpath = os.path.join(SHORTS_DIR, safe_name + '.mp4')
+    if os.path.exists(fpath):
+        return FileResponse(fpath, media_type='video/mp4')
+    for fname in os.listdir(SHORTS_DIR):
+        if fname.endswith('.mp4') and (safe_name in fname or file_id in fname):
+            fpath = os.path.join(SHORTS_DIR, fname)
+            if os.path.exists(fpath):
+                return FileResponse(fpath, media_type='video/mp4')
+    base_id = f5.base._safe_name((file_id.split('_')[0] if '_' in file_id else file_id))
+    for fname in os.listdir(SHORTS_DIR):
+        if fname.endswith('.mp4') and fname.startswith(base_id):
+            return FileResponse(os.path.join(SHORTS_DIR, fname), media_type='video/mp4')
+    return JSONResponse({'error': 'File not found'}, status_code=404)
+
+# ===== REWRITE =====
 @app.post('/api/rewrite_share')
 @app.post('/api/url_wall')
 async def _rw(request:Request):
@@ -83,12 +541,33 @@ async def _rw(request:Request):
     title,raw,img=_scrape(url,14000)
     if len(raw)<50:raw=ctx[:14000]
     if len(raw)<50:return JSONResponse({'error':'Không đọc được bài'},status_code=422)
+    og_img = img if img and img.startswith('http') else ''
+    if not og_img:
+        try:
+            d = f5.base.scrape_any_url(url)
+            if d: og_img = d.get('og_image', '') or d.get('image', '') or ''
+        except: pass
+    if not og_img:
+        og_img = 'https://image.pollinations.ai/prompt/Vietnamese%20news%20update'
     text=None
-    try:text=await asyncio.wait_for(f5.base.qwen_generate(f'Tóm tắt đăng Tường AI:\nTiêu đề: {title}\n{raw[:14000]}\n\n4-6 ý chính. Cuối ghi nguồn.',image_url=img or None,max_tokens=1000),timeout=30)
+    try:text=await asyncio.wait_for(f5.base.qwen_generate(f'Tóm tắt đăng Tường AI:\nTiêu đề: {title}\n{raw[:14000]}\n\n4-6 ý chính. Cuối ghi nguồn.',image_url=og_img or None,max_tokens=1000),timeout=30)
     except:pass
     if not text or len(text)<80:text=f"Tóm tắt: {title}\n\n{raw[:1200]}\n\nNguồn: {_domain(url)}"
-    post=f5.base.make_post(title or 'Bài viết',text,img,url,'rewrite',sources=[{'title':title,'url':url,'via':_domain(url)}])
-    ps=f5.base._load_ai_wall();ps.insert(0,post);f5.base._save_ai_wall(ps);return JSONResponse({'post':post})
+    paragraphs = [p.strip() for p in raw.split('\n') if len(p.strip()) > 60]
+    if not paragraphs:
+        paragraphs = [p.strip() for p in raw.split('\n') if len(p.strip()) > 20]
+    slides = []
+    for i, pt in enumerate(paragraphs[:8]):
+        slides.append({'text': pt, 'image': og_img, 'index': i + 1})
+    post=f5.base.make_post(title or 'Bài viết',text,og_img,url,'rewrite',sources=[{'title':title,'url':url,'via':_domain(url)}])
+    post['images'] = [og_img] if og_img else []
+    post['slides'] = slides
+    ps=f5.base._load_ai_wall();ps.insert(0,post);f5.base._save_ai_wall(ps)
+    if len(text) > 100:
+        t = threading.Thread(target=_gen_short_sync, args=(post,), daemon=True)
+        t.start()
+    return JSONResponse({'post':post})
+
 @app.post('/api/topic/rewrite')
 async def _tr(request:Request):
     b=await request.json();pid=str(b.get('post_id','')).strip()
@@ -128,7 +607,6 @@ PATCH_INJECT=r'''
 .article-ai-ask{margin-top:12px;background:#141414;border:1px solid #2a2a2a;border-radius:10px;padding:10px}.article-ai-ask textarea{width:100%;min-height:60px;background:#222;border:1px solid #444;color:#eee;border-radius:10px;padding:9px}.article-ai-ask button{background:#2d8659;border:0;color:#fff;border-radius:10px;padding:8px 12px;margin-top:6px}.article-ai-answer{white-space:pre-wrap;color:#ccc;font-size:13px;line-height:1.55;margin-top:8px}
 .storage-warn{background:#332200;border:1px solid #664400;color:#ffcc00;padding:8px 12px;border-radius:8px;font-size:11px;margin:6px 4px}
 button[onclick*="rewriteCurrentArticle"]{display:none!important}
-/* Hide ALL old Short AI slides from previous layers */
 #ai-short-home,.ai-short-home,.ai-short-card-final{display:none!important}
 .source-detail-box a[target="_blank"]{display:none!important}
 </style>
@@ -137,40 +615,27 @@ button[onclick*="rewriteCurrentArticle"]{display:none!important}
 (function(){
 function esc(s){return String(s||'').replace(/[&<>"']/g,m=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[m]));}
 fetch('/api/storage_status').then(r=>r.json()).then(j=>{if(!j.persistent){let h=document.getElementById('view-home');if(h){let w=document.createElement('div');w.className='storage-warn';w.innerHTML='⚠️ <b>Persistent Storage chưa bật.</b> Bật: Space Settings → Persistent Storage → Small.';h.prepend(w);}}});
-
-// === Short AI Slide on homepage (same as Dantri shorts) ===
 async function renderShortAISlide(){let home=document.getElementById('view-home');if(!home)return;document.getElementById('short-ai-final-slide')?.remove();let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).posts||[];let vids=wall.filter(p=>p.video);if(!vids.length)return;let wrap=document.createElement('div');wrap.id='short-ai-final-slide';wrap.className='slider-wrap';wrap.innerHTML='<div class="slider-header"><span class="slider-label">🎬 Short AI</span></div><div class="slider-track">'+vids.slice(0,30).map((p,i)=>`<div class="slider-item shorts-item" onclick="openAIShortFeed(${i})"><div class="slider-thumb shorts-thumb"><video src="${p.video}" muted preload="metadata" style="width:100%;height:100%;object-fit:cover"></video><div class="card-play">▶</div></div><div class="slider-title">${esc(p.title)}</div></div>`).join('')+'</div>';let comp=home.querySelector('.ai-compose');if(comp&&comp.nextSibling)comp.parentNode.insertBefore(wrap,comp.nextSibling);else home.prepend(wrap);}
-setTimeout(renderShortAISlide,2500);
-
-// === Source Details ===
+setTimeout(renderShortAISlide,2500);setInterval(renderShortAISlide,15000);
 function renderSourceDetails(post,container){let det=post.source_details||[];if(!det.length)return;container.querySelectorAll('.source-detail-box').forEach(e=>e.remove());let box=document.createElement('div');box.className='source-detail-box';box.innerHTML='<h3 style="font-size:14px;color:#5cb87a;margin-bottom:8px">📚 Bài nguồn</h3>'+det.map((s,i)=>`<div class="source-detail-item" data-url="${esc(s.url||'')}"><div class="source-detail-title">${i+1}. ${esc(s.title)}</div><div class="source-detail-content">${esc((s.content||'').slice(0,300))}</div><span class="source-vnews-btn">📖 Xem trên VNEWS</span></div>`).join('');container.appendChild(box);box.querySelectorAll('.source-detail-item').forEach(el=>{el.onclick=function(){let u=el.dataset.url;if(u&&typeof readArticle==='function')readArticle(u);}});det.forEach((s,i)=>{if(!s.url)return;fetch('/api/article?url='+encodeURIComponent(s.url)).then(r=>r.json()).then(d=>{if(d&&(d.og_image||d.img)){let items=box.querySelectorAll('.source-detail-item');if(items[i]){let img=document.createElement('img');img.src=d.og_image||d.img;img.loading='lazy';img.onerror=function(){this.style.display='none'};items[i].prepend(img);}}}).catch(()=>{});});}
-
-// === AI Wall Post View ===
 async function readAIWallPost(i){let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).posts||[];let p=wall[i];if(!p)return;showView('view-article');let h=`<button class="back-btn" onclick="switchCat('home')">← Quay lại</button><div class="article-view"><span class="badge badge-ai">AI</span><h1 class="article-title">${esc(p.title)}</h1>${p.img?`<img class="article-img" src="${p.img}">`:''}`;h+=`<p class="article-p" style="white-space:pre-wrap">${esc(p.text)}</p>`;h+=`<div class="article-actions"><button class="primary" onclick="doRewriteTopic(this,'${esc(p.id)}')">🤖 Rewrite AI đăng tường</button>${p.video?`<button onclick="openAIShortFeed(${i})">🎬 Xem Short</button>`:''}<button onclick="doShare('${esc(p.title)}','${location.origin}','${esc(p.img||'')}')">📤</button></div>`;h+=`<div class="article-ai-ask"><h3 style="font-size:14px;color:#5cb87a">🤖 Hỏi AI</h3><textarea id="article-ai-q" placeholder="Hỏi về nội dung..."></textarea><button onclick="askAIWall(${i})">Hỏi</button><div id="article-ai-ans" class="article-ai-answer"></div></div></div>`;document.getElementById('view-article').innerHTML=h;let art=document.querySelector('.article-view');if(art)renderSourceDetails(p,art);window.scrollTo(0,0);}
 window.readAIWallPost=readAIWallPost;window.aiReadWallPatched=window.aiReadWall=window.readWallPost=function(i){readAIWallPost(i)};
-
-// === Short AI Feed: FULL interaction buttons like Dantri Shorts ===
 window.openAIShortFeed=async function(startIdx){let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).posts||[];let vids=wall.filter(p=>p.video);if(!vids.length)return alert('Chưa có Short AI');let ordered=startIdx>0?vids.slice(startIdx).concat(vids.slice(0,startIdx)):vids;showView('view-tiktok');let h='<button class="back-btn" onclick="switchCat(\'home\')">← Short AI</button><div class="tiktok-container"><div class="tiktok-feed" id="tiktok-feed">';ordered.forEach((p,i)=>{h+=`<div class="tiktok-slide" data-id="${p.id}"><video src="${p.video}" playsinline loop></video><div class="tiktok-bottom"><span class="badge badge-ai">AI Short</span><p class="tiktok-title">${esc(p.title)}</p></div><div class="tiktok-right"><button class="tiktok-right-btn" onclick="event.stopPropagation()"><div class="icon">👁</div><div class="count">0</div></button><button class="tiktok-right-btn" onclick="event.stopPropagation();likeShort('${p.id}',this)"><div class="icon">❤️</div><div class="count">0</div></button><button class="tiktok-right-btn" onclick="event.stopPropagation();openShortComments('${p.id}')"><div class="icon">💬</div><div class="count" id="cc-${p.id}">0</div></button><button class="tiktok-right-btn" onclick="event.stopPropagation();shareShort('${esc(p.title)}')"><div class="icon">📤</div><div class="count">Share</div></button></div><span class="tiktok-counter">${i+1}/${ordered.length}</span></div>`});h+='</div></div>';document.getElementById('view-tiktok').innerHTML=h;initShortFeed();ordered.forEach(p=>{fetch('/api/short/comments?id='+encodeURIComponent(p.id)).then(r=>r.json()).then(j=>{let el=document.getElementById('cc-'+p.id);if(el)el.textContent=(j.comments||[]).length}).catch(()=>{});});}
 window.likeShort=function(id,btn){let c=btn.querySelector('.count');c.textContent=parseInt(c.textContent||0)+1;}
 window.shareShort=function(title){if(navigator.share)navigator.share({title,url:location.href}).catch(()=>{});else{navigator.clipboard.writeText(location.href);alert('Đã sao chép link!');}}
 function initShortFeed(){let feed=document.getElementById('tiktok-feed');if(!feed)return;let slides=feed.querySelectorAll('.tiktok-slide');let cur=-1;function act(i){if(i===cur)return;slides.forEach((sl,idx)=>{let v=sl.querySelector('video');let fr=sl.querySelector('iframe');if(idx===i){if(v)v.play().catch(()=>{});if(fr&&!fr.src&&fr.dataset.ytSrc)fr.src=fr.dataset.ytSrc;}else{if(v)v.pause();if(fr&&fr.src)fr.src='';}});cur=i}let t;feed.addEventListener('scroll',()=>{clearTimeout(t);t=setTimeout(()=>{let rect=feed.getBoundingClientRect(),ctr=rect.top+rect.height/2,b=-1,d=1e9;slides.forEach((sl,i)=>{let dd=Math.abs(sl.getBoundingClientRect().top+sl.getBoundingClientRect().height/2-ctr);if(dd<d){d=dd;b=i}});if(b>=0)act(b)},130)});setTimeout(()=>act(0),300);slides.forEach(sl=>{let v=sl.querySelector('video');if(v)v.addEventListener('click',e=>{e.preventDefault();v.paused?v.play().catch(()=>{}):v.pause()})});}
-
-// === Handlers ===
 window.doRewriteTopic=async function(btn,pid){btn.disabled=true;btn.textContent='Đang rewrite...';try{let r=await fetch('/api/topic/rewrite',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({post_id:pid})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');alert('Rewrite thành công!');showRewriteResult(j.post);}catch(e){alert(e.message)}finally{btn.disabled=false;btn.textContent='🤖 Rewrite AI đăng tường';}};
 window.doRewriteArticle=async function(btn){let url=(window._currentArticle&&window._currentArticle.url)||'';if(!url){let a=document.querySelector('#view-article a[href*="://"]');if(a)url=a.href;}if(!url){let text=document.querySelector('.article-view')?.innerText?.slice(0,14000)||'';if(text.length<100){alert('Không tìm được nội dung để rewrite');return;}btn.disabled=true;btn.textContent='Đang rewrite...';try{let r=await fetch('/api/rewrite_share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url:'https://vnews.local/inline',context:text})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error);alert('Rewrite thành công!');showRewriteResult(j.post);}catch(e){alert(e.message)}finally{btn.disabled=false;btn.textContent='🤖 Rewrite AI đăng tường';}return;}btn.disabled=true;btn.textContent='Đang rewrite...';try{let ctx=document.querySelector('.article-view')?.innerText?.slice(0,14000)||'';let r=await fetch('/api/rewrite_share',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url,context:ctx})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');alert('Rewrite thành công!');showRewriteResult(j.post);}catch(e){alert(e.message)}finally{btn.disabled=false;btn.textContent='🤖 Rewrite AI đăng tường';}};
 function showRewriteResult(post){if(!post)return;showView('view-article');document.getElementById('view-article').innerHTML=`<button class="back-btn" onclick="switchCat('home')">← Quay lại</button><div class="article-view"><span class="badge badge-ai">Rewrite</span><h1 class="article-title">${esc(post.title)}</h1>${post.img?`<img class="article-img" src="${post.img}">`:''}` +`<p class="article-p" style="white-space:pre-wrap">${esc(post.text)}</p><div class="article-actions"><button class="primary" onclick="makeShortFromPost('${esc(post.id)}',this)">🎬 Tạo Short AI</button><button onclick="doShare('${esc(post.title)}','${location.origin}','${esc(post.img||'')}')">📤</button></div></div>`;window.scrollTo(0,0);}
-window.makeShortFromPost=async function(pid,btn){if(btn){btn.disabled=true;btn.textContent='Đang tạo...';}try{let r=await fetch('/api/ai/short/'+pid,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({voice:'nu',emotion:'neutral',speed:1.2})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');alert('Đã tạo Short AI!');renderShortAISlide();}catch(e){alert(e.message)}finally{if(btn){btn.disabled=false;btn.textContent='🎬 Tạo Short AI';}}};
+window.makeShortFromPost=async function(pid,btn){if(btn){btn.disabled=true;btn.textContent='⏳ Đang tạo video...';}try{let r=await fetch('/api/ai/short/'+pid,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({voice:'nu',emotion:'neutral',speed:1.2})});let j=await r.json();if(!r.ok||j.error)throw new Error(j.error||'Lỗi');if(j.video){alert('✅ Đã tạo Short AI thành công!');renderShortAISlide();}else{alert(j.message||'Đã tạo!');renderShortAISlide();}}catch(e){alert('Lỗi: '+e.message)}finally{if(btn){btn.disabled=false;btn.textContent='🎬 Tạo Short AI';}}};
 window.rewriteCurrentArticle=function(){let btn=document.querySelector('[data-rw-article]');if(btn)doRewriteArticle(btn);};
 window.askAIWall=async function(i){let q=document.getElementById('article-ai-q')?.value.trim();if(!q)return alert('Nhập câu hỏi');document.getElementById('article-ai-ans').textContent='Đang hỏi...';let wall=(await fetch('/api/ai_wall').then(r=>r.json()).catch(()=>({posts:[]}))).posts||[];let p=wall[i]||{};let ctx=(p.text||'');for(let s of (p.source_details||[]))ctx+='\n'+(s.content||'');try{let r=await fetch('/api/article/ask',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({question:q,context:ctx.slice(0,12000)})});let j=await r.json();document.getElementById('article-ai-ans').textContent=j.answer||'Không trả lời được';}catch(e){document.getElementById('article-ai-ans').textContent='Lỗi: '+e.message}};
 window.askArticleAI=async function(){let q=document.getElementById('article-ai-question')?.value.trim();if(!q)return alert('Nhập câu hỏi');let a=document.getElementById('article-ai-answer');a.textContent='Đang hỏi...';let url=(window._currentArticle&&window._currentArticle.url)||'';let ctx=document.querySelector('.article-view')?.innerText?.slice(0,12000)||'';try{let r=await fetch('/api/article/ask',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({url,question:q,context:ctx})});let j=await r.json();a.textContent=j.answer||'Không trả lời được';}catch(e){a.textContent='Lỗi: '+e.message}};
 window.openShortComments=async function(id){let panel=document.getElementById('short-cmt-panel');let j=await fetch('/api/short/comments?id='+encodeURIComponent(id)).then(r=>r.json()).catch(()=>({comments:[]}));panel.innerHTML=`<h3 style="color:#5cb87a">💬 Bình luận</h3><div id="cmt-list">${(j.comments||[]).map(c=>`<div class="cmt-item">${esc(c.text)}</div>`).join('')||'<div class="cmt-item" style="color:#777">Chưa có</div>'}</div><textarea id="cmt-text" placeholder="Bình luận..."></textarea><button onclick="submitShortCmt('${esc(id)}')">Gửi</button><button onclick="document.getElementById('short-cmt-panel').classList.remove('active')">Đóng</button>`;panel.classList.add('active');}
 window.submitShortCmt=async function(id){let t=document.getElementById('cmt-text')?.value.trim();if(!t)return;let j=await fetch('/api/short/comment',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({id,text:t})}).then(r=>r.json()).catch(()=>({comments:[]}));document.getElementById('cmt-list').innerHTML=(j.comments||[]).map(c=>`<div class="cmt-item">${esc(c.text)}</div>`).join('');document.getElementById('cmt-text').value='';let el=document.getElementById('cc-'+id);if(el)el.textContent=(j.comments||[]).length;}
-
-// === Patch regular articles ===
 function patchArticle(){let art=document.querySelector('#view-article .article-view');if(!art)return;art.querySelectorAll('button[onclick*="rewriteCurrentArticle"],[data-rewrite],.rewrite-injected').forEach(e=>e.remove());art.querySelectorAll('.article-ai-ask').forEach((e,i)=>{if(i>0)e.remove();});if(!art.querySelector('[data-rw-article]')){let a=art.querySelector('.article-actions');if(a){let b=document.createElement('button');b.className='primary';b.setAttribute('data-rw-article','1');b.textContent='🤖 Rewrite AI đăng tường';b.onclick=function(){doRewriteArticle(b)};a.insertBefore(b,a.firstChild);}}if(!art.querySelector('.article-ai-ask')){let box=document.createElement('div');box.className='article-ai-ask';box.innerHTML='<h3 style="font-size:14px;color:#5cb87a">🤖 Hỏi AI</h3><textarea id="article-ai-question" placeholder="Hỏi..."></textarea><button onclick="askArticleAI()">Hỏi</button><div id="article-ai-answer" class="article-ai-answer"></div>';art.appendChild(box);}}
 function patchShortBtns(){document.querySelectorAll('.tiktok-slide').forEach(sl=>{if(sl.dataset.cmtDone)return;sl.dataset.cmtDone='1';let id=sl.dataset.id||'';if(!id)return;let r=sl.querySelector('.tiktok-right');if(!r||r.querySelector('[data-cmt]'))return;let b=document.createElement('button');b.className='tiktok-right-btn';b.setAttribute('data-cmt','1');b.innerHTML='<div class="icon">💬</div><div class="count">0</div>';b.onclick=function(e){e.stopPropagation();openShortComments(id);};r.appendChild(b);fetch('/api/short/comments?id='+encodeURIComponent(id)).then(r=>r.json()).then(j=>{b.querySelector('.count').textContent=(j.comments||[]).length}).catch(()=>{});});}
 function patchOldSourceLinks(){document.querySelectorAll('.source-detail-item a[target="_blank"],.source-detail-item a[href]').forEach(a=>{if(a.dataset.p7)return;a.dataset.p7='1';let url=a.href||'';a.removeAttribute('target');a.removeAttribute('href');a.textContent='📖 Xem trên VNEWS';a.className='source-vnews-btn';a.style.cursor='pointer';a.onclick=function(e){e.preventDefault();e.stopPropagation();if(url&&typeof readArticle==='function')readArticle(url);}});}
-
 let oldRA=window.readArticle;if(oldRA){window.readArticle=async function(){let ret=await oldRA.apply(this,arguments);setTimeout(patchArticle,500);return ret;}}
 let _hl=false;function dH(){if(_hl)return;_hl=true;setTimeout(()=>{if(typeof ensureHotTopics==='function')ensureHotTopics();if(typeof ensureNewsShortsHome==='function')ensureNewsShortsHome();},4000);}
 if(document.readyState==='complete')dH();else window.addEventListener('load',dH);
@@ -181,8 +646,8 @@ setInterval(()=>{patchArticle();patchShortBtns();patchOldSourceLinks();},1500);
 
 @app.get('/')
 async def _index():
-    html=f5.f4.f3.f2.f1._load_index_html()
+    html=open('/app/static/index_v2.html','r',encoding='utf-8').read() if os.path.exists('/app/static/index_v2.html') else ('<html><body>VNEWS</body></html>' if os.path.exists('/app/static/index.html') else '')
     body=getattr(rt.old,'PATCH_INJECT','')+f5.f4.f3.f2.f1.FINAL_INJECT+f5.f4.f3.FINAL3_INJECT+f5.f4.FINAL4_INJECT+f5.FINAL5_INJECT
     body+=getattr(f6,'FINAL6_INJECT','');body+=getattr(f6,'FINAL6_FAST_HOME_INJECT','');body+=getattr(f6,'FINAL6E_INJECT','')
     body+=PATCH_INJECT
-    return HTMLResponse(html.replace('</body>',body+'\n</body>') if '</body>' in html else html+body)
+    return HTMLResponse(html.replace('</body>',body+'\n</body>') if '</body>' in html else html+body)