Merge pull request #2305 from bsipocz/large_crossid_queries

Large crossid queries

Author: bsipocz

CHANGES.rst

@@ -7,6 +7,7 @@ New Tools and Services
 
 Service fixes and enhancements
 ------------------------------
+
 casda
 ^^^^^
 
@@ -44,6 +45,8 @@ sdss
 
 - Fix ``query_crossid`` for spectral data and DR17. [#2258, #2304]
 
+- Fix ``query_crossid`` to be able to query larger list of coordinates. [#2305]
+
 
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------

astroquery/sdss/core.py

@@ -156,7 +156,8 @@ def query_crossid_async(self, coordinates, obj_names=None,
                              for i in range(len(coordinates))])
 
         # firstcol is hardwired, as obj_names is always passed
-        request_payload = dict(uquery=sql_query, paste=data,
+        files = {'upload': ('astroquery', data)}
+        request_payload = dict(uquery=sql_query,
                                firstcol=1,
                                format='csv', photoScope='nearPrim',
                                radius=radius,
@@ -166,9 +167,11 @@ def query_crossid_async(self, coordinates, obj_names=None,
             request_payload['searchtool'] = 'CrossID'
 
         if get_query_payload:
-            return request_payload
+            return request_payload, files
+
         url = self._get_crossid_url(data_release)
         response = self._request("POST", url, data=request_payload,
+                                 files=files,
                                  timeout=timeout, cache=cache)
         return response
 

astroquery/sdss/tests/test_sdss_remote.py

@@ -3,7 +3,7 @@
 from numpy.testing import assert_allclose
 import pytest
 
-from astropy import coordinates
+from astropy.coordinates import SkyCoord
 from astropy.table import Table
 
 from urllib.error import URLError
@@ -18,9 +18,17 @@
 @pytest.mark.remote_data
 class TestSDSSRemote:
     # Test Case: A Seyfert 1 galaxy
-    coords = coordinates.SkyCoord('0h8m05.63s +14d50m23.3s')
+    coords = SkyCoord('0h8m05.63s +14d50m23.3s')
     mintimeout = 1e-2
 
+    @pytest.fixture()
+    def large_results(self):
+        # Large list of objects for regression tests
+        query = "select top 1000 z, ra, dec, bestObjID from specObj where class = 'galaxy' and programname = 'eboss'"
+        results = sdss.SDSS.query_sql(query)
+        coords_large = SkyCoord(ra=results['ra'], dec=results['dec'], unit='deg')
+        return coords_large
+
     def test_images_timeout(self):
         """
         This test *must* be run before `test_sdss_image` because that query
@@ -191,3 +199,9 @@ def test_spectro_query_crossid(self, dr):
 
         assert isinstance(query2, Table)
         assert query2['specObjID'][0] == query2['specObjID'][1] == query1['specObjID'][0]
+
+    def test_large_crossid(self, large_results):
+        # Regression test for #589
+
+        results = sdss.SDSS.query_crossid(large_results)
+        assert len(results) == 894