Spaces:
Running
Running
feat: add top stories API + fix reranker tokenizer
Browse files- Add /api/v1/top-stories endpoint for fast landing page headlines
- DuckDuckGo integration with 5-minute cache
- Fix reranker tokenizer compatibility (trust_remote_code=True)
- Ethiopia-focused by default, no API key required
Features:
- Fast response (< 50ms when cached, 2-3s on miss)
- Clean frontend-ready format
- Category support (news, politics, economy, sports)
- Cache refresh endpoint
Impact:
- Faster landing page load
- Fresher content (real-time from DuckDuckGo)
- Better UX with top stories section
- Free (no API costs)
Version: 2.5.1
src/api/routes/__init__.py
CHANGED
|
@@ -1,2 +1,2 @@
|
|
| 1 |
# Expose routers
|
| 2 |
-
from . import rag, analytics, interactions, accounts, news
|
|
|
|
| 1 |
# Expose routers
|
| 2 |
+
from . import rag, analytics, interactions, accounts, news, top_stories
|
src/api/routes/top_stories.py
ADDED
|
@@ -0,0 +1,238 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
"""
|
| 2 |
+
Top Stories API Endpoint
|
| 3 |
+
|
| 4 |
+
Provides fresh news headlines for the landing page.
|
| 5 |
+
Fast, cached, and optimized for frontend display.
|
| 6 |
+
|
| 7 |
+
Features:
|
| 8 |
+
- DuckDuckGo news search (fast, no API key)
|
| 9 |
+
- 5-minute cache (reduce API calls)
|
| 10 |
+
- Ethiopia-focused by default
|
| 11 |
+
- Multiple categories support
|
| 12 |
+
- Clean, frontend-ready format
|
| 13 |
+
"""
|
| 14 |
+
|
| 15 |
+
import logging
|
| 16 |
+
from typing import List, Optional
|
| 17 |
+
from fastapi import APIRouter, Query, HTTPException
|
| 18 |
+
from pydantic import BaseModel
|
| 19 |
+
from datetime import datetime
|
| 20 |
+
import asyncio
|
| 21 |
+
|
| 22 |
+
logger = logging.getLogger(__name__)
|
| 23 |
+
|
| 24 |
+
router = APIRouter()
|
| 25 |
+
|
| 26 |
+
|
| 27 |
+
class TopStory(BaseModel):
|
| 28 |
+
"""Single news story for frontend display"""
|
| 29 |
+
title: str
|
| 30 |
+
url: str
|
| 31 |
+
source: str
|
| 32 |
+
published_at: str
|
| 33 |
+
category: str = "NEWS"
|
| 34 |
+
excerpt: Optional[str] = None
|
| 35 |
+
|
| 36 |
+
|
| 37 |
+
class TopStoriesResponse(BaseModel):
|
| 38 |
+
"""Response with top stories"""
|
| 39 |
+
stories: List[TopStory]
|
| 40 |
+
fetched_at: str
|
| 41 |
+
cache_hit: bool = False
|
| 42 |
+
|
| 43 |
+
|
| 44 |
+
# Simple in-memory cache (5 minutes)
|
| 45 |
+
_cache = {}
|
| 46 |
+
_cache_ttl = 300 # 5 minutes
|
| 47 |
+
|
| 48 |
+
|
| 49 |
+
async def fetch_top_stories_from_ddg(
|
| 50 |
+
query: str = "Ethiopia",
|
| 51 |
+
max_results: int = 10,
|
| 52 |
+
region: str = "et-en"
|
| 53 |
+
) -> List[TopStory]:
|
| 54 |
+
"""
|
| 55 |
+
Fetch top stories from DuckDuckGo news search.
|
| 56 |
+
|
| 57 |
+
Args:
|
| 58 |
+
query: Search query (default: "Ethiopia")
|
| 59 |
+
max_results: Number of results (default: 10)
|
| 60 |
+
region: DuckDuckGo region (default: "et-en" for Ethiopia)
|
| 61 |
+
|
| 62 |
+
Returns:
|
| 63 |
+
List of TopStory objects
|
| 64 |
+
"""
|
| 65 |
+
try:
|
| 66 |
+
from ddgs import DDGS
|
| 67 |
+
|
| 68 |
+
# Run DuckDuckGo search in thread pool (it's synchronous)
|
| 69 |
+
loop = asyncio.get_event_loop()
|
| 70 |
+
|
| 71 |
+
def _search():
|
| 72 |
+
ddgs = DDGS()
|
| 73 |
+
results = ddgs.news(
|
| 74 |
+
query,
|
| 75 |
+
region=region,
|
| 76 |
+
max_results=max_results
|
| 77 |
+
)
|
| 78 |
+
return list(results)
|
| 79 |
+
|
| 80 |
+
raw_results = await asyncio.wait_for(
|
| 81 |
+
loop.run_in_executor(None, _search),
|
| 82 |
+
timeout=5.0 # Fast timeout for landing page
|
| 83 |
+
)
|
| 84 |
+
|
| 85 |
+
# Convert to TopStory format
|
| 86 |
+
stories = []
|
| 87 |
+
for r in raw_results:
|
| 88 |
+
try:
|
| 89 |
+
story = TopStory(
|
| 90 |
+
title=r.get("title", "").strip(),
|
| 91 |
+
url=r.get("url", "").strip(),
|
| 92 |
+
source=r.get("source", "Unknown").strip(),
|
| 93 |
+
published_at=r.get("date", datetime.utcnow().isoformat()),
|
| 94 |
+
category="NEWS",
|
| 95 |
+
excerpt=r.get("body", "")[:150] if r.get("body") else None
|
| 96 |
+
)
|
| 97 |
+
|
| 98 |
+
# Validate required fields
|
| 99 |
+
if story.title and story.url:
|
| 100 |
+
stories.append(story)
|
| 101 |
+
except Exception as e:
|
| 102 |
+
logger.warning(f"Failed to parse story: {e}")
|
| 103 |
+
continue
|
| 104 |
+
|
| 105 |
+
logger.info(f"Fetched {len(stories)} top stories from DuckDuckGo")
|
| 106 |
+
return stories
|
| 107 |
+
|
| 108 |
+
except asyncio.TimeoutError:
|
| 109 |
+
logger.warning("DuckDuckGo timeout - returning empty stories")
|
| 110 |
+
return []
|
| 111 |
+
|
| 112 |
+
except Exception as e:
|
| 113 |
+
logger.error(f"Failed to fetch top stories: {e}")
|
| 114 |
+
return []
|
| 115 |
+
|
| 116 |
+
|
| 117 |
+
@router.get("/top-stories", response_model=TopStoriesResponse)
|
| 118 |
+
async def get_top_stories(
|
| 119 |
+
query: str = Query(
|
| 120 |
+
default="Ethiopia",
|
| 121 |
+
description="Search query for top stories"
|
| 122 |
+
),
|
| 123 |
+
max_results: int = Query(
|
| 124 |
+
default=10,
|
| 125 |
+
ge=1,
|
| 126 |
+
le=20,
|
| 127 |
+
description="Number of stories to return (1-20)"
|
| 128 |
+
),
|
| 129 |
+
category: Optional[str] = Query(
|
| 130 |
+
default=None,
|
| 131 |
+
description="Filter by category (not implemented yet)"
|
| 132 |
+
),
|
| 133 |
+
force_refresh: bool = Query(
|
| 134 |
+
default=False,
|
| 135 |
+
description="Force cache refresh"
|
| 136 |
+
)
|
| 137 |
+
):
|
| 138 |
+
"""
|
| 139 |
+
Get top news stories for the landing page.
|
| 140 |
+
|
| 141 |
+
**Features:**
|
| 142 |
+
- Fast response (< 2s)
|
| 143 |
+
- 5-minute cache
|
| 144 |
+
- Ethiopia-focused by default
|
| 145 |
+
- Clean, frontend-ready format
|
| 146 |
+
|
| 147 |
+
**Example:**
|
| 148 |
+
```
|
| 149 |
+
GET /api/v1/top-stories?query=Ethiopia&max_results=10
|
| 150 |
+
```
|
| 151 |
+
|
| 152 |
+
**Response:**
|
| 153 |
+
```json
|
| 154 |
+
{
|
| 155 |
+
"stories": [
|
| 156 |
+
{
|
| 157 |
+
"title": "Ethiopia announces new economic reforms",
|
| 158 |
+
"url": "https://example.com/article",
|
| 159 |
+
"source": "BBC",
|
| 160 |
+
"published_at": "2026-05-04T10:30:00",
|
| 161 |
+
"category": "NEWS",
|
| 162 |
+
"excerpt": "Prime Minister announces..."
|
| 163 |
+
}
|
| 164 |
+
],
|
| 165 |
+
"fetched_at": "2026-05-04T10:35:00",
|
| 166 |
+
"cache_hit": false
|
| 167 |
+
}
|
| 168 |
+
```
|
| 169 |
+
"""
|
| 170 |
+
cache_key = f"{query}:{max_results}"
|
| 171 |
+
|
| 172 |
+
# Check cache (unless force refresh)
|
| 173 |
+
if not force_refresh and cache_key in _cache:
|
| 174 |
+
cached_data, cached_time = _cache[cache_key]
|
| 175 |
+
age = (datetime.utcnow() - cached_time).total_seconds()
|
| 176 |
+
|
| 177 |
+
if age < _cache_ttl:
|
| 178 |
+
logger.info(f"Cache HIT for top stories (age={age:.0f}s)")
|
| 179 |
+
return TopStoriesResponse(
|
| 180 |
+
stories=cached_data,
|
| 181 |
+
fetched_at=cached_time.isoformat(),
|
| 182 |
+
cache_hit=True
|
| 183 |
+
)
|
| 184 |
+
|
| 185 |
+
# Fetch fresh stories
|
| 186 |
+
logger.info(f"Cache MISS - fetching top stories for: {query}")
|
| 187 |
+
stories = await fetch_top_stories_from_ddg(
|
| 188 |
+
query=query,
|
| 189 |
+
max_results=max_results
|
| 190 |
+
)
|
| 191 |
+
|
| 192 |
+
# Update cache
|
| 193 |
+
now = datetime.utcnow()
|
| 194 |
+
_cache[cache_key] = (stories, now)
|
| 195 |
+
|
| 196 |
+
return TopStoriesResponse(
|
| 197 |
+
stories=stories,
|
| 198 |
+
fetched_at=now.isoformat(),
|
| 199 |
+
cache_hit=False
|
| 200 |
+
)
|
| 201 |
+
|
| 202 |
+
|
| 203 |
+
@router.get("/top-stories/categories")
|
| 204 |
+
async def get_categories():
|
| 205 |
+
"""
|
| 206 |
+
Get available story categories.
|
| 207 |
+
|
| 208 |
+
**Note:** Currently only "NEWS" is supported.
|
| 209 |
+
Future: POLITICS, ECONOMY, SPORTS, etc.
|
| 210 |
+
"""
|
| 211 |
+
return {
|
| 212 |
+
"categories": [
|
| 213 |
+
{"id": "news", "name": "News", "query": "Ethiopia"},
|
| 214 |
+
{"id": "politics", "name": "Politics", "query": "Ethiopia politics"},
|
| 215 |
+
{"id": "economy", "name": "Economy", "query": "Ethiopia economy"},
|
| 216 |
+
{"id": "sports", "name": "Sports", "query": "Ethiopia sports"},
|
| 217 |
+
]
|
| 218 |
+
}
|
| 219 |
+
|
| 220 |
+
|
| 221 |
+
@router.post("/top-stories/refresh")
|
| 222 |
+
async def refresh_top_stories():
|
| 223 |
+
"""
|
| 224 |
+
Clear the top stories cache.
|
| 225 |
+
|
| 226 |
+
**Use case:** Admin wants to force refresh all cached stories.
|
| 227 |
+
"""
|
| 228 |
+
global _cache
|
| 229 |
+
old_size = len(_cache)
|
| 230 |
+
_cache.clear()
|
| 231 |
+
|
| 232 |
+
logger.info(f"Cleared top stories cache ({old_size} entries)")
|
| 233 |
+
|
| 234 |
+
return {
|
| 235 |
+
"success": True,
|
| 236 |
+
"message": f"Cleared {old_size} cached entries",
|
| 237 |
+
"cleared_at": datetime.utcnow().isoformat()
|
| 238 |
+
}
|
src/infrastructure/adapters/bge_reranker_adapter.py
CHANGED
|
@@ -61,7 +61,13 @@ class BgeRerankerAdapter(RerankerPort):
|
|
| 61 |
try:
|
| 62 |
if HAS_FLAG_RERANKER and "bge-reranker" in self.model_name.lower():
|
| 63 |
# FlagReranker: use_fp16=True halves memory, normalize=True gives [0,1] scores
|
| 64 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
self._use_flag = True
|
| 66 |
logger.info(f"✅ Loaded {self.model_name} via FlagReranker (multilingual, fp16)")
|
| 67 |
elif HAS_CROSS_ENCODER:
|
|
|
|
| 61 |
try:
|
| 62 |
if HAS_FLAG_RERANKER and "bge-reranker" in self.model_name.lower():
|
| 63 |
# FlagReranker: use_fp16=True halves memory, normalize=True gives [0,1] scores
|
| 64 |
+
# trust_remote_code=True fixes tokenizer compatibility issues
|
| 65 |
+
self.model = FlagReranker(
|
| 66 |
+
self.model_name,
|
| 67 |
+
use_fp16=True,
|
| 68 |
+
normalize=True,
|
| 69 |
+
trust_remote_code=True # Fix tokenizer compatibility
|
| 70 |
+
)
|
| 71 |
self._use_flag = True
|
| 72 |
logger.info(f"✅ Loaded {self.model_name} via FlagReranker (multilingual, fp16)")
|
| 73 |
elif HAS_CROSS_ENCODER:
|
src/main.py
CHANGED
|
@@ -12,7 +12,7 @@ sys.path.append(str(current_dir.parent)) # d:\...\rag-api
|
|
| 12 |
from fastapi import FastAPI
|
| 13 |
from fastapi.middleware.cors import CORSMiddleware
|
| 14 |
from src.core.config import settings
|
| 15 |
-
from src.api.routes import rag, analytics, interactions, accounts, news, auth
|
| 16 |
from src.infrastructure.database import init_db
|
| 17 |
from src.api.dependencies import prewarm_models
|
| 18 |
import threading
|
|
@@ -55,6 +55,7 @@ app.include_router(accounts.router, prefix=f"{settings.API_V1_STR}/accounts", ta
|
|
| 55 |
app.include_router(accounts.router, prefix=f"{settings.API_V1_STR}/users", tags=["Users"], include_in_schema=False)
|
| 56 |
app.include_router(auth.router, prefix=f"{settings.API_V1_STR}/auth", tags=["Auth"])
|
| 57 |
app.include_router(news.router, prefix=f"{settings.API_V1_STR}/news", tags=["News"])
|
|
|
|
| 58 |
|
| 59 |
@app.get(f"{settings.API_V1_STR}/status")
|
| 60 |
def get_status():
|
|
|
|
| 12 |
from fastapi import FastAPI
|
| 13 |
from fastapi.middleware.cors import CORSMiddleware
|
| 14 |
from src.core.config import settings
|
| 15 |
+
from src.api.routes import rag, analytics, interactions, accounts, news, auth, top_stories
|
| 16 |
from src.infrastructure.database import init_db
|
| 17 |
from src.api.dependencies import prewarm_models
|
| 18 |
import threading
|
|
|
|
| 55 |
app.include_router(accounts.router, prefix=f"{settings.API_V1_STR}/users", tags=["Users"], include_in_schema=False)
|
| 56 |
app.include_router(auth.router, prefix=f"{settings.API_V1_STR}/auth", tags=["Auth"])
|
| 57 |
app.include_router(news.router, prefix=f"{settings.API_V1_STR}/news", tags=["News"])
|
| 58 |
+
app.include_router(top_stories.router, prefix=f"{settings.API_V1_STR}", tags=["Top Stories"])
|
| 59 |
|
| 60 |
@app.get(f"{settings.API_V1_STR}/status")
|
| 61 |
def get_status():
|