made variables inside of httputils.py private and incorporated use of get methods

Author: simran7s

app/main.py

@@ -16,7 +16,7 @@
 from .config import get_settings
 from .data import data_source
 from .routers import V1, V2
-from .utils.httputils import setup_client_session, teardown_client_session
+from .utils.httputils import Session
 
 # ############
 # FastAPI App
@@ -37,8 +37,8 @@
     version="2.0.4",
     docs_url="/",
     redoc_url="/docs",
-    on_startup=[setup_client_session],
-    on_shutdown=[teardown_client_session],
+    on_startup=[Session.setup_client_session],
+    on_shutdown=[Session.teardown_client_session],
 )
 
 # #####################

app/services/location/csbs.py

@@ -52,7 +52,7 @@ async def get_locations():
         locations = cache_results
     else:
         LOGGER.info(f"{data_id} shared cache empty")
-        async with httputils.CLIENT_SESSION.get(BASE_URL) as response:
+        async with httputils.Session.getClientSession().get(BASE_URL) as response:
             text = await response.text()
 
         LOGGER.debug(f"{data_id} Data received")
@@ -84,7 +84,8 @@ async def get_locations():
                     # Coordinates.
                     Coordinates(item["Latitude"], item["Longitude"]),
                     # Last update (parse as ISO).
-                    datetime.strptime(last_update, "%Y-%m-%d %H:%M").isoformat() + "Z",
+                    datetime.strptime(
+                        last_update, "%Y-%m-%d %H:%M").isoformat() + "Z",
                     # Statistics.
                     int(item["Confirmed"] or 0),
                     int(item["Death"] or 0),

app/services/location/jhu.py

@@ -68,7 +68,7 @@ async def get_category(category):
 
         # Request the data
         LOGGER.info(f"{data_id} Requesting data...")
-        async with httputils.CLIENT_SESSION.get(url) as response:
+        async with httputils.Session.getClientSession().get(url) as response:
             text = await response.text()
 
         LOGGER.debug(f"{data_id} Data received")
@@ -82,10 +82,12 @@ async def get_category(category):
 
         for item in data:
             # Filter out all the dates.
-            dates = dict(filter(lambda element: date_util.is_date(element[0]), item.items()))
+            dates = dict(
+                filter(lambda element: date_util.is_date(element[0]), item.items()))
 
             # Make location history from dates.
-            history = {date: int(float(amount or 0)) for date, amount in dates.items()}
+            history = {date: int(float(amount or 0))
+                       for date, amount in dates.items()}
 
             # Country for this location.
             country = item["Country/Region"]
@@ -101,7 +103,7 @@ async def get_category(category):
                     "country_code": countries.country_code(country),
                     "province": item["Province/State"],
                     # Coordinates.
-                    "coordinates": {"lat": item["Lat"], "long": item["Long"],},
+                    "coordinates": {"lat": item["Lat"], "long": item["Long"], },
                     # History.
                     "history": history,
                     # Latest statistic.
@@ -178,7 +180,8 @@ async def get_locations():
                 location["country"],
                 location["province"],
                 # Coordinates.
-                Coordinates(latitude=coordinates["lat"], longitude=coordinates["long"]),
+                Coordinates(
+                    latitude=coordinates["lat"], longitude=coordinates["long"]),
                 # Last update.
                 datetime.utcnow().isoformat() + "Z",
                 # Timelines (parse dates as ISO).

app/services/location/nyt.py

@@ -85,7 +85,7 @@ async def get_locations():
         locations = cache_results
     else:
         LOGGER.info(f"{data_id} shared cache empty")
-        async with httputils.CLIENT_SESSION.get(BASE_URL) as response:
+        async with httputils.Session.getClientSession().get(BASE_URL) as response:
             text = await response.text()
 
         LOGGER.debug(f"{data_id} Data received")
@@ -104,18 +104,21 @@ async def get_locations():
             # Make location history for confirmed and deaths from dates.
             # List is tuples of (date, amount) in order of increasing dates.
             confirmed_list = histories["confirmed"]
-            confirmed_history = {date: int(amount or 0) for date, amount in confirmed_list}
+            confirmed_history = {date: int(amount or 0)
+                                 for date, amount in confirmed_list}
 
             deaths_list = histories["deaths"]
-            deaths_history = {date: int(amount or 0) for date, amount in deaths_list}
+            deaths_history = {date: int(amount or 0)
+                              for date, amount in deaths_list}
 
             # Normalize the item and append to locations.
             locations.append(
                 NYTLocation(
                     id=idx,
                     state=county_state[1],
                     county=county_state[0],
-                    coordinates=Coordinates(None, None),  # NYT does not provide coordinates
+                    # NYT does not provide coordinates
+                    coordinates=Coordinates(None, None),
                     last_updated=datetime.utcnow().isoformat() + "Z",  # since last request
                     timelines={
                         "confirmed": Timeline(

app/utils/httputils.py

@@ -6,8 +6,14 @@
 
 class Session:
     # Singleton aiohttp.ClientSession instance.
-    CLIENT_SESSION: ClientSession
-    LOGGER = logging.getLogger(__name__)
+    __CLIENT_SESSION: ClientSession
+    __LOGGER = logging.getLogger(__name__)
+
+    def getClientSession(self):
+        return self.__CLIENT_SESSION
+
+    def getLogger(self):
+        return self.__LOGGER
 
     async def setup_client_session(self):
         """Set up the application-global aiohttp.ClientSession instance.
@@ -16,13 +22,13 @@ async def setup_client_session(self):
         See: https://docs.aiohttp.org/en/stable/client_quickstart.html#make-a-request
 
         """
-        global CLIENT_SESSION  # pylint: disable=global-statement
-        self.LOGGER.info("Setting up global aiohttp.ClientSession.")
-        CLIENT_SESSION = ClientSession()
+        # global CLIENT_SESSION  # pylint: disable=global-statement
+        self.getLogger().info("Setting up global aiohttp.ClientSession.")
+        self.getClientSession() = ClientSession()
 
     async def teardown_client_session(self):
         """Close the application-global aiohttp.ClientSession.
         """
-        global CLIENT_SESSION  # pylint: disable=global-statement
-        self.LOGGER.info("Closing global aiohttp.ClientSession.")
-        await CLIENT_SESSION.close()
+        # global CLIENT_SESSION  # pylint: disable=global-statement
+        self.getLogger().info("Closing global aiohttp.ClientSession.")
+        await self.getClientSession().close()