Make mandatory kwarg, propagate exception

Author: snbianco

astroquery/mast/collections.py

@@ -204,7 +204,7 @@ def query_region_async(self, coordinates, *, radius=0.2*u.deg, catalog="Hsc",
         """
 
         # Put coordinates and radius into consistent format
-        coordinates = commons.parse_coordinates(coordinates, 'icrs')
+        coordinates = commons.parse_coordinates(coordinates, return_frame='icrs')
 
         # if radius is just a number we assume degrees
         radius = coord.Angle(radius, u.deg)

astroquery/mast/missions.py

@@ -219,7 +219,7 @@ def query_region_async(self, coordinates, *, radius=3*u.arcmin, limit=5000, offs
         self._validate_criteria(**criteria)
 
         # Put coordinates and radius into consistent format
-        coordinates = commons.parse_coordinates(coordinates, 'icrs')
+        coordinates = commons.parse_coordinates(coordinates, return_frame='icrs')
 
         # If radius is just a number, assume arcminutes
         radius = coord.Angle(radius, u.arcmin)

astroquery/mast/observations.py

@@ -235,7 +235,7 @@ def query_region_async(self, coordinates, *, radius=0.2*u.deg, pagesize=None, pa
         """
 
         # Put coordinates and radius into consistent format
-        coordinates = commons.parse_coordinates(coordinates, 'icrs')
+        coordinates = commons.parse_coordinates(coordinates, return_frame='icrs')
 
         # if radius is just a number we assume degrees
         radius = coord.Angle(radius, u.deg)
@@ -364,7 +364,7 @@ def query_region_count(self, coordinates, *, radius=0.2*u.deg, pagesize=None, pa
         """
 
         # build the coordinates string needed by ObservationsClass._caom_filtered_position
-        coordinates = commons.parse_coordinates(coordinates, 'icrs')
+        coordinates = commons.parse_coordinates(coordinates, return_frame='icrs')
 
         # if radius is just a number we assume degrees
         radius = coord.Angle(radius, u.deg)

astroquery/mast/tests/test_mast.py

@@ -1197,3 +1197,37 @@ def test_zcut_get_cutouts(patch_post, tmpdir):
     assert isinstance(cutout_list, list)
     assert len(cutout_list) == 1
     assert isinstance(cutout_list[0], fits.HDUList)
+
+
+################
+# Utils tests #
+################
+
+
+def test_parse_input_location(patch_post):
+    # Test with coordinates
+    coord = SkyCoord(23.34086, 60.658, unit="deg")
+    loc = mast.utils.parse_input_location(coordinates=coord)
+    assert isinstance(loc, SkyCoord)
+    assert loc.ra == coord.ra
+    assert loc.dec == coord.dec
+
+    # Test with object name
+    obj_coord = SkyCoord(124.531756290083, -68.3129998725044, unit="deg")
+    loc = mast.utils.parse_input_location(objectname="TIC 307210830")
+    assert isinstance(loc, SkyCoord)
+    assert loc.ra == obj_coord.ra
+    assert loc.dec == obj_coord.dec
+
+    # Error if both coordinates and object name are provided
+    with pytest.raises(InvalidQueryError, match="Only one of objectname and coordinates may be specified"):
+        mast.utils.parse_input_location(coordinates=coord, objectname="M101")
+
+    # Error if neither coordinates nor object name is provided
+    with pytest.raises(InvalidQueryError, match="One of objectname and coordinates must be specified"):
+        mast.utils.parse_input_location()
+
+    # Warn if resolver is specified without an object name
+    with pytest.warns(InputWarning, match="Resolver is only used when resolving object names"):
+        loc = mast.utils.parse_input_location(coordinates=coord, resolver="SIMBAD")
+        assert isinstance(loc, SkyCoord)

astroquery/mast/utils.py

@@ -235,7 +235,7 @@ def parse_input_location(*, coordinates=None, objectname=None, resolver=None):
 
     # Parse coordinates, if given
     if coordinates:
-        obj_coord = commons.parse_coordinates(coordinates, 'icrs')
+        obj_coord = commons.parse_coordinates(coordinates, return_frame='icrs')
 
     return obj_coord
 

astroquery/utils/commons.py

@@ -40,7 +40,7 @@
 ASTROPY_LT_7_1_1 = not minversion('astropy', '7.1.1')
 
 
-def parse_coordinates(coordinates, return_frame=None):
+def parse_coordinates(coordinates, *, return_frame=None):
     """
     Takes a string or astropy.coordinates object. Checks if the
     string is parsable as an `astropy.coordinates`
@@ -100,10 +100,7 @@ def parse_coordinates(coordinates, return_frame=None):
 
     # Convert to requested frame, if given
     if return_frame and c.frame.name != return_frame.lower():
-        try:
-            c = c.transform_to(return_frame)
-        except ValueError:
-            warnings.warn(f"Failed to transform coordinates to requested frame: {return_frame}.", InputWarning)
+        c = c.transform_to(return_frame)
 
     return c
 

astroquery/utils/tests/test_utils.py

@@ -15,7 +15,6 @@
 import astropy.utils.data as aud
 from astropy.logger import log
 
-from ...exceptions import InputWarning
 from ...utils import chunk_read, chunk_report, class_or_instance, commons
 from ...utils.process_asyncs import async_to_sync_docstr, async_to_sync
 from ...utils.docstr_chompers import remove_sections, prepend_docstr_nosections
@@ -100,8 +99,8 @@ def test_parse_coordinates_return_frame():
     assert galactic.frame.name == 'galactic'
     assert coords.frame.name == 'icrs'
 
-    # Warn if transformation fails
-    with pytest.warns(InputWarning, match='Failed to transform coordinates'):
+    # ValueError if transformation fails
+    with pytest.raises(ValueError):
         coords = commons.parse_coordinates(galactic, return_frame='invalid')