fix: trending section blank when scores are stale + trend scorer error isolation
Dashboard _get_trending() was querying scores within 1 day only — if the nightly trend task hadn't run (e.g. worker restarted mid-run), the trending section returned empty. Now falls back through 1→3→7→30 day windows so stale scores always surface something. Trend scorer now wraps per-bill scoring in try/except so a single bad newsapi/gnews call can't abort the entire 1600-bill run. Authored by: Jack Levy
This commit is contained in:
@@ -16,16 +16,20 @@ router = APIRouter()
|
|||||||
|
|
||||||
|
|
||||||
async def _get_trending(db: AsyncSession) -> list[dict]:
|
async def _get_trending(db: AsyncSession) -> list[dict]:
|
||||||
trending_result = await db.execute(
|
# Try progressively wider windows so stale scores still surface results
|
||||||
select(Bill)
|
for days_back in (1, 3, 7, 30):
|
||||||
.options(selectinload(Bill.sponsor), selectinload(Bill.briefs), selectinload(Bill.trend_scores))
|
trending_result = await db.execute(
|
||||||
.join(TrendScore, Bill.bill_id == TrendScore.bill_id)
|
select(Bill)
|
||||||
.where(TrendScore.score_date >= date.today() - timedelta(days=1))
|
.options(selectinload(Bill.sponsor), selectinload(Bill.briefs), selectinload(Bill.trend_scores))
|
||||||
.order_by(desc(TrendScore.composite_score))
|
.join(TrendScore, Bill.bill_id == TrendScore.bill_id)
|
||||||
.limit(10)
|
.where(TrendScore.score_date >= date.today() - timedelta(days=days_back))
|
||||||
)
|
.order_by(desc(TrendScore.composite_score))
|
||||||
trending_bills = trending_result.scalars().unique().all()
|
.limit(10)
|
||||||
return [_serialize_bill(b) for b in trending_bills]
|
)
|
||||||
|
trending_bills = trending_result.scalars().unique().all()
|
||||||
|
if trending_bills:
|
||||||
|
return [_serialize_bill(b) for b in trending_bills]
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
def _serialize_bill(bill: Bill) -> dict:
|
def _serialize_bill(bill: Bill) -> dict:
|
||||||
|
|||||||
@@ -91,24 +91,27 @@ def calculate_all_trend_scores(self):
|
|||||||
gtrends_scores = trends_service.get_trends_scores_batch(keyword_groups)
|
gtrends_scores = trends_service.get_trends_scores_batch(keyword_groups)
|
||||||
|
|
||||||
for i, bill in enumerate(batch):
|
for i, bill in enumerate(batch):
|
||||||
query = bill_queries[i]
|
try:
|
||||||
# NewsAPI + Google News counts (gnews served from 2-hour cache)
|
query = bill_queries[i]
|
||||||
newsapi_articles = news_service.fetch_newsapi_articles(query, days=30)
|
# NewsAPI + Google News counts (gnews served from 2-hour cache)
|
||||||
newsapi_count = len(newsapi_articles)
|
newsapi_articles = news_service.fetch_newsapi_articles(query, days=30)
|
||||||
gnews_count = news_service.fetch_gnews_count(query, days=30)
|
newsapi_count = len(newsapi_articles)
|
||||||
gtrends_score = gtrends_scores[i]
|
gnews_count = news_service.fetch_gnews_count(query, days=30)
|
||||||
|
gtrends_score = gtrends_scores[i]
|
||||||
|
|
||||||
composite = calculate_composite_score(newsapi_count, gnews_count, gtrends_score)
|
composite = calculate_composite_score(newsapi_count, gnews_count, gtrends_score)
|
||||||
|
|
||||||
db.add(TrendScore(
|
db.add(TrendScore(
|
||||||
bill_id=bill.bill_id,
|
bill_id=bill.bill_id,
|
||||||
score_date=today,
|
score_date=today,
|
||||||
newsapi_count=newsapi_count,
|
newsapi_count=newsapi_count,
|
||||||
gnews_count=gnews_count,
|
gnews_count=gnews_count,
|
||||||
gtrends_score=gtrends_score,
|
gtrends_score=gtrends_score,
|
||||||
composite_score=composite,
|
composite_score=composite,
|
||||||
))
|
))
|
||||||
scored += 1
|
scored += 1
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning(f"Trend scoring skipped for {bill.bill_id}: {exc}")
|
||||||
|
|
||||||
db.commit()
|
db.commit()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user