Fix: HOT feed chỉ hiện hashtag + rewrite timeout 15s

app_v2_entry.py

@@ -1,5 +1,8 @@
 """VNEWS v2 Entry Point - with friendly highlights"""
 import sys, os, traceback
+# Áp dụng patch sửa timeout rewrite 75s→15s
+try: import patch_qwen_timeout
+except: pass
 from main import app, HEADERS, BONGDA_HEADERS, fetch_bongda_api, HL_LEAGUES
 from fastapi.responses import HTMLResponse, JSONResponse, FileResponse
 from fastapi.staticfiles import StaticFiles

patch_qwen_timeout.py

@@ -0,0 +1,31 @@
+# Patch applied at Space startup: reduce Qwen timeout from 75s to 15s
+# This file is sourced by the entry point
+
+import re, os
+
+PATCH_DONE_FLAG = "/app/.qwen_timeout_patched"
+
+def apply_patch():
+    if os.path.exists(PATCH_DONE_FLAG):
+        return
+    try:
+        for fpath in ["/app/main.py", os.path.join(os.path.dirname(__file__), "main.py")]:
+            if os.path.exists(fpath):
+                with open(fpath, "r") as f:
+                    content = f.read()
+                # Change timeout=75 to timeout=15
+                orig = 'r=requests.post("https://router.huggingface.co/v1/chat/completions",headers=headers,json=payload,timeout=75)'
+                new  = 'r=requests.post("https://router.huggingface.co/v1/chat/completions",headers=headers,json=payload,timeout=15)'
+                if orig in content:
+                    content = content.replace(orig, new)
+                    with open(fpath, "w") as f:
+                        f.write(content)
+                    print("[patch] Applied Qwen timeout patch (75s → 15s) to", fpath)
+                break
+        # Create flag file
+        with open(PATCH_DONE_FLAG, "w") as f:
+            f.write("ok")
+    except Exception as e:
+        print("[patch] Failed to apply patch:", e)
+
+apply_patch()

static/app_v2.js

@@ -1,8 +1,7 @@
 // === VNEWS Frontend v2 - Full Functions ===
-// Added: World Cup highlight tab + Friendly highlights on homepage + 🔥 HOT feed
-// Updated: HOT feed chỉ hiển thị hashtag chips, click vào hashtag thì hiện tin
+// HOT feed: chỉ hiển thị hashtag chips, click vào hashtag thì hiện tin
+// Fix: timeout cho rewrite calls (60s), không treo vô hạn
 // Fix: safeJson parsing to handle non-JSON error responses gracefully
-// Fix: timeout cho rewrite calls, không treo vô hạn
 
 // === SAFE JSON PARSE ===
 async function safeJson(resp){
@@ -10,7 +9,6 @@ async function safeJson(resp){
     const text=await resp.text();
     try{return JSON.parse(text);}
     catch(e){
-      // Server returned non-JSON (e.g., HTML error page)
       console.warn('Non-JSON response:', text.slice(0,200));
       return {error: 'Server error', _status: resp.status, _raw: text.slice(0,200)};
     }
@@ -73,34 +71,29 @@ async function loadHotTopics(){
     const topicText=t.topic||t.label.replace(/^#/,'');
     return`<button class="hot-chip" onclick="searchTopic('${topicText.replace(/'/g,"\\'")}')">${esc(t.label)}</button>`;
   }).join('');
-  if(_allHotTopics&&_allHotTopics[0]){
-    const firstTopic=_allHotTopics[0].topic||_allHotTopics[0].label.replace(/^#/,'');
-    setTimeout(()=>searchTopic(firstTopic),800);
-  }
 }
 
 function searchTopic(topic){
   if(!topic){topic=document.getElementById('topic-input')?.value.trim();if(!topic){alert('Nhập chủ đề');return;}}
   document.getElementById('topic-input').value='';
   _htTopic=topic;_htPage=0;
-  // Chỉ tìm tin của hashtag được click, không tổng hợp
+  // Chỉ tìm tin của 1 hashtag được click
   showHashtagSources(topic, 0, '');
 }
 
 async function showHashtagSources(topic, page, extraTopics){
   const box=document.getElementById('hashtag-box');if(!box)return;
-  let topicLabel=esc(topic);
-  if(page===0)box.innerHTML=`<div class="hashtag-sources"><h3>🔍 ${topicLabel}</h3><div class="hashtag-loading"><div class="hashtag-spinner"></div>Đang tìm nguồn tin...</div></div>`;
+  if(page===0)box.innerHTML=`<div class="hashtag-sources"><h3>🔍 ${esc(topic)}</h3><div class="hashtag-loading"><div class="hashtag-spinner"></div>Đang tìm nguồn tin...</div></div>`;
   try{
     let url=`/api/hashtag/sources?topic=${encodeURIComponent(topic)}&page=${page}`;
     if(extraTopics) url+=`&extra_topics=${encodeURIComponent(extraTopics)}`;
     const r=await fetch(url);const j=await safeJson(r);
     if(j.error){box.innerHTML=`<div class="hashtag-sources"><h3>🔍 ${esc(topic)}</h3><div style="color:#e74c3c;padding:8px">Lỗi: ${esc(j.error)}</div></div>`;return;}
     const sources=j.sources||[];
-    if(!sources.length&&page===0){box.innerHTML=`<div class="hashtag-sources"><h3>🔍 ${topicLabel}</h3><div style="color:#888;padding:8px">Không tìm được bài viết liên quan</div></div>`;return;}
+    if(!sources.length&&page===0){box.innerHTML=`<div class="hashtag-sources"><h3>🔍 ${esc(topic)}</h3><div style="color:#888;padding:8px">Không tìm được bài viết</div></div>`;return;}
     let h='';
     if(page===0){
-      h=`<div class="hashtag-sources"><h3>🔍 ${topicLabel}</h3>`;
+      h=`<div class="hashtag-sources"><h3>🔍 ${esc(topic)}</h3>`;
       h+=`<div style="font-size:10px;color:#888;margin-bottom:6px">${j.total} bài từ nhiều nguồn</div>`;
       h+=`<div id="ht-list">`;
     }
@@ -116,36 +109,34 @@ async function rewriteHashtag(topic){
   const btn=event?.target;
   if(btn){btn.disabled=true;btn.textContent='Đang xử lý...';}
   try{
-    // Timeout 60s cho rewrite
     const r=await fetchWithTimeout('/api/topic_post',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({topic})},60000);
     const j=await safeJson(r);
-    if(!r.ok||j.error)throw new Error(j.error||'Lỗi');
+    if(!r.ok||j.error)throw new Error(j.error||'Lỗi server');
     toast('✅ Đã đăng Tường AI!');
     if(btn)btn.textContent='✅ Đã đăng!';
   }catch(e){
-    if(e.message==='timeout'){toast('❌ Quá lâu, thử lại');}
-    else{toast('❌ '+e.message);}
+    if(e.message==='timeout')toast('❌ Quá lâu, thử lại');
+    else toast('❌ '+e.message);
     if(btn){btn.disabled=false;btn.textContent='🤖 Rewrite AI';}
   }
 }
 
-// ===== 🔥 HOT FEED — chỉ hiển thị danh sách hashtag, click vào hashtag thì hiện tin =====
+// ===== 🔥 HOT FEED — chỉ hiển thị hashtag chips =====
 async function loadHotFeed(){
   const box=document.getElementById('hot-feed');if(!box)return;
-  box.innerHTML=`<div class="hot-feed-section"><div class="hot-feed-header">🔥 HOT <span style="font-size:10px;color:#f0c040;font-weight:400">Đang tải hashtag...</span></div><div class="hot-feed-loading"><div class="hashtag-spinner"></div>Đang tải...</div></div>`;
+  box.innerHTML=`<div class="hot-feed-section"><div class="hot-feed-header">🔥 HOT <span style="font-size:10px;color:#f0c040;font-weight:400">Đang tải...</span></div><div class="hot-feed-loading"><div class="hashtag-spinner"></div></div></div>`;
   try{
     const ht=await fetch('/api/hot_topics').then(r=>safeJson(r)).catch(()=>({topics:[]}));
     const allTopics=(ht.topics||[]).slice(0,10);
     if(!allTopics.length){box.innerHTML='';return;}
     const topicCount=allTopics.length;
-    const headerLabel=topicCount>1?`🔥 HOT <span style="font-size:11px;color:#f0c040;font-weight:600">${topicCount} hashtag trending nhất</span>`:`🔥 HOT <span style="font-size:10px;color:#f0c040;font-weight:400">Tin hot nhất hôm nay</span>`;
+    const headerLabel=topicCount>1?`🔥 HOT <span style="font-size:11px;color:#f0c040;font-weight:600">${topicCount} hashtag trending nhất</span>`:`🔥 HOT`;
     const topicChipsHtml=allTopics.map(t=>{
       const lbl=t.label||t.topic||'';
       const tp=t.topic||t.label.replace(/^#/,'');
       return`<span class="hot-feed-chip" onclick="searchTopic('${esc(tp).replace(/'/g,"\\'")}')">${esc(lbl)}</span>`;
     }).join('');
-    let h=`<div class="hot-feed-section"><div class="hot-feed-header">${headerLabel}</div><div class="hot-feed-topics">${topicChipsHtml}</div>`;
-    h+=`</div>`;box.innerHTML=h;
+    box.innerHTML=`<div class="hot-feed-section"><div class="hot-feed-header">${headerLabel}</div><div class="hot-feed-topics">${topicChipsHtml}</div></div>`;
   }catch(e){box.innerHTML='';}
 }