news memory + get_news tool (news-07..12): feed summaries, deduped rolling store (schema v6), on-demand filtered retrieval

fjerkroa_bot/persistence.py

@@ -13,7 +13,7 @@ from contextlib import closing
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
-SCHEMA_VERSION = 5
+SCHEMA_VERSION = 6
 
 
 class PersistentStore:
@@ -72,6 +72,13 @@ class PersistentStore:
                     " due_at TEXT NOT NULL, payload TEXT NOT NULL, state TEXT NOT NULL DEFAULT 'queued',"
                     " created_at TEXT NOT NULL DEFAULT (datetime('now')), executed_at TEXT)"
                 )
+            if version < 6:
+                # News memory (SPEC-013 NEWS-09): deduped rolling store of fetched items
+                conn.execute(
+                    "CREATE TABLE IF NOT EXISTS news (id INTEGER PRIMARY KEY, dedup_key TEXT UNIQUE NOT NULL,"
+                    " source TEXT NOT NULL DEFAULT '', title TEXT NOT NULL, link TEXT NOT NULL DEFAULT '',"
+                    " summary TEXT NOT NULL DEFAULT '', first_seen TEXT NOT NULL DEFAULT (datetime('now')))"
+                )
             if version < SCHEMA_VERSION:
                 conn.execute(f"PRAGMA user_version = {SCHEMA_VERSION}")
         os.chmod(self.db_path, 0o600)  # conversation data (PER-04)
@@ -115,6 +122,64 @@ class PersistentStore:
             row = conn.execute("SELECT value FROM usage WHERE day = ? AND key = ?", (day, key)).fetchone()
         return float(row[0]) if row else 0.0
 
+    # --- news memory (SPEC-013 NEWS-09..12) ---
+
+    def add_news_items(self, items: List[Dict[str, Any]]) -> int:
+        """Insert deduped news rows (by link or title); returns how many were new (NEWS-09)."""
+        added = 0
+        with closing(self._connect()) as conn, conn:
+            for item in items:
+                title = str(item.get("title") or "").strip()
+                key = (str(item.get("link") or "").strip()) or title
+                if not title or not key:
+                    continue
+                cursor = conn.execute(
+                    "INSERT OR IGNORE INTO news (dedup_key, source, title, link, summary) VALUES (?, ?, ?, ?, ?)",
+                    (key, str(item.get("source") or ""), title, str(item.get("link") or ""), str(item.get("summary") or "")),
+                )
+                added += cursor.rowcount
+        return added
+
+    def recent_news(self, limit: int = 20, source: Optional[str] = None) -> List[Dict[str, Any]]:
+        sql = "SELECT source, title, link, summary FROM news"
+        params: List[Any] = []
+        if source:
+            sql += " WHERE source = ?"
+            params.append(source)
+        sql += " ORDER BY id DESC LIMIT ?"
+        params.append(int(limit))
+        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]
+
+    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)."""
+        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
+        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]
+
+    def prune_news(self, keep: int) -> int:
+        """Keep the newest `keep` rows, delete the rest (rolling window, NEWS-09)."""
+        with closing(self._connect()) as conn, conn:
+            cursor = conn.execute("DELETE FROM news WHERE id NOT IN (SELECT id FROM news ORDER BY id DESC LIMIT ?)", (int(keep),))
+        return cursor.rowcount
+
+    def news_count(self) -> int:
+        with closing(self._connect()) as conn:
+            return int(conn.execute("SELECT COUNT(*) FROM news").fetchone()[0])
+
     def delete_history_of_user(self, user: str) -> int:
         """Remove persisted rows carrying this user's messages (SAF-08)."""
         with closing(self._connect()) as conn, conn: