From f927012f39a960373c31d74f41816638a72fc150 Mon Sep 17 00:00:00 2001
From: Bradley Sappington <bsappington@stsci.edu>
Date: Tue, 7 Nov 2023 16:54:08 -0500
Subject: [PATCH 1/7] implementing date range in query page

---
 jwql/utils/constants.py                       |  2 ++
 jwql/website/apps/jwql/data_containers.py     | 20 ++++++++++++++++++
 jwql/website/apps/jwql/forms.py               | 20 +++++++++++-------
 jwql/website/apps/jwql/templates/base.html    |  5 +++++
 .../apps/jwql/templates/jwql_query.html       | 21 +++++++++++++++++++
 jwql/website/apps/jwql/views.py               |  8 ++++---
 6 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/jwql/utils/constants.py b/jwql/utils/constants.py
index dee4123d2..92f189b5d 100644
--- a/jwql/utils/constants.py
+++ b/jwql/utils/constants.py
@@ -439,6 +439,7 @@ class QUERY_CONFIG_KEYS:
     INSTRUMENTS = "INSTRUMENTS"
     PROPOSAL_CATEGORY = "PROPOSAL_CATEGORY"
     LOOK_STATUS = "LOOK_STATUS"
+    DATE_RANGE = "DATE_RANGE"
     NUM_PER_PAGE = "NUM_PER_PAGE"
     SORT_TYPE = "SORT_TYPE"
     ANOMALIES = "ANOMALIES"
@@ -459,6 +460,7 @@ class QUERY_CONFIG_KEYS:
     QUERY_CONFIG_KEYS.LOOK_STATUS: [],
     QUERY_CONFIG_KEYS.NUM_PER_PAGE: 100,
     QUERY_CONFIG_KEYS.SORT_TYPE: 'Recent',
+    QUERY_CONFIG_KEYS.DATE_RANGE: "",
     QUERY_CONFIG_KEYS.ANOMALIES: {},
     QUERY_CONFIG_KEYS.APERTURES: {},
     QUERY_CONFIG_KEYS.DETECTORS: {},
diff --git a/jwql/website/apps/jwql/data_containers.py b/jwql/website/apps/jwql/data_containers.py
index f4ecb6aa7..fb64f68da 100644
--- a/jwql/website/apps/jwql/data_containers.py
+++ b/jwql/website/apps/jwql/data_containers.py
@@ -48,6 +48,7 @@
 import pandas as pd
 import pyvo as vo
 import requests
+from datetime import datetime
 
 from jwql.database import database_interface as di
 from jwql.database.database_interface import load_connection
@@ -1500,6 +1501,18 @@ def get_rootnames_from_query(parameters):
     """
 
     filtered_rootnames = []
+    DATE_FORMAT = "%Y/%m/%d %I:%M%p" #noqa n806
+
+    # Parse DATE_RANGE string into correct format
+    date_range = parameters[QUERY_CONFIG_KEYS.DATE_RANGE]
+    start_date_range, stop_date_range = date_range.split(" - ")
+    # Parse the strings into datetime objects
+    start_datetime = datetime.strptime(start_date_range, DATE_FORMAT)
+    stop_datetime = datetime.strptime(stop_date_range, DATE_FORMAT)
+    # store as astroquery Time objects in isot format to be used in filter (with mjd format)
+    start_time  = Time(start_datetime.isoformat(), format="isot")
+    stop_time = Time(stop_datetime.isoformat(), format="isot")
+
     # Each Query Selection is Instrument specific
     for inst in parameters[QUERY_CONFIG_KEYS.INSTRUMENTS]:
         # Make sure instruments are of the proper format for the archive query
@@ -1509,6 +1522,13 @@ def get_rootnames_from_query(parameters):
         # General fields
         sort_type = parameters[QUERY_CONFIG_KEYS.SORT_TYPE]
         look_status = parameters[QUERY_CONFIG_KEYS.LOOK_STATUS]
+
+        # Get a queryset of all observations STARTING within our date range
+        current_ins_rootfileinfos = current_ins_rootfileinfos.filter(
+            expstart__gte=start_time.mjd)
+        current_ins_rootfileinfos = current_ins_rootfileinfos.filter(
+            expstart__lte=stop_time.mjd)
+
         if len(look_status) == 1:
             viewed = (look_status[0] == 'VIEWED')
             current_ins_rootfileinfos = current_ins_rootfileinfos.filter(viewed=viewed)
diff --git a/jwql/website/apps/jwql/forms.py b/jwql/website/apps/jwql/forms.py
index b0554b451..f156350b8 100644
--- a/jwql/website/apps/jwql/forms.py
+++ b/jwql/website/apps/jwql/forms.py
@@ -59,9 +59,10 @@ def view_function(request):
 from jwql.website.apps.jwql.models import Anomalies
 
 
-from jwql.utils.constants import (ANOMALY_CHOICES_PER_INSTRUMENT, ANOMALIES_PER_INSTRUMENT, APERTURES_PER_INSTRUMENT, DETECTOR_PER_INSTRUMENT, EXP_TYPE_PER_INSTRUMENT,
-                                  FILTERS_PER_INSTRUMENT, GENERIC_SUFFIX_TYPES, GRATING_PER_INSTRUMENT, GUIDER_FILENAME_TYPE, JWST_INSTRUMENT_NAMES_MIXEDCASE,
-                                  JWST_INSTRUMENT_NAMES_SHORTHAND, READPATT_PER_INSTRUMENT, IGNORED_SUFFIXES, SUBARRAYS_PER_INSTRUMENT, PUPILS_PER_INSTRUMENT,
+from jwql.utils.constants import (ANOMALY_CHOICES_PER_INSTRUMENT, ANOMALIES_PER_INSTRUMENT, APERTURES_PER_INSTRUMENT, DETECTOR_PER_INSTRUMENT,
+                                  EXP_TYPE_PER_INSTRUMENT, FILTERS_PER_INSTRUMENT, GENERIC_SUFFIX_TYPES, GRATING_PER_INSTRUMENT,
+                                  GUIDER_FILENAME_TYPE, JWST_INSTRUMENT_NAMES_MIXEDCASE, JWST_INSTRUMENT_NAMES_SHORTHAND,
+                                  READPATT_PER_INSTRUMENT, IGNORED_SUFFIXES,  SUBARRAYS_PER_INSTRUMENT, PUPILS_PER_INSTRUMENT,
                                   LOOK_OPTIONS, SORT_OPTIONS, PROPOSAL_CATEGORIES)
 from jwql.utils.utils import (get_config, get_rootnames_for_instrument_proposal, filename_parser, query_format)
 
@@ -144,6 +145,8 @@ class JwqlQueryForm(BaseForm):
     look_status = forms.MultipleChoiceField(
         required=False, choices=look_choices, widget=forms.CheckboxSelectMultiple)
 
+    date_range = forms.CharField(required=True)
+
     cat_choices = [(query_format(choice), query_format(choice)) for choice in PROPOSAL_CATEGORIES]
     proposal_category = forms.MultipleChoiceField(
         required=False, choices=cat_choices, widget=forms.CheckboxSelectMultiple)
@@ -304,8 +307,10 @@ def clean_search(self):
             # See if there are any matching proposals and, if so, what
             # instrument they are for
             proposal_string = '{:05d}'.format(int(search))
-            search_string_public = os.path.join(get_config()['filesystem'], 'public', 'jw{}'.format(proposal_string), '*', '*{}*.fits'.format(proposal_string))
-            search_string_proprietary = os.path.join(get_config()['filesystem'], 'proprietary', 'jw{}'.format(proposal_string), '*', '*{}*.fits'.format(proposal_string))
+            search_string_public = os.path.join(get_config()['filesystem'], 'public', 'jw{}'.format(proposal_string),
+                                                '*', '*{}*.fits'.format(proposal_string))
+            search_string_proprietary = os.path.join(get_config()['filesystem'], 'proprietary', 'jw{}'.format(proposal_string),
+                                                     '*', '*{}*.fits'.format(proposal_string))
             all_files = glob.glob(search_string_public)
             all_files.extend(glob.glob(search_string_proprietary))
 
@@ -335,9 +340,10 @@ def clean_search(self):
 
                 if len(set(all_instruments)) > 1:
                     # Technically all proposal have multiple instruments if you include guider data. Remove Guider Data
-                    instrument_routes = [format_html('<a href="/{}/archive/{}/obs{}">{}</a>', instrument, proposal_string[1:], all_observations[instrument][0], instrument) for instrument in set(all_instruments)]
+                    instrument_routes = [format_html('<a href="/{}/archive/{}/obs{}">{}</a>', instrument, proposal_string[1:],
+                                                     all_observations[instrument][0], instrument) for instrument in set(all_instruments)]
                     raise forms.ValidationError(
-                        mark_safe(('Proposal contains multiple instruments, please click instrument link to view data: {}.').format(', '.join(instrument_routes))))  # nosec
+                        mark_safe(('Proposal contains multiple instruments, please click instrument link to view data: {}.').format(', '.join(instrument_routes))))  # noqa
 
                 self.instrument = all_instruments[0]
             else:
diff --git a/jwql/website/apps/jwql/templates/base.html b/jwql/website/apps/jwql/templates/base.html
index a06f7ffe8..1d00bfaea 100644
--- a/jwql/website/apps/jwql/templates/base.html
+++ b/jwql/website/apps/jwql/templates/base.html
@@ -27,6 +27,11 @@
 		<script type="text/javascript" src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-{{ bokeh_version }}.min.js"></script>
 		<script src="{{ static('js/jwql.js') }}?{% now 'U' %}"></script>
 
+		<!-- Needed for Daterange on Query Page -->
+		<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
+		<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
+		<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css" />
+
 		{% block preamble %}
         {% endblock %}
 
diff --git a/jwql/website/apps/jwql/templates/jwql_query.html b/jwql/website/apps/jwql/templates/jwql_query.html
index 4cd308acd..78cb34e74 100644
--- a/jwql/website/apps/jwql/templates/jwql_query.html
+++ b/jwql/website/apps/jwql/templates/jwql_query.html
@@ -105,6 +105,27 @@ <h1>Dynamic Query Form</h1>
                                 {% endfor %}
                             </div>
                         </div>
+                        <div class="col-md-2">
+                            <span class="help-block">Date Range</span>
+                            <div class="form-control" id='date_range'>
+                                <input type="text" name="date_range" style="cursor: pointer; padding: 5px 10px; width: 100%"/>
+                                <script>
+                                $(function() {
+                                    $('input[name="date_range"]').daterangepicker({
+                                        timePicker: true,
+                                        timePicker24Hour: true,
+                                        showDropdowns: true,
+                                        minDate: "2021/12/05",
+                                        startDate: "2021/12/05",
+                                        endDate: moment().startOf('hour'),
+                                        locale: {
+                                        format: 'YYYY/MM/DD hh:mmA'
+                                        }
+                                    });
+                                });
+                                </script>
+                            </div>
+                        </div>
                         <div class="col-md-2">
                             <span class="help-block">Sort Type</span>
                             <div class="form-control" id='sort_type'>
diff --git a/jwql/website/apps/jwql/views.py b/jwql/website/apps/jwql/views.py
index f1916dce1..00044b2d5 100644
--- a/jwql/website/apps/jwql/views.py
+++ b/jwql/website/apps/jwql/views.py
@@ -75,7 +75,6 @@
 from .data_containers import get_image_info
 from .data_containers import get_instrument_looks
 from .data_containers import get_rootnames_from_query
-from .data_containers import get_thumbnail_by_rootname
 from .data_containers import random_404_page
 from .data_containers import text_scrape
 from .data_containers import thumbnails_ajax
@@ -111,7 +110,8 @@ def jwql_query(request):
                 query_configs[instrument]['pupils'] = [query_unformat(i) for i in form.cleaned_data['{}_pupil'.format(instrument)]]
                 query_configs[instrument]['anomalies'] = [query_unformat(i) for i in form.cleaned_data['{}_anomalies'.format(instrument)]]
 
-            all_filters, all_apers, all_detectors, all_exptypes, all_readpatts, all_gratings, all_subarrays, all_pupils, all_anomalies = {}, {}, {}, {}, {}, {}, {}, {}, {}
+            all_filters, all_apers, all_detectors, all_exptypes = {}, {}, {}, {}
+            all_readpatts, all_gratings, all_subarrays, all_pupils, all_anomalies = {}, {}, {}, {}, {}
             for instrument in query_configs:
                 all_filters[instrument] = query_configs[instrument]['filters']
                 all_apers[instrument] = query_configs[instrument]['apertures']
@@ -126,6 +126,7 @@ def jwql_query(request):
             parameters = QUERY_CONFIG_TEMPLATE.copy()
             parameters[QUERY_CONFIG_KEYS.INSTRUMENTS] = form.cleaned_data['instrument']
             parameters[QUERY_CONFIG_KEYS.LOOK_STATUS] = form.cleaned_data['look_status']
+            parameters[QUERY_CONFIG_KEYS.DATE_RANGE] = form.cleaned_data['date_range']
             parameters[QUERY_CONFIG_KEYS.PROPOSAL_CATEGORY] = form.cleaned_data['proposal_category']
             parameters[QUERY_CONFIG_KEYS.SORT_TYPE] = form.cleaned_data['sort_type']
             parameters[QUERY_CONFIG_KEYS.ANOMALIES] = all_anomalies
@@ -994,7 +995,8 @@ def explore_image(request, inst, file_root, filetype):
     return render(request, template, context)
 
 
-def explore_image_ajax(request, inst, file_root, filetype, line_plots='false', low_lim=None, high_lim=None, ext_name="SCI", int1_nr=None, grp1_nr=None, int2_nr=None, grp2_nr=None):
+def explore_image_ajax(request, inst, file_root, filetype, line_plots='false', low_lim=None, high_lim=None,
+                       ext_name="SCI", int1_nr=None, grp1_nr=None, int2_nr=None, grp2_nr=None):
     """Generate the page listing all archived images in the database
     for a certain proposal
 

From 3ee4483060147a1ca459abdf76483497369bbfcf Mon Sep 17 00:00:00 2001
From: Bradley Sappington <bsappington@stsci.edu>
Date: Tue, 7 Nov 2023 17:00:50 -0500
Subject: [PATCH 2/7] fix some linting errors

---
 jwql/utils/constants.py                   | 40 ++++++++++++-----------
 jwql/website/apps/jwql/data_containers.py | 39 ++++++++++++----------
 jwql/website/apps/jwql/views.py           | 36 ++++++++++----------
 3 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/jwql/utils/constants.py b/jwql/utils/constants.py
index 92f189b5d..5c998667e 100644
--- a/jwql/utils/constants.py
+++ b/jwql/utils/constants.py
@@ -235,9 +235,11 @@
 FILTERS_PER_INSTRUMENT = {'fgs': [],
                           'miri': ['F560W', 'F770W', 'F1000W', 'F1065C', 'F1130W', 'F1140C', 'F1280W', 'F1500W',
                                    'F1550C', 'F1800W', 'F2100W', 'F2300C', 'F2550W', 'F2550WR', 'FLENS', 'FND', 'OPAQUE', 'P750L'],
-                          'nircam': ['F070W', 'F090W', 'F115W', 'F140M', 'F150W', 'F150W2', 'F182M', 'F187N', 'F200W', 'F210M', 'F212N',
-                                     'WLP4', 'F277W', 'F356W', 'F444W', 'F300M', 'F335M', 'F360M', 'F410M', 'F430M', 'F460M', 'F480M', 'F250M', 'F322W2'],
-                          'niriss': ['F090W', 'F115W', 'F140M', 'F150W', 'F200W', 'F277W', 'F356W', 'F380M', 'F430M', 'F444W', 'F480M', 'GR150C', 'GR150R'],
+                          'nircam': ['F070W', 'F090W', 'F115W', 'F140M', 'F150W', 'F150W2', 'F182M', 'F187N', 'F200W', 'F210M',
+                                     'F212N', 'WLP4', 'F277W', 'F356W', 'F444W', 'F300M', 'F335M', 'F360M', 'F410M', 'F430M',
+                                     'F460M', 'F480M', 'F250M', 'F322W2'],
+                          'niriss': ['F090W', 'F115W', 'F140M', 'F150W', 'F200W', 'F277W', 'F356W', 'F380M', 'F430M', 'F444W',
+                                     'F480M', 'GR150C', 'GR150R'],
                           'nirspec': ['CLEAR', 'F070LP', 'F100LP', 'F110W', 'F140X', 'F170LP', 'F290LP', 'OPAQUE', 'P750L']}
 
 FOUR_AMP_SUBARRAYS = ['WFSS128R', 'WFSS64R']
@@ -435,7 +437,7 @@
 # Keep keys defined via class as they are used many places with potential mispellings
 # Keys are in sort order from general to instrument specific, then alphabetical
 # within instrument specific fields.
-class QUERY_CONFIG_KEYS:
+class QueryConfigKeys:
     INSTRUMENTS = "INSTRUMENTS"
     PROPOSAL_CATEGORY = "PROPOSAL_CATEGORY"
     LOOK_STATUS = "LOOK_STATUS"
@@ -455,21 +457,21 @@ class QUERY_CONFIG_KEYS:
 
 # Template for parameters to be stored in "query_config" session for query_page
 QUERY_CONFIG_TEMPLATE = {
-    QUERY_CONFIG_KEYS.INSTRUMENTS: [],
-    QUERY_CONFIG_KEYS.PROPOSAL_CATEGORY: [],
-    QUERY_CONFIG_KEYS.LOOK_STATUS: [],
-    QUERY_CONFIG_KEYS.NUM_PER_PAGE: 100,
-    QUERY_CONFIG_KEYS.SORT_TYPE: 'Recent',
-    QUERY_CONFIG_KEYS.DATE_RANGE: "",
-    QUERY_CONFIG_KEYS.ANOMALIES: {},
-    QUERY_CONFIG_KEYS.APERTURES: {},
-    QUERY_CONFIG_KEYS.DETECTORS: {},
-    QUERY_CONFIG_KEYS.EXP_TYPES: {},
-    QUERY_CONFIG_KEYS.FILTERS: {},
-    QUERY_CONFIG_KEYS.GRATINGS: {},
-    QUERY_CONFIG_KEYS.PUPILS: {},
-    QUERY_CONFIG_KEYS.READ_PATTS: {},
-    QUERY_CONFIG_KEYS.SUBARRAYS: {}
+    QueryConfigKeys.INSTRUMENTS: [],
+    QueryConfigKeys.PROPOSAL_CATEGORY: [],
+    QueryConfigKeys.LOOK_STATUS: [],
+    QueryConfigKeys.NUM_PER_PAGE: 100,
+    QueryConfigKeys.SORT_TYPE: 'Recent',
+    QueryConfigKeys.DATE_RANGE: "",
+    QueryConfigKeys.ANOMALIES: {},
+    QueryConfigKeys.APERTURES: {},
+    QueryConfigKeys.DETECTORS: {},
+    QueryConfigKeys.EXP_TYPES: {},
+    QueryConfigKeys.FILTERS: {},
+    QueryConfigKeys.GRATINGS: {},
+    QueryConfigKeys.PUPILS: {},
+    QueryConfigKeys.READ_PATTS: {},
+    QueryConfigKeys.SUBARRAYS: {}
 }
 
 # RAPID-style readout patterns for each instrument. Added so we can
diff --git a/jwql/website/apps/jwql/data_containers.py b/jwql/website/apps/jwql/data_containers.py
index fb64f68da..8dd38dc25 100644
--- a/jwql/website/apps/jwql/data_containers.py
+++ b/jwql/website/apps/jwql/data_containers.py
@@ -58,7 +58,7 @@
 from jwql.utils.constants import EXPOSURE_PAGE_SUFFIX_ORDER, IGNORED_SUFFIXES, INSTRUMENT_SERVICE_MATCH
 from jwql.utils.constants import JWST_INSTRUMENT_NAMES_MIXEDCASE, JWST_INSTRUMENT_NAMES
 from jwql.utils.constants import REPORT_KEYS_PER_INSTRUMENT
-from jwql.utils.constants import SUFFIXES_TO_ADD_ASSOCIATION, SUFFIXES_WITH_AVERAGED_INTS, QUERY_CONFIG_KEYS
+from jwql.utils.constants import SUFFIXES_TO_ADD_ASSOCIATION, SUFFIXES_WITH_AVERAGED_INTS, QueryConfigKeys
 from jwql.utils.credentials import get_mast_token
 from jwql.utils.permissions import set_permissions
 from jwql.utils.utils import get_rootnames_for_instrument_proposal
@@ -617,7 +617,8 @@ def get_edb_components(request):
                     mnemonic_query_result = get_mnemonic(mnemonic_identifier, start_time, end_time)
 
                     if len(mnemonic_query_result.data) == 0:
-                        mnemonic_query_status = "QUERY RESULT RETURNED NO DATA FOR {} ON DATES {} - {}".format(mnemonic_identifier, start_time, end_time)
+                        mnemonic_query_status = "QUERY RESULT RETURNED NO DATA FOR {} ON DATES {} - {}".format(mnemonic_identifier,
+                                                                                                               start_time, end_time)
                     else:
                         mnemonic_query_status = 'SUCCESS'
 
@@ -1249,7 +1250,8 @@ def get_instrument_proposals(instrument):
         List of proposals for the given instrument
     """
     tap_service = vo.dal.TAPService("https://vao.stsci.edu/caomtap/tapservice.aspx")
-    tap_results = tap_service.search(f"select distinct prpID from CaomObservation where collection='JWST' and maxLevel>0 and insName like '{instrument.lower()}%'")
+    tap_results = tap_service.search(f"""select distinct prpID from CaomObservation where collection='JWST'
+                                     and maxLevel>0 and insName like '{instrument.lower()}%'""")
     prop_table = tap_results.to_table()
     proposals = prop_table['prpID'].data
     inst_proposals = sorted(proposals.compressed(), reverse=True)
@@ -1479,7 +1481,8 @@ def get_rootnames_for_proposal(proposal):
         List of rootnames for the given instrument and proposal number
     """
     tap_service = vo.dal.TAPService("https://vao.stsci.edu/caomtap/tapservice.aspx")
-    tap_results = tap_service.search(f"select observationID from dbo.CaomObservation where collection='JWST' and maxLevel=2 and prpID='{int(proposal)}'")
+    tap_results = tap_service.search(f"""select observationID from dbo.CaomObservation where
+                                     collection='JWST' and maxLevel=2 and prpID='{int(proposal)}'""")
     prop_table = tap_results.to_table()
     rootnames = prop_table['observationID'].data
     return rootnames.compressed()
@@ -1504,7 +1507,7 @@ def get_rootnames_from_query(parameters):
     DATE_FORMAT = "%Y/%m/%d %I:%M%p" #noqa n806
 
     # Parse DATE_RANGE string into correct format
-    date_range = parameters[QUERY_CONFIG_KEYS.DATE_RANGE]
+    date_range = parameters[QueryConfigKeys.DATE_RANGE]
     start_date_range, stop_date_range = date_range.split(" - ")
     # Parse the strings into datetime objects
     start_datetime = datetime.strptime(start_date_range, DATE_FORMAT)
@@ -1514,14 +1517,14 @@ def get_rootnames_from_query(parameters):
     stop_time = Time(stop_datetime.isoformat(), format="isot")
 
     # Each Query Selection is Instrument specific
-    for inst in parameters[QUERY_CONFIG_KEYS.INSTRUMENTS]:
+    for inst in parameters[QueryConfigKeys.INSTRUMENTS]:
         # Make sure instruments are of the proper format for the archive query
         inst = inst.lower()
         current_ins_rootfileinfos = RootFileInfo.objects.filter(instrument=JWST_INSTRUMENT_NAMES_MIXEDCASE[inst])
 
         # General fields
-        sort_type = parameters[QUERY_CONFIG_KEYS.SORT_TYPE]
-        look_status = parameters[QUERY_CONFIG_KEYS.LOOK_STATUS]
+        sort_type = parameters[QueryConfigKeys.SORT_TYPE]
+        look_status = parameters[QueryConfigKeys.LOOK_STATUS]
 
         # Get a queryset of all observations STARTING within our date range
         current_ins_rootfileinfos = current_ins_rootfileinfos.filter(
@@ -1532,20 +1535,20 @@ def get_rootnames_from_query(parameters):
         if len(look_status) == 1:
             viewed = (look_status[0] == 'VIEWED')
             current_ins_rootfileinfos = current_ins_rootfileinfos.filter(viewed=viewed)
-        proposal_category = parameters[QUERY_CONFIG_KEYS.PROPOSAL_CATEGORY]
+        proposal_category = parameters[QueryConfigKeys.PROPOSAL_CATEGORY]
         if len(proposal_category) > 0:
             current_ins_rootfileinfos = current_ins_rootfileinfos.filter(obsnum__proposal__category__in=proposal_category)
 
         # Instrument fields
-        inst_anomalies = parameters[QUERY_CONFIG_KEYS.ANOMALIES][inst]
-        inst_aperture = parameters[QUERY_CONFIG_KEYS.APERTURES][inst]
-        inst_detector = parameters[QUERY_CONFIG_KEYS.DETECTORS][inst]
-        inst_exp_type = parameters[QUERY_CONFIG_KEYS.EXP_TYPES][inst]
-        inst_filter = parameters[QUERY_CONFIG_KEYS.FILTERS][inst]
-        inst_grating = parameters[QUERY_CONFIG_KEYS.GRATINGS][inst]
-        inst_pupil = parameters[QUERY_CONFIG_KEYS.PUPILS][inst]
-        inst_read_patt = parameters[QUERY_CONFIG_KEYS.READ_PATTS][inst]
-        inst_subarray = parameters[QUERY_CONFIG_KEYS.SUBARRAYS][inst]
+        inst_anomalies = parameters[QueryConfigKeys.ANOMALIES][inst]
+        inst_aperture = parameters[QueryConfigKeys.APERTURES][inst]
+        inst_detector = parameters[QueryConfigKeys.DETECTORS][inst]
+        inst_exp_type = parameters[QueryConfigKeys.EXP_TYPES][inst]
+        inst_filter = parameters[QueryConfigKeys.FILTERS][inst]
+        inst_grating = parameters[QueryConfigKeys.GRATINGS][inst]
+        inst_pupil = parameters[QueryConfigKeys.PUPILS][inst]
+        inst_read_patt = parameters[QueryConfigKeys.READ_PATTS][inst]
+        inst_subarray = parameters[QueryConfigKeys.SUBARRAYS][inst]
 
         if (inst_aperture != []):
             current_ins_rootfileinfos = current_ins_rootfileinfos.filter(aperture__in=inst_aperture)
diff --git a/jwql/website/apps/jwql/views.py b/jwql/website/apps/jwql/views.py
index 00044b2d5..393f386dd 100644
--- a/jwql/website/apps/jwql/views.py
+++ b/jwql/website/apps/jwql/views.py
@@ -61,7 +61,7 @@
 from jwql.database.database_interface import load_connection
 from jwql.utils import monitor_utils
 from jwql.utils.interactive_preview_image import InteractivePreviewImg
-from jwql.utils.constants import JWST_INSTRUMENT_NAMES_MIXEDCASE, URL_DICT, QUERY_CONFIG_TEMPLATE, QUERY_CONFIG_KEYS
+from jwql.utils.constants import JWST_INSTRUMENT_NAMES_MIXEDCASE, URL_DICT, QUERY_CONFIG_TEMPLATE, QueryConfigKeys
 from jwql.utils.utils import filename_parser, get_base_url, get_config, get_rootnames_for_instrument_proposal, query_unformat
 
 from .data_containers import build_table
@@ -124,20 +124,20 @@ def jwql_query(request):
                 all_anomalies[instrument] = query_configs[instrument]['anomalies']
 
             parameters = QUERY_CONFIG_TEMPLATE.copy()
-            parameters[QUERY_CONFIG_KEYS.INSTRUMENTS] = form.cleaned_data['instrument']
-            parameters[QUERY_CONFIG_KEYS.LOOK_STATUS] = form.cleaned_data['look_status']
-            parameters[QUERY_CONFIG_KEYS.DATE_RANGE] = form.cleaned_data['date_range']
-            parameters[QUERY_CONFIG_KEYS.PROPOSAL_CATEGORY] = form.cleaned_data['proposal_category']
-            parameters[QUERY_CONFIG_KEYS.SORT_TYPE] = form.cleaned_data['sort_type']
-            parameters[QUERY_CONFIG_KEYS.ANOMALIES] = all_anomalies
-            parameters[QUERY_CONFIG_KEYS.APERTURES] = all_apers
-            parameters[QUERY_CONFIG_KEYS.FILTERS] = all_filters
-            parameters[QUERY_CONFIG_KEYS.DETECTORS] = all_detectors
-            parameters[QUERY_CONFIG_KEYS.EXP_TYPES] = all_exptypes
-            parameters[QUERY_CONFIG_KEYS.READ_PATTS] = all_readpatts
-            parameters[QUERY_CONFIG_KEYS.GRATINGS] = all_gratings
-            parameters[QUERY_CONFIG_KEYS.SUBARRAYS] = all_subarrays
-            parameters[QUERY_CONFIG_KEYS.PUPILS] = all_pupils
+            parameters[QueryConfigKeys.INSTRUMENTS] = form.cleaned_data['instrument']
+            parameters[QueryConfigKeys.LOOK_STATUS] = form.cleaned_data['look_status']
+            parameters[QueryConfigKeys.DATE_RANGE] = form.cleaned_data['date_range']
+            parameters[QueryConfigKeys.PROPOSAL_CATEGORY] = form.cleaned_data['proposal_category']
+            parameters[QueryConfigKeys.SORT_TYPE] = form.cleaned_data['sort_type']
+            parameters[QueryConfigKeys.ANOMALIES] = all_anomalies
+            parameters[QueryConfigKeys.APERTURES] = all_apers
+            parameters[QueryConfigKeys.FILTERS] = all_filters
+            parameters[QueryConfigKeys.DETECTORS] = all_detectors
+            parameters[QueryConfigKeys.EXP_TYPES] = all_exptypes
+            parameters[QueryConfigKeys.READ_PATTS] = all_readpatts
+            parameters[QueryConfigKeys.GRATINGS] = all_gratings
+            parameters[QueryConfigKeys.SUBARRAYS] = all_subarrays
+            parameters[QueryConfigKeys.PUPILS] = all_pupils
 
             # save the query config settings to a session
             request.session['query_config'] = parameters
@@ -482,12 +482,12 @@ def archive_thumbnails_query_ajax(request):
     filtered_rootnames = get_rootnames_from_query(parameters)
 
     paginator = Paginator(filtered_rootnames,
-                          parameters[QUERY_CONFIG_KEYS.NUM_PER_PAGE])
+                          parameters[QueryConfigKeys.NUM_PER_PAGE])
     page_number = request.GET.get("page", 1)
     page_obj = paginator.get_page(page_number)
 
     data = thumbnails_query_ajax(page_obj.object_list)
-    data['thumbnail_sort'] = parameters[QUERY_CONFIG_KEYS.SORT_TYPE]
+    data['thumbnail_sort'] = parameters[QueryConfigKeys.SORT_TYPE]
     data['thumbnail_group'] = request.session.get("image_group", "Exposure")
 
     # add top level parameters for summarizing
@@ -511,7 +511,7 @@ def archive_thumbnails_query_ajax(request):
     data['total_pages'] = paginator.num_pages
     data['total_files'] = paginator.count
 
-    request.session['image_sort'] = parameters[QUERY_CONFIG_KEYS.SORT_TYPE]
+    request.session['image_sort'] = parameters[QueryConfigKeys.SORT_TYPE]
     save_page_navigation_data(request, data)
     return JsonResponse(data, json_dumps_params={'indent': 2})
 

From 5be0a6c72eae7a72dff2c8e2eddd1eedaa0215d4 Mon Sep 17 00:00:00 2001
From: Bradley Sappington <bsappington@stsci.edu>
Date: Wed, 8 Nov 2023 10:45:23 -0500
Subject: [PATCH 3/7] remove old date_range page

---
 jwql/website/apps/jwql/data_containers.py     | 126 ------------------
 jwql/website/apps/jwql/static/js/jwql.js      |  96 ++-----------
 .../jwql/templates/archive_date_range.html    |  59 --------
 jwql/website/apps/jwql/templates/base.html    |   1 -
 .../apps/jwql/templates/instrument.html       |   5 +-
 jwql/website/apps/jwql/urls.py                |  14 +-
 jwql/website/apps/jwql/views.py               | 110 +--------------
 7 files changed, 24 insertions(+), 387 deletions(-)
 delete mode 100644 jwql/website/apps/jwql/templates/archive_date_range.html

diff --git a/jwql/website/apps/jwql/data_containers.py b/jwql/website/apps/jwql/data_containers.py
index 8dd38dc25..23862e07d 100644
--- a/jwql/website/apps/jwql/data_containers.py
+++ b/jwql/website/apps/jwql/data_containers.py
@@ -2002,132 +2002,6 @@ def thumbnails_ajax(inst, proposal, obs_num=None):
 
     return data_dict
 
-
-def thumbnails_date_range_ajax(inst, observations, inclusive_start_time_mjd, exclusive_stop_time_mjd):
-    """Generate a page that provides data necessary to render thumbnails for
-    ``archive_date_range`` template.
-
-    Parameters
-    ----------
-    inst : str
-        Name of JWST instrument
-    observations: list
-        observation models to use to get filenames
-    inclusive_start_time_mjd : float
-        Start time in mjd format for date range
-    exclusive_stop_time_mjd : float
-        Stop time in mjd format for date range
-
-    Returns
-    -------
-    data_dict : dict
-        Dictionary of data needed for the ``thumbnails`` template
-    """
-
-    data_dict = {'inst': inst,
-                 'file_data': dict()}
-    exp_types = set()
-    exp_groups = set()
-
-    # Get the available files for the instrument
-    for observation in observations:
-        obs_num = observation.obsnum
-        proposal = observation.proposal.prop_id
-        filenames, columns = get_filenames_by_instrument(inst, proposal, observation_id=obs_num, other_columns=['expstart', 'exp_type'])
-        # Get set of unique rootnames
-        rootnames = set(['_'.join(f.split('/')[-1].split('_')[:-1]) for f in filenames])
-        # Gather data for each rootname, and construct a list of all observations in the proposal
-        for rootname in rootnames:
-            # Parse filename
-            try:
-                filename_dict = filename_parser(rootname)
-
-                # Weed out file types that are not supported by generate_preview_images
-                if 'stage_3' in filename_dict['filename_type']:
-                    continue
-
-            except ValueError:
-                # Temporary workaround for noncompliant files in filesystem
-                filename_dict = {'activity': rootname[17:19],
-                                 'detector': rootname[26:],
-                                 'exposure_id': rootname[20:25],
-                                 'observation': rootname[7:10],
-                                 'parallel_seq_id': rootname[16],
-                                 'program_id': rootname[2:7],
-                                 'visit': rootname[10:13],
-                                 'visit_group': rootname[14:16],
-                                 'group_root': rootname[:26]}
-
-            # Get list of available filenames and exposure start times. All files with a given
-            # rootname will have the same exposure start time, so just keep the first.
-            available_files = []
-            exp_start = None
-            exp_type = None
-            for i, item in enumerate(filenames):
-                if rootname in item:
-                    available_files.append(item)
-                    if exp_start is None:
-                        exp_start = columns['expstart'][i]
-                        exp_type = columns['exp_type'][i]
-
-            if exp_start >= inclusive_start_time_mjd and exp_start < exclusive_stop_time_mjd:
-                exp_types.add(exp_type)
-                # Viewed is stored by rootname in the Model db.  Save it with the data_dict
-                # THUMBNAIL_FILTER_LOOK is boolean accessed according to a viewed flag
-                try:
-                    root_file_info = RootFileInfo.objects.get(root_name=rootname)
-                    viewed = THUMBNAIL_FILTER_LOOK[root_file_info.viewed]
-                except RootFileInfo.DoesNotExist:
-                    viewed = THUMBNAIL_FILTER_LOOK[0]
-
-                # Add to list of all exposure groups
-                exp_groups.add(filename_dict['group_root'])
-
-                # Add data to dictionary
-                data_dict['file_data'][rootname] = {}
-                data_dict['file_data'][rootname]['filename_dict'] = filename_dict
-                data_dict['file_data'][rootname]['available_files'] = available_files
-                data_dict['file_data'][rootname]["viewed"] = viewed
-                data_dict['file_data'][rootname]["exp_type"] = exp_type
-                data_dict['file_data'][rootname]['thumbnail'] = get_thumbnail_by_rootname(rootname)
-
-                try:
-                    data_dict['file_data'][rootname]['expstart'] = exp_start
-                    data_dict['file_data'][rootname]['expstart_iso'] = Time(exp_start, format='mjd').iso.split('.')[0]
-                except (ValueError, TypeError) as e:
-                    logging.warning("Unable to populate exp_start info for {}".format(rootname))
-                    logging.warning(e)
-                except KeyError:
-                    print("KeyError with get_expstart for {}".format(rootname))
-
-    # Extract information for sorting with dropdown menus
-    # (Don't include the proposal as a sorting parameter if the proposal has already been specified)
-    detectors, proposals = [], []
-    for rootname in list(data_dict['file_data'].keys()):
-        proposals.append(data_dict['file_data'][rootname]['filename_dict']['program_id'])
-        try:  # Some rootnames cannot parse out detectors
-            detectors.append(data_dict['file_data'][rootname]['filename_dict']['detector'])
-        except KeyError:
-            pass
-
-    dropdown_menus = {'detector': sorted(detectors),
-                      'proposal': sorted(proposals),
-                      'look': THUMBNAIL_FILTER_LOOK,
-                      'exp_type': sorted(set(exp_types))}
-
-    data_dict['tools'] = MONITORS
-    data_dict['dropdown_menus'] = dropdown_menus
-
-    # Order dictionary by descending expstart time.
-    sorted_file_data = OrderedDict(sorted(data_dict['file_data'].items(),
-                                   key=lambda x: getitem(x[1], 'expstart'), reverse=True))
-
-    data_dict['file_data'] = sorted_file_data
-    data_dict['exp_groups'] = sorted(exp_groups)
-
-    return data_dict
-
-
 def thumbnails_query_ajax(rootnames):
     """Generate a page that provides data necessary to render the
     ``thumbnails`` template.
diff --git a/jwql/website/apps/jwql/static/js/jwql.js b/jwql/website/apps/jwql/static/js/jwql.js
index 4bca2470e..54ff39519 100644
--- a/jwql/website/apps/jwql/static/js/jwql.js
+++ b/jwql/website/apps/jwql/static/js/jwql.js
@@ -312,8 +312,8 @@ function determine_page_title_obs(instrument, proposal, observation) {
 
 /**
  * adds/removes disabled_section class and clears value
- * @param {string} element_id 
- * @param {boolean} set_disable 
+ * @param {string} element_id
+ * @param {boolean} set_disable
  */
  function set_disabled_section (element_id, set_disable) {
 
@@ -331,7 +331,7 @@ function determine_page_title_obs(instrument, proposal, observation) {
  *                              values are the number of groups for that suffix
  */
 function explore_image_update_enable_options(integrations, groups) {
-    
+
     // Check nr of integrations and groups of currently selected extension
     var ext_name = get_radio_button_value("extension");
 
@@ -343,7 +343,7 @@ function explore_image_update_enable_options(integrations, groups) {
     groups = groups.replace(/&#39;/g, '"');
     groups = groups.replace(/'/g, '"');
     groups = JSON.parse(groups)[ext_name];
-    
+
     // Zero base our calculations
     integrations -= 1
     groups -=1
@@ -353,15 +353,15 @@ function explore_image_update_enable_options(integrations, groups) {
     document.getElementById("integration2").max = integrations;
     document.getElementById("group1").max = groups;
     document.getElementById("group2").max = groups;
-    
-    
+
+
     // If multiple integrations or groups.  Allow difference calculations
     //          enable calculate_difference box
     //          enable subtrahend boxes
     if (integrations > 0 || groups > 0) {
         set_disabled_section("calcDifferenceForm", false);
         calc_difference = document.getElementById("calcDifference").checked;
-        
+
     } else {
         document.getElementById("calcDifference").checked.value = false;
         set_disabled_section("calcDifferenceForm", true);
@@ -384,7 +384,7 @@ function explore_image_update_enable_options(integrations, groups) {
     set_disabled_section("groupInput1", (groups < 1));
     set_disabled_section("integrationInput2", (!calc_difference || integrations < 1));
     set_disabled_section("groupInput2", (!calc_difference || groups < 1));
-    
+
 }
 
 
@@ -811,7 +811,7 @@ function sort_by_thumbnails(sort_type, base_url) {
     // Update dropdown menu text
     document.getElementById('sort_dropdownMenuButton').innerHTML = sort_type;
 
-    // Sort the thumbnails accordingly.  
+    // Sort the thumbnails accordingly.
     // Note: Because thumbnails will sort relating to their current order (when the exp_start is the same between thumbnails), we need to do multiple sorts to guarantee consistency.
 
     var thumbs = $('div#thumbnail-array>div')
@@ -838,9 +838,9 @@ function sort_by_thumbnails(sort_type, base_url) {
 
 
 /**
- * Toggle a viewed button when pressed.  
+ * Toggle a viewed button when pressed.
  * Ajax call to update RootFileInfo model with toggled value
- * 
+ *
  * @param {String} file_root - The rootname of the file corresponding to the thumbnail
  * @param {String} base_url - The base URL for gathering data from the AJAX view.
  */
@@ -850,7 +850,7 @@ function toggle_viewed(file_root, base_url) {
     var elem = document.getElementById("viewed");
     update_viewed_button(elem.value == "New" ? true : false);
     elem.disabled=true;
-    
+
     // Ajax Call to update RootFileInfo model with "viewed" info
     $.ajax({
         url: base_url + '/ajax/viewed/' + file_root,
@@ -1309,7 +1309,7 @@ function update_thumbnail_array(data) {
     var thumbnail_content = "";
     var image_updates = [];
     for (var i = 0; i < Object.keys(data.file_data).length; i++) {
-        
+
         // Parse out useful variables
         var rootname = Object.keys(data.file_data)[i];
         var file = data.file_data[rootname];
@@ -1361,76 +1361,6 @@ function update_thumbnail_array(data) {
     insert_thumbnail_images(image_updates);
 }
 
-/**
- * Read and submit the form for archive date ranges.
- * @param {String} inst - The instrument of interest (e.g. "FGS")
- * @param {String} base_url - The base URL for gathering data from the AJAX view.
- */
-function submit_date_range_form(inst, base_url, group) {
-
-    var start_date = document.getElementById("start_date_range").value;
-    var stop_date = document.getElementById("stop_date_range").value;
-
-    if (!start_date) {
-        alert("You must enter a Start Date/Time");
-    }  else if (!stop_date) {
-        alert("You must enter a Stop Date/Time");
-    } else if (start_date >= stop_date) {
-        alert("Start Time must be earlier than Stop Time");
-    } else {
-        document.getElementById("loading").style.display = "block";
-        document.getElementById("thumbnail-array").style.display = "none";
-        document.getElementById("no_thumbnails_msg").style.display = "none";
-        $.ajax({
-            url: base_url + '/ajax/' + inst + '/archive_date_range/start_date_' + start_date + '/stop_date_' + stop_date,
-            success: function(data){
-                var show_thumbs = true;
-                var num_thumbnails = Object.keys(data.file_data).length;
-                // verify we want to continue with results
-                if (num_thumbnails > 1000) {
-                    show_thumbs = false;
-                    alert("Returning " + num_thumbnails + " images reduce your date/time range for page to load correctly");
-                }
-                if (show_thumbs) {
-                    // Handle DIV updates
-                    // Clear our existing array
-                    $("#thumbnail-array")[0].innerHTML = "";
-                    if (num_thumbnails > 0) {
-                        update_show_count(num_thumbnails, 'activities');
-                        update_thumbnail_array(data);
-                        update_filter_options(data, base_url, 'thumbnail');
-                        update_group_options(data, base_url);
-                        update_sort_options(data, base_url);
-
-                        // Do initial sort and group to match sort button display
-                        group_by_thumbnails(group, base_url);
-                        sort_by_thumbnails(data.thumbnail_sort, base_url);
-
-                        // Replace loading screen with the proposal array div
-                        document.getElementById("loading").style.display = "none";
-                        document.getElementById("thumbnail-array").style.display = "block";
-                        document.getElementById("no_thumbnails_msg").style.display = "none";
-                    } else {
-                        show_thumbs = false;
-                    }
-                } 
-                if (!show_thumbs) {
-                    document.getElementById("loading").style.display = "none";
-                    document.getElementById("no_thumbnails_msg").style.display = "inline-block";
-                }
-
-            },
-            error : function(response) {
-                document.getElementById("loading").style.display = "none";
-                document.getElementById("thumbnail-array").style.display = "none";
-                document.getElementById("no_thumbnails_msg").style.display = "inline-block";
-    
-            }
-        });
-    }
-}
-
-
 /**
  * Updates various components on the thumbnails page
  * @param {String} inst - The instrument of interest (e.g. "FGS")
diff --git a/jwql/website/apps/jwql/templates/archive_date_range.html b/jwql/website/apps/jwql/templates/archive_date_range.html
deleted file mode 100644
index 15b7ec4af..000000000
--- a/jwql/website/apps/jwql/templates/archive_date_range.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{% extends "base.html" %}
-
-{% block preamble %}
-
-	<title>Archive Date Range {{ inst }} Images - JWQL</title>
-
-{% endblock %}
-
-{% block content %}
-
-<main role="main" class="container">
-
-    <h3 id='title'>Archive Date Range {{ inst }} Images</h3>
-
-    <div id='img_show_count'></div>
-    <hr>
-
-    <!-- Filter and sort options -->
-    <div class="d-flex flex-row">
-        <div class="mr-4 mr-5" id="thumbnail-filter"></div>
-        <div class="mx-4" id="thumbnail-sort"></div>
-        <div class="mx-4 mr-5 ml-auto" id="group-by-exposure"></div>
-    </div>
-
-    <hr>
-    <div class="d-flex flex-row">
-        <div class="mr-auto">
-            Date Range:<br>
-            <input type="datetime-local" id="start_date_range" name="start_date_range">
-            <input type="datetime-local" id="stop_date_range" name="stop_date_range">
-            <button class="btn btn-primary" type="button" href='#' onclick="submit_date_range_form('{{inst}}', '{{base_url}}', '{{group}}');">Submit</button>
-        </div>
-    </div>
-    <hr>
-
-    <!-- Loading animation -->
-    <div id="loading" style='display: none'>
-        <div class="lds-css ng-scope">
-            <div style="width:100%;height:100%" class="lds-magnify">
-                <div>
-                    <div>
-                        <div>
-                        </div>
-                        <div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            Loading ...
-        </div>
-    </div>
-
-    <!-- Display the data -->
-    <div id='thumbnail-array'></div>
-    <br>
-    <a id="no_thumbnails_msg">No data match the date range.</a>
-</main>
-
-{% endblock %}
diff --git a/jwql/website/apps/jwql/templates/base.html b/jwql/website/apps/jwql/templates/base.html
index 1d00bfaea..54bb04ba3 100644
--- a/jwql/website/apps/jwql/templates/base.html
+++ b/jwql/website/apps/jwql/templates/base.html
@@ -121,7 +121,6 @@
 								<!-- <a class="dropdown-item disabled-dropdown" href='#'>Unlooked Images</a> -->
 								<!-- <a class="dropdown-item disabled-dropdown" href="#">Image Anomalies</a> -->
 								<a class="dropdown-item" href={{ url('jwql:archive', args=[inst_key]) }}>Archived Images</a>
-								<a class="dropdown-item" href={{ url('jwql:archive_date_range', args=[inst_key]) }}>Date Range Images</a>
 								<div class="dropdown-divider"></div>
 								<a class='dropdown-heading mx-3'>Monitors</a>
 									{% for monitor_name, monitor_url in inst_tools %}
diff --git a/jwql/website/apps/jwql/templates/instrument.html b/jwql/website/apps/jwql/templates/instrument.html
index 1f1b08f24..ed5ce89e9 100644
--- a/jwql/website/apps/jwql/templates/instrument.html
+++ b/jwql/website/apps/jwql/templates/instrument.html
@@ -45,7 +45,6 @@ <h2>Archive</h2>
 						  <!-- <a class="dropdown-item" href={{ url('jwql:unlooked', args=[inst]) }}>Unlooked Images (Currently Unavailable)</a> -->
 						  <!-- <a class="dropdown-item" href="#">Image Anomalies (Currently Unavailable)</a> -->
 						  <a class="dropdown-item" href={{ url('jwql:archive', args=[inst]) }}>Archived Images</a>
-						  <a class="dropdown-item" href={{ url('jwql:archive_date_range', args=[inst]) }}>Date Range Images</a>
 						</div>
 					</div>
 				</div>
@@ -76,7 +75,7 @@ <h2>Monitors</h2>
 					</div>
 				</div>
 			</div>
-			
+
 			<div class="container">
 				<div class="col-md-20 text-center">
 					<!-- Documentation -->
@@ -94,7 +93,7 @@ <h2>Documentation</h2>
 					</br>
 				</div>
 			</div>
-			
+
 		</div>
 
 	</main>
diff --git a/jwql/website/apps/jwql/urls.py b/jwql/website/apps/jwql/urls.py
index 0b4420080..6c054ed72 100644
--- a/jwql/website/apps/jwql/urls.py
+++ b/jwql/website/apps/jwql/urls.py
@@ -83,25 +83,27 @@
     path('query_submit/', views.query_submit, name='query_submit'),
     re_path(r'^(?P<inst>({}))/$'.format(instruments), views.instrument, name='instrument'),
     re_path(r'^(?P<inst>({}))/archive/$'.format(instruments), views.archived_proposals, name='archive'),
-    re_path(r'^(?P<inst>({}))/archive_date_range/$'.format(instruments), views.archive_date_range, name='archive_date_range'),
     re_path(r'^(?P<inst>({}))/unlooked/$'.format(instruments), views.unlooked_images, name='unlooked'),
     re_path(r'^(?P<inst>({}))/report/$'.format(instruments), views.download_report, name='download_report'),
     re_path(r'^(?P<inst>({}))/(?P<file_root>[\w-]+)/$'.format(instruments), views.view_image, name='view_image'),
     re_path(r'^(?P<inst>({}))/(?P<file_root>.+)_(?P<filetype>.+)/explore_image/'.format(instruments), views.explore_image, name='explore_image'),
     re_path(r'^(?P<inst>({}))/(?P<filename>.+)_(?P<filetype>.+)/header/'.format(instruments), views.view_header, name='view_header'),
-    re_path(r'^(?P<inst>({}))/archive/(?P<proposal>[\d]{{1,5}})/obs(?P<observation>[\d]{{1,3}})/$'.format(instruments), views.archive_thumbnails_per_observation, name='archive_thumb_per_obs'),
+    re_path(r'^(?P<inst>({}))/archive/(?P<proposal>[\d]{{1,5}})/obs(?P<observation>[\d]{{1,3}})/$'.format(instruments),
+            views.archive_thumbnails_per_observation, name='archive_thumb_per_obs'),
     re_path(r'^(?P<inst>({}))/exposure/(?P<group_root>[\w-]+)/$'.format(instruments), views.view_exposure, name='view_exposure'),
 
     # AJAX views
     re_path('ajax/query_submit/', views.archive_thumbnails_query_ajax, name='archive_thumb_query_ajax'),
     re_path(r'^ajax/(?P<inst>({}))/archive/$'.format(instruments), views.archived_proposals_ajax, name='archive_ajax'),
-    re_path(r'^ajax/(?P<inst>({}))/(?P<file_root>.+)_(?P<filetype>.+)/explore_image/$'.format(instruments), views.explore_image_ajax, name='explore_image_ajax'),
-    re_path(r'^ajax/(?P<inst>({}))/(?P<file_root>.+)_(?P<filetype>.+)/explore_image/plot_(?P<line_plots>(true|false))/ext_(?P<ext_name>.+)/int1_(?P<int1_nr>.+)/grp1_(?P<grp1_nr>.+)/int2_(?P<int2_nr>.+)/grp2_(?P<grp2_nr>.+)/$'.format(instruments), views.explore_image_ajax, name='explore_image_ajax'),
-    re_path(r'^ajax/(?P<inst>({}))/archive/(?P<proposal>[\d]{{1,5}})/obs(?P<observation>[\d]{{1,3}})/$'.format(instruments), views.archive_thumbnails_ajax, name='archive_thumb_ajax'),
+    re_path(r'^ajax/(?P<inst>({}))/(?P<file_root>.+)_(?P<filetype>.+)/explore_image/$'.format(instruments), views.explore_image_ajax,
+            name='explore_image_ajax'),
+    re_path(r'^ajax/(?P<inst>({}))/(?P<file_root>.+)_(?P<filetype>.+)/explore_image/plot_(?P<line_plots>(true|false))/ext_(?P<ext_name>.+)/int1_(?P<int1_nr>.+)/grp1_(?P<grp1_nr>.+)/int2_(?P<int2_nr>.+)/grp2_(?P<grp2_nr>.+)/$'.format(instruments),
+             views.explore_image_ajax, name='explore_image_ajax'),
+    re_path(r'^ajax/(?P<inst>({}))/archive/(?P<proposal>[\d]{{1,5}})/obs(?P<observation>[\d]{{1,3}})/$'.format(instruments),
+            views.archive_thumbnails_ajax, name='archive_thumb_ajax'),
     re_path(r'^ajax/viewed/(?P<file_root>.+)/$', views.toggle_viewed_ajax, name='toggle_viewed_ajax'),
     re_path(r'^ajax/viewed_group/(?P<group_root>.+)/(?P<status>(viewed|new|Viewed|New))/$',
             views.set_viewed_ajax, name='set_viewed_ajax'),
-    re_path(r'^ajax/(?P<inst>({}))/archive_date_range/start_date_(?P<start_date>.+)/stop_date_(?P<stop_date>.+)/$'.format(instruments), views.archive_date_range_ajax, name='archive_date_range_ajax'),
     re_path(r'^ajax/image_group/$', views.save_image_group_ajax, name='save_image_group_ajax'),
     re_path(r'^ajax/image_sort/$', views.save_image_sort_ajax, name='save_image_sort_ajax'),
     re_path(r'^ajax/navigate_filter/$', views.save_page_navigation_data_ajax, name='save_page_navigation_data_ajax'),
diff --git a/jwql/website/apps/jwql/views.py b/jwql/website/apps/jwql/views.py
index 393f386dd..30e6a0a26 100644
--- a/jwql/website/apps/jwql/views.py
+++ b/jwql/website/apps/jwql/views.py
@@ -79,14 +79,11 @@
 from .data_containers import text_scrape
 from .data_containers import thumbnails_ajax
 from .data_containers import thumbnails_query_ajax
-from .data_containers import thumbnails_date_range_ajax
 from .forms import JwqlQueryForm
 from .forms import FileSearchForm
 if not os.environ.get("READTHEDOCS"):
-    from .models import Observation, RootFileInfo
+    from .models import RootFileInfo
 from astropy.io import fits
-from astropy.time import Time
-import astropy.units as u
 
 
 def jwql_query(request):
@@ -221,111 +218,6 @@ def save_page_navigation_data_ajax(request):
     context = {'item': request.session['navigation_data']}
     return JsonResponse(context, json_dumps_params={'indent': 2})
 
-
-def archive_date_range(request, inst):
-    """Generate the page for date range images
-
-    Parameters
-    ----------
-    request : HttpRequest object
-        Incoming request from the webpage
-    inst : str
-        Name of JWST instrument
-
-    Returns
-    -------
-    HttpResponse object
-        Outgoing response sent to the webpage
-    """
-
-    # Ensure the instrument is correctly capitalized
-    inst = JWST_INSTRUMENT_NAMES_MIXEDCASE[inst.lower()]
-
-    template = 'archive_date_range.html'
-    sort_type = request.session.get('image_sort', 'Recent')
-    group_type = request.session.get('image_group', 'Exposure')
-    context = {'inst': inst,
-               'base_url': get_base_url(),
-               'sort': sort_type,
-               'group': group_type}
-
-    return render(request, template, context)
-
-
-def archive_date_range_ajax(request, inst, start_date, stop_date):
-    """Generate the page listing all archived images within the inclusive date range for all proposals
-
-    Parameters
-    ----------
-    request : HttpRequest object
-        Incoming request from the webpage
-    inst : str
-        Name of JWST instrument
-    start_date : str
-        Start date for date range
-    stop_date : str
-        stop date for date range
-
-    Returns
-    -------
-    JsonResponse object
-        Outgoing response sent to the webpage
-    """
-
-    # Ensure the instrument is correctly capitalized
-    inst = JWST_INSTRUMENT_NAMES_MIXEDCASE[inst.lower()]
-
-    # Calculate start date/time in MJD format to begin our range
-    inclusive_start_time = Time(start_date)
-
-    # Add a minute to the stop time and mark it 'exclusive' for code clarity,
-    # doing this to get all seconds selected minute
-    exclusive_stop_time = Time(stop_date) + (1 * u.minute)
-
-    # Get a queryset of all observations STARTING WITHIN our date range
-    begin_after_start = Observation.objects.filter(
-        proposal__archive__instrument=inst,
-        obsstart__gte=inclusive_start_time.mjd)
-    all_entries_beginning_in_range = begin_after_start.filter(
-        obsstart__lt=exclusive_stop_time.mjd)
-
-    # Get a queryset of all observations ENDING WITHIN our date range
-    end_after_start = Observation.objects.filter(
-        proposal__archive__instrument=inst,
-        obsend__gte=inclusive_start_time.mjd)
-    all_entries_ending_in_range = end_after_start.filter(
-        obsend__lt=exclusive_stop_time.mjd)
-
-    # Get a queryset of all observations SPANNING
-    # (starting before and ending after) our date range.
-    # Bump our window out a few days to catch hypothetical
-    # observations that last over 24 hours.
-    # The larger the window the more time the query takes so keeping it tight.
-    two_days_before_start_time = Time(start_date) - (2 * u.day)
-    two_days_after_end_time = Time(stop_date) + (3 * u.day)
-    end_after_stop = Observation.objects.filter(
-        proposal__archive__instrument=inst,
-        obsend__gte=two_days_after_end_time.mjd)
-    all_entries_spanning_range = end_after_stop.filter(
-        obsstart__lt=two_days_before_start_time.mjd)
-
-    obs_beginning = [observation for observation in all_entries_beginning_in_range]
-    obs_ending = [observation for observation in all_entries_ending_in_range]
-    obs_spanning = [observation for observation in all_entries_spanning_range]
-
-    # Create a single list of all pertinent observations
-    all_observations = list(set(obs_beginning + obs_ending + obs_spanning))
-    # Get all thumbnails that occurred within the time frame for these observations
-    data = thumbnails_date_range_ajax(
-        inst, all_observations, inclusive_start_time.mjd, exclusive_stop_time.mjd)
-    data['thumbnail_sort'] = request.session.get("image_sort", "Recent")
-    data['thumbnail_group'] = request.session.get("image_group", "Exposure")
-
-    # Create Dictionary of Rootnames with expstart
-    save_page_navigation_data(request, data)
-    return JsonResponse(data, json_dumps_params={'indent': 2})
-
-
 def archived_proposals(request, inst):
     """Generate the page listing all archived proposals in the database
 

From cac9cd2f4b35f7ca1fddf9d74c080028d2ca5bc9 Mon Sep 17 00:00:00 2001
From: Bradley Sappington <bsappington@stsci.edu>
Date: Wed, 8 Nov 2023 12:28:40 -0500
Subject: [PATCH 4/7] pesky pep8 fixes

---
 jwql/utils/constants.py                   | 1137 +++++++++++++++------
 jwql/website/apps/jwql/data_containers.py |   15 +-
 jwql/website/apps/jwql/forms.py           |    2 +-
 jwql/website/apps/jwql/urls.py            |    2 +-
 jwql/website/apps/jwql/views.py           |    1 +
 5 files changed, 809 insertions(+), 348 deletions(-)

diff --git a/jwql/utils/constants.py b/jwql/utils/constants.py
index 5c998667e..39db77e92 100644
--- a/jwql/utils/constants.py
+++ b/jwql/utils/constants.py
@@ -34,109 +34,159 @@
 # and the second for y coordinates. Within each tuple are value for
 # starting, ending, and step size. Step size is needed for MIRI, where
 # the pixels corresponding to the 4 amplifiers are interleaved.
-AMPLIFIER_BOUNDARIES = {'nircam': {'1': [(0, 512, 1), (0, 2048, 1)],
-                                   '2': [(512, 1024, 1), (0, 2048, 1)],
-                                   '3': [(1024, 1536, 1), (0, 2048, 1)],
-                                   '4': [(1536, 2048, 1), (0, 2048, 1)]},
-                        'niriss': {'1': [(0, 2048, 1), (0, 512, 1)],
-                                   '2': [(0, 2048, 1), (512, 1024, 1)],
-                                   '3': [(0, 2048, 1), (1024, 1536, 1)],
-                                   '4': [(0, 2048, 1), (1536, 2048, 1)]},
-                        'fgs': {'1': [(0, 512, 1), (0, 2048, 1)],
-                                '2': [(512, 1024, 1), (0, 2048, 1)],
-                                '3': [(1024, 1536, 1), (0, 2048, 1)],
-                                '4': [(1536, 2048, 1), (0, 2048, 1)]},
-                        'nirspec': {'1': [(0, 2048, 1), (0, 512, 1)],
-                                    '2': [(0, 2048, 1), (512, 1024, 1)],
-                                    '3': [(0, 2048, 1), (1024, 1536, 1)],
-                                    '4': [(0, 2048, 1), (1536, 2048, 1)]},
-                        'miri': {'1': [(0, 1032, 4), (0, 1024, 1)],
-                                 '2': [(1, 1032, 4), (0, 1024, 1)],
-                                 '3': [(2, 1032, 4), (0, 1024, 1)],
-                                 '4': [(3, 1032, 4), (0, 1024, 1)]}}
+AMPLIFIER_BOUNDARIES = {
+    "nircam": {
+        "1": [(0, 512, 1), (0, 2048, 1)],
+        "2": [(512, 1024, 1), (0, 2048, 1)],
+        "3": [(1024, 1536, 1), (0, 2048, 1)],
+        "4": [(1536, 2048, 1), (0, 2048, 1)],
+    },
+    "niriss": {
+        "1": [(0, 2048, 1), (0, 512, 1)],
+        "2": [(0, 2048, 1), (512, 1024, 1)],
+        "3": [(0, 2048, 1), (1024, 1536, 1)],
+        "4": [(0, 2048, 1), (1536, 2048, 1)],
+    },
+    "fgs": {
+        "1": [(0, 512, 1), (0, 2048, 1)],
+        "2": [(512, 1024, 1), (0, 2048, 1)],
+        "3": [(1024, 1536, 1), (0, 2048, 1)],
+        "4": [(1536, 2048, 1), (0, 2048, 1)],
+    },
+    "nirspec": {
+        "1": [(0, 2048, 1), (0, 512, 1)],
+        "2": [(0, 2048, 1), (512, 1024, 1)],
+        "3": [(0, 2048, 1), (1024, 1536, 1)],
+        "4": [(0, 2048, 1), (1536, 2048, 1)],
+    },
+    "miri": {
+        "1": [(0, 1032, 4), (0, 1024, 1)],
+        "2": [(1, 1032, 4), (0, 1024, 1)],
+        "3": [(2, 1032, 4), (0, 1024, 1)],
+        "4": [(3, 1032, 4), (0, 1024, 1)],
+    },
+}
 
 # Dictionary describing instruments to which anomalies apply
 ANOMALIES_PER_INSTRUMENT = {
     # anomalies affecting all instruments:
-    'cosmic_ray_shower': ['fgs', 'miri', 'nircam', 'niriss', 'nirspec'],
-    'diffraction_spike': ['fgs', 'miri', 'nircam', 'niriss', 'nirspec'],
-    'excessive_saturation': ['fgs', 'miri', 'nircam', 'niriss', 'nirspec'],
-    'guidestar_failure': ['fgs', 'miri', 'nircam', 'niriss', 'nirspec'],
-    'persistence': ['fgs', 'miri', 'nircam', 'niriss', 'nirspec'],
+    "cosmic_ray_shower": ["fgs", "miri", "nircam", "niriss", "nirspec"],
+    "diffraction_spike": ["fgs", "miri", "nircam", "niriss", "nirspec"],
+    "excessive_saturation": ["fgs", "miri", "nircam", "niriss", "nirspec"],
+    "guidestar_failure": ["fgs", "miri", "nircam", "niriss", "nirspec"],
+    "persistence": ["fgs", "miri", "nircam", "niriss", "nirspec"],
     # anomalies affecting multiple instruments:
-    'crosstalk': ['fgs', 'nircam', 'niriss', 'nirspec'],
-    'data_transfer_error': ['fgs', 'nircam', 'niriss', 'nirspec'],
-    'ghost': ['fgs', 'nircam', 'niriss', 'nirspec'],
-    'snowball': ['fgs', 'nircam', 'niriss', 'nirspec'],
+    "crosstalk": ["fgs", "nircam", "niriss", "nirspec"],
+    "data_transfer_error": ["fgs", "nircam", "niriss", "nirspec"],
+    "ghost": ["fgs", "nircam", "niriss", "nirspec"],
+    "snowball": ["fgs", "nircam", "niriss", "nirspec"],
     # instrument-specific anomalies:
-    'column_pull_up': ['miri'],
-    'column_pull_down': ['miri'],
-    'Dominant_MSA_Leakage': ['nirspec'],
-    'dragons_breath': ['nircam'],
-    'MRS_Glow': ['miri'],
-    'MRS_Zipper': ['miri'],
-    'internal_reflection': ['miri'],
-    'optical_short': ['nirspec'],  # Only for MOS observations
-    'row_pull_up': ['miri'],
-    'row_pull_down': ['miri'],
-    'LRS_Contamination': ['miri'],
-    'tree_rings': ['miri'],
-    'scattered_light': ['niriss', 'nircam'],
-    'claws': ['nircam'],
-    'wisps': ['nircam'],
-    'tilt_event': ['nircam'],
-    'light_saber': ['niriss'],
+    "column_pull_up": ["miri"],
+    "column_pull_down": ["miri"],
+    "Dominant_MSA_Leakage": ["nirspec"],
+    "dragons_breath": ["nircam"],
+    "MRS_Glow": ["miri"],
+    "MRS_Zipper": ["miri"],
+    "internal_reflection": ["miri"],
+    "optical_short": ["nirspec"],  # Only for MOS observations
+    "row_pull_up": ["miri"],
+    "row_pull_down": ["miri"],
+    "LRS_Contamination": ["miri"],
+    "tree_rings": ["miri"],
+    "scattered_light": ["niriss", "nircam"],
+    "claws": ["nircam"],
+    "wisps": ["nircam"],
+    "tilt_event": ["nircam"],
+    "light_saber": ["niriss"],
     # additional anomalies:
-    'other': ['fgs', 'miri', 'nircam', 'niriss', 'nirspec']}
+    "other": ["fgs", "miri", "nircam", "niriss", "nirspec"],
+}
 # anomalies that shouldn't be 'titleized'
-special_cases = ['Dominant_MSA_Leakage', 'MRS_Glow', 'MRS_Zipper', 'LRS_Contamination']
+special_cases = ["Dominant_MSA_Leakage", "MRS_Glow", "MRS_Zipper", "LRS_Contamination"]
 
 # Defines the possible anomalies to flag through the web app
-ANOMALY_CHOICES = [(anomaly, inflection.titleize(anomaly)) if anomaly not in special_cases
-                   else (anomaly, anomaly.replace('_', ' '))
-                   for anomaly in ANOMALIES_PER_INSTRUMENT]
-
-ANOMALY_CHOICES_FGS = [(anomaly, inflection.titleize(anomaly)) for anomaly in ANOMALIES_PER_INSTRUMENT
-                       if 'fgs' in ANOMALIES_PER_INSTRUMENT[anomaly]]
-
-ANOMALY_CHOICES_MIRI = [(anomaly, inflection.titleize(anomaly)) if anomaly not in special_cases
-                        else (anomaly, anomaly.replace('_', ' '))
-                        for anomaly in ANOMALIES_PER_INSTRUMENT
-                        if 'miri' in ANOMALIES_PER_INSTRUMENT[anomaly]]
-
-ANOMALY_CHOICES_NIRCAM = [(anomaly, inflection.titleize(anomaly)) for anomaly in ANOMALIES_PER_INSTRUMENT
-                          if 'nircam' in ANOMALIES_PER_INSTRUMENT[anomaly]]
-
-ANOMALY_CHOICES_NIRISS = [(anomaly, inflection.titleize(anomaly)) for anomaly in ANOMALIES_PER_INSTRUMENT
-                          if 'niriss' in ANOMALIES_PER_INSTRUMENT[anomaly]]
-
-ANOMALY_CHOICES_NIRSPEC = [(anomaly, inflection.titleize(anomaly)) if anomaly not in special_cases
-                           else (anomaly, anomaly.replace('_', ' '))
-                           for anomaly in ANOMALIES_PER_INSTRUMENT
-                           if 'nirspec' in ANOMALIES_PER_INSTRUMENT[anomaly]]
-
-ANOMALY_CHOICES_PER_INSTRUMENT = {'fgs': ANOMALY_CHOICES_FGS,
-                                  'miri': ANOMALY_CHOICES_MIRI,
-                                  'nircam': ANOMALY_CHOICES_NIRCAM,
-                                  'niriss': ANOMALY_CHOICES_NIRISS,
-                                  'nirspec': ANOMALY_CHOICES_NIRSPEC
-                                  }
-
-APERTURES_PER_INSTRUMENT = {'nircam': [],  # NIRCAM aperture redundant, can just use Subarray + Detector
-                            'niriss': [],  # NIRISS preferred subarray only
-                            'nirspec': ['NRS_FULL_MSA', 'NRS_FULL_IFU', 'NRS_S200A1_SLIT', 'NRS_S200A2_SLIT',
-                                        'NRS_S400A1_SLIT', 'NRS_S1600A1_SLIT', 'NRS_S200B1_SLIT'],
-                            'miri': [],   # MIRI preferred subarray only
-                            'fgs': ['FGS1_FULL', 'FGS2_FULL']}
+ANOMALY_CHOICES = [
+    (anomaly, inflection.titleize(anomaly))
+    if anomaly not in special_cases
+    else (anomaly, anomaly.replace("_", " "))
+    for anomaly in ANOMALIES_PER_INSTRUMENT
+]
+
+ANOMALY_CHOICES_FGS = [
+    (anomaly, inflection.titleize(anomaly))
+    for anomaly in ANOMALIES_PER_INSTRUMENT
+    if "fgs" in ANOMALIES_PER_INSTRUMENT[anomaly]
+]
+
+ANOMALY_CHOICES_MIRI = [
+    (anomaly, inflection.titleize(anomaly))
+    if anomaly not in special_cases
+    else (anomaly, anomaly.replace("_", " "))
+    for anomaly in ANOMALIES_PER_INSTRUMENT
+    if "miri" in ANOMALIES_PER_INSTRUMENT[anomaly]
+]
+
+ANOMALY_CHOICES_NIRCAM = [
+    (anomaly, inflection.titleize(anomaly))
+    for anomaly in ANOMALIES_PER_INSTRUMENT
+    if "nircam" in ANOMALIES_PER_INSTRUMENT[anomaly]
+]
+
+ANOMALY_CHOICES_NIRISS = [
+    (anomaly, inflection.titleize(anomaly))
+    for anomaly in ANOMALIES_PER_INSTRUMENT
+    if "niriss" in ANOMALIES_PER_INSTRUMENT[anomaly]
+]
+
+ANOMALY_CHOICES_NIRSPEC = [
+    (anomaly, inflection.titleize(anomaly))
+    if anomaly not in special_cases
+    else (anomaly, anomaly.replace("_", " "))
+    for anomaly in ANOMALIES_PER_INSTRUMENT
+    if "nirspec" in ANOMALIES_PER_INSTRUMENT[anomaly]
+]
+
+ANOMALY_CHOICES_PER_INSTRUMENT = {
+    "fgs": ANOMALY_CHOICES_FGS,
+    "miri": ANOMALY_CHOICES_MIRI,
+    "nircam": ANOMALY_CHOICES_NIRCAM,
+    "niriss": ANOMALY_CHOICES_NIRISS,
+    "nirspec": ANOMALY_CHOICES_NIRSPEC,
+}
+
+APERTURES_PER_INSTRUMENT = {
+    "nircam": [],  # NIRCAM aperture redundant, can just use Subarray + Detector
+    "niriss": [],  # NIRISS preferred subarray only
+    "nirspec": [
+        "NRS_FULL_MSA",
+        "NRS_FULL_IFU",
+        "NRS_S200A1_SLIT",
+        "NRS_S200A2_SLIT",
+        "NRS_S400A1_SLIT",
+        "NRS_S1600A1_SLIT",
+        "NRS_S200B1_SLIT",
+    ],
+    "miri": [],  # MIRI preferred subarray only
+    "fgs": ["FGS1_FULL", "FGS2_FULL"],
+}
 
 # Observing templates used for ASIC tuning. MAST query results that
 # have one of these templates will be ignored
-ASIC_TEMPLATES = ['ISIM ASIC Tuning']
+ASIC_TEMPLATES = ["ISIM ASIC Tuning"]
 
 # Bad pixel types by the type of data used to find them
-BAD_PIXEL_TYPES = ['DEAD', 'HOT', 'LOW_QE', 'RC', 'OPEN', 'ADJ_OPEN', 'TELEGRAPH', 'OTHER_BAD_PIXEL']
-DARKS_BAD_PIXEL_TYPES = ['HOT', 'RC', 'OTHER_BAD_PIXEL', 'TELEGRAPH']
-FLATS_BAD_PIXEL_TYPES = ['DEAD', 'OPEN', 'ADJ_OPEN', 'LOW_QE']
+BAD_PIXEL_TYPES = [
+    "DEAD",
+    "HOT",
+    "LOW_QE",
+    "RC",
+    "OPEN",
+    "ADJ_OPEN",
+    "TELEGRAPH",
+    "OTHER_BAD_PIXEL",
+]
+DARKS_BAD_PIXEL_TYPES = ["HOT", "RC", "OTHER_BAD_PIXEL", "TELEGRAPH"]
+FLATS_BAD_PIXEL_TYPES = ["DEAD", "OPEN", "ADJ_OPEN", "LOW_QE"]
 
 # The maximum number of bad pixels allowed on a bad pixel monitor plot. If there
 # are more than this number of bad pixels identified for a particular type of
@@ -145,14 +195,16 @@
 BAD_PIXEL_MONITOR_MAX_POINTS_TO_PLOT = 15000
 
 # Possible exposure types for dark current data
-DARK_EXP_TYPES = {'nircam': ['NRC_DARK'],
-                  'niriss': ['NIS_DARK'],
-                  'miri': ['MIR_DARKIMG', 'MIR_DARKMRS', 'MIR_DARKALL'],
-                  'nirspec': ['NRS_DARK'],
-                  'fgs': ['FGS_DARK']}
+DARK_EXP_TYPES = {
+    "nircam": ["NRC_DARK"],
+    "niriss": ["NIS_DARK"],
+    "miri": ["MIR_DARKIMG", "MIR_DARKMRS", "MIR_DARKALL"],
+    "nirspec": ["NRS_DARK"],
+    "fgs": ["FGS_DARK"],
+}
 
 # Types of potential bad pixels identified by the dark current monitor
-DARK_MONITOR_BADPIX_TYPES = ['hot', 'dead', 'noisy']
+DARK_MONITOR_BADPIX_TYPES = ["hot", "dead", "noisy"]
 
 # Maximum number of potential new bad pixels to overplot on the dark monitor
 # mean dark image plot. Too many overplotted points starts to obscure the image
@@ -160,48 +212,144 @@
 DARK_MONITOR_MAX_BADPOINTS_TO_PLOT = 1000
 
 # Dictionary of observing modes available for each instrument
-DETECTOR_PER_INSTRUMENT = {'miri': ['MIRIFULONG', 'MIRIFUSHORT', 'MIRIMAGE'],
-                           'nircam': ['NRCB4', 'NRCA4', 'NRCA2', 'NRCALONG',
-                                      'NRCBLONG', 'NRCB2', 'NRCB3', 'NRCA1',
-                                      'NRCA3', 'NRCB1'],
-                           'niriss': ['NIS'],
-                           'nirspec': ['NRS1', 'NRS2'],
-                           'fgs': ['GUIDER1', 'GUIDER2']}
+DETECTOR_PER_INSTRUMENT = {
+    "miri": ["MIRIFULONG", "MIRIFUSHORT", "MIRIMAGE"],
+    "nircam": [
+        "NRCB4",
+        "NRCA4",
+        "NRCA2",
+        "NRCALONG",
+        "NRCBLONG",
+        "NRCB2",
+        "NRCB3",
+        "NRCA1",
+        "NRCA3",
+        "NRCB1",
+    ],
+    "niriss": ["NIS"],
+    "nirspec": ["NRS1", "NRS2"],
+    "fgs": ["GUIDER1", "GUIDER2"],
+}
 
 # Default time range to use for EDB monitor telemetry plots. The plots will
 # go from this starting time to the monitor run time, unless otherwise requested.
 EDB_DEFAULT_PLOT_RANGE = 14  # days.
 
-EXP_TYPE_PER_INSTRUMENT = {'fgs': ['FGS_FOCUS', 'FGS_IMAGE', 'FGS_INTFLAT',
-                                   'FGS_SKYFLAT', 'FGS_DARK'],
-                           'miri': ['MIR_FLATMRS', 'MIR_MRS', 'MIR_FLATIMAGE',
-                                    'MIR_DARK', 'MIR_LYOT', 'MIR_IMAGE',
-                                    'MIR_LRS-FIXEDSLIT', 'MIR_LRS-SLITLESS',
-                                    'MIR_CORONCAL', 'MIR_4QPM', 'MIR_FLATIMAGE-EXT',
-                                    'MIR_TACQ', 'MIR_DARKMRS',
-                                    'MIR_DARKIMG', 'MIR_FLATMRS-EXT', 'MIR_TACONFIRM'],
-                           'nircam': ['NRC_LED', 'NRC_DARK', 'NRC_CORON',
-                                      'NRC_IMAGE', 'NRC_FOCUS', 'NRC_TSGRISM',
-                                      'NRC_TSIMAGE', 'NRC_WFSS', 'NRC_TACQ',
-                                      'NRC_TACONFIRM', 'NRC_FLAT', 'NRC_GRISM'],
-                           'niriss': ['NIS_IMAGE', 'NIS_FOCUS', 'NIS_SOSS',
-                                      'NIS_AMI', 'NIS_LAMP', 'NIS_WFSS', 'NIS_DARK',
-                                      'NIS_EXTCAL', 'NIS_TACONFIRM', 'NIS_TACQ'],
-                           'nirspec': ['NRS_IFU', 'NRS_MSASPEC', 'NRS_BRIGHTOBJ', 'NRS_DARK',
-                                       'NRS_AUTOWAVE', 'NRS_LAMP', 'NRS_AUTOFLAT', 'NRS_IMAGE',
-                                       'NRS_CONFIRM', 'NRS_FIXEDSLIT', 'NRS_MIMF', 'NRS_FOCUS',
-                                       'NRS_TACONFIRM', 'NRS_WATA', 'NRS_MSATA']}
-
-EXPTYPES = {"nircam": {"imaging": "NRC_IMAGE", "ts_imaging": "NRC_TSIMAGE",
-                       "wfss": "NRC_WFSS", "ts_grism": "NRC_TSGRISM"},
-            "niriss": {"imaging": "NIS_IMAGE", "ami": "NIS_IMAGE",
-                       "pom": "NIS_IMAGE", "wfss": "NIS_WFSS"},
-            "fgs": {"imaging": "FGS_IMAGE"}}
-
-EXPOSURE_PAGE_SUFFIX_ORDER = ['uncal', 'dark', 'trapsfilled', 'ramp', 'rate', 'rateints', 'fitopt', 'cal', 'calints',
-                              'msa', 'crf', 'crfints', 'bsub', 'bsubints', 'i2d', 's2d', 's3d', 'x1d', 'x1dints',
-                              'cat', 'segm', 'c1d', 'psfstack', 'psfalign', 'psfsub', 'amiavg', 'aminorm', 'ami',
-                              'psf-amiavg', 'phot', 'whtlt', 'wfscmb']
+EXP_TYPE_PER_INSTRUMENT = {
+    "fgs": ["FGS_FOCUS", "FGS_IMAGE", "FGS_INTFLAT", "FGS_SKYFLAT", "FGS_DARK"],
+    "miri": [
+        "MIR_FLATMRS",
+        "MIR_MRS",
+        "MIR_FLATIMAGE",
+        "MIR_DARK",
+        "MIR_LYOT",
+        "MIR_IMAGE",
+        "MIR_LRS-FIXEDSLIT",
+        "MIR_LRS-SLITLESS",
+        "MIR_CORONCAL",
+        "MIR_4QPM",
+        "MIR_FLATIMAGE-EXT",
+        "MIR_TACQ",
+        "MIR_DARKMRS",
+        "MIR_DARKIMG",
+        "MIR_FLATMRS-EXT",
+        "MIR_TACONFIRM",
+    ],
+    "nircam": [
+        "NRC_LED",
+        "NRC_DARK",
+        "NRC_CORON",
+        "NRC_IMAGE",
+        "NRC_FOCUS",
+        "NRC_TSGRISM",
+        "NRC_TSIMAGE",
+        "NRC_WFSS",
+        "NRC_TACQ",
+        "NRC_TACONFIRM",
+        "NRC_FLAT",
+        "NRC_GRISM",
+    ],
+    "niriss": [
+        "NIS_IMAGE",
+        "NIS_FOCUS",
+        "NIS_SOSS",
+        "NIS_AMI",
+        "NIS_LAMP",
+        "NIS_WFSS",
+        "NIS_DARK",
+        "NIS_EXTCAL",
+        "NIS_TACONFIRM",
+        "NIS_TACQ",
+    ],
+    "nirspec": [
+        "NRS_IFU",
+        "NRS_MSASPEC",
+        "NRS_BRIGHTOBJ",
+        "NRS_DARK",
+        "NRS_AUTOWAVE",
+        "NRS_LAMP",
+        "NRS_AUTOFLAT",
+        "NRS_IMAGE",
+        "NRS_CONFIRM",
+        "NRS_FIXEDSLIT",
+        "NRS_MIMF",
+        "NRS_FOCUS",
+        "NRS_TACONFIRM",
+        "NRS_WATA",
+        "NRS_MSATA",
+    ],
+}
+
+EXPTYPES = {
+    "nircam": {
+        "imaging": "NRC_IMAGE",
+        "ts_imaging": "NRC_TSIMAGE",
+        "wfss": "NRC_WFSS",
+        "ts_grism": "NRC_TSGRISM",
+    },
+    "niriss": {
+        "imaging": "NIS_IMAGE",
+        "ami": "NIS_IMAGE",
+        "pom": "NIS_IMAGE",
+        "wfss": "NIS_WFSS",
+    },
+    "fgs": {"imaging": "FGS_IMAGE"},
+}
+
+EXPOSURE_PAGE_SUFFIX_ORDER = [
+    "uncal",
+    "dark",
+    "trapsfilled",
+    "ramp",
+    "rate",
+    "rateints",
+    "fitopt",
+    "cal",
+    "calints",
+    "msa",
+    "crf",
+    "crfints",
+    "bsub",
+    "bsubints",
+    "i2d",
+    "s2d",
+    "s3d",
+    "x1d",
+    "x1dints",
+    "cat",
+    "segm",
+    "c1d",
+    "psfstack",
+    "psfalign",
+    "psfsub",
+    "amiavg",
+    "aminorm",
+    "ami",
+    "psf-amiavg",
+    "phot",
+    "whtlt",
+    "wfscmb",
+]
 
 # Filename Component Lengths
 FILE_AC_CAR_ID_LEN = 4
@@ -221,109 +369,248 @@
 FILE_VISIT_LEN = 3
 
 # MSA metadata file do not have a standard suffix attached
-FILETYPE_WO_STANDARD_SUFFIX = 'msa.fits'
-
-FLAT_EXP_TYPES = {'nircam': ['NRC_FLAT'],
-                  'niriss': ['NIS_LAMP'],
-                  'miri': ['MIR_FLATIMAGE', 'MIR_FLATMRS'],
-                  'nirspec': ['NRS_AUTOFLAT', 'NRS_LAMP'],
-                  'fgs': ['FGS_INTFLAT']}
+FILETYPE_WO_STANDARD_SUFFIX = "msa.fits"
+
+FLAT_EXP_TYPES = {
+    "nircam": ["NRC_FLAT"],
+    "niriss": ["NIS_LAMP"],
+    "miri": ["MIR_FLATIMAGE", "MIR_FLATMRS"],
+    "nirspec": ["NRS_AUTOFLAT", "NRS_LAMP"],
+    "fgs": ["FGS_INTFLAT"],
+}
 
 # output subdirectories to keep track of via the filesytem monitor
-FILESYSTEM_MONITOR_SUBDIRS = ['logs', 'outputs', 'preview_images', 'thumbnails', 'all']
-
-FILTERS_PER_INSTRUMENT = {'fgs': [],
-                          'miri': ['F560W', 'F770W', 'F1000W', 'F1065C', 'F1130W', 'F1140C', 'F1280W', 'F1500W',
-                                   'F1550C', 'F1800W', 'F2100W', 'F2300C', 'F2550W', 'F2550WR', 'FLENS', 'FND', 'OPAQUE', 'P750L'],
-                          'nircam': ['F070W', 'F090W', 'F115W', 'F140M', 'F150W', 'F150W2', 'F182M', 'F187N', 'F200W', 'F210M',
-                                     'F212N', 'WLP4', 'F277W', 'F356W', 'F444W', 'F300M', 'F335M', 'F360M', 'F410M', 'F430M',
-                                     'F460M', 'F480M', 'F250M', 'F322W2'],
-                          'niriss': ['F090W', 'F115W', 'F140M', 'F150W', 'F200W', 'F277W', 'F356W', 'F380M', 'F430M', 'F444W',
-                                     'F480M', 'GR150C', 'GR150R'],
-                          'nirspec': ['CLEAR', 'F070LP', 'F100LP', 'F110W', 'F140X', 'F170LP', 'F290LP', 'OPAQUE', 'P750L']}
+FILESYSTEM_MONITOR_SUBDIRS = ["logs", "outputs", "preview_images", "thumbnails", "all"]
+
+FILTERS_PER_INSTRUMENT = {
+    "fgs": [],
+    "miri": [
+        "F560W",
+        "F770W",
+        "F1000W",
+        "F1065C",
+        "F1130W",
+        "F1140C",
+        "F1280W",
+        "F1500W",
+        "F1550C",
+        "F1800W",
+        "F2100W",
+        "F2300C",
+        "F2550W",
+        "F2550WR",
+        "FLENS",
+        "FND",
+        "OPAQUE",
+        "P750L",
+    ],
+    "nircam": [
+        "F070W",
+        "F090W",
+        "F115W",
+        "F140M",
+        "F150W",
+        "F150W2",
+        "F182M",
+        "F187N",
+        "F200W",
+        "F210M",
+        "F212N",
+        "WLP4",
+        "F277W",
+        "F356W",
+        "F444W",
+        "F300M",
+        "F335M",
+        "F360M",
+        "F410M",
+        "F430M",
+        "F460M",
+        "F480M",
+        "F250M",
+        "F322W2",
+    ],
+    "niriss": [
+        "F090W",
+        "F115W",
+        "F140M",
+        "F150W",
+        "F200W",
+        "F277W",
+        "F356W",
+        "F380M",
+        "F430M",
+        "F444W",
+        "F480M",
+        "GR150C",
+        "GR150R",
+    ],
+    "nirspec": [
+        "CLEAR",
+        "F070LP",
+        "F100LP",
+        "F110W",
+        "F140X",
+        "F170LP",
+        "F290LP",
+        "OPAQUE",
+        "P750L",
+    ],
+}
 
-FOUR_AMP_SUBARRAYS = ['WFSS128R', 'WFSS64R']
+FOUR_AMP_SUBARRAYS = ["WFSS128R", "WFSS64R"]
 
 # Names of full-frame apertures for all instruments
-FULL_FRAME_APERTURES = {'NIRCAM': ['NRCA1_FULL', 'NRCA2_FULL', 'NRCA3_FULL', 'NRCA4_FULL',
-                                   'NRCA5_FULL', 'NRCB1_FULL', 'NRCB2_FULL', 'NRCB3_FULL',
-                                   'NRCB4_FULL', 'NRCB5_FULL'],
-                        'NIRISS': ['NIS_CEN'],
-                        'NIRSPEC': ['NRS1_FULL', 'NRS2_FULL'],
-                        'MIRI': ['MIRIM_FULL'],
-                        'FGS': ['FGS1_FULL', 'FGS2_FULL']
-                        }
+FULL_FRAME_APERTURES = {
+    "NIRCAM": [
+        "NRCA1_FULL",
+        "NRCA2_FULL",
+        "NRCA3_FULL",
+        "NRCA4_FULL",
+        "NRCA5_FULL",
+        "NRCB1_FULL",
+        "NRCB2_FULL",
+        "NRCB3_FULL",
+        "NRCB4_FULL",
+        "NRCB5_FULL",
+    ],
+    "NIRISS": ["NIS_CEN"],
+    "NIRSPEC": ["NRS1_FULL", "NRS2_FULL"],
+    "MIRI": ["MIRIM_FULL"],
+    "FGS": ["FGS1_FULL", "FGS2_FULL"],
+}
 
 # Possible suffix types for nominal files
-GENERIC_SUFFIX_TYPES = ['uncal', 'cal', 'rateints', 'rate', 'trapsfilled', 'i2d',
-                        'x1dints', 'x1d', 's2d', 's3d', 'dark', 'crfints',
-                        'crf', 'ramp', 'fitopt', 'bsubints', 'bsub', 'cat', 'segm', 'c1d']
+GENERIC_SUFFIX_TYPES = [
+    "uncal",
+    "cal",
+    "rateints",
+    "rate",
+    "trapsfilled",
+    "i2d",
+    "x1dints",
+    "x1d",
+    "s2d",
+    "s3d",
+    "dark",
+    "crfints",
+    "crf",
+    "ramp",
+    "fitopt",
+    "bsubints",
+    "bsub",
+    "cat",
+    "segm",
+    "c1d",
+]
 
 # Gratings available for each instrument
-GRATING_PER_INSTRUMENT = {'fgs': [],
-                          'miri': [],
-                          'nircam': [],
-                          'niriss': [],
-                          'nirspec': ['G140M', 'G235M', 'G395M', 'G140H',
-                                      'G235H', 'G395H', 'PRISM', 'MIRROR']
-                          }
+GRATING_PER_INSTRUMENT = {
+    "fgs": [],
+    "miri": [],
+    "nircam": [],
+    "niriss": [],
+    "nirspec": [
+        "G140M",
+        "G235M",
+        "G395M",
+        "G140H",
+        "G235H",
+        "G395H",
+        "PRISM",
+        "MIRROR",
+    ],
+}
 
 # Filename extensions for guider data
-GUIDER_FILENAME_TYPE = ['gs-fg', 'gs-track', 'gs-id', 'gs-acq1', 'gs-acq2']
+GUIDER_FILENAME_TYPE = ["gs-fg", "gs-track", "gs-id", "gs-acq1", "gs-acq2"]
 
 # Possible suffix types for guider exposures
-GUIDER_SUFFIX_TYPES = ['stream', 'stacked_uncal', 'image_uncal', 'stacked_cal', 'image_cal']
+GUIDER_SUFFIX_TYPES = [
+    "stream",
+    "stacked_uncal",
+    "image_uncal",
+    "stacked_cal",
+    "image_cal",
+]
 
 # JWQL should ignore some filetypes in the filesystem.
-IGNORED_SUFFIXES = ['original', 'stream', 'x1d', 'x1dints', 'c1d', 'pre-image']
+IGNORED_SUFFIXES = ["original", "stream", "x1d", "x1dints", "c1d", "pre-image"]
 
 # Instrument monitor database tables
 INSTRUMENT_MONITOR_DATABASE_TABLES = {
-    'dark_monitor': ['<instrument>_dark_dark_current', '<instrument>_dark_pixel_stats', '<instrument>_dark_query_history'],
-    'bad_pixel_monitor': ['<instrument>_bad_pixel_stats', '<instrument>_bad_pixel_query_history'],
-    'cosmic_ray_monitor': ['<instrument>_cosmic_ray_stats', '<instrument>_cosmic_ray_query_history'],
-    'msata_monitor': ['<instrument>_ta_stats', '<instrument>_ta_query_history'],
-    'wata_monitor': ['<instrument>_ta_stats', '<instrument>_ta_query_history']
+    "dark_monitor": [
+        "<instrument>_dark_dark_current",
+        "<instrument>_dark_pixel_stats",
+        "<instrument>_dark_query_history",
+    ],
+    "bad_pixel_monitor": [
+        "<instrument>_bad_pixel_stats",
+        "<instrument>_bad_pixel_query_history",
+    ],
+    "cosmic_ray_monitor": [
+        "<instrument>_cosmic_ray_stats",
+        "<instrument>_cosmic_ray_query_history",
+    ],
+    "msata_monitor": ["<instrument>_ta_stats", "<instrument>_ta_query_history"],
+    "wata_monitor": ["<instrument>_ta_stats", "<instrument>_ta_query_history"],
 }
 
 INSTRUMENT_SERVICE_MATCH = {
-    'FGS': 'Mast.Jwst.Filtered.Fgs',
-    'MIRI': 'Mast.Jwst.Filtered.Miri',
-    'NIRCam': 'Mast.Jwst.Filtered.Nircam',
-    'NIRISS': 'Mast.Jwst.Filtered.Niriss',
-    'NIRSpec': 'Mast.Jwst.Filtered.Nirspec'}
+    "FGS": "Mast.Jwst.Filtered.Fgs",
+    "MIRI": "Mast.Jwst.Filtered.Miri",
+    "NIRCam": "Mast.Jwst.Filtered.Nircam",
+    "NIRISS": "Mast.Jwst.Filtered.Niriss",
+    "NIRSpec": "Mast.Jwst.Filtered.Nirspec",
+}
 
 # JWST data products
-JWST_DATAPRODUCTS = ['IMAGE', 'SPECTRUM', 'SED', 'TIMESERIES', 'VISIBILITY',
-                     'EVENTLIST', 'CUBE', 'CATALOG', 'ENGINEERING', 'NULL']
+JWST_DATAPRODUCTS = [
+    "IMAGE",
+    "SPECTRUM",
+    "SED",
+    "TIMESERIES",
+    "VISIBILITY",
+    "EVENTLIST",
+    "CUBE",
+    "CATALOG",
+    "ENGINEERING",
+    "NULL",
+]
 
 # Lowercase JWST instrument names
-JWST_INSTRUMENT_NAMES = sorted(['niriss', 'nircam', 'nirspec', 'miri', 'fgs'])
+JWST_INSTRUMENT_NAMES = sorted(["niriss", "nircam", "nirspec", "miri", "fgs"])
 
 # JWST instrument names with shorthand notation
-JWST_INSTRUMENT_NAMES_SHORTHAND = {'gui': 'fgs',
-                                   'mir': 'miri',
-                                   'nis': 'niriss',
-                                   'nrc': 'nircam',
-                                   'nrs': 'nirspec'}
+JWST_INSTRUMENT_NAMES_SHORTHAND = {
+    "gui": "fgs",
+    "mir": "miri",
+    "nis": "niriss",
+    "nrc": "nircam",
+    "nrs": "nirspec",
+}
 
 # Mixed case JWST instrument names
-JWST_INSTRUMENT_NAMES_MIXEDCASE = {'fgs': 'FGS',
-                                   'miri': 'MIRI',
-                                   'nircam': 'NIRCam',
-                                   'niriss': 'NIRISS',
-                                   'nirspec': 'NIRSpec'}
+JWST_INSTRUMENT_NAMES_MIXEDCASE = {
+    "fgs": "FGS",
+    "miri": "MIRI",
+    "nircam": "NIRCam",
+    "niriss": "NIRISS",
+    "nirspec": "NIRSpec",
+}
 
 # Upper case JWST instrument names
-JWST_INSTRUMENT_NAMES_UPPERCASE = {key: value.upper() for key, value in
-                                   JWST_INSTRUMENT_NAMES_MIXEDCASE.items()}
+JWST_INSTRUMENT_NAMES_UPPERCASE = {
+    key: value.upper() for key, value in JWST_INSTRUMENT_NAMES_MIXEDCASE.items()
+}
 
 # Astoquery service string for each JWST instrument
-JWST_MAST_SERVICES = ['Mast.Jwst.Filtered.{}'.format(value.title()) for value in
-                      JWST_INSTRUMENT_NAMES]
+JWST_MAST_SERVICES = [
+    "Mast.Jwst.Filtered.{}".format(value.title()) for value in JWST_INSTRUMENT_NAMES
+]
 
 # Possible values for look status filter
-LOOK_OPTIONS = ['New', 'Viewed']
+LOOK_OPTIONS = ["New", "Viewed"]
 
 # Maximum number of records returned by MAST for a single query
 MAST_QUERY_LIMIT = 500000
@@ -331,107 +618,163 @@
 # Expected position sensor values for MIRI. Used by the EDB monitor
 # to filter out bad values. Tuple values are the expected value and
 # the standard deviation associated with the value
-MIRI_POS_RATIO_VALUES = {'FW': {'FND': (-164.8728073, 0.204655346),
-                                'OPAQUE':  (380.6122145, 0.078856646),
-                                'F1000W':  (-24.15638797, 0.182865887),
-                                'F1130W':  (137.8245397, 0.24910941),
-                                'F1280W':  (-298.7062532, 0.229963508),
-                                'P750L':   (12.39439777, 0.246932037),
-                                'F1500W':  (-377.9888235, 0.263432415),
-                                'F1800W':  (435.9046314, 0.27885876),
-                                'F2100W':  (-126.5991201, 0.197193968),
-                                'F560W':   (218.0010353, 0.282554884),
-                                'FLENS':   (-212.7978283, 0.409300208),
-                                'F2300C':  (306.0488778, 0.265448583),
-                                'F770W':   (-62.48455213, 0.340861733),
-                                'F1550C':  (188.7366748, 0.291288105),
-                                'F2550W':  (-324.2364737, 0.176262309),
-                                'F1140C':  (82.81057729, 0.169772457),
-                                'F2550WR': (-255.5816917, 0.251581688),
-                                'F1065C':  (261.4486618, 0.16177981),
-                                },
-                         'CCC': {'CLOSED': (398.0376386, 0.173703628),
-                                 'OPEN': (504.0482685, 0.328112274)
-                                 },
-                         'GW14': {'SHORT': (626.9411005, 0.116034024),
-                                  'MEDIUM': (342.8685233, 0.127123169),
-                                  'LONG': (408.8339259, 0.117079193)
-                                  },
-                         'GW23': {'SHORT': (619.7948107, 0.215417336),
-                                  'MEDIUM': (373.1697309, 0.204314122),
-                                  'LONG': (441.6632325, 0.349161169)
-                                  }
-                         }
+MIRI_POS_RATIO_VALUES = {
+    "FW": {
+        "FND": (-164.8728073, 0.204655346),
+        "OPAQUE": (380.6122145, 0.078856646),
+        "F1000W": (-24.15638797, 0.182865887),
+        "F1130W": (137.8245397, 0.24910941),
+        "F1280W": (-298.7062532, 0.229963508),
+        "P750L": (12.39439777, 0.246932037),
+        "F1500W": (-377.9888235, 0.263432415),
+        "F1800W": (435.9046314, 0.27885876),
+        "F2100W": (-126.5991201, 0.197193968),
+        "F560W": (218.0010353, 0.282554884),
+        "FLENS": (-212.7978283, 0.409300208),
+        "F2300C": (306.0488778, 0.265448583),
+        "F770W": (-62.48455213, 0.340861733),
+        "F1550C": (188.7366748, 0.291288105),
+        "F2550W": (-324.2364737, 0.176262309),
+        "F1140C": (82.81057729, 0.169772457),
+        "F2550WR": (-255.5816917, 0.251581688),
+        "F1065C": (261.4486618, 0.16177981),
+    },
+    "CCC": {"CLOSED": (398.0376386, 0.173703628), "OPEN": (504.0482685, 0.328112274)},
+    "GW14": {
+        "SHORT": (626.9411005, 0.116034024),
+        "MEDIUM": (342.8685233, 0.127123169),
+        "LONG": (408.8339259, 0.117079193),
+    },
+    "GW23": {
+        "SHORT": (619.7948107, 0.215417336),
+        "MEDIUM": (373.1697309, 0.204314122),
+        "LONG": (441.6632325, 0.349161169),
+    },
+}
 
 # Suffix for msa files
-MSA_SUFFIX = ['msa']
+MSA_SUFFIX = ["msa"]
 
 # Available monitor names and their location for each JWST instrument
 MONITORS = {
-    'fgs': [('Bad Pixel Monitor', '/fgs/bad_pixel_monitor'),
-            ('Cosmic Ray Monitor', '#'),
-            ('Dark Current Monitor', '/fgs/dark_monitor'),
-            ('EDB Telemetry Monitor', '/fgs/edb_monitor'),
-            ('Readnoise Monitor', '/fgs/readnoise_monitor')],
-    'miri': [('Bad Pixel Monitor', '/miri/bad_pixel_monitor'),
-             ('Cosmic Ray Monitor', '#'),
-             ('Dark Current Monitor', '/miri/dark_monitor'),
-             ('EDB Telemetry Monitor', '/miri/edb_monitor'),
-             ('Readnoise Monitor', '/miri/readnoise_monitor')],
-    'nircam': [('Bad Pixel Monitor', '/nircam/bad_pixel_monitor'),
-               ('Bias Monitor', '/nircam/bias_monitor'),
-               ('Cosmic Ray Monitor', '#'),
-               ('Dark Current Monitor', '/nircam/dark_monitor'),
-               ('EDB Telemetry Monitor', '/nircam/edb_monitor'),
-               ('Readnoise Monitor', '/nircam/readnoise_monitor')],
-    'niriss': [('Bad Pixel Monitor', '/niriss/bad_pixel_monitor'),
-               ('Bias Monitor', '/niriss/bias_monitor'),
-               ('Cosmic Ray Monitor', '#'),
-               ('Dark Current Monitor', '/niriss/dark_monitor'),
-               ('EDB Telemetry Monitor', '/niriss/edb_monitor'),
-               ('Readnoise Monitor', '/niriss/readnoise_monitor')],
-    'nirspec': [('Bad Pixel Monitor', '/nirspec/bad_pixel_monitor'),
-                ('Bias Monitor', '/nirspec/bias_monitor'),
-                ('Dark Monitor', '/nirspec/dark_monitor'),
-                ('Cosmic Ray Monitor', '#'),
-                ('EDB Telemetry Monitor', '/nirspec/edb_monitor'),
-                ('MSATA Monitor', '/nirspec/msata_monitor'),
-                ('Readnoise Monitor', '/nirspec/readnoise_monitor'),
-                ('WATA Monitor', '/nirspec/wata_monitor')
-                ]}
+    "fgs": [
+        ("Bad Pixel Monitor", "/fgs/bad_pixel_monitor"),
+        ("Cosmic Ray Monitor", "#"),
+        ("Dark Current Monitor", "/fgs/dark_monitor"),
+        ("EDB Telemetry Monitor", "/fgs/edb_monitor"),
+        ("Readnoise Monitor", "/fgs/readnoise_monitor"),
+    ],
+    "miri": [
+        ("Bad Pixel Monitor", "/miri/bad_pixel_monitor"),
+        ("Cosmic Ray Monitor", "#"),
+        ("Dark Current Monitor", "/miri/dark_monitor"),
+        ("EDB Telemetry Monitor", "/miri/edb_monitor"),
+        ("Readnoise Monitor", "/miri/readnoise_monitor"),
+    ],
+    "nircam": [
+        ("Bad Pixel Monitor", "/nircam/bad_pixel_monitor"),
+        ("Bias Monitor", "/nircam/bias_monitor"),
+        ("Cosmic Ray Monitor", "#"),
+        ("Dark Current Monitor", "/nircam/dark_monitor"),
+        ("EDB Telemetry Monitor", "/nircam/edb_monitor"),
+        ("Readnoise Monitor", "/nircam/readnoise_monitor"),
+    ],
+    "niriss": [
+        ("Bad Pixel Monitor", "/niriss/bad_pixel_monitor"),
+        ("Bias Monitor", "/niriss/bias_monitor"),
+        ("Cosmic Ray Monitor", "#"),
+        ("Dark Current Monitor", "/niriss/dark_monitor"),
+        ("EDB Telemetry Monitor", "/niriss/edb_monitor"),
+        ("Readnoise Monitor", "/niriss/readnoise_monitor"),
+    ],
+    "nirspec": [
+        ("Bad Pixel Monitor", "/nirspec/bad_pixel_monitor"),
+        ("Bias Monitor", "/nirspec/bias_monitor"),
+        ("Dark Monitor", "/nirspec/dark_monitor"),
+        ("Cosmic Ray Monitor", "#"),
+        ("EDB Telemetry Monitor", "/nirspec/edb_monitor"),
+        ("MSATA Monitor", "/nirspec/msata_monitor"),
+        ("Readnoise Monitor", "/nirspec/readnoise_monitor"),
+        ("WATA Monitor", "/nirspec/wata_monitor"),
+    ],
+}
 
 # Possible suffix types for coronograph exposures
-NIRCAM_CORONAGRAPHY_SUFFIX_TYPES = ['psfstack', 'psfalign', 'psfsub']
+NIRCAM_CORONAGRAPHY_SUFFIX_TYPES = ["psfstack", "psfalign", "psfsub"]
 
 # NIRCam subarrays that use four amps for readout
-NIRCAM_FOUR_AMP_SUBARRAYS = ['WFSS128R', 'WFSS64R']
+NIRCAM_FOUR_AMP_SUBARRAYS = ["WFSS128R", "WFSS64R"]
 
 # NIRCam long wavelength detector names
-NIRCAM_LONGWAVE_DETECTORS = ['NRCA5', 'NRCB5']
+NIRCAM_LONGWAVE_DETECTORS = ["NRCA5", "NRCB5"]
 
 # NIRCam short wavelength detector names
-NIRCAM_SHORTWAVE_DETECTORS = ['NRCA1', 'NRCA2', 'NRCA3', 'NRCA4',
-                              'NRCB1', 'NRCB2', 'NRCB3', 'NRCB4']
+NIRCAM_SHORTWAVE_DETECTORS = [
+    "NRCA1",
+    "NRCA2",
+    "NRCA3",
+    "NRCA4",
+    "NRCB1",
+    "NRCB2",
+    "NRCB3",
+    "NRCB4",
+]
 
 # NIRCam subarrays that use either one or four amps
-NIRCAM_SUBARRAYS_ONE_OR_FOUR_AMPS = ['SUBGRISMSTRIPE64', 'SUBGRISMSTRIPE128', 'SUBGRISMSTRIPE256']
+NIRCAM_SUBARRAYS_ONE_OR_FOUR_AMPS = [
+    "SUBGRISMSTRIPE64",
+    "SUBGRISMSTRIPE128",
+    "SUBGRISMSTRIPE256",
+]
 
 # Possible suffix types for AMI files
-NIRISS_AMI_SUFFIX_TYPES = ['amiavg', 'aminorm', 'ami', 'psf-amiavg']
+NIRISS_AMI_SUFFIX_TYPES = ["amiavg", "aminorm", "ami", "psf-amiavg"]
 
 # Base name for the file listing the preview images for a given instrument.
 # The complete name will have "_{instrument.lower}.txt" added to the end of this.
-PREVIEW_IMAGE_LISTFILE = 'preview_image_inventory'
+PREVIEW_IMAGE_LISTFILE = "preview_image_inventory"
 
 # All possible proposal categories
-PROPOSAL_CATEGORIES = ['AR', 'CAL', 'COM', 'DD', 'ENG', 'GO', 'GTO', 'NASA', 'SURVEY']
-
-PUPILS_PER_INSTRUMENT = {'nircam': ['CLEAR', 'FLAT', 'F162M', 'F164N', 'GDHS0', 'GDHS60', 'MASKBAR', 'MASKIPR', 'MASKRND',
-                                    'PINHOLES', 'WLM8', 'WLP8', 'F323N', 'F405N', 'F466N', 'F470N', 'GRISMC', 'GRISMR', 'GRISMV2', 'GRISMV3'],
-                         'niriss': ['CLEARP', 'F090W', 'F115W', 'F140M', 'F150W', 'F158M', 'F200W', 'GR700XD', 'NRM'],
-                         'nirspec': [],
-                         'miri': [],
-                         'fgs': []}
+PROPOSAL_CATEGORIES = ["AR", "CAL", "COM", "DD", "ENG", "GO", "GTO", "NASA", "SURVEY"]
+
+PUPILS_PER_INSTRUMENT = {
+    "nircam": [
+        "CLEAR",
+        "FLAT",
+        "F162M",
+        "F164N",
+        "GDHS0",
+        "GDHS60",
+        "MASKBAR",
+        "MASKIPR",
+        "MASKRND",
+        "PINHOLES",
+        "WLM8",
+        "WLP8",
+        "F323N",
+        "F405N",
+        "F466N",
+        "F470N",
+        "GRISMC",
+        "GRISMR",
+        "GRISMV2",
+        "GRISMV3",
+    ],
+    "niriss": [
+        "CLEARP",
+        "F090W",
+        "F115W",
+        "F140M",
+        "F150W",
+        "F158M",
+        "F200W",
+        "GR700XD",
+        "NRM",
+    ],
+    "nirspec": [],
+    "miri": [],
+    "fgs": [],
+}
 
 
 # Keep keys defined via class as they are used many places with potential mispellings
@@ -461,7 +804,7 @@ class QueryConfigKeys:
     QueryConfigKeys.PROPOSAL_CATEGORY: [],
     QueryConfigKeys.LOOK_STATUS: [],
     QueryConfigKeys.NUM_PER_PAGE: 100,
-    QueryConfigKeys.SORT_TYPE: 'Recent',
+    QueryConfigKeys.SORT_TYPE: "Recent",
     QueryConfigKeys.DATE_RANGE: "",
     QueryConfigKeys.ANOMALIES: {},
     QueryConfigKeys.APERTURES: {},
@@ -471,89 +814,205 @@ class QueryConfigKeys:
     QueryConfigKeys.GRATINGS: {},
     QueryConfigKeys.PUPILS: {},
     QueryConfigKeys.READ_PATTS: {},
-    QueryConfigKeys.SUBARRAYS: {}
+    QueryConfigKeys.SUBARRAYS: {},
 }
 
 # RAPID-style readout patterns for each instrument. Added so we can
 # differentiate in MAST searches for e.g. the dark current monitor
-RAPID_READPATTERNS = {'fgs': ['FGSRAPID'],
-                      'miri': ['FAST', 'FASTR1', 'SLOW', 'SLOWR1', 'FASTGRPAVG',
-                               'FASTGRPAVG8', 'FASTGRPAVG16', 'FASTGRPAVG32',
-                               'FASTGRPAVG64', 'FASTR100'],
-                      'nircam': ['RAPID'],
-                      'niriss': ['NISRAPID'],
-                      'nirspec': ['NRSRAPID', 'NRSIRS2RAPID']}
-
-READPATT_PER_INSTRUMENT = {'fgs': ['FGS', 'FGSRAPID', 'FGS60', 'FGS840', 'FGS8370'],
-                           'miri': ['FAST', 'FASTR1', 'SLOW', 'SLOWR1', 'FASTGRPAVG',
-                                    'FASTGRPAVG8', 'FASTGRPAVG16', 'FASTGRPAVG32',
-                                    'FASTGRPAVG64', 'FASTR100'],
-                           'nircam': ['RAPID', 'SHALLOW2', 'BRIGHT2', 'MEDIUM2', 'SHALLOW4',
-                                      'MEDIUM8', 'BRIGHT1', 'DEEP2', 'DEEP8'],
-                           'niriss': ['NISRAPID', 'NIS'],
-                           'nirspec': ['NRS', 'NRSRAPID', 'NRSIRS2RAPID',
-                                       'NRSRAPIDD2', 'NRSRAPIDD6']}
-
-
-REPORT_KEYS_PER_INSTRUMENT = {'fgs': ['proposal', 'exp_type',
-                                      'expstart', 'filter', 'aperture',
-                                      'detector', 'subarray', 'viewed'],
-                              'miri': ['proposal', 'exp_type',
-                                       'expstart', 'filter', 'aperture',
-                                       'detector', 'subarray', 'viewed'],
-                              'nircam': ['proposal', 'exp_type', 'expstart',
-                                         'filter', 'pupil', 'aperture',
-                                         'detector', 'subarray', 'viewed'],
-                              'niriss': ['proposal', 'exp_type', 'expstart',
-                                         'filter', 'pupil', 'aperture',
-                                         'detector', 'subarray', 'viewed'],
-                              'nirspec': ['exp_type', 'filter', 'grating',
-                                          'read_patt_num', 'viewed']}
+RAPID_READPATTERNS = {
+    "fgs": ["FGSRAPID"],
+    "miri": [
+        "FAST",
+        "FASTR1",
+        "SLOW",
+        "SLOWR1",
+        "FASTGRPAVG",
+        "FASTGRPAVG8",
+        "FASTGRPAVG16",
+        "FASTGRPAVG32",
+        "FASTGRPAVG64",
+        "FASTR100",
+    ],
+    "nircam": ["RAPID"],
+    "niriss": ["NISRAPID"],
+    "nirspec": ["NRSRAPID", "NRSIRS2RAPID"],
+}
+
+READPATT_PER_INSTRUMENT = {
+    "fgs": ["FGS", "FGSRAPID", "FGS60", "FGS840", "FGS8370"],
+    "miri": [
+        "FAST",
+        "FASTR1",
+        "SLOW",
+        "SLOWR1",
+        "FASTGRPAVG",
+        "FASTGRPAVG8",
+        "FASTGRPAVG16",
+        "FASTGRPAVG32",
+        "FASTGRPAVG64",
+        "FASTR100",
+    ],
+    "nircam": [
+        "RAPID",
+        "SHALLOW2",
+        "BRIGHT2",
+        "MEDIUM2",
+        "SHALLOW4",
+        "MEDIUM8",
+        "BRIGHT1",
+        "DEEP2",
+        "DEEP8",
+    ],
+    "niriss": ["NISRAPID", "NIS"],
+    "nirspec": ["NRS", "NRSRAPID", "NRSIRS2RAPID", "NRSRAPIDD2", "NRSRAPIDD6"],
+}
 
-# Possible values for sort order
-SORT_OPTIONS = ['Ascending', 'Descending', 'Recent', 'Oldest']
 
-SUBARRAYS_ONE_OR_FOUR_AMPS = ['SUBGRISMSTRIPE64', 'SUBGRISMSTRIPE128', 'SUBGRISMSTRIPE256']
+REPORT_KEYS_PER_INSTRUMENT = {
+    "fgs": [
+        "proposal",
+        "exp_type",
+        "expstart",
+        "filter",
+        "aperture",
+        "detector",
+        "subarray",
+        "viewed",
+    ],
+    "miri": [
+        "proposal",
+        "exp_type",
+        "expstart",
+        "filter",
+        "aperture",
+        "detector",
+        "subarray",
+        "viewed",
+    ],
+    "nircam": [
+        "proposal",
+        "exp_type",
+        "expstart",
+        "filter",
+        "pupil",
+        "aperture",
+        "detector",
+        "subarray",
+        "viewed",
+    ],
+    "niriss": [
+        "proposal",
+        "exp_type",
+        "expstart",
+        "filter",
+        "pupil",
+        "aperture",
+        "detector",
+        "subarray",
+        "viewed",
+    ],
+    "nirspec": ["exp_type", "filter", "grating", "read_patt_num", "viewed"],
+}
 
-SUBARRAYS_PER_INSTRUMENT = {'nircam': ['FULL', 'FULLP', 'SUB640', 'SUB320', 'SUB160', 'SUB400P', 'SUB160P', 'SUB64P',
-                                       'SUB32TATS', 'SUB640A210R', 'SUB640ASWB', 'SUB320A335R', 'SUB320A430R', 'SUB320ALWB',
-                                       'SUBGRISM256', 'SUBGRISM128', 'SUBGRISM64', 'SUB32TATSGRISM'],
-                            'niriss': ['FULL', 'SUBSTRIP96', 'SUBSTRIP256', 'SUB80', 'SUB64', 'SUB128', 'SUB256',
-                                       'WFSS64R', 'WFSS128R', 'WFSS64C', 'WFSS128C', 'SUBAMPCAL', 'SUBTAAMI', 'SUBTASOSS'],
-                            'nirspec': [],
-                            'miri': ['BRIGHTSKY', 'FULL', 'MASK1065', 'MASK1140', 'MASK1550', 'MASKLYOT', 'SLITLESSPRISM',
-                                     'SUB64', 'SUB128', 'SUB256'],
-                            'fgs': []}
+# Possible values for sort order
+SORT_OPTIONS = ["Ascending", "Descending", "Recent", "Oldest"]
+
+SUBARRAYS_ONE_OR_FOUR_AMPS = [
+    "SUBGRISMSTRIPE64",
+    "SUBGRISMSTRIPE128",
+    "SUBGRISMSTRIPE256",
+]
+
+SUBARRAYS_PER_INSTRUMENT = {
+    "nircam": [
+        "FULL",
+        "FULLP",
+        "SUB640",
+        "SUB320",
+        "SUB160",
+        "SUB400P",
+        "SUB160P",
+        "SUB64P",
+        "SUB32TATS",
+        "SUB640A210R",
+        "SUB640ASWB",
+        "SUB320A335R",
+        "SUB320A430R",
+        "SUB320ALWB",
+        "SUBGRISM256",
+        "SUBGRISM128",
+        "SUBGRISM64",
+        "SUB32TATSGRISM",
+    ],
+    "niriss": [
+        "FULL",
+        "SUBSTRIP96",
+        "SUBSTRIP256",
+        "SUB80",
+        "SUB64",
+        "SUB128",
+        "SUB256",
+        "WFSS64R",
+        "WFSS128R",
+        "WFSS64C",
+        "WFSS128C",
+        "SUBAMPCAL",
+        "SUBTAAMI",
+        "SUBTASOSS",
+    ],
+    "nirspec": [],
+    "miri": [
+        "BRIGHTSKY",
+        "FULL",
+        "MASK1065",
+        "MASK1140",
+        "MASK1550",
+        "MASKLYOT",
+        "SLITLESSPRISM",
+        "SUB64",
+        "SUB128",
+        "SUB256",
+    ],
+    "fgs": [],
+}
 
 # Filename suffixes that need to include the association value in the suffix in
 # order to identify the preview image file. This should only be crf and crfints,
 # since those are essentially level 2 files that are output by the level 3 pipeline.
-SUFFIXES_TO_ADD_ASSOCIATION = ['crf', 'crfints']
+SUFFIXES_TO_ADD_ASSOCIATION = ["crf", "crfints"]
 
 # Filename suffixes where data have been averaged over integrations
-SUFFIXES_WITH_AVERAGED_INTS = ['rate', 'cal', 'crf', 'i2d', 'bsub']
+SUFFIXES_WITH_AVERAGED_INTS = ["rate", "cal", "crf", "i2d", "bsub"]
 
 # boolean accessed according to a viewed flag
-THUMBNAIL_FILTER_LOOK = ['New', 'Viewed']
+THUMBNAIL_FILTER_LOOK = ["New", "Viewed"]
 
 # Base name for the file listing the thumbnail images for a given instrument.
 # The complete name will have "_{instrument.lower}.txt" added to the end of this.
-THUMBNAIL_LISTFILE = 'thumbnail_inventory'
+THUMBNAIL_LISTFILE = "thumbnail_inventory"
 
 # Possible suffix types for time-series exposures
-TIME_SERIES_SUFFIX_TYPES = ['phot', 'whtlt']
+TIME_SERIES_SUFFIX_TYPES = ["phot", "whtlt"]
 
 # Possible suffix types for WFS&C files
-WFSC_SUFFIX_TYPES = ['wfscmb']
+WFSC_SUFFIX_TYPES = ["wfscmb"]
 
 # Concatenate all suffix types (ordered to ensure successful matching)
-FILE_SUFFIX_TYPES = GUIDER_SUFFIX_TYPES + GENERIC_SUFFIX_TYPES + \
-    TIME_SERIES_SUFFIX_TYPES + NIRCAM_CORONAGRAPHY_SUFFIX_TYPES + \
-    NIRISS_AMI_SUFFIX_TYPES + WFSC_SUFFIX_TYPES + MSA_SUFFIX
+FILE_SUFFIX_TYPES = (
+    GUIDER_SUFFIX_TYPES
+    + GENERIC_SUFFIX_TYPES
+    + TIME_SERIES_SUFFIX_TYPES
+    + NIRCAM_CORONAGRAPHY_SUFFIX_TYPES
+    + NIRISS_AMI_SUFFIX_TYPES
+    + WFSC_SUFFIX_TYPES
+    + MSA_SUFFIX
+)
 
 # Instrument Documentation Links
-URL_DICT = {'fgs': 'https://jwst-docs.stsci.edu/jwst-observatory-hardware/jwst-fine-guidance-sensor',
-            'miri': 'https://jwst-docs.stsci.edu/jwst-mid-infrared-instrument',
-            'niriss': 'https://jwst-docs.stsci.edu/jwst-near-infrared-imager-and-slitless-spectrograph',
-            'nirspec': 'https://jwst-docs.stsci.edu/jwst-near-infrared-spectrograph',
-            'nircam': 'https://jwst-docs.stsci.edu/jwst-near-infrared-camera'}
+URL_DICT = {
+    "fgs": "https://jwst-docs.stsci.edu/jwst-observatory-hardware/jwst-fine-guidance-sensor",
+    "miri": "https://jwst-docs.stsci.edu/jwst-mid-infrared-instrument",
+    "niriss": "https://jwst-docs.stsci.edu/jwst-near-infrared-imager-and-slitless-spectrograph",
+    "nirspec": "https://jwst-docs.stsci.edu/jwst-near-infrared-spectrograph",
+    "nircam": "https://jwst-docs.stsci.edu/jwst-near-infrared-camera",
+}
diff --git a/jwql/website/apps/jwql/data_containers.py b/jwql/website/apps/jwql/data_containers.py
index 23862e07d..170390673 100644
--- a/jwql/website/apps/jwql/data_containers.py
+++ b/jwql/website/apps/jwql/data_containers.py
@@ -406,8 +406,8 @@ def get_available_suffixes(all_suffixes, return_untracked=True):
     untracked_suffixes = set(all_suffixes)
     for poss_suffix in EXPOSURE_PAGE_SUFFIX_ORDER:
         if 'crf' not in poss_suffix:
-            if (poss_suffix in all_suffixes
-                    and poss_suffix not in suffixes):
+            if (poss_suffix in all_suffixes and
+                poss_suffix not in suffixes):
                 suffixes.append(poss_suffix)
                 untracked_suffixes.remove(poss_suffix)
         else:
@@ -417,8 +417,8 @@ def get_available_suffixes(all_suffixes, return_untracked=True):
             # So in this case, we strip the e.g. o001 from the
             # suffixes and check which list elements match.
             for image_suffix in all_suffixes:
-                if (image_suffix.endswith(poss_suffix)
-                        and image_suffix not in suffixes):
+                if (image_suffix.endswith(poss_suffix) and
+                    image_suffix not in suffixes):
                     suffixes.append(image_suffix)
                     untracked_suffixes.remove(image_suffix)
 
@@ -1407,7 +1407,7 @@ def get_proposals_by_category(instrument):
     unique_results = list(map(dict, set(tuple(sorted(sub.items())) for sub in results)))
 
     # Make a dictionary of {program: category} to pull from
-    proposals_by_category = {d['program']:d['category'] for d in unique_results}
+    proposals_by_category = {d['program']: d['category'] for d in unique_results}
 
     return proposals_by_category
 
@@ -1504,7 +1504,7 @@ def get_rootnames_from_query(parameters):
     """
 
     filtered_rootnames = []
-    DATE_FORMAT = "%Y/%m/%d %I:%M%p" #noqa n806
+    DATE_FORMAT = "%Y/%m/%d %I:%M%p"  # noqa n806
 
     # Parse DATE_RANGE string into correct format
     date_range = parameters[QueryConfigKeys.DATE_RANGE]
@@ -1513,7 +1513,7 @@ def get_rootnames_from_query(parameters):
     start_datetime = datetime.strptime(start_date_range, DATE_FORMAT)
     stop_datetime = datetime.strptime(stop_date_range, DATE_FORMAT)
     # store as astroquery Time objects in isot format to be used in filter (with mjd format)
-    start_time  = Time(start_datetime.isoformat(), format="isot")
+    start_time = Time(start_datetime.isoformat(), format="isot")
     stop_time = Time(stop_datetime.isoformat(), format="isot")
 
     # Each Query Selection is Instrument specific
@@ -2002,6 +2002,7 @@ def thumbnails_ajax(inst, proposal, obs_num=None):
 
     return data_dict
 
+
 def thumbnails_query_ajax(rootnames):
     """Generate a page that provides data necessary to render the
     ``thumbnails`` template.
diff --git a/jwql/website/apps/jwql/forms.py b/jwql/website/apps/jwql/forms.py
index f156350b8..5b7d7ac49 100644
--- a/jwql/website/apps/jwql/forms.py
+++ b/jwql/website/apps/jwql/forms.py
@@ -62,7 +62,7 @@ def view_function(request):
 from jwql.utils.constants import (ANOMALY_CHOICES_PER_INSTRUMENT, ANOMALIES_PER_INSTRUMENT, APERTURES_PER_INSTRUMENT, DETECTOR_PER_INSTRUMENT,
                                   EXP_TYPE_PER_INSTRUMENT, FILTERS_PER_INSTRUMENT, GENERIC_SUFFIX_TYPES, GRATING_PER_INSTRUMENT,
                                   GUIDER_FILENAME_TYPE, JWST_INSTRUMENT_NAMES_MIXEDCASE, JWST_INSTRUMENT_NAMES_SHORTHAND,
-                                  READPATT_PER_INSTRUMENT, IGNORED_SUFFIXES,  SUBARRAYS_PER_INSTRUMENT, PUPILS_PER_INSTRUMENT,
+                                  READPATT_PER_INSTRUMENT, IGNORED_SUFFIXES, SUBARRAYS_PER_INSTRUMENT, PUPILS_PER_INSTRUMENT,
                                   LOOK_OPTIONS, SORT_OPTIONS, PROPOSAL_CATEGORIES)
 from jwql.utils.utils import (get_config, get_rootnames_for_instrument_proposal, filename_parser, query_format)
 
diff --git a/jwql/website/apps/jwql/urls.py b/jwql/website/apps/jwql/urls.py
index 6c054ed72..afe91f441 100644
--- a/jwql/website/apps/jwql/urls.py
+++ b/jwql/website/apps/jwql/urls.py
@@ -98,7 +98,7 @@
     re_path(r'^ajax/(?P<inst>({}))/(?P<file_root>.+)_(?P<filetype>.+)/explore_image/$'.format(instruments), views.explore_image_ajax,
             name='explore_image_ajax'),
     re_path(r'^ajax/(?P<inst>({}))/(?P<file_root>.+)_(?P<filetype>.+)/explore_image/plot_(?P<line_plots>(true|false))/ext_(?P<ext_name>.+)/int1_(?P<int1_nr>.+)/grp1_(?P<grp1_nr>.+)/int2_(?P<int2_nr>.+)/grp2_(?P<grp2_nr>.+)/$'.format(instruments),
-             views.explore_image_ajax, name='explore_image_ajax'),
+            views.explore_image_ajax, name='explore_image_ajax'),
     re_path(r'^ajax/(?P<inst>({}))/archive/(?P<proposal>[\d]{{1,5}})/obs(?P<observation>[\d]{{1,3}})/$'.format(instruments),
             views.archive_thumbnails_ajax, name='archive_thumb_ajax'),
     re_path(r'^ajax/viewed/(?P<file_root>.+)/$', views.toggle_viewed_ajax, name='toggle_viewed_ajax'),
diff --git a/jwql/website/apps/jwql/views.py b/jwql/website/apps/jwql/views.py
index 30e6a0a26..3fc36eaa7 100644
--- a/jwql/website/apps/jwql/views.py
+++ b/jwql/website/apps/jwql/views.py
@@ -218,6 +218,7 @@ def save_page_navigation_data_ajax(request):
     context = {'item': request.session['navigation_data']}
     return JsonResponse(context, json_dumps_params={'indent': 2})
 
+
 def archived_proposals(request, inst):
     """Generate the page listing all archived proposals in the database
 

From ea4ae52c2a4a1b80fb3834972455f2eb22dd0d0b Mon Sep 17 00:00:00 2001
From: Bradley Sappington <bsappington@stsci.edu>
Date: Wed, 8 Nov 2023 12:33:34 -0500
Subject: [PATCH 5/7] more pep8

---
 jwql/utils/constants.py                   | 14 +++++++-------
 jwql/website/apps/jwql/data_containers.py |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jwql/utils/constants.py b/jwql/utils/constants.py
index 39db77e92..499921019 100644
--- a/jwql/utils/constants.py
+++ b/jwql/utils/constants.py
@@ -999,13 +999,13 @@ class QueryConfigKeys:
 
 # Concatenate all suffix types (ordered to ensure successful matching)
 FILE_SUFFIX_TYPES = (
-    GUIDER_SUFFIX_TYPES
-    + GENERIC_SUFFIX_TYPES
-    + TIME_SERIES_SUFFIX_TYPES
-    + NIRCAM_CORONAGRAPHY_SUFFIX_TYPES
-    + NIRISS_AMI_SUFFIX_TYPES
-    + WFSC_SUFFIX_TYPES
-    + MSA_SUFFIX
+    GUIDER_SUFFIX_TYPES +
+    GENERIC_SUFFIX_TYPES +
+    TIME_SERIES_SUFFIX_TYPES +
+    NIRCAM_CORONAGRAPHY_SUFFIX_TYPES +
+    NIRISS_AMI_SUFFIX_TYPES +
+    WFSC_SUFFIX_TYPES +
+    MSA_SUFFIX
 )
 
 # Instrument Documentation Links
diff --git a/jwql/website/apps/jwql/data_containers.py b/jwql/website/apps/jwql/data_containers.py
index 170390673..5f8033e04 100644
--- a/jwql/website/apps/jwql/data_containers.py
+++ b/jwql/website/apps/jwql/data_containers.py
@@ -406,10 +406,10 @@ def get_available_suffixes(all_suffixes, return_untracked=True):
     untracked_suffixes = set(all_suffixes)
     for poss_suffix in EXPOSURE_PAGE_SUFFIX_ORDER:
         if 'crf' not in poss_suffix:
-            if (poss_suffix in all_suffixes and
-                poss_suffix not in suffixes):
-                suffixes.append(poss_suffix)
-                untracked_suffixes.remove(poss_suffix)
+            if (poss_suffix in all_suffixes
+                and poss_suffix not in suffixes):
+                    suffixes.append(poss_suffix)
+                    untracked_suffixes.remove(poss_suffix)
         else:
             # EXPOSURE_PAGE_SUFFIX_ORDER contains crf and crfints,
             # but the actual suffixes in the data will be e.g. o001_crf,

From 445b84ba96806daa62c195e608a62889578761a6 Mon Sep 17 00:00:00 2001
From: Bradley Sappington <bsappington@stsci.edu>
Date: Wed, 8 Nov 2023 12:43:04 -0500
Subject: [PATCH 6/7] fix anti-pattern

---
 jwql/utils/constants.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jwql/utils/constants.py b/jwql/utils/constants.py
index 499921019..39db77e92 100644
--- a/jwql/utils/constants.py
+++ b/jwql/utils/constants.py
@@ -999,13 +999,13 @@ class QueryConfigKeys:
 
 # Concatenate all suffix types (ordered to ensure successful matching)
 FILE_SUFFIX_TYPES = (
-    GUIDER_SUFFIX_TYPES +
-    GENERIC_SUFFIX_TYPES +
-    TIME_SERIES_SUFFIX_TYPES +
-    NIRCAM_CORONAGRAPHY_SUFFIX_TYPES +
-    NIRISS_AMI_SUFFIX_TYPES +
-    WFSC_SUFFIX_TYPES +
-    MSA_SUFFIX
+    GUIDER_SUFFIX_TYPES
+    + GENERIC_SUFFIX_TYPES
+    + TIME_SERIES_SUFFIX_TYPES
+    + NIRCAM_CORONAGRAPHY_SUFFIX_TYPES
+    + NIRISS_AMI_SUFFIX_TYPES
+    + WFSC_SUFFIX_TYPES
+    + MSA_SUFFIX
 )
 
 # Instrument Documentation Links

From bafa6c2a5d700945e9591d15c0f5dd2bd6b1e2a5 Mon Sep 17 00:00:00 2001
From: Bradley Sappington <bsappington@stsci.edu>
Date: Wed, 8 Nov 2023 14:18:36 -0500
Subject: [PATCH 7/7] put DateRange above GENERAL options row

---
 .../apps/jwql/templates/jwql_query.html       | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/jwql/website/apps/jwql/templates/jwql_query.html b/jwql/website/apps/jwql/templates/jwql_query.html
index 78cb34e74..6274c5a83 100644
--- a/jwql/website/apps/jwql/templates/jwql_query.html
+++ b/jwql/website/apps/jwql/templates/jwql_query.html
@@ -73,6 +73,29 @@ <h1>Dynamic Query Form</h1>
             <form class='form-horizontal' id='searchform' method='post'>
                 <hr class="col-md-12">
                 <div class='instrument-form-group' id='instrument_form_group'>
+                    <div style="display: flex" id="DATERANGE">
+                        <div class="col-md-3">
+                            <span class="help-block">Date Range</span>
+                            <div class="form-control" id='date_range'>
+                                <input type="text" name="date_range" style="cursor: pointer; padding: 5px 10px; width: 100%"/>
+                                <script>
+                                $(function() {
+                                    $('input[name="date_range"]').daterangepicker({
+                                        timePicker: true,
+                                        timePicker24Hour: true,
+                                        showDropdowns: true,
+                                        minDate: "2021/12/05",
+                                        startDate: "2021/12/05",
+                                        endDate: moment().startOf('hour'),
+                                        locale: {
+                                        format: 'YYYY/MM/DD hh:mmA'
+                                        }
+                                    });
+                                });
+                                </script>
+                            </div>
+                        </div>
+                    </div>
                     <!-- Initial INSTRUMENT Checkbox -->
                     <div style="display: flex" id="GENERAL">
                         <div class="col-md-2">
@@ -105,27 +128,6 @@ <h1>Dynamic Query Form</h1>
                                 {% endfor %}
                             </div>
                         </div>
-                        <div class="col-md-2">
-                            <span class="help-block">Date Range</span>
-                            <div class="form-control" id='date_range'>
-                                <input type="text" name="date_range" style="cursor: pointer; padding: 5px 10px; width: 100%"/>
-                                <script>
-                                $(function() {
-                                    $('input[name="date_range"]').daterangepicker({
-                                        timePicker: true,
-                                        timePicker24Hour: true,
-                                        showDropdowns: true,
-                                        minDate: "2021/12/05",
-                                        startDate: "2021/12/05",
-                                        endDate: moment().startOf('hour'),
-                                        locale: {
-                                        format: 'YYYY/MM/DD hh:mmA'
-                                        }
-                                    });
-                                });
-                                </script>
-                            </div>
-                        </div>
                         <div class="col-md-2">
                             <span class="help-block">Sort Type</span>
                             <div class="form-control" id='sort_type'>