Initial implementation of asynchronous views

wdfn-server/Makefile

@@ -34,7 +34,7 @@ env-wdfn: wdfn-server/env wdfn-server/instance/config.py wdfn-env-requirements
 
 wdfn-server/env:
 	@echo 'Creating the virtualenv env'
-	virtualenv --python=python3.6 --no-download wdfn-server/env
+	virtualenv --python=python3.8 --no-download wdfn-server/env
 	$(PIP) install --upgrade pip
 
 wdfn-env-requirements:

wdfn-server/requirements.txt

+aiohttp==3.7.4.post0
 certifi==2021.5.30
-Flask==2.0.1
+Flask[async]==2.0.1
 Markdown==3.3.4
 MarkupSafe==2.0.1
 pendulum==2.1.2

wdfn-server/waterdata/services/nwissite.py

@@ -92,7 +92,7 @@ async def get_huc_sites(session, huc_cd):
     })
 
 
-def get_county_sites(session, state_county_cd):
+async def get_county_sites(session, state_county_cd):
     """
     Get all sites within a county.
     :param session: instance of aiohttp.ClientSession
@@ -102,6 +102,6 @@ def get_county_sites(session, state_county_cd):
         - reason - string
         - sites - list of dict representing the site in state_county_cd
      """
-    return get(session, {
+    return await get(session, {
         'countyCd': state_county_cd
     })

wdfn-server/waterdata/services/sifta.py

@@ -11,7 +11,7 @@ async def get_cooperators(session, site_no):
 
     :param session - instance aiohttp.ClientSession
     :param str site_no: USGS site number
-    :yields Array of dict
+    :returns Array of dict
     """
     url = f'{app.config["COOPERATOR_SERVICE_ENDPOINT"]}{site_no}'
     app.logger.debug(f'Requesting data from {url}')  # pylint: disable=no-member

wdfn-server/waterdata/views.py

@@ -6,6 +6,7 @@ import datetime
 import json
 import smtplib
 
+import aiohttp
 from ua_parser import user_agent_parser
 
 from flask import abort, render_template, redirect, request, Markup, make_response, url_for
@@ -17,7 +18,7 @@ from .location_utils import build_linked_data, get_disambiguated_values, rollup_
     get_period_of_record_by_parm_cd, get_default_parameter_code
 from .utils import defined_when, set_cookie_for_banner_message, create_message
 from .services.camera import get_monitoring_location_camera_details
-from .services.nwissite import SiteService
+from .services.nwissite import get_county_sites, get_huc_sites, get_site_data, get_period_of_record
 from .services.ogc import MonitoringLocationNetworkService
 from .services.sifta import get_cooperators
 from .services.timezone import TimeZoneService
@@ -99,6 +100,7 @@ def iv_data_availability():
     """Render the IV data availability statement page."""
     return render_template('iv_data_availability_statement.html')
 
+
 @app.route('/monitoring-location/<site_no>/', methods=['GET'])
 async def monitoring_location(site_no):
     # pylint: disable=too-many-locals
@@ -109,18 +111,20 @@ async def monitoring_location(site_no):
     """
     agency_cd = request.args.get('agency_cd', '')
 
-    async with aiohttp.ClientSession()
+    async with aiohttp.ClientSession() as session:
+        site_data_task = asyncio.create_task(get_site_data(session, site_no, agency_cd))
+        period_of_record_task = asyncio.create_task(get_period_of_record(session, site_no, agency_cd))
+        cooperators_task = asyncio.create_task(get_cooperators(session, site_no))
 
-    loop = asyncio.get_event_loop()
-    coroutines = [get_cooperators(sifta_endpoint, site_no)]
-    results = loop.run_until_complete(asyncio.gather(*coroutines))
-    site_status, site_status_reason, site_data = site_service.get_site_data(site_no, agency_cd)
+        site_data_resp, period_of_record_resp, cooperators = \
+            await asyncio.gather(site_data_task, period_of_record_task, cooperators_task)
+    site_status, site_status_reason, site_data = site_data_resp
     json_ld = None
 
     if site_status == 200:
         template = 'monitoring_location.html'
         context = {
-            'status_code': site_status,
+            'status_code': 200,
             'stations': site_data,
             'STATION_FIELDS_D': STATION_FIELDS_D
         }
@@ -128,7 +132,7 @@ async def monitoring_location(site_no):
         if len(site_data) == 1:
             unique_site = site_data[0]
 
-            _, _, period_of_record = site_service.get_period_of_record(site_no, agency_cd)
+            _, _, period_of_record = period_of_record_resp
             iv_period_of_record = get_period_of_record_by_parm_cd(period_of_record, 'uv')
             gw_period_of_record = get_period_of_record_by_parm_cd(period_of_record, 'gw') if app.config[
                 'GROUNDWATER_LEVELS_ENABLED'] else {}
@@ -168,8 +172,6 @@ async def monitoring_location(site_no):
             except KeyError:
                 site_owner_state = None
 
-            cooperators = sifta_service.get_cooperators(site_no)
-
             if site_owner_state is not None:
                 email_for_data_questions = \
                     app.config['EMAIL_TARGET']['contact'].format(state_district_code=site_owner_state.lower())
@@ -232,7 +234,7 @@ def return_404():
 @app.route('/hydrological-unit/', defaults={'huc_cd': None}, methods=['GET'])
 @app.route('/hydrological-unit/<huc_cd>/', methods=['GET'])
 @defined_when(app.config['HYDROLOGIC_PAGES_ENABLED'], return_404)
-def hydrological_unit(huc_cd, show_locations=False):
+async def hydrological_unit(huc_cd, show_locations=False):
     """
     Hydrological unit view
     :param str huc_cd: ID for this unit
@@ -245,7 +247,10 @@ def hydrological_unit(huc_cd, show_locations=False):
         huc = app.config['HUC_LOOKUP']['hucs'].get(huc_cd, None)
         # If this is a HUC8 site, get the monitoring locations within it.
         if huc and show_locations:
-            _, _, monitoring_locations = site_service.get_huc_sites(huc_cd)
+            async with aiohttp.ClientSession() as session:
+                huc_task = asyncio.create_task(get_huc_sites(session, huc_cd))
+                huc_resp = await asyncio.gather(huc_task)
+            _, _, monitoring_locations = huc_resp[0]
 
     # If we don't have a HUC, display all the root HUC2 units as children.
     else:
@@ -318,7 +323,7 @@ def networks(network_cd):
 @app.route('/states/<state_cd>/', defaults={'county_cd': None}, methods=['GET'])
 @app.route('/states/<state_cd>/counties/<county_cd>/', methods=['GET'])
 @defined_when(app.config['STATE_COUNTY_PAGES_ENABLED'], return_404)
-def states_counties(state_cd, county_cd, show_locations=False):
+async def states_counties(state_cd, county_cd, show_locations=False):
     """
     State unit view
 
@@ -335,7 +340,10 @@ def states_counties(state_cd, county_cd, show_locations=False):
         political_unit = app.config['COUNTRY_STATE_COUNTY_LOOKUP']['US']['state_cd'].get(state_cd, None)['county_cd']\
             .get(county_cd, None)
         if show_locations:
-            _, _, monitoring_locations = site_service.get_county_sites(state_county_cd)
+            async with aiohttp.ClientSession() as session:
+                county_task = asyncio.create_task(get_county_sites(session, state_county_cd))
+                county_resp = await asyncio.gather(county_task)
+            _, _, monitoring_locations = county_resp[0]
 
     # Get the data corresponding to this state
     elif state_cd and not county_cd: