Add async/await keywords as necessary up the call chain

Author: james-gray

app/router/v1/all.py

@@ -4,11 +4,11 @@
 
 
 @V1.get("/all")
-def all():  # pylint: disable=redefined-builtin
+async def all():  # pylint: disable=redefined-builtin
     """Get all the categories."""
-    confirmed = get_category("confirmed")
-    deaths = get_category("deaths")
-    recovered = get_category("recovered")
+    confirmed = await get_category("confirmed")
+    deaths = await get_category("deaths")
+    recovered = await get_category("recovered")
 
     return {
         # Data.

app/router/v1/confirmed.py

@@ -4,6 +4,8 @@
 
 
 @V1.get("/confirmed")
-def confirmed():
+async def confirmed():
     """Confirmed cases."""
-    return get_category("confirmed")
+    confirmed = await get_category("confirmed")
+
+    return confirmed

app/router/v1/deaths.py

@@ -4,6 +4,8 @@
 
 
 @V1.get("/deaths")
-def deaths():
+async def deaths():
     """Total deaths."""
-    return get_category("deaths")
+    deaths = await get_category("deaths")
+
+    return deaths

app/router/v1/recovered.py

@@ -4,6 +4,8 @@
 
 
 @V1.get("/recovered")
-def recovered():
+async def recovered():
     """Recovered cases."""
-    return get_category("recovered")
+    recovered = await get_category("recovered")
+
+    return recovered

app/router/v2/latest.py

@@ -7,11 +7,11 @@
 
 
 @V2.get("/latest", response_model=Latest)
-def get_latest(request: Request, source: Sources = "jhu"):  # pylint: disable=unused-argument
+async def get_latest(request: Request, source: Sources = "jhu"):  # pylint: disable=unused-argument
     """
     Getting latest amount of total confirmed cases, deaths, and recoveries.
     """
-    locations = request.state.source.get_all()
+    locations = await request.state.source.get_all()
     return {
         "latest": {
             "confirmed": sum(map(lambda location: location.confirmed, locations)),

app/router/v2/locations.py

@@ -9,7 +9,7 @@
 
 # pylint: disable=unused-argument,too-many-arguments,redefined-builtin
 @V2.get("/locations", response_model=Locations, response_model_exclude_unset=True)
-def get_locations(
+async def get_locations(
     request: Request,
     source: Sources = "jhu",
     country_code: str = None,
@@ -28,7 +28,7 @@ def get_locations(
     params.pop("timelines", None)
 
     # Retrieve all the locations.
-    locations = request.state.source.get_all()
+    locations = await request.state.source.get_all()
 
     # Attempt to filter out locations with properties matching the provided query params.
     for key, value in params.items():
@@ -57,8 +57,9 @@ def get_locations(
 
 # pylint: disable=invalid-name
 @V2.get("/locations/{id}", response_model=Location)
-def get_location_by_id(request: Request, id: int, source: Sources = "jhu", timelines: bool = True):
+async def get_location_by_id(request: Request, id: int, source: Sources = "jhu", timelines: bool = True):
     """
     Getting specific location by id.
     """
-    return {"location": request.state.source.get(id).serialize(timelines)}
+    location = await request.state.source.get(id)
+    return {"location": location.serialize(timelines)}

app/services/location/__init__.py

@@ -8,7 +8,7 @@ class LocationService(ABC):
     """
 
     @abstractmethod
-    def get_all(self):
+    async def get_all(self):
         """
         Gets and returns all of the locations.
 
@@ -18,7 +18,7 @@ def get_all(self):
         raise NotImplementedError
 
     @abstractmethod
-    def get(self, id):  # pylint: disable=redefined-builtin,invalid-name
+    async def get(self, id):  # pylint: disable=redefined-builtin,invalid-name
         """
         Gets and returns location with the provided id.
 

app/services/location/csbs.py

@@ -12,15 +12,18 @@
 
 class CSBSLocationService(LocationService):
     """
-    Servive for retrieving locations from csbs
+    Service for retrieving locations from csbs
     """
 
-    def get_all(self):
-        # Get the locations
-        return get_locations()
+    async def get_all(self):
+        # Get the locations.
+        locations = await get_locations()
+        return locations
 
-    def get(self, loc_id):  # pylint: disable=arguments-differ
-        return self.get_all()[loc_id]
+    async def get(self, loc_id):  # pylint: disable=arguments-differ
+        # Get location at the index equal to the provided id.
+        locations = await self.get_all()
+        return locations[loc_id]
 
 
 # Base URL for fetching data

app/services/location/jhu.py

@@ -18,13 +18,15 @@ class JhuLocationService(LocationService):
     Service for retrieving locations from Johns Hopkins CSSE (https://github.com/CSSEGISandData/COVID-19).
     """
 
-    def get_all(self):
+    async def get_all(self):
         # Get the locations.
-        return get_locations()
+        locations = await get_locations()
+        return locations
 
-    def get(self, loc_id):  # pylint: disable=arguments-differ
+    async def get(self, loc_id):  # pylint: disable=arguments-differ
         # Get location at the index equal to provided id.
-        return self.get_all()[loc_id]
+        locations = await self.get_all()
+        return locations[loc_id]
 
 
 # ---------------------------------------------------------------
@@ -103,28 +105,32 @@ async def get_category(category):
 
 
 @cached(cache=TTLCache(maxsize=1024, ttl=3600))
-def get_locations():
+async def get_locations():
     """
     Retrieves the locations from the categories. The locations are cached for 1 hour.
 
     :returns: The locations.
     :rtype: List[Location]
     """
     # Get all of the data categories locations.
-    confirmed = get_category("confirmed")["locations"]
-    deaths = get_category("deaths")["locations"]
-    # recovered = get_category('recovered')['locations']
+    confirmed = await get_category("confirmed")
+    deaths = await get_category("deaths")
+    # recovered = await get_category("recovered")
+
+    locations_confirmed = confirmed["locations"]
+    locations_deaths = deaths["locations"]
+    # locations_recovered = recovered["locations"]
 
     # Final locations to return.
     locations = []
 
     # Go through locations.
-    for index, location in enumerate(confirmed):
+    for index, location in enumerate(locations_confirmed):
         # Get the timelines.
         timelines = {
-            "confirmed": confirmed[index]["history"],
-            "deaths": deaths[index]["history"],
-            # 'recovered' : recovered[index]['history'],
+            "confirmed": locations_confirmed[index]["history"],
+            "deaths": locations_deaths[index]["history"],
+            # 'recovered' : locations_recovered[index]['history'],
         }
 
         # Grab coordinates.