Fix: ensure rewrite has image, updates wall, short works after rewrite"

app_entry.py

@@ -1,4 +1,4 @@
-"""Wrapper: extra fixes + auto title rewrite + topic source image."""
+"""Wrapper: extra fixes + auto title rewrite + topic source image + guaranteed image."""
 from ai_runtime_patch_fast import *
 from ai_runtime_patch_fast import app, f5, f6, rt, PATCH_INJECT, _scrape, _domain, clean
 from patch_extra import EXTRA_FIX
@@ -6,7 +6,9 @@ from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi import Request
 import asyncio, re
 
-# Override endpoints for auto-title and source image.
+DEFAULT_IMG="https://s1.vnecdn.net/vnexpress/restruct/i/v9505/logo_default.jpg"
+
+# Override endpoints.
 app.router.routes=[r for r in app.router.routes if not (
     (getattr(r,'path',None)=='/api/topic_post' and 'POST' in getattr(r,'methods',set())) or
     (getattr(r,'path',None)=='/api/topic/rewrite' and 'POST' in getattr(r,'methods',set())) or
@@ -36,6 +38,11 @@ def _source_image(sources, details):
             if img and 'pollinations' not in img and len(img)>20:return img
     return ''
 
+def _ensure_img(img):
+    """Always return a valid image URL."""
+    if img and len(img)>20 and img.startswith('http'):return img
+    return DEFAULT_IMG
+
 @app.post('/api/topic_post')
 async def _tp(request:Request):
     b=await request.json();topic=clean(b.get('topic',''))
@@ -43,8 +50,7 @@ async def _tp(request:Request):
     research=f6._fast_context(topic) if hasattr(f6,'_fast_context') else f6._web_research_context(topic)
     ctx=research.get('context','');src=research.get('sources',[]);det=f6._extract_source_details_from_context(ctx,src) if hasattr(f6,'_extract_source_details_from_context') else []
     if not ctx or not src:return JSONResponse({'error':'Không tìm được nội dung.'},status_code=422)
-    # Use og:image from source article instead of AI-generated image
-    img=_source_image(src,det) or f6._topic_image(topic)
+    img=_ensure_img(_source_image(src,det) or f6._topic_image(topic))
     sb='\n\n'.join([f"[{i+1}] {d.get('title','')} ({d.get('via','')})\n{d.get('content','')[:1400]}" for i,d in enumerate(det)]) if det else ctx[:18000]
     text=None
     try:text=await asyncio.wait_for(f5.base.qwen_generate(f'Viết bài tiếng Việt VỀ: "{topic}"\nNGUỒN:\n{sb[:18000]}\nCHỈ viết về "{topic}". 5-8 đoạn. Cuối có nguồn.',image_url=img,max_tokens=1700),timeout=35)
@@ -61,6 +67,7 @@ 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)
+    img=_ensure_img(img)
     prompt=f"""Tóm tắt bài viết đăng Tường AI. Dòng đầu tiên là TIÊU ĐỀ MỚI hấp dẫn phù hợp nội dung (không dùng tiêu đề gốc).
 
 Tiêu đề gốc (tham khảo): {title}
@@ -71,7 +78,7 @@ Dòng 1: Tiêu đề mới hấp dẫn.
 Tiếp theo: 4-6 ý chính tóm tắt.
 Cuối: ghi nguồn."""
     text=None
-    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=img or None,max_tokens=1000),timeout=30)
+    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=img,max_tokens=1000),timeout=30)
     except:pass
     if not text or len(text)<80:text=f"{title}\n\n{raw[:1200]}\n\nNguồn: {_domain(url)}"
     ai_title=_extract_title(text)
@@ -87,9 +94,13 @@ async def _tr(request:Request):
     ps=f5.base._load_ai_wall();p=next((x for x in ps if str(x.get('id'))==pid),None)
     if not p:return JSONResponse({'error':'Bài không tồn tại'},status_code=404)
     urls=list(dict.fromkeys([s['url'] for s in (p.get('source_details') or []) if s.get('url')]+[s['url'] for s in (p.get('sources') or []) if s.get('url')]))[:5]
-    parts=[]
-    for u in urls:t,r,_=_scrape(u,6000);(parts.append(f"[{_domain(u)}] {t}\n{r}") if r and len(r)>150 else None)
+    parts=[];best_img=''
+    for u in urls:
+        t,r,uimg=_scrape(u,6000)
+        if r and len(r)>150:parts.append(f"[{_domain(u)}] {t}\n{r}")
+        if not best_img and uimg and len(uimg)>20:best_img=uimg
     ac='\n---\n'.join(parts) if parts else (p.get('text') or '')
+    img=_ensure_img(best_img or p.get('img',''))
     prompt=f"""Viết lại thành bản tóm tắt mới. Dòng đầu tiên là TIÊU ĐỀ MỚI hấp dẫn phù hợp nội dung.
 
 Chủ đề gốc: {p.get('title','')}
@@ -100,13 +111,13 @@ Dòng 1: Tiêu đề mới.
 Tiếp: 4-6 ý chính.
 Cuối: nguồn tham khảo."""
     text=None
-    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=p.get('img'),max_tokens=1200),timeout=35)
+    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=img,max_tokens=1200),timeout=35)
     except:pass
     if not text or len(text)<100:text=f"Tóm tắt: {p.get('title','')}\n\n{ac[:1500]}\n\nNguồn: VNEWS AI"
     ai_title=_extract_title(text)
     lines=text.strip().split('\n')
     body_text='\n'.join(lines[1:]).strip() if lines and lines[0].strip()==ai_title else text
-    np=f5.base.make_post(ai_title,body_text,p.get('img',''),'','rewrite_topic',sources=p.get('sources',[]));np['images']=p.get('images',[])
+    np=f5.base.make_post(ai_title,body_text,img,'','rewrite_topic',sources=p.get('sources',[]));np['images']=[img]
     all_p=f5.base._load_ai_wall();all_p.insert(0,np);f5.base._save_ai_wall(all_p);return JSONResponse({'post':np})
 
 @app.get('/')