Fjerkroa/discord_bot
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

news: get_news degrades softly on topic miss (news-13) — any-term ranked fallback, recent+note, language hint in schema; idle-impulse default varies form

Browse Source
This commit is contained in:
Oleksandr Kozachuk
2026-07-17 16:26:47 +02:00
parent dc7864efe1
commit f8b9bc75ee
5 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fjerkroa_bot/persistence.py
+21 -8
View File
@@ -152,20 +152,33 @@ class PersistentStore:
rows = conn.execute(sql, params).fetchall()
return [{"source": r[0], "title": r[1], "link": r[2], "summary": r[3]} for r in rows]
def search_news(self, terms: List[str], limit: int = 20, source: Optional[str] = None) -> List[Dict[str, Any]]:
"""Rows where every term appears in title or summary; optional source filter (NEWS-11)."""
def search_news(self, terms: List[str], limit: int = 20, source: Optional[str] = None, match_any: bool = False) -> List[Dict[str, Any]]:
"""Rows where every term appears in title/summary/source; match_any ranks by how many terms hit (NEWS-11/13)."""
params: List[Any] = []
clauses = []
for term in terms:
clauses.append("(title LIKE ? OR summary LIKE ? OR source LIKE ?)")
like = f"%{term}%"
params += [like, like, like]
where = " AND ".join(clauses) if clauses else "1=1"
if source:
where = f"({where}) AND source = ?"
params.append(source)
params.append(int(limit))
sql = f"SELECT source, title, link, summary FROM news WHERE {where} ORDER BY id DESC LIMIT ?" # nosec B608 - fixed templates; values parameterised
if match_any and clauses:
hits = " + ".join(clauses)
where = "hits > 0"
if source:
where += " AND source = ?"
params.append(source)
params.append(int(limit))
sql = (
f"SELECT source, title, link, summary FROM " # nosec B608 - fixed templates; values parameterised
f"(SELECT id, source, title, link, summary, {hits} AS hits FROM news) "
f"WHERE {where} ORDER BY hits DESC, id DESC LIMIT ?"
)
else:
where = " AND ".join(clauses) if clauses else "1=1"
if source:
where = f"({where}) AND source = ?"
params.append(source)
params.append(int(limit))
sql = f"SELECT source, title, link, summary FROM news WHERE {where} ORDER BY id DESC LIMIT ?" # nosec B608 - fixed templates; values parameterised
with closing(self._connect()) as conn:
rows = conn.execute(sql, params).fetchall()
return [{"source": r[0], "title": r[1], "link": r[2], "summary": r[3]} for r in rows]