Make core blocking functions async using aiohttp

Author: james-gray

app/services/location/csbs.py

@@ -2,11 +2,11 @@
 import csv
 from datetime import datetime
 
-import requests
 from cachetools import TTLCache, cached
 
 from ...coordinates import Coordinates
 from ...location.csbs import CSBSLocation
+from ...utils import httputils
 from . import LocationService
 
 
@@ -28,15 +28,15 @@ def get(self, loc_id):  # pylint: disable=arguments-differ
 
 
 @cached(cache=TTLCache(maxsize=1, ttl=3600))
-def get_locations():
+async def get_locations():
     """
     Retrieves county locations; locations are cached for 1 hour
 
     :returns: The locations.
     :rtype: dict
     """
-    request = requests.get(BASE_URL)
-    text = request.text
+    async with httputils.client_session.get(BASE_URL) as response:
+        text = await response.text()
 
     data = list(csv.DictReader(text.splitlines()))
 

app/services/location/jhu.py

@@ -2,14 +2,14 @@
 import csv
 from datetime import datetime
 
-import requests
 from cachetools import TTLCache, cached
 
 from ...coordinates import Coordinates
 from ...location import TimelinedLocation
 from ...timeline import Timeline
 from ...utils import countries
 from ...utils import date as date_util
+from ...utils import httputils
 from . import LocationService
 
 
@@ -37,7 +37,7 @@ def get(self, loc_id):  # pylint: disable=arguments-differ
 
 
 @cached(cache=TTLCache(maxsize=1024, ttl=3600))
-def get_category(category):
+async def get_category(category):
     """
     Retrieves the data for the provided category. The data is cached for 1 hour.
 
@@ -52,8 +52,8 @@ def get_category(category):
     url = BASE_URL + "time_series_covid19_%s_global.csv" % category
 
     # Request the data
-    request = requests.get(url)
-    text = request.text
+    async with httputils.client_session.get(url) as response:
+        text = await response.text()
 
     # Parse the CSV.
     data = list(csv.DictReader(text.splitlines()))