improve handling of missing visit cache

Author: ebellm

python/lsst/ip/diffim/detectAndMeasure.py

@@ -1014,23 +1014,24 @@ def filterSatellites(self, diaSources, science):
         sattle_output = requests.put(
             f'{self.config.sattle_host}:{self.config.sattle_port}/diasource_allow_list',
             json={"visit_id": visit_id, "detector_id": detector_id, "diasources": dia_sources_json})
+
         if sattle_output.status_code != 200:
             # Check if the cache is missing the visit and retry once
             if sattle_output.status_code == 404:
                 try:
-                    self.log.info('Sending data to the visit cache')
+                    self.log.info('Visit not found in sattle cache, re-sending')
 
-                    visit_id = science.exposure.getInfo().getVisitInfo().id
+                    visit_id = science.getInfo().getVisitInfo().id
 
                     visit_date = Time(
-                        science.exposure.getInfo().getVisitInfo().getDate().toPython()).jd
+                        science.getInfo().getVisitInfo().getDate().toPython()).jd
 
-                    exposure_time_jd = science.exposure.getInfo().getVisitInfo().getExposureTime() / 86400.0
+                    exposure_time_jd = science.getInfo().getVisitInfo().getExposureTime() / 86400.0
                     exposure_end_jd = visit_date + exposure_time_jd / 2.0
                     exposure_start_jd = visit_date - exposure_time_jd / 2.0
 
-                    boresight_ra = science.exposure.getInfo().getVisitInfo().boresightRaDec[0].asDegrees()
-                    boresight_dec = science.exposure.getInfo().getVisitInfo().boresightRaDec[1].asDegrees()
+                    boresight_ra = science.getInfo().getVisitInfo().boresightRaDec[0].asDegrees()
+                    boresight_dec = science.getInfo().getVisitInfo().boresightRaDec[1].asDegrees()
 
                     r = requests.put(
                         f'{self.config.sattle_host}:{self.config.sattle_port}/visit_cache',
@@ -1041,7 +1042,13 @@ def filterSatellites(self, diaSources, science):
                               "boresight_dec": boresight_dec,
                               "historical": self.config.sattle_historical})
 
-                    self.log.info(f'status code: {r.status_code}')
+                    sattle_output = requests.put(
+                        f'{self.config.sattle_host}:{self.config.sattle_port}/diasource_allow_list',
+                        json={"visit_id": visit_id, "detector_id": detector_id, "diasources": dia_sources_json})
+
+                    # fail on any non-success
+                    if sattle_output.status_code != 200:
+                        raise RuntimeError(sattle_output.text)
 
                 except (requests.RequestException, ConnectionError) as e:
                     raise RuntimeError(sattle_output.text) from e

tests/test_detectAndMeasure.py

@@ -108,7 +108,8 @@ def _check_values(self, values, minValue=None, maxValue=None):
         if maxValue is not None:
             self.assertTrue(np.all(values <= maxValue))
 
-    def _setup_detection(self, doSkySources=True, nSkySources=5, doSubtractBackground=False, doSattle=False, **kwargs):
+    def _setup_detection(self, doSkySources=True, nSkySources=5,
+                         doSubtractBackground=False, doSattle=False, **kwargs):
         """Setup and configure the detection and measurement PipelineTask.
 
         Parameters
@@ -747,7 +748,7 @@ def json(self):
                                 f"Provided visit {data['visit_id']} not present in cache!")
         # All sources are allowed
         elif data['visit_id'] == 3:
-            return MockResponse({"allow_list": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 ,17,
+            return MockResponse({"allow_list": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
                                                 18, 19, 20]},
                                 200, "test 3")
         # ALl sources are filtered, bad things happen
@@ -774,13 +775,13 @@ def test_filter_id_not_in_sattle(self, mock_put):
         difference = science.clone()
         detectionTask = self._setup_detection(doDeblend=True,
                                               badSubtractionRatioThreshold=1.,
-                                              doSkySources=False)
+                                              doSkySources=False, doSattle=True)
 
-        # Run detection and check the results
-        output = detectionTask.run(science, matchedTemplate, difference,
+        # Nothing in the visit cache raises
+        with self.assertRaises(RuntimeError):
+            detectionTask.run(science, matchedTemplate, difference,
                                    sources,
                                    idFactory=IdFactory.makeSimple())
-        # The returned soured table should be empty, which raises a warning
 
     @mock.patch('lsst.ip.diffim.detectAndMeasure.requests.put', side_effect=mocked_requests_put)
     def test_filter_satellites_some_allowed(self, mock_put):
@@ -855,15 +856,11 @@ def test_filter_satellites_none_allowed(self, mock_put):
                                               badSubtractionRatioThreshold=1.,
                                               doSkySources=False, doSattle=True)
 
-        # Run detection and check the results
-        output = detectionTask.run(science, matchedTemplate, difference,
-                                   sources,
-                                   idFactory=IdFactory.makeSimple())
-
-        # The returned source table should be completely empty, which raises a
-        # warning but not a runtime error.
-
-        self.assertEqual(len(output.diaSources), 0)
+        # Run detection and confirm it raises for no diasources
+        with self.assertRaises(detectAndMeasure.NoDiaSourcesError):
+            detectionTask.run(science, matchedTemplate, difference,
+                                       sources,
+                                       idFactory=IdFactory.makeSimple())
 
 
 class DetectAndMeasureScoreTest(DetectAndMeasureTestBase, lsst.utils.tests.TestCase):
@@ -1313,9 +1310,9 @@ def testMergeFootprints(self):
         self.assertEqual((~result.diaSources["is_negative"]).sum(), 3)
 
 
-def makeVisitInfo(id = 1):
+def makeVisitInfo(id=1):
     """Return a non-NaN visitInfo."""
-    return afwImage.VisitInfo(id = id,
+    return afwImage.VisitInfo(id=id,
                               exposureTime=10.01,
                               darkTime=11.02,
                               date=dafBase.DateTime(65321.1, dafBase.DateTime.MJD, dafBase.DateTime.TAI),