Fix ai_patch syntax/self import and stabilize segmented shorts

ai_patch.py

@@ -1,9 +1,10 @@
-import os, re, time, random, json, html as html_lib, subprocess
-import requests
-import ai_ext as base
-from ai_ext import app
+import os, re, html as html_lib, subprocess, requests
+from urllib.parse import quote_plus
+from bs4 import BeautifulSoup
 from fastapi import Request
 from fastapi.responses import JSONResponse, HTMLResponse, FileResponse
+import ai_ext as base
+from ai_ext import app
 
 try:
     from PIL import Image, ImageDraw, ImageFont
@@ -21,68 +22,66 @@ def _norm(s):
     return re.sub(r"\s+", " ", s).strip()
 
 
-def _similar(a, b):
-    ta, tb = set(_norm(a).split()), set(_norm(b).split())
-    if not ta or not tb: return False
-    return len(ta & tb) / max(1, min(len(ta), len(tb))) >= 0.72
+def _similar(a,b):
+    ta,tb=set(_norm(a).split()),set(_norm(b).split())
+    if not ta or not tb:return False
+    return len(ta&tb)/max(1,min(len(ta),len(tb)))>=0.72
 
 
-def _dedupe_units(units, max_units=7):
-    out, seen = [], set()
+def _dedupe_units(units,max_units=7):
+    out=[];seen=set()
     for u in units:
-        u = _clean(re.sub(r"^[-•*\d\.\)\s]+", "", u))
-        if len(u) < 18: continue
-        nu = _norm(u)
-        if nu in seen or any(_similar(u, old) for old in out): continue
-        seen.add(nu); out.append(u)
-        if len(out) >= max_units: break
+        u=_clean(re.sub(r"^[-•*\d\.\)\s]+","",u))
+        if len(u)<18:continue
+        nu=_norm(u)
+        if nu in seen or any(_similar(u,o) for o in out):continue
+        seen.add(nu);out.append(u)
+        if len(out)>=max_units:break
     return out
 
 
-def _postprocess_ai_text(text, max_units=7):
-    text = _clean(text)
-    if not text: return text
-    raw = []
-    for line in re.split(r"\n+", text):
-        line = _clean(line)
-        if not line: continue
-        low = line.lower()
-        if any(low.startswith(p) and len(line) < 80 for p in ("dưới đây", "sau đây", "tôi sẽ", "tiêu đề:", "sapo:", "nội dung:")):
-            continue
-        raw.append(line)
-    units = []
-    for line in raw:
-        units.extend(re.split(r"(?<=[\.\!\?])\s+(?=[A-ZÀ-Ỹ0-9])", line) if len(line) > 260 else [line])
-    units = _dedupe_units(units, max_units=max_units)
-    if not units: return text[:900]
-    title = ""
-    if raw and len(raw[0]) <= 90 and not raw[0].startswith(("-", "•", "*")):
-        title = raw[0]; units = [u for u in units if not _similar(u, title)]
-    body = "\n".join("• " + u for u in units[:max_units])
-    return (title + "\n\n" + body).strip() if title else body
-
-
-def _fallback_summary(prompt, max_units=6):
-    text = prompt or ""
-    for marker in ["Nội dung nguồn:", "Nội dung gốc:", "Nội dung:", "Nguồn/bối cảnh internet:"]:
+def _postprocess(text,max_units=7):
+    text=_clean(text)
+    if not text:return text
+    lines=[]
+    for line in re.split(r"\n+",text):
+        line=_clean(line)
+        if not line:continue
+        low=line.lower()
+        if any(low.startswith(p) and len(line)<80 for p in ("dưới đây","sau đây","tôi sẽ","tiêu đề:","sapo:","nội dung:")):continue
+        lines.append(line)
+    units=[]
+    for line in lines:
+        units.extend(re.split(r"(?<=[\.\!\?])\s+(?=[A-ZÀ-Ỹ0-9])",line) if len(line)>260 else [line])
+    units=_dedupe_units(units,max_units)
+    if not units:return text[:900]
+    title=""
+    if lines and len(lines[0])<=90 and not lines[0].startswith(("-","•","*")):
+        title=lines[0];units=[u for u in units if not _similar(u,title)]
+    body="\n".join("• "+u for u in units[:max_units])
+    return (title+"\n\n"+body).strip() if title else body
+
+
+def _fallback_summary(prompt,max_units=6):
+    text=prompt or ""
+    for marker in ["Nội dung nguồn:","Nội dung gốc:","Nội dung:","Nguồn/bối cảnh internet:"]:
         if marker in text:
-            text = text.split(marker, 1)[1]; break
-    text = re.sub(r"https?://\S+", "", text)
-    text = _clean(text)
-    sents = [_clean(s) for s in re.split(r"(?<=[\.\!\?])\s+(?=[A-ZÀ-Ỹ0-9])", text)]
-    units = _dedupe_units([s for s in sents if 45 <= len(s) <= 260], max_units=max_units)
-    return "\n".join("• " + u for u in units) if units else ("• " + text[:700].rsplit(" ", 1)[0] if text else "• Không có đủ nội dung nguồn để tóm tắt.")
+            text=text.split(marker,1)[1];break
+    text=re.sub(r"https?://\S+","",text);text=_clean(text)
+    sents=[_clean(s) for s in re.split(r"(?<=[\.\!\?])\s+(?=[A-ZÀ-Ỹ0-9])",text)]
+    units=_dedupe_units([s for s in sents if 45<=len(s)<=260],max_units)
+    return "\n".join("• "+u for u in units) if units else ("• "+text[:700].rsplit(" ",1)[0] if text else "• Không có đủ nội dung nguồn để tóm tắt.")
 
 
 def _source_line(sources):
     names=[]
     for s in (sources or [])[:5]:
         via=s.get("via") or base._domain(s.get("url","")) or s.get("title","")
-        if via and via not in names: names.append(via)
+        if via and via not in names:names.append(via)
     return "Nguồn tham khảo: "+", ".join(names[:5]) if names else "Nguồn tham khảo: tổng hợp internet"
 
 
-def _make_summary_prompt(title, raw, source_hint=""):
+def _make_summary_prompt(title,raw,source_hint=""):
     return f"""Bạn là biên tập viên tóm tắt tin tức tiếng Việt.
 
 NHIỆM VỤ BẮT BUỘC:
@@ -90,7 +89,6 @@ NHIỆM VỤ BẮT BUỘC:
 - Không lặp lại cùng một ý, cùng một câu, cùng một chi tiết.
 - Không thêm thông tin ngoài nguồn.
 - Tối đa 5 gạch đầu dòng, mỗi gạch đầu dòng 1 câu ngắn.
-- Nếu bài có số liệu/nhân vật/thời điểm quan trọng thì giữ lại.
 
 Tiêu đề nguồn: {title}
 Nguồn: {source_hint}
@@ -99,79 +97,70 @@ Nội dung nguồn:
 {raw[:14000]}"""
 
 
-def _rich_web_context(topic, limit=5):
-    """Best effort: search, then scrape body of top source pages. Some sites block scraping, so this cannot be 100%."""
-    try:
-        ctx, sources = base.web_context(topic, limit=limit)
-    except Exception:
-        ctx, sources = "", []
-    rich, rich_sources, seen = [], [], set()
+def _rich_web_context(topic,limit=5):
+    try: ctx,sources=base.web_context(topic,limit=limit)
+    except Exception: ctx,sources="",[]
+    rich=[];rich_sources=[];seen=set()
     for s in (sources or [])[:limit*2]:
-        url = s.get("url") or ""
-        if not url.startswith("http") or url in seen: continue
+        url=s.get("url") or ""
+        if not url.startswith("http") or url in seen:continue
         seen.add(url)
         try:
-            data = base.scrape_any_url(url)
-            raw = (data.get("summary","") + "\n" + data.get("text","")).strip()
-            if len(raw) < 180: continue
-            title = data.get("title") or s.get("title") or url
-            via = data.get("via") or s.get("via") or base._domain(url)
+            data=base.scrape_any_url(url)
+            raw=(data.get("summary","")+"\n"+data.get("text","")).strip()
+            if len(raw)<180:continue
+            title=data.get("title") or s.get("title") or url
+            via=data.get("via") or s.get("via") or base._domain(url)
             rich.append(f"### {title} ({via})\n{raw[:2400]}")
             rich_sources.append({"title":title,"url":url,"excerpt":raw[:700],"via":via})
-            if len(rich) >= limit: break
-        except Exception:
-            continue
-    if rich: return "\n\n".join(rich), rich_sources
-    if ctx: return ctx, sources
-    return f"Chủ đề cần tóm tắt: {topic}. Không truy xuất được nguồn đầy đủ, hãy tạo bản tóm tắt định hướng ngắn.", []
+            if len(rich)>=limit:break
+        except Exception:continue
+    if rich:return "\n\n".join(rich),rich_sources
+    if ctx:return ctx,sources
+    return f"Chủ đề cần tóm tắt: {topic}. Không truy xuất được nguồn đầy đủ, hãy tạo bản tóm tắt định hướng ngắn.",[]
 
 
-async def qwen_generate_resilient(prompt, image_url=None, max_tokens=1200):
-    token = base._hf_token(); errors=[]
+async def qwen_resilient(prompt,image_url=None,max_tokens=1200):
+    token=base._hf_token();errors=[]
     try:
-        original = getattr(base, "_original_qwen_generate", None)
-        if original:
-            txt = await original(prompt, image_url=image_url, max_tokens=max_tokens)
-            if txt: base.LAST_QWEN_ERROR=""; return txt
-            if getattr(base, "LAST_QWEN_ERROR", ""): errors.append("sdk: "+str(base.LAST_QWEN_ERROR)[:220])
-    except Exception as e: errors.append(f"sdk: {type(e).__name__}: {str(e)[:220]}")
+        orig=getattr(base,"_original_qwen_generate",None)
+        if orig:
+            txt=await orig(prompt,image_url=image_url,max_tokens=max_tokens)
+            if txt:base.LAST_QWEN_ERROR="";return txt
+    except Exception as e:errors.append(f"sdk:{str(e)[:160]}")
     if token:
-        models=[]
-        for m in [os.getenv("QWEN_VL_MODEL",""),"Qwen/Qwen2.5-VL-7B-Instruct","Qwen/Qwen2.5-VL-3B-Instruct","Qwen/Qwen2.5-7B-Instruct","Qwen/Qwen2.5-3B-Instruct","Qwen/Qwen2.5-1.5B-Instruct"]:
-            if m and m not in models: models.append(m)
         headers={"Authorization":"Bearer "+token,"Content-Type":"application/json"}
-        for model in models:
+        for model in [os.getenv("QWEN_VL_MODEL",""),"Qwen/Qwen2.5-VL-7B-Instruct","Qwen/Qwen2.5-VL-3B-Instruct","Qwen/Qwen2.5-7B-Instruct","Qwen/Qwen2.5-3B-Instruct","Qwen/Qwen2.5-1.5B-Instruct"]:
+            if not model:continue
             try:
-                is_vl = "VL" in model and bool(image_url)
-                user_content = ([{"type":"image_url","image_url":{"url":image_url}},{"type":"text","text":prompt}] if is_vl else prompt)
-                payload={"model":model,"messages":[{"role":"system","content":"Bạn là biên tập viên AI tiếng Việt. Chỉ tóm tắt súc tích nội dung nguồn, không viết lại toàn bài, không lặp ý, không bịa chi tiết."},{"role":"user","content":user_content}],"max_tokens":min(int(max_tokens or 900),1400),"temperature":0.35,"top_p":0.85}
+                is_vl="VL" in model and bool(image_url)
+                content=([{"type":"image_url","image_url":{"url":image_url}},{"type":"text","text":prompt}] if is_vl else prompt)
+                payload={"model":model,"messages":[{"role":"system","content":"Bạn là biên tập viên AI tiếng Việt. Chỉ tóm tắt súc tích nội dung nguồn, không viết lại toàn bài, không lặp ý."},{"role":"user","content":content}],"max_tokens":min(int(max_tokens or 900),1400),"temperature":0.35,"top_p":0.85}
                 r=requests.post("https://router.huggingface.co/v1/chat/completions",headers=headers,json=payload,timeout=95)
-                if r.status_code>=300: errors.append(f"{model}: HTTP {r.status_code} {r.text[:160]}"); continue
+                if r.status_code>=300:errors.append(f"{model}:{r.status_code}");continue
                 txt=(r.json().get("choices",[{}])[0].get("message",{}).get("content") or "").strip()
-                if txt: base.LAST_QWEN_ERROR=""; return txt
-            except Exception as e: errors.append(f"{model}: {type(e).__name__}: {str(e)[:180]}")
-    base.LAST_QWEN_ERROR = " | ".join(errors[-5:]) or "Qwen unavailable; extractive fallback"
-    return _fallback_summary(prompt, 6)
+                if txt:base.LAST_QWEN_ERROR="";return txt
+            except Exception as e:errors.append(f"{model}:{str(e)[:120]}")
+    base.LAST_QWEN_ERROR=" | ".join(errors[-5:]) or "fallback"
+    return _fallback_summary(prompt,6)
 
 
-if not hasattr(base, "_original_qwen_generate"):
-    base._original_qwen_generate = base.qwen_generate
-base.qwen_generate = qwen_generate_resilient
+if not hasattr(base,"_original_qwen_generate"):
+    base._original_qwen_generate=base.qwen_generate
+base.qwen_generate=qwen_resilient
 
 
-_PATCHED={('/api/topic_post','POST'),('/api/url_wall','POST'),('/api/rewrite_share','POST'),('/api/ai/short/{post_id}','POST')}
+_PATCHED={('/api/topic_post','POST'),('/api/url_wall','POST'),('/api/rewrite_share','POST'),('/api/ai/short/{post_id}','POST'),('/api/ai/short-file/{file_id}','GET')}
 app.router.routes=[r for r in app.router.routes if not any(getattr(r,'path',None)==p and m in getattr(r,'methods',set()) for p,m in _PATCHED)]
 
-
 @app.get('/api/wall')
-def compat_wall(): return JSONResponse({'posts': base._load_ai_wall()[:80]})
-
+def compat_wall():return JSONResponse({'posts':base._load_ai_wall()[:80]})
 
 @app.post('/api/topic_post')
-async def compat_topic_post(request:Request):
-    body=await request.json(); topic=base._clean_text(body.get('topic',''))
-    if not topic: return JSONResponse({'error':'missing topic'},status_code=400)
-    ctx, sources = _rich_web_context(topic, limit=5)
+async def topic_post(request:Request):
+    body=await request.json();topic=base._clean_text(body.get('topic',''))
+    if not topic:return JSONResponse({'error':'missing topic'},status_code=400)
+    ctx,sources=_rich_web_context(topic,5)
     image=base.pollinations_image_url(topic)
     prompt=f"""Tóm tắt tổng hợp chủ đề để đăng Tường AI.
 
@@ -188,179 +177,157 @@ Yêu cầu:
 Nguồn/bối cảnh internet:
 {ctx}"""
     text=await base.qwen_generate(prompt,image_url=image,max_tokens=950)
-    text=_postprocess_ai_text(text,7)
-    if 'Nguồn tham khảo:' not in text: text += '\n\n' + _source_line(sources)
+    text=_postprocess(text,7)
+    if 'Nguồn tham khảo:' not in text:text+='\n\n'+_source_line(sources)
     post=base.make_post('Tổng hợp: '+topic,text,image,'','topic',sources=sources[:5])
-    posts=base._load_ai_wall(); posts.insert(0,post); base._save_ai_wall(posts)
+    posts=base._load_ai_wall();posts.insert(0,post);base._save_ai_wall(posts)
     return JSONResponse({'post':post})
 
-
 @app.post('/api/url_wall')
-async def compat_url_wall(request:Request):
-    body=await request.json(); url=base._clean_text(body.get('url',''))
-    if not url.startswith('http'): return JSONResponse({'error':'missing url'},status_code=400)
-    try: data=base.scrape_any_url(url)
-    except Exception as e: return JSONResponse({'error':'Không scrape được URL: '+str(e)[:180]},status_code=422)
+async def url_wall(request:Request):
+    body=await request.json();url=base._clean_text(body.get('url',''))
+    if not url.startswith('http'):return JSONResponse({'error':'missing url'},status_code=400)
+    try:data=base.scrape_any_url(url)
+    except Exception as e:return JSONResponse({'error':'Không scrape được URL: '+str(e)[:180]},status_code=422)
     raw=(data.get('summary','')+'\n'+data.get('text','')).strip()
-    if len(raw)<120: return JSONResponse({'error':'URL không có đủ nội dung để tóm tắt'},status_code=422)
-    prompt=_make_summary_prompt(data.get('title',''), raw, data.get('via','') or base._domain(url))
+    if len(raw)<120:return JSONResponse({'error':'URL không có đủ nội dung để tóm tắt'},status_code=422)
+    prompt=_make_summary_prompt(data.get('title',''),raw,data.get('via','') or base._domain(url))
     text=await base.qwen_generate(prompt,image_url=data.get('image') or None,max_tokens=850)
-    text=_postprocess_ai_text(text,6)
+    text=_postprocess(text,6)
     src=[{'title':data.get('title'),'url':url,'excerpt':raw[:500],'via':data.get('via') or base._domain(url)}]
-    if 'Nguồn tham khảo:' not in text: text+='\n\n'+_source_line(src)
+    if 'Nguồn tham khảo:' not in text:text+='\n\n'+_source_line(src)
     post=base.make_post(data.get('title') or 'Bài viết',text,data.get('image') or '',url,'url',sources=src)
-    posts=base._load_ai_wall(); posts.insert(0,post); base._save_ai_wall(posts)
+    posts=base._load_ai_wall();posts.insert(0,post);base._save_ai_wall(posts)
     return JSONResponse({'post':post})
 
-
 @app.post('/api/rewrite_share')
-async def compat_rewrite_share(request:Request):
-    body=await request.json(); url=base._clean_text(body.get('url',''))
-    if not url.startswith('http'): return JSONResponse({'error':'missing url'},status_code=400)
-    try: data=base.scrape_any_url(url)
-    except Exception as e: return JSONResponse({'error':'Không đọc được bài viết: '+str(e)[:180]},status_code=422)
+async def rewrite_share(request:Request):
+    body=await request.json();url=base._clean_text(body.get('url',''))
+    if not url.startswith('http'):return JSONResponse({'error':'missing url'},status_code=400)
+    try:data=base.scrape_any_url(url)
+    except Exception as e:return JSONResponse({'error':'Không đọc được bài viết: '+str(e)[:180]},status_code=422)
     raw=(data.get('summary','')+'\n'+data.get('text','')).strip()
-    if len(raw)<120: return JSONResponse({'error':'Bài viết không đủ nội dung để tóm tắt'},status_code=422)
-    prompt=_make_summary_prompt(data.get('title',''), raw, data.get('via','') or base._domain(url))
+    if len(raw)<120:return JSONResponse({'error':'Bài viết không đủ nội dung để tóm tắt'},status_code=422)
+    prompt=_make_summary_prompt(data.get('title',''),raw,data.get('via','') or base._domain(url))
     text=await base.qwen_generate(prompt,image_url=data.get('image') or None,max_tokens=850)
-    text=_postprocess_ai_text(text,6)
+    text=_postprocess(text,6)
     src=[{'title':data.get('title'),'url':url,'excerpt':raw[:500],'via':data.get('via') or base._domain(url)}]
-    if 'Nguồn tham khảo:' not in text: text+='\n\n'+_source_line(src)
+    if 'Nguồn tham khảo:' not in text:text+='\n\n'+_source_line(src)
     post=base.make_post(data.get('title') or 'Bài viết',text,data.get('image') or '',url,'summary',sources=src)
-    posts=base._load_ai_wall(); posts.insert(0,post); base._save_ai_wall(posts)
+    posts=base._load_ai_wall();posts.insert(0,post);base._save_ai_wall(posts)
     return JSONResponse({'post':post})
 
 
 def split_segments(post):
-    title=_clean(post.get('title',''))
-    text=re.sub(r'Nguồn tham khảo:.*','',post.get('text',''),flags=re.S).strip()
+    title=_clean(post.get('title',''));text=re.sub(r'Nguồn tham khảo:.*','',post.get('text',''),flags=re.S).strip()
     lines=[]
-    if title: lines.append(title)
-    for line in re.split(r'\n+', text):
+    if title:lines.append(title)
+    for line in re.split(r'\n+',text):
         line=_clean(re.sub(r'^[•\-*]\s*','',line))
-        if len(line)>8: lines.append(line)
-    # combine very short lines, keep each segment readable.
-    segs=[]; cur=''
+        if len(line)>8:lines.append(line)
+    segs=[];cur=''
     for line in lines:
-        if len(cur)+len(line)<190:
-            cur=(cur+' '+line).strip()
+        if len(cur)+len(line)<190:cur=(cur+' '+line).strip()
         else:
-            if cur: segs.append(cur)
+            if cur:segs.append(cur)
             cur=line
-    if cur: segs.append(cur)
+    if cur:segs.append(cur)
     return segs[:14]
 
-
-def wrap_text(draw, text, font, max_width, max_lines):
-    words=_clean(text).split(); lines=[]; cur=''
+def wrap_text(draw,text,font,max_width,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 Exception: width=len(test)*20
-        if width<=max_width: cur=test
+        try:width=draw.textbbox((0,0),test,font=font)[2]
+        except Exception:width=len(test)*20
+        if width<=max_width:cur=test
         else:
-            if cur: lines.append(cur)
+            if cur:lines.append(cur)
             cur=w
-        if len(lines)>=max_lines: break
-    if cur and len(lines)<max_lines: lines.append(cur)
+        if len(lines)>=max_lines:break
+    if cur and len(lines)<max_lines:lines.append(cur)
     return lines
 
-
-def make_segment_frame(post, segment, idx, total, img_path, out_path):
-    if Image is None: return base._make_short_frame(post,img_path,out_path)
-    W,H=1080,1920
-    bg=Image.new('RGB',(W,H),(14,14,14))
+def make_segment_frame(post,segment,idx,total,img_path,out_path):
+    if Image is None:return base._make_short_frame(post,img_path,out_path)
+    W,H=1080,1920;bg=Image.new('RGB',(W,H),(14,14,14))
     try:
-        im=Image.open(img_path).convert('RGB')
-        target=(1080,760); ratio=im.width/im.height; tr=target[0]/target[1]
-        if ratio>tr: nh=target[1]; nw=int(nh*ratio)
-        else: nw=target[0]; nh=int(nw/ratio)
-        im=im.resize((nw,nh)); left=(nw-target[0])//2; top=(nh-target[1])//2
-        bg.paste(im.crop((left,top,left+target[0],top+target[1])),(0,0))
-    except Exception: pass
+        im=Image.open(img_path).convert('RGB');target=(1080,760);ratio=im.width/im.height;tr=target[0]/target[1]
+        if ratio>tr:nh=target[1];nw=int(nh*ratio)
+        else:nw=target[0];nh=int(nw/ratio)
+        im=im.resize((nw,nh));left=(nw-target[0])//2;top=(nh-target[1])//2;bg.paste(im.crop((left,top,left+target[0],top+target[1])),(0,0))
+    except Exception:pass
     draw=ImageDraw.Draw(bg)
     try:
-        ft=ImageFont.truetype('/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf',46)
-        fb=ImageFont.truetype('/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf',44)
-        fl=ImageFont.truetype('/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf',28)
-    except Exception: ft=fb=fl=None
-    draw.rectangle((0,720,W,H),fill=(14,14,14))
-    margin=48; maxw=W-margin*2
+        fb=ImageFont.truetype('/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf',44);fl=ImageFont.truetype('/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf',28)
+    except Exception:fb=fl=None
+    draw.rectangle((0,720,W,H),fill=(14,14,14));margin=48;maxw=W-margin*2
     draw.text((margin,770),f'VNEWS · Short AI  {idx}/{total}',fill=(92,184,122),font=fl)
     y=840
-    for ln in wrap_text(draw, segment, fb, maxw, 16):
-        draw.text((margin,y),ln,fill=(242,242,242),font=fb)
-        y+=58
-        if y>1650: break
+    for ln in wrap_text(draw,segment,fb,maxw,16):
+        draw.text((margin,y),ln,fill=(242,242,242),font=fb);y+=58
+        if y>1650:break
     bg.save(out_path,quality=92)
 
-
-def make_tts(text, voice, out_path):
+def make_tts(text,voice,out_path):
     edge_voice={'nam':'vi-VN-NamMinhNeural','male':'vi-VN-NamMinhNeural','nu':'vi-VN-HoaiMyNeural','female':'vi-VN-HoaiMyNeural','mien-nam':'vi-VN-HoaiMyNeural'}.get(voice,'vi-VN-HoaiMyNeural')
-    try:
-        subprocess.run(['python','-m','edge_tts','--voice',edge_voice,'--text',text,'--write-media',out_path],check=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE,timeout=160)
+    try:subprocess.run(['python','-m','edge_tts','--voice',edge_voice,'--text',text,'--write-media',out_path],check=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE,timeout=160)
     except Exception:
         tld='com.vn' if voice in ('nu','female','mien-nam') else 'com'
-        try: base.gTTS(text,lang='vi',tld=tld,slow=False).save(out_path)
-        except TypeError: base.gTTS(text,lang='vi',slow=False).save(out_path)
-
+        try:base.gTTS(text,lang='vi',tld=tld,slow=False).save(out_path)
+        except TypeError:base.gTTS(text,lang='vi',slow=False).save(out_path)
 
 @app.post('/api/ai/short/{post_id}')
-async def patched_segment_short(post_id:str, request:Request):
-    try: body=await request.json()
-    except Exception: body={}
-    voice=str(body.get('voice','nu')).lower().strip(); emotion=str(body.get('emotion','neutral')).lower().strip(); speed=max(0.85,min(1.35,float(body.get('speed',1.2) or 1.2)))
-    posts=base._load_ai_wall(); post=next((p for p in posts if str(p.get('id'))==str(post_id)),None)
-    if not post: return JSONResponse({'error':'post not found'},status_code=404)
-    os.makedirs(base.SHORTS_DIR,exist_ok=True)
-    suffix=f'_{voice}_{emotion}_{str(speed).replace(".","p")}_segments'
+async def segmented_short(post_id:str,request:Request):
+    try:body=await request.json()
+    except Exception:body={}
+    voice=str(body.get('voice','nu')).lower().strip();emotion=str(body.get('emotion','neutral')).lower().strip();speed=max(0.85,min(1.35,float(body.get('speed',1.2) or 1.2)))
+    posts=base._load_ai_wall();post=next((p for p in posts if str(p.get('id'))==str(post_id)),None)
+    if not post:return JSONResponse({'error':'post not found'},status_code=404)
+    os.makedirs(base.SHORTS_DIR,exist_ok=True);suffix=f'_{voice}_{emotion}_{str(speed).replace(".","p")}_segments'
     out_mp4=os.path.join(base.SHORTS_DIR,base._safe_name(post_id+suffix)+'.mp4')
-    if os.path.exists(out_mp4):
-        post['video']='/api/ai/short-file/'+post_id+suffix; base._save_ai_wall(posts); return JSONResponse({'video':post['video']})
-    work=os.path.join(base.SHORTS_DIR,base._safe_name(post_id+suffix)); os.makedirs(work,exist_ok=True)
-    img=os.path.join(work,'image.jpg'); base._download_image(post.get('img'),post.get('title','AI news'),img)
+    if os.path.exists(out_mp4):post['video']='/api/ai/short-file/'+post_id+suffix;base._save_ai_wall(posts);return JSONResponse({'video':post['video']})
+    work=os.path.join(base.SHORTS_DIR,base._safe_name(post_id+suffix));os.makedirs(work,exist_ok=True)
+    img=os.path.join(work,'image.jpg');base._download_image(post.get('img'),post.get('title','AI news'),img)
     segs=split_segments(post)
-    if not segs: return JSONResponse({'error':'Không có nội dung để tạo short'},status_code=422)
+    if not segs:return JSONResponse({'error':'Không có nội dung để tạo short'},status_code=422)
     clips=[]
     try:
         for i,seg in enumerate(segs,1):
-            frame=os.path.join(work,f'frame_{i:02d}.jpg'); aud=os.path.join(work,f'aud_{i:02d}.mp3'); audf=os.path.join(work,f'audf_{i:02d}.mp3'); clip=os.path.join(work,f'clip_{i:02d}.mp4')
+            frame=os.path.join(work,f'frame_{i:02d}.jpg');aud=os.path.join(work,f'aud_{i:02d}.mp3');audf=os.path.join(work,f'audf_{i:02d}.mp3');clip=os.path.join(work,f'clip_{i:02d}.mp4')
             prefix={'urgent':'Tin nhanh.','warm':'Câu chuyện đáng chú ý.','serious':'Bản tin nghiêm túc.','energetic':'Cập nhật nổi bật.'}.get(emotion,'')
             spoken=(prefix+' '+seg).strip() if i==1 and prefix else seg
-            make_segment_frame(post, seg, i, len(segs), img, frame)
-            make_tts(spoken, voice, aud)
+            make_segment_frame(post,seg,i,len(segs),img,frame);make_tts(spoken,voice,aud)
             subprocess.run(['ffmpeg','-y','-i',aud,'-filter:a',f'atempo={speed}','-vn',audf],check=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE,timeout=120)
             subprocess.run(['ffmpeg','-y','-loop','1','-i',frame,'-i',audf,'-shortest','-c:v','libx264','-tune','stillimage','-pix_fmt','yuv420p','-c:a','aac','-b:a','128k','-vf','scale=1080:1920',clip],check=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE,timeout=180)
             clips.append(clip)
         listfile=os.path.join(work,'list.txt')
         with open(listfile,'w',encoding='utf-8') as f:
-            for c in clips: f.write("file '{}'
-".format(c.replace("'","'\\''")))
+            for c in clips:f.write("file '{}'\n".format(c.replace("'","'\\''")))
         subprocess.run(['ffmpeg','-y','-f','concat','-safe','0','-i',listfile,'-c','copy',out_mp4],check=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE,timeout=240)
-        post['video']='/api/ai/short-file/'+post_id+suffix; post['short_voice']=voice; post['short_emotion']=emotion; post['short_speed']=speed; post['short_subtitles']=False; post['short_segments']=len(segs)
-        base._save_ai_wall(posts)
+        post['video']='/api/ai/short-file/'+post_id+suffix;post['short_voice']=voice;post['short_emotion']=emotion;post['short_speed']=speed;post['short_subtitles']=False;post['short_segments']=len(segs);base._save_ai_wall(posts)
         return JSONResponse({'video':post['video'],'segments':len(segs),'speed':speed,'subtitles':False})
-    except Exception as e:
-        return JSONResponse({'error':'Không tạo được shorts: '+str(e)[:180]},status_code=500)
-
+    except Exception as e:return JSONResponse({'error':'Không tạo được shorts: '+str(e)[:180]},status_code=500)
 
 @app.get('/api/ai/short-file/{file_id}')
-def patched_short_file(file_id:str):
+def short_file(file_id:str):
     path=os.path.join(base.SHORTS_DIR,base._safe_name(file_id)+'.mp4')
-    if not os.path.exists(path): return JSONResponse({'error':'not found'},status_code=404)
+    if not os.path.exists(path):return JSONResponse({'error':'not found'},status_code=404)
     return FileResponse(path,media_type='video/mp4',filename=f'vnews-ai-{file_id}.mp4')
 
-
-# Keep previous UI patch, but override topic alert/progress wording.
+# Front-end patch
 app.router.routes=[r for r in app.router.routes if not (getattr(r,'path',None)=='/' and 'GET' in getattr(r,'methods',set()))]
-@app.get('/')
-async def index_patched():
-    with open('/app/static/index.html','r',encoding='utf-8') as f: html=f.read()
-    inject=PATCH_INJECT+r'''
+PATCH_INJECT=r'''
 <script>
 (function(){
+if(window.aiMakeShortPatched){const old=window.aiMakeShortPatched;window.aiMakeShortPatched=function(i){return old(i)}}
 window.createTopicPost=function(){let inp=document.getElementById('ai-topic-input');let topic=(inp&&inp.value||'').trim();if(!topic)return alert('Nhập chủ đề trước');fetch('/api/topic_post',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({topic})}).then(r=>r.json().then(j=>({ok:r.ok,j}))).then(({ok,j})=>{if(ok&&j.post){window.location.reload();alert('Đã tổng hợp nội dung các nguồn thành 1 bản tóm tắt trên Tường AI');}else alert(j.error||'Lỗi tạo bài')}).catch(e=>alert(e.message||'Lỗi tạo bài'));};
 })();
 </script>
 '''
-    return HTMLResponse(html.replace('</body>',inject+'\n</body>'))
+@app.get('/')
+async def index_patched():
+    with open('/app/static/index.html','r',encoding='utf-8') as f:html=f.read()
+    # Preserve original ai_ext injection if present there via main import? This app now injects only needed override.
+    extra=getattr(base,'AI_INJECT','') if hasattr(base,'AI_INJECT') else ''
+    return HTMLResponse(html.replace('</body>',extra+PATCH_INJECT+'\n</body>'))