updating moving target functionality and test coverage for get_sectors, download_cutouts, and get_cutouts. also fixing import statements and other typos.

Author: jaymedina

astroquery/mast/cutouts.py

@@ -155,9 +155,10 @@ def get_sectors(self, coordinates=None, radius=0*u.deg, objectname=None, moving_
 
         if moving_target:
 
-            # Check that objectname has been passed in
+            # Check that objectname has been passed in and coordinates
+            # is not
             if coordinates:
-                raise InvalidQueryError("Only one of moving_target and coordinates may be specified.")
+                raise InvalidQueryError("Only one of moving_target and coordinates may be specified. Please remove coordinates if using moving_target and objectname.")
 
             if not objectname:
                 raise InvalidQueryError("Please specify the object name or ID (as understood by the `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) of a moving target such as an asteroid or comet.")
@@ -259,14 +260,21 @@ def download_cutouts(self, coordinates=None, size=5, sector=None, path=".", infl
         """
 
         if moving_target:
-            # Check only ony object designator has been passed in
-            if objectname or coordinates:
-                raise InvalidQueryError("Only one of objectname, coordinates, and moving_target may be specified.")
 
-            astrocut_request = f"moving_target/astrocut?obj_id={moving_target}"
+            # Check that objectname has been passed in and coordinates
+            # is not
+            if coordinates:
+                raise InvalidQueryError("Only one of moving_target and coordinates may be specified. Please remove coordinates if using moving_target and objectname.")
+
+            if not objectname:
+                raise InvalidQueryError("Please specify the object name or ID (as understood by the `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) of a moving target such as an asteroid or comet.")
+
+            astrocut_request = f"moving_target/astrocut?obj_id={objectname}"
             if mt_type:
                 astrocut_request += f"&obj_type={mt_type}"
+
         else:
+
             # Get Skycoord object for coordinates/object
             coordinates = parse_input_location(coordinates, objectname)
 
@@ -364,11 +372,15 @@ def get_cutouts(self, coordinates=None, size=5, sector=None,
 
         if moving_target:
 
-            # Check only on object designator has been passed in
-            if objectname or coordinates:
-                raise InvalidQueryError("Only one of objectname, coordinates, and moving_target may be specified.")
+            # Check that objectname has been passed in and coordinates
+            # is not
+            if coordinates:
+                raise InvalidQueryError("Only one of moving_target and coordinates may be specified. Please remove coordinates if using moving_target and objectname.")
+
+            if not objectname:
+                raise InvalidQueryError("Please specify the object name or ID (as understood by the `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) of a moving target such as an asteroid or comet.")
 
-            param_dict["obj_id"] = moving_target
+            param_dict["obj_id"] = objectname
 
             # Add optional parameter if present
             if mt_type:

astroquery/mast/tests/test_mast.py

@@ -590,7 +590,8 @@ def test_tesscut_get_sector(patch_post):
     assert sector_table['ccd'][0] == 3
 
     # Exercising the search by moving target
-    sector_table = mast.Tesscut.get_sectors(moving_target="Ceres")
+    sector_table = mast.Tesscut.get_sectors(objectname="Ceres",
+                                            moving_target=True)
     assert isinstance(sector_table, Table)
     assert len(sector_table) == 1
     assert sector_table['sectorName'][0] == "tess-s0001-1-3"
@@ -599,14 +600,10 @@ def test_tesscut_get_sector(patch_post):
     assert sector_table['ccd'][0] == 3
 
     # Testing catch for multiple designators'
-    error_str = "Only one of objectname, coordinates, and moving_target may be specified."
+    error_str = "Only one of moving_target and coordinates may be specified. Please remove coordinates if using moving_target and objectname."
 
     with pytest.raises(InvalidQueryError) as invalid_query:
-        mast.Tesscut.get_sectors(moving_target="Ceres", coordinates=coord)
-    assert error_str in str(invalid_query.value)
-
-    with pytest.raises(InvalidQueryError) as invalid_query:
-        mast.Tesscut.get_sectors(moving_target="Ceres", objectname="M103")
+        mast.Tesscut.get_sectors(objectname='Ceres', moving_target=True, coordinates=coord)
     assert error_str in str(invalid_query.value)
 
 
@@ -637,21 +634,24 @@ def test_tesscut_download_cutouts(patch_post, tmpdir):
     assert os.path.isfile(manifest[0]['Local Path'])
 
     # Exercising the search by moving target
-    manifest = mast.Tesscut.download_cutouts(moving_target="Eleonora", size=5, path=str(tmpdir))
+    manifest = mast.Tesscut.download_cutouts(objectname="Eleonora",
+                                             moving_target=True,
+                                             size=5,
+                                             path=str(tmpdir))
     assert isinstance(manifest, Table)
     assert len(manifest) == 1
     assert manifest["Local Path"][0][-4:] == "fits"
     assert os.path.isfile(manifest[0]['Local Path'])
 
     # Testing catch for multiple designators'
-    error_str = "Only one of objectname, coordinates, and moving_target may be specified."
+    error_str = "Only one of moving_target and coordinates may be specified. Please remove coordinates if using moving_target and objectname."
 
     with pytest.raises(InvalidQueryError) as invalid_query:
-        mast.Tesscut.download_cutouts(moving_target="Eleonora", coordinates=coord, size=5, path=str(tmpdir))
-    assert error_str in str(invalid_query.value)
-
-    with pytest.raises(InvalidQueryError) as invalid_query:
-        mast.Tesscut.download_cutouts(moving_target="Eleonora", objectname="M103", size=5, path=str(tmpdir))
+        mast.Tesscut.download_cutouts(objectname="Eleonora",
+                                      moving_target=True,
+                                      coordinates=coord,
+                                      size=5,
+                                      path=str(tmpdir))
     assert error_str in str(invalid_query.value)
 
 
@@ -670,20 +670,21 @@ def test_tesscut_get_cutouts(patch_post, tmpdir):
     assert isinstance(cutout_hdus_list[0], fits.HDUList)
 
     # Exercising the search by object name
-    cutout_hdus_list = mast.Tesscut.get_cutouts(moving_target="Eleonora", size=5)
+    cutout_hdus_list = mast.Tesscut.get_cutouts(objectname='Eleonora',
+                                                moving_target=True,
+                                                size=5)
     assert isinstance(cutout_hdus_list, list)
     assert len(cutout_hdus_list) == 1
     assert isinstance(cutout_hdus_list[0], fits.HDUList)
 
     # Testing catch for multiple designators'
-    error_str = "Only one of objectname, coordinates, and moving_target may be specified."
-
-    with pytest.raises(InvalidQueryError) as invalid_query:
-        mast.Tesscut.get_cutouts(moving_target="Eleonora", coordinates=coord, size=5)
-    assert error_str in str(invalid_query.value)
+    error_str = "Only one of moving_target and coordinates may be specified. Please remove coordinates if using moving_target and objectname."
 
     with pytest.raises(InvalidQueryError) as invalid_query:
-        mast.Tesscut.get_cutouts(moving_target="Eleonora", objectname="M103", size=5)
+        mast.Tesscut.get_cutouts(objectname="Eleonora",
+                                 moving_target=True,
+                                 coordinates=coord,
+                                 size=5)
     assert error_str in str(invalid_query.value)
 
 

astroquery/mast/tests/test_mast_remote.py

@@ -11,10 +11,10 @@
 from astropy.io import fits
 import astropy.units as u
 
-from astroquery.exceptions import NoResultsWarning
 from astroquery import mast
 
-from ...exceptions import RemoteServiceError, MaxResultsWarning
+from ..utils import ResolverError
+from ...exceptions import InvalidQueryError, MaxResultsWarning, NoResultsWarning, RemoteServiceError
 
 
 OBSID = '1647157'
@@ -702,14 +702,49 @@ def test_tesscut_get_sectors(self):
         assert sector_table['camera'][0] > 0
         assert sector_table['ccd'][0] > 0
 
-        sector_table = mast.Tesscut.get_sectors(moving_target="Stichius")
+        # Moving target functionality testing
+
+        moving_target_name = 'Eleonora'
+
+        sector_table = mast.Tesscut.get_sectors(objectname=moving_target_name,
+                                                moving_target=True)
         assert isinstance(sector_table, Table)
         assert len(sector_table) >= 1
-        assert sector_table['sectorName'][0] == "tess-s0001-1-1"
-        assert sector_table['sector'][0] == 1
+        assert sector_table['sectorName'][0] == "tess-s0006-1-1"
+        assert sector_table['sector'][0] == 6
         assert sector_table['camera'][0] == 1
         assert sector_table['ccd'][0] == 1
 
+        error_noname = "Please specify the object name or ID (as understood by the `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) of a moving target such as an asteroid or comet."
+        error_nameresolve = f"Could not resolve {moving_target_name} to a sky position."
+        error_mt_coord = "Only one of moving_target and coordinates may be specified."
+        error_name_coord = "Only one of objectname and coordinates may be specified."
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.get_sectors(moving_target=True)
+        assert error_noname in str(error_msg.value)
+
+        with pytest.raises(ResolverError) as error_msg:
+            mast.Tesscut.get_sectors(objectname=moving_target_name)
+        assert error_nameresolve in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.get_sectors(coordinates=coord, moving_target=True)
+        assert error_mt_coord in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.get_sectors(objectname=moving_target_name,
+                                     coordinates=coord)
+        assert error_name_coord in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.get_sectors(objectname=moving_target_name,
+                                     coordinates=coord,
+                                     moving_target=True)
+        assert error_mt_coord in str(error_msg.value)
+
+
+
     def test_tesscut_download_cutouts(self, tmpdir):
 
         coord = SkyCoord(349.62609, -47.12424, unit="deg")
@@ -749,13 +784,49 @@ def test_tesscut_download_cutouts(self, tmpdir):
         for row in manifest:
             assert os.path.isfile(row['Local Path'])
 
-        manifest = mast.Tesscut.download_cutouts(moving_target="Eleonora", sector=6, size=5, path=str(tmpdir))
+        # Moving target functionality testing
+
+        moving_target_name = 'Eleonora'
+
+        manifest = mast.Tesscut.download_cutouts(objectname=moving_target_name,
+                                                 moving_target=True,
+                                                 sector=6,
+                                                 size=5,
+                                                 path=str(tmpdir))
         assert isinstance(manifest, Table)
         assert len(manifest) == 1
         assert manifest["Local Path"][0][-4:] == "fits"
         for row in manifest:
             assert os.path.isfile(row['Local Path'])
 
+        error_noname = "Please specify the object name or ID (as understood by the `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) of a moving target such as an asteroid or comet."
+        error_nameresolve = f"Could not resolve {moving_target_name} to a sky position."
+        error_mt_coord = "Only one of moving_target and coordinates may be specified."
+        error_name_coord = "Only one of objectname and coordinates may be specified."
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(moving_target=True)
+        assert error_noname in str(error_msg.value)
+
+        with pytest.raises(ResolverError) as error_msg:
+            mast.Tesscut.download_cutouts(objectname=moving_target_name)
+        assert error_nameresolve in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(coordinates=coord, moving_target=True)
+        assert error_mt_coord in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(objectname=moving_target_name,
+                                     coordinates=coord)
+        assert error_name_coord in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(objectname=moving_target_name,
+                                     coordinates=coord,
+                                     moving_target=True)
+        assert error_mt_coord in str(error_msg.value)
+
     def test_tesscut_get_cutouts(self, tmpdir):
 
         coord = SkyCoord(107.18696, -70.50919, unit="deg")
@@ -782,11 +853,46 @@ def test_tesscut_get_cutouts(self, tmpdir):
         assert len(cutout_hdus_list) >= 1
         assert isinstance(cutout_hdus_list[0], fits.HDUList)
 
-        cutout_hdus_list = mast.Tesscut.get_cutouts(moving_target="Eleonora", sector=6, size=5)
+        # Moving target functionality testing
+
+        moving_target_name = 'Eleonora'
+
+        cutout_hdus_list = mast.Tesscut.get_cutouts(objectname=moving_target_name,
+                                moving_target=True,
+                                sector=6,
+                                size=5)
         assert isinstance(cutout_hdus_list, list)
         assert len(cutout_hdus_list) == 1
         assert isinstance(cutout_hdus_list[0], fits.HDUList)
 
+        error_noname = "Please specify the object name or ID (as understood by the `JPL ephemerides service <https://ssd.jpl.nasa.gov/horizons.cgi>`__) of a moving target such as an asteroid or comet."
+        error_nameresolve = f"Could not resolve {moving_target_name} to a sky position."
+        error_mt_coord = "Only one of moving_target and coordinates may be specified."
+        error_name_coord = "Only one of objectname and coordinates may be specified."
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(moving_target=True)
+        assert error_noname in str(error_msg.value)
+
+        with pytest.raises(ResolverError) as error_msg:
+            mast.Tesscut.download_cutouts(objectname=moving_target_name)
+        assert error_nameresolve in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(coordinates=coord, moving_target=True)
+        assert error_mt_coord in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(objectname=moving_target_name,
+                                          coordinates=coord)
+        assert error_name_coord in str(error_msg.value)
+
+        with pytest.raises(InvalidQueryError) as error_msg:
+            mast.Tesscut.download_cutouts(objectname=moving_target_name,
+                                          coordinates=coord,
+                                          moving_target=True)
+        assert error_mt_coord in str(error_msg.value)
+
     ###################
     # ZcutClass tests #
     ###################