Make it more async

Author: pmysl

mariusz/main.py

@@ -142,7 +142,7 @@ def __init__(
         self.mumble_last_check = time.time()
         self.wiki_last_update = time.time()
         self.wiki_last_check = time.time()
-        self.wiki_msg = mariusz.wiki.build_wiki_message()
+        self.wiki_msg: str | None = None
 
         if path_to_chat_db:
             self.chat_db: ChatDb | None = ChatDb(path_to_chat_db)
@@ -354,10 +354,15 @@ async def maybe_update_meetup_message(self) -> None:
 
     async def maybe_update_wiki(self) -> None:
         """Check if anybody wrote anything on our wiki."""
+        if self.wiki_msg is None:
+            # Initialize here, as we can't invoke async functions in __init__
+            self.wiki_msg = await mariusz.wiki.build_wiki_message()
+            return
+
         now = time.time()
         if now - self.wiki_last_check < 60:
             return
-        msg = mariusz.wiki.build_wiki_message()
+        msg = await mariusz.wiki.build_wiki_message()
         differs = self.wiki_msg != msg
         late_enough = abs(now - self.wiki_last_update) > 60
         no_error = msg and self.wiki_msg

mariusz/wiki.py

@@ -4,26 +4,30 @@
 
 import dateutil.parser
 import lxml.etree as E
-import requests
+import httpx
 
 NS = "{http://www.w3.org/2005/Atom}"
 
 
-def get_wiki_entries(url: str):
+async def get_wiki_entries(url: str):
     """Returns all Wiki entries for a given URL."""
-    tree = E.fromstring(requests.get(url, timeout=10).text.encode())
+    async with httpx.AsyncClient() as client:
+        r = await client.get(url, timeout=10)
+        r.raise_for_status()
+        text = r.text.encode()
+    tree = E.fromstring(text)
     entry_f = E.ETXPath(NS + "entry")
     entries = entry_f(tree)
     updated_f = E.ETXPath(".//" + NS + "updated/text()")
     entries.sort(key=lambda e: dateutil.parser.parse(updated_f(e)[0]))
     return entries
 
 
-def build_wiki_message() -> str:
+async def build_wiki_message() -> str:
     """Builds a message describing the current state of the wiki."""
     wiki_url = "https://github.com/hakierspejs/wiki/wiki.atom"
     try:
-        entries = get_wiki_entries(wiki_url)
+        entries = await get_wiki_entries(wiki_url)
         if not entries:
             return ""
         latest = entries.pop()

requirements.txt

@@ -2,7 +2,7 @@ python-telegram-bot==21.9  # try python-telegram-bot<20.0 if you have issues
 standard-imghdr
 python-dateutil
 lxml
-requests
+httpx
 humanize==2.0.0
 meetupscraper>=0.11.0
 parameterized