Add new Scout interface

tom_base/settings.py

@@ -287,6 +287,11 @@
     'tom_observations.cadences.resume_cadence_after_failure.ResumeCadenceAfterFailureStrategy'
 ]
 
+DATA_SERVICES = {
+    'Scout': {
+        'base_url': 'https://ssd-api.jpl.nasa.gov/scout.api',
+    },
+}
 # Define extra target fields here. Types can be any of "number", "string", "boolean" or "datetime"
 # See https://tomtoolkit.github.io/docs/target_fields for documentation on this feature
 # For example:

tom_catalogs/tests/harvesters/test_jplhorizons.py

@@ -9,36 +9,37 @@ def setUp(self):
         self.broker = JPLHorizonsHarvester()
 
     def test_query_number_only(self):
-        self.broker.query('700000')
+        self.broker.query('69420')
         target = self.broker.to_target()
         target.save(names=getattr(target, 'extra_names', []))
         # Only test things that are not likely to change (much) with time
-        self.assertEqual(target.name, '700000 (1994 UX10)')
-        self.assertEqual(target.names, ['700000 (1994 UX10)'])
+        self.assertEqual(target.name, '69420 (1995 YA1)')
+        self.assertEqual(target.names, ['69420 (1995 YA1)'])
         self.assertEqual(target.type, 'NON_SIDEREAL')
         self.assertEqual(target.scheme, 'MPC_MINOR_PLANET')
         self.assertEqual(target.ra, None)
         self.assertEqual(target.dec, None)
-        self.assertAlmostEqual(target.eccentricity, 0.093, places=3)
-        self.assertAlmostEqual(target.inclination, 4.1684084, places=3)
-        self.assertAlmostEqual(target.semimajor_axis, 2.657503, places=3)
-        self.assertAlmostEqual(target.abs_mag, 17.76, places=2)
+        self.assertAlmostEqual(target.eccentricity, 0.255042, places=4)
+        self.assertAlmostEqual(target.inclination, 13.208657, places=3)
+        self.assertAlmostEqual(target.semimajor_axis, 2.58835, places=3)
+        self.assertAlmostEqual(target.abs_mag, 15.09, places=2)
         self.assertAlmostEqual(target.slope, 0.15, places=2)
 
     def test_query_designation_only(self):
-        self.broker.query('2025 MB18')
+        self.broker.query('1995 YA1')
         target = self.broker.to_target()
         target.save(names=getattr(target, 'extra_names', []))
         # Only test things that are not likely to change (much) with time
-        self.assertEqual(target.name, '(2025 MB18)')
-        self.assertEqual(target.names, ['(2025 MB18)'])
+        self.assertEqual(target.name, '69420 (1995 YA1)')
+        self.assertEqual(target.names, ['69420 (1995 YA1)'])
         self.assertEqual(target.type, 'NON_SIDEREAL')
         self.assertEqual(target.scheme, 'MPC_MINOR_PLANET')
         self.assertEqual(target.ra, None)
         self.assertEqual(target.dec, None)
-        self.assertAlmostEqual(target.eccentricity, 0.1386, places=4)
-        self.assertAlmostEqual(target.inclination, 19.2780, places=4)
-        self.assertAlmostEqual(target.abs_mag, 24.33, places=2)
+        self.assertAlmostEqual(target.eccentricity, 0.255042, places=4)
+        self.assertAlmostEqual(target.inclination, 13.208657, places=3)
+        self.assertAlmostEqual(target.semimajor_axis, 2.58835, places=3)
+        self.assertAlmostEqual(target.abs_mag, 15.09, places=2)
         self.assertAlmostEqual(target.slope, 0.15, places=2)
 
     def test_query_name(self):
@@ -58,15 +59,15 @@ def test_query_name(self):
         self.assertAlmostEqual(target.slope, 0.60, places=2)
 
     def test_comet_query_desig(self):
-        self.broker.query('C/2025 A6')
+        self.broker.query('P/2012 B1')
         target = self.broker.to_target()
         target.save(names=getattr(target, 'extra_names', []))
         # Only test things that are not likely to change (much) with time
-        self.assertEqual(target.name, 'Lemmon (C/2025 A6)')
-        self.assertEqual(target.names, ['Lemmon (C/2025 A6)'])
+        self.assertEqual(target.name, 'PANSTARRS (P/2012 B1)')
+        self.assertEqual(target.names, ['PANSTARRS (P/2012 B1)'])
         self.assertEqual(target.type, 'NON_SIDEREAL')
         self.assertEqual(target.scheme, 'MPC_COMET')
         self.assertEqual(target.ra, None)
         self.assertEqual(target.dec, None)
-        self.assertAlmostEqual(target.eccentricity, 0.9956, places=4)
-        self.assertAlmostEqual(target.inclination, 143.663531, places=3)
+        self.assertAlmostEqual(target.eccentricity, 0.410531, places=4)
+        self.assertAlmostEqual(target.inclination, 7.605125, places=3)

tom_catalogs/tests/harvesters/test_mpc.py

@@ -185,37 +185,37 @@ def setUp(self):
         self.broker = MPCHarvester()
 
     def test_query_number_only(self):
-        self.broker.query('700000')
+        self.broker.query('69420')
         target = self.broker.to_target()
         target.save(names=getattr(target, 'extra_names', []))
         # Only test things that are not likely to change (much) with time
-        self.assertEqual(target.name, '700000')
-        self.assertEqual(target.names, ['700000'])
+        self.assertEqual(target.name, '69420')
+        self.assertEqual(target.names, ['69420'])
         self.assertEqual(target.type, 'NON_SIDEREAL')
         self.assertEqual(target.scheme, 'MPC_MINOR_PLANET')
         self.assertEqual(target.ra, None)
         self.assertEqual(target.dec, None)
-        self.assertAlmostEqual(target.eccentricity, 0.092, places=3)
-        self.assertAlmostEqual(target.inclination, 4.1688, places=4)
-        self.assertAlmostEqual(target.mean_anomaly, 315.8420, places=4)
-        self.assertAlmostEqual(target.semimajor_axis, 2.6555, places=4)
-        self.assertAlmostEqual(target.abs_mag, 17.76, places=2)
+        self.assertAlmostEqual(target.eccentricity, 0.255042, places=4)
+        self.assertAlmostEqual(target.inclination, 13.208657, places=3)
+        self.assertAlmostEqual(target.semimajor_axis, 2.58835, places=3)
+        self.assertAlmostEqual(target.abs_mag, 15.09, places=2)
         self.assertAlmostEqual(target.slope, 0.15, places=2)
 
     def test_query_designation_only(self):
-        self.broker.query('2025 MB18')
+        self.broker.query('1998 WB2')
         target = self.broker.to_target()
         target.save(names=getattr(target, 'extra_names', []))
         # Only test things that are not likely to change (much) with time
-        self.assertEqual(target.name, '2025 MB18')
-        self.assertEqual(target.names, ['2025 MB18'])
+        self.assertEqual(target.name, '1998 WB2')
+        self.assertEqual(target.names, ['1998 WB2'])
         self.assertEqual(target.type, 'NON_SIDEREAL')
         self.assertEqual(target.scheme, 'MPC_MINOR_PLANET')
         self.assertEqual(target.ra, None)
         self.assertEqual(target.dec, None)
-        self.assertAlmostEqual(target.eccentricity, 0.1398, places=4)
-        self.assertAlmostEqual(target.inclination, 19.3561, places=4)
-        self.assertAlmostEqual(target.abs_mag, 24.33, places=2)
+        self.assertAlmostEqual(target.eccentricity, 0.586622, places=4)
+        self.assertAlmostEqual(target.inclination, 2.37248, places=3)
+        self.assertAlmostEqual(target.semimajor_axis, 1.97247, places=3)
+        self.assertAlmostEqual(target.abs_mag, 21.85, places=2)
         self.assertAlmostEqual(target.slope, 0.15, places=2)
 
     def test_query_name(self):

tom_dataservices/apps.py

@@ -34,5 +34,6 @@ def data_services(self):
         data_services = [
             {'class': f'{self.name}.data_services.simbad.SimbadDataService'},
             {'class': f'{self.name}.data_services.tns.TNSDataService'},
+            {'class': f'{self.name}.data_services.jpl.ScoutDataService'},
         ]
         return data_services