parameters will be passed as JSON objects only when accessing PANSTARRS API. parameter syntax updated.

Author: jaymedina

astroquery/mast/collections.py

@@ -162,7 +162,11 @@ def query_region_async(self, coordinates, *, radius=0.2*u.deg, catalog="Hsc",
         for prop, value in kwargs.items():
             params[prop] = value
 
-        return self._current_connection.service_request_async(service, params, pagesize=pagesize, page=page)
+        # Parameters will be passed as JSON objects only when accessing the PANSTARRS API
+        use_json = True if catalog.lower() == 'panstarrs' else False
+
+        return self._current_connection.service_request_async(service, params, pagesize=pagesize, page=page,
+                                                              use_json=use_json)
 
     @class_or_instance
     def query_object_async(self, objectname, *, radius=0.2*u.deg, catalog="Hsc",
@@ -313,7 +317,11 @@ def query_criteria_async(self, catalog, *, pagesize=None, page=None, **criteria)
                 raise InvalidQueryError("At least one non-positional criterion must be supplied.")
             params["filters"] = filters
 
-        return self._current_connection.service_request_async(service, params, pagesize=pagesize, page=page)
+        # Parameters will be passed as JSON objects only when accessing the PANSTARRS API
+        use_json = True if catalog.lower() == 'panstarrs' else False
+
+        return self._current_connection.service_request_async(service, params, pagesize=pagesize, page=page,
+                                                              use_json=use_json)
 
     @class_or_instance
     def query_hsc_matchid_async(self, match, *, version=3, pagesize=None, page=None):

astroquery/mast/services.py

@@ -281,23 +281,33 @@ def service_request_async(self, service, params, page_size=None, page=None, use_
         if page_size is not None:
             catalogs_request.append(('pagesize', page_size))
 
-        # Updating syntax of sort_by inputs if sort direction
-        # was specified
-        if 'sort_by' in params.keys():
-            new_sort_by = []
-            for item in params['sort_by']:
-                if item[0].lower() in ['asc', 'desc']:
-                    new_sort_by.append(item[1] + '.' + item[0])
-                params['sort_by'] = new_sort_by
-
         if not use_json:
             # Decompose filters, sort
             for prop, value in kwargs.items():
                 params[prop] = value
             catalogs_request.extend(self._build_catalogs_params(params))
         else:
             headers['Content-Type'] = 'application/json'
-            catalogs_request = params
+
+            # Parameter syntax needs to be updated only for PANSTARRS catalog queries
+            if service.lower() == 'panstarrs':
+                catalogs_request.extend(self._build_catalogs_params(params))
+
+                # After parameter syntax is updated, revert back to dictionary
+                # so params can be passed as a JSON dictionary
+                params_dict = {}
+                for key, val in catalogs_request:
+                    params_dict.setdefault(key, []).append(val)
+                catalogs_request = params_dict
+
+                # Removing single-element lists. Single values will live on their own (except for `sort_by`)
+                for key in catalogs_request.keys():
+                    if (key != 'sort_by') & (len(catalogs_request[key]) == 1):
+                        catalogs_request[key] = catalogs_request[key][0]
+
+            # Otherwise, catalogs_request can remain as the original params dict
+            else:
+                catalogs_request = params
 
         response = self._request('POST', request_url, data=catalogs_request, headers=headers, use_json=use_json)
         return response
@@ -327,7 +337,11 @@ def _build_catalogs_params(self, params):
                 # Loop through each value if list
                 if isinstance(value, list):
                     for sort_item in value:
-                        catalog_params.append(('sort_by', sort_item))
+                        # Determine if tuple with sort direction
+                        if isinstance(sort_item, tuple):
+                            catalog_params.append(('sort_by', sort_item[1] + '.' + sort_item[0]))
+                        else:
+                            catalog_params.append(('sort_by', sort_item))
                 else:
                     # A single sort
                     # Determine if tuple with sort direction