Merge branch 'develop' into logging_fix

CHANGES.rst

@@ -1,5 +1,27 @@
 ## What's Changed
 
+1.2.11 (2024-08-26)
+===================
+
+Web Application
+~~~~~~~~~~~~~~~
+- Customize colorbar location and size based on aperture size by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1592
+- Add keyword to specify program IDs for preview image creation by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1602
+- Adjust view image and view exposure to allow for larger preview images by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1600
+- filter thumbnails by filter/pupil/grating by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1623
+- Add Image and Exposure level Comments by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1624
+- Update NRS TA Monitor Plotting by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1633
+- Fix readnoise monitor plot y range by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1634
+
+Project & API Documentation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Update Bokeh `filter` Keyword in NRS TA Monitors by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1620
+- Switch dark monitor to use django models by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1493
+- Fix log cleanup script by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1628
+- Fix missing data in readnoise monitor plots by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1631
+- filename_parser() no longer raises an exception for unrecognized files by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1614
+
+
 1.2.10 (2024-07-10)
 ===================
 

jwql/website/apps/jwql/data_containers.py

@@ -1720,8 +1720,13 @@ def get_proposal_info(filepaths):
             for fname in files_for_proposal:
                 file_info = filename_parser(fname)
                 if file_info['recognized_filename']:
-                    obs = file_info['observation']
-                    obsnums.append(obs)
+                    # Wrap in a try/except because level 3 files do not have an 'observation' key.
+                    # That's ok. We will ignore those files.
+                    try:
+                        obs = file_info['observation']
+                        obsnums.append(obs)
+                    except KeyError:
+                        pass
                 else:
                     logging.warning((f'While running get_proposal_info() for a program {proposal}, {fname} '
                                      'was not recognized by the filename_parser().'))
@@ -2163,7 +2168,10 @@ def thumbnails_ajax(inst, proposal, obs_num=None):
         # in those files anyway.
         file_info = filename_parser(root)
         if file_info['recognized_filename']:
-            all_obs.append(file_info['observation'])
+            try:
+                all_obs.append(file_info['observation'])
+            except KeyError:
+                pass
         else:
             logging.warning((f'While running thumbnails_ajax() on root {root}, '
                              'filename_parser() failed to recognize the file pattern.'))