Merge pull request 'feat: add notifications' (#9) from notification i…

…nto main

Reviewed-on: https://git.leozq.in/leo/rssynthesis/pulls/9

.gitignore

@@ -162,4 +162,6 @@ cython_debug/
 
 # system stuff
 *.yml
-*.json
+*.json
+session.txt
+.envrc

pyproject.toml

@@ -44,7 +44,8 @@ dependencies = [
     "markdown2[all]",
     "langchain",
     "unstructured",
-    "markdown"
+    "markdown",
+    "simplematrixbotlib"
 ]
 
 [project.urls]

rssynthesis/notifications.py

@@ -0,0 +1,25 @@
+from simplematrixbotlib import Bot, Creds
+from os import environ
+from logging import getLogger
+from rssynthesis.models import Feed, FeedEntry
+
+creds = Creds(
+    homeserver=environ["MATRIX_HOMESERVER_URL"],
+    username=environ["MATRIX_BOT_USERNAME"],
+    password=environ["MATRIX_BOT_PASSWORD"],
+)
+
+bot = Bot(creds=creds)
+room_id = environ["MATRIX_BOT_ROOM_ID"]
+
+logger = getLogger("uvicorn.error")
+
+def _make_read_link(entry: FeedEntry):
+    base_url = environ["RSS_BASE_URL"]
+    return f"{base_url}/read/{entry.id}"
+
+
+async def send_notification(feed: Feed, entry: FeedEntry):
+    msg = f"{feed.name}: [{entry.title}]({_make_read_link(entry)})"
+    logger.info(f"Sending notification to {room_id}")
+    await bot.api.send_markdown_message(room_id=room_id, message=msg)

rssynthesis/rss.py

@@ -7,6 +7,7 @@
 
 from rssynthesis.db import DB
 from rssynthesis.models import Feed, FeedEntry
+from rssynthesis.notifications import send_notification
 
 logger = getLogger("uvicorn.error")
 
@@ -25,7 +26,7 @@ def load_feeds(config_path: str) -> None:
         db.insert_feed(feed)
 
 
-def check_feeds() -> List:
+async def check_feeds() -> List:
     now = int(datetime.now(tz=timezone.utc).timestamp())
     logger.info(f"Checking feeds starting at time {now}")
 
@@ -44,12 +45,12 @@ def check_feeds() -> List:
             # if we have no history, take the first 5
             new_items.extend(feed.rss.entries[0:5])
 
-        db.update_poll_state(feed=feed, now=now)
-        add_feed_entries(feed=feed, entries=new_items)
+        await db.update_poll_state(feed=feed, now=now)
+        await add_feed_entries(feed=feed, entries=new_items)
         logger.info(f"Found {len(new_items)} new item(s) for feed {feed.name}")
 
 
-def add_feed_entries(feed: Feed, entries: List) -> None:
+async def add_feed_entries(feed: Feed, entries: List) -> None:
     for entry in entries:
         feed_entry = FeedEntry(
             **{
@@ -68,5 +69,7 @@ def add_feed_entries(feed: Feed, entries: List) -> None:
             f"Upserting entry from {feed.name}: {feed_entry.title} - id {feed_entry.id}"
         )
 
-        db.upsert_feed_entry(feed=feed, entry=feed_entry)
-        db.get_entry_content(entry=feed_entry)
+        await db.upsert_feed_entry(feed=feed, entry=feed_entry)
+        await db.get_entry_content(entry=feed_entry)
+
+        await send_notification(feed=feed, entry=feed_entry)

rssynthesis/rssynthesis.py

@@ -11,6 +11,7 @@
 
 from rssynthesis.rss import load_feeds, check_feeds
 from rssynthesis.ui import list_feeds, list_entries, get_entry_content
+from rssynthesis.notifications import bot
 
 logger = getLogger("uvicorn.error")
 base_path = Path(__file__).parent
@@ -26,16 +27,20 @@
 @repeat_every(seconds=60*5, logger=logger)
 async def poll_feeds():
     logger.info("Checking feeds for updates")
-    check_feeds()
+    await check_feeds()
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     load_feeds(config_path=config_path)
+
+    await bot.api.login()
     await poll_feeds()
 
     yield
 
+    bot.api.async_client.logout()
+
 
 app = FastAPI(lifespan=lifespan, title="RSSynthesis", openapi_url="/openapi.json")