From 997af2fde6f7bae122669c64af294503fbd2c1e4 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 5 Nov 2023 14:47:17 +0000
Subject: [PATCH] Make thespacedevs async

---
 agenda/__init__.py     |  7 ++++---
 agenda/thespacedevs.py | 11 ++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/agenda/__init__.py b/agenda/__init__.py
index bc5d6cf..dca1040 100644
--- a/agenda/__init__.py
+++ b/agenda/__init__.py
@@ -21,8 +21,6 @@ import yaml
 from dateutil.easter import easter
 from dateutil.relativedelta import FR, relativedelta
 
-from agenda import thespacedevs
-
 from . import (
     birthday,
     calendar,
@@ -32,6 +30,7 @@ from . import (
     gwr,
     markets,
     sun,
+    thespacedevs,
     travel,
     waste_schedule,
 )
@@ -301,10 +300,12 @@ async def get_data(now: datetime) -> typing.Mapping[str, str | object]:
         gbpusd,
         gwr_advance_tickets,
         bank_holiday,
+        rockets,
     ) = await asyncio.gather(
         fx.get_gbpusd(config),
         gwr.advance_ticket_date(data_dir),
         get_next_bank_holiday(today),
+        thespacedevs.get_launches(rocket_dir, limit=40),
     )
 
     reply = {
@@ -328,7 +329,7 @@ async def get_data(now: datetime) -> typing.Mapping[str, str | object]:
             + markets.tobacco_factory(last_year)
             + markets.nailsea_farmers(last_year)
         ),
-        "rockets": thespacedevs.get_launches(rocket_dir, limit=40),
+        "rockets": rockets,
     }
 
     skip = {"now", "gbpusd", "rockets", "stock_markets", "xmas_last_posting_dates"}
diff --git a/agenda/thespacedevs.py b/agenda/thespacedevs.py
index eadce46..3ea2b23 100644
--- a/agenda/thespacedevs.py
+++ b/agenda/thespacedevs.py
@@ -3,20 +3,21 @@ import os
 import typing
 from datetime import datetime
 
-import requests
+import httpx
 
 Launch = dict[str, typing.Any]
 Summary = dict[str, typing.Any]
 
 
-def next_launch_api(rocket_dir: str, limit: int = 200) -> list[Launch]:
+async def next_launch_api(rocket_dir: str, limit: int = 200) -> list[Launch]:
     """Get the next upcoming launches from the API."""
     now = datetime.now()
     filename = os.path.join(rocket_dir, now.strftime("%Y-%m-%d_%H:%M:%S.json"))
     url = "https://ll.thespacedevs.com/2.2.0/launch/upcoming/"
 
     params: dict[str, str | int] = {"limit": limit}
-    r = requests.get(url, params=params)
+    async with httpx.AsyncClient() as client:
+        r = await client.get(url, params=params)
     open(filename, "w").write(r.text)
     data = r.json()
     return [summarize_launch(launch) for launch in data["results"]]
@@ -107,7 +108,7 @@ def summarize_launch(launch: Launch) -> Summary:
     }
 
 
-def get_launches(rocket_dir: str, limit: int = 200) -> list[Summary]:
+async def get_launches(rocket_dir: str, limit: int = 200) -> list[Summary]:
     """Get rocket launches with caching."""
     now = datetime.now()
     existing = [x for x in (filename_timestamp(f) for f in os.listdir(rocket_dir)) if x]
@@ -116,7 +117,7 @@ def get_launches(rocket_dir: str, limit: int = 200) -> list[Summary]:
 
     if not existing or (now - existing[0][0]).seconds > 3600:  # one hour
         try:
-            return next_launch_api(rocket_dir, limit=limit)
+            return await next_launch_api(rocket_dir, limit=limit)
         except ValueError:
             print("*** SpaceX next launch error ***")