Merge pull request #2144 from keflavich/jplspec_small

Small changes to JPLspec

Author: bsipocz

CHANGES.rst

@@ -14,6 +14,9 @@ Service fixes and enhancements
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------
 
+- JPLSpec now raises an EmptyResponseError if the returned result is empty.
+  The API for JPLspec's ``lookup_table.find`` function returns a dictionary
+  instead of values (for compatibility w/CDMS).  [#2144]
 
 
 0.4.3 (2021-07-07)

astroquery/exceptions.py

@@ -96,3 +96,10 @@ class MaxResultsWarning(AstropyWarning):
     results are returned.
     """
     pass
+
+
+class EmptyResponseError(ValueError):
+    """
+    Astroquery error class to be raised when the query returns an empty result
+    """
+    pass

astroquery/jplspec/core.py

@@ -9,6 +9,7 @@
 # import configurable items declared in __init__.py
 from . import conf
 from . import lookup_table
+from astroquery.exceptions import EmptyResponseError, InvalidQueryError
 
 
 __all__ = ['JPLSpec', 'JPLSpecClass']
@@ -104,11 +105,11 @@ def query_lines_async(self, min_frequency, max_frequency,
         if molecule is not None:
             if parse_name_locally:
                 self.lookup_ids = build_lookup()
-                payload['Mol'] = tuple(self.lookup_ids.find(molecule, flags))
+                payload['Mol'] = tuple(self.lookup_ids.find(molecule, flags).values())
                 if len(molecule) == 0:
-                    raise ValueError('No matching species found. Please\
-                                     refine your search or read the Docs\
-                                     for pointers on how to search.')
+                    raise InvalidQueryError('No matching species found. Please '
+                                            'refine your search or read the Docs '
+                                            'for pointers on how to search.')
             else:
                 payload['Mol'] = molecule
 
@@ -156,6 +157,9 @@ def _parse_result(self, response, verbose=False):
         QN":   Quantum numbers for the lower state.
         """
 
+        if 'Zero lines were found' in response.text:
+            raise EmptyResponseError(f"Response was empty; message was '{response.text}'.")
+
         # data starts at 0 since regex was applied
         # Warning for a result with more than 1000 lines:
         # THIS form is currently limited to 1000 lines.

astroquery/jplspec/lookup_table.py

@@ -35,4 +35,4 @@ def find(self, s, flags):
             if match:
                 out[k] = v
 
-        return out.values()
+        return out