Kill renderTopicWallE BEFORE old injects run, not after"

app_entry.py

@@ -1,4 +1,4 @@
-"""Wrapper: fast load, no FINAL6E, highlight 1:1, auto title, source image."""
+"""Wrapper: kill old renderers FIRST, then inject everything."""
 from ai_runtime_patch_fast import *
 from ai_runtime_patch_fast import app, f5, f6, rt, PATCH_INJECT, _scrape, _domain, clean, _bg, _bg_home, _bg_shorts
 from patch_extra import EXTRA_FIX
@@ -8,7 +8,6 @@ import asyncio, re, threading, time
 
 DEFAULT_IMG="https://s1.vnecdn.net/vnexpress/restruct/i/v9505/logo_default.jpg"
 
-# Remove ALL routes we want to override (including homepage/shorts that may block)
 app.router.routes=[r for r in app.router.routes if not (
     (getattr(r,'path',None)=='/api/homepage' and 'GET' in getattr(r,'methods',set())) or
     (getattr(r,'path',None)=='/api/shorts' and 'GET' in getattr(r,'methods',set())) or
@@ -19,13 +18,11 @@ app.router.routes=[r for r in app.router.routes if not (
     (getattr(r,'path',None)=='/' and 'GET' in getattr(r,'methods',set()))
 )]
 
-# === FAST HOMEPAGE: never block, always return immediately ===
 @app.get('/api/homepage')
 def _homepage_fast():
     if _bg_home['d']:
         if time.time()-_bg_home['t']>300:threading.Thread(target=_bg,daemon=True).start()
         return JSONResponse(_bg_home['d'])
-    # No cache yet — trigger background and return empty immediately (page will reload sections)
     threading.Thread(target=_bg,daemon=True).start()
     return JSONResponse([])
 
@@ -37,7 +34,6 @@ def _shorts_fast(refresh:int=Query(default=0)):
     threading.Thread(target=_bg,daemon=True).start()
     return JSONResponse([])
 
-# === Auto title + source image ===
 def _extract_title(text):
     if not text:return 'Bài viết AI'
     lines=[l.strip() for l in text.strip().split('\n') if l.strip()]
@@ -45,7 +41,6 @@ def _extract_title(text):
         first=re.sub(r'^[#*\-•\d\.\)\s]+','',lines[0]).strip()
         if 10<=len(first)<=120:return first
     return lines[0][:100] if lines else 'Bài viết AI'
-
 def _source_image(sources, details):
     for s in (details or []):
         if s.get('url'):
@@ -58,7 +53,6 @@ def _source_image(sources, details):
             except:img=''
             if img and 'pollinations' not in img and len(img)>20:return img
     return ''
-
 def _ensure_img(img):
     if img and len(img)>20 and img.startswith('http'):return img
     return DEFAULT_IMG
@@ -78,7 +72,6 @@ async def _tp(request:Request):
     if not text or len(text)<300:text=f"{topic}: tổng hợp\n\n"+'\n'.join([f"• {d['title']}: {d.get('content','')[:300]}" for d in (det or [])[:6]])+"\n\nNguồn: "+', '.join(sorted({d.get('via','') for d in (det or []) if d.get('via')}))
     post=f5.base.make_post(topic,text,img,'','topic_focused',sources=[s for s in src if s.get('url')]);post['images']=[img];post['source_details']=det
     ps=f5.base._load_ai_wall();ps.insert(0,post);f5.base._save_ai_wall(ps);return JSONResponse({'post':post})
-
 @app.post('/api/rewrite_share')
 @app.post('/api/url_wall')
 async def _rw(request:Request):
@@ -88,22 +81,14 @@ async def _rw(request:Request):
     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.
-
-Tiêu đề gốc: {title}
-Nội dung:
-{raw[:14000]}
-
-Dòng 1: Tiêu đề mới. Tiếp: 4-6 ý chính. Cuối: nguồn."""
     text=None
-    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=img,max_tokens=1000),timeout=30)
+    try:text=await asyncio.wait_for(f5.base.qwen_generate(f'Tóm tắt đăng Tường AI. Dòng 1: TIÊU ĐỀ MỚI.\n\nTiêu đề gốc: {title}\nNội dung:\n{raw[:14000]}\n\nDòng 1: Tiêu đề mới. Tiếp: 4-6 ý. Cuối: nguồn.',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);lines=text.strip().split('\n')
     body_text='\n'.join(lines[1:]).strip() if lines and lines[0].strip()==ai_title else text
     post=f5.base.make_post(ai_title,body_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})
-
 @app.post('/api/topic/rewrite')
 async def _tr(request:Request):
     b=await request.json();pid=str(b.get('post_id','')).strip()
@@ -118,15 +103,8 @@ async def _tr(request:Request):
         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 tóm tắt mới. Dòng đầu là TIÊU ĐỀ MỚI hấp dẫn.
-
-Chủ đề: {p.get('title','')}
-Nguồn:
-{ac[:16000]}
-
-Dòng 1: Tiêu đề mới. Tiếp: 4-6 ý. Cuối: nguồn."""
     text=None
-    try:text=await asyncio.wait_for(f5.base.qwen_generate(prompt,image_url=img,max_tokens=1200),timeout=35)
+    try:text=await asyncio.wait_for(f5.base.qwen_generate(f'Viết lại tóm tắt. Dòng 1: TIÊU ĐỀ MỚI.\n\nChủ đề: {p.get("title","")}\nNguồn:\n{ac[:16000]}\n\nDòng 1: Tiêu đề mới. Tiếp: 4-6 ý. Cuối: nguồn.',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')
@@ -134,6 +112,16 @@ Dòng 1: Tiêu đề mới. Tiếp: 4-6 ý. Cuối: nguồn."""
     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})
 
+# === CRITICAL: Script that runs BEFORE all old injects to prevent slide destruction ===
+PRE_KILL_SCRIPT = r'''
+<script>
+// PRE-KILL: Override destructive functions BEFORE old inject code defines and calls them
+Object.defineProperty(window,'renderTopicWallE',{get:function(){return function(){}},set:function(){},configurable:true});
+Object.defineProperty(window,'renderAIShortHome',{get:function(){return function(){}},set:function(){},configurable:true});
+Object.defineProperty(window,'renderAIShorts7',{get:function(){return function(){}},set:function(){},configurable:true});
+</script>
+'''
+
 HIGHLIGHT_FIX = r'''
 <style>
 .vp-wrap{aspect-ratio:1/1!important;width:100%!important;max-height:100vh!important;background:#000!important;position:relative!important}
@@ -145,10 +133,12 @@ HIGHLIGHT_FIX = r'''
 @app.get('/')
 async def _index_final():
     html=f5.f4.f3.f2.f1._load_index_html()
-    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
+    # PRE-KILL goes FIRST before any old inject can run
+    body=PRE_KILL_SCRIPT
+    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','')
-    # NO FINAL6E_INJECT — it destroys slides
+    # NO FINAL6E_INJECT
     body+=PATCH_INJECT
     body+=EXTRA_FIX
     body+=HIGHLIGHT_FIX