Add list_catalogs, get_images, fix documentation issues.

Author: DinoBektesevic

astroquery/ipac/irsa/most/__init__.py

@@ -17,24 +17,9 @@ class Conf(_config.ConfigNamespace):
     server = _config.ConfigItem(
         'https://irsa.ipac.caltech.edu/cgi-bin/MOST/nph-most',
         'URL address of the MOST service.')
-    catalog = _config.ConfigItem(
-        'wise_merge',
-        ('Default catalog to query. See the drop-down menu at '
-         'https://irsa.ipac.caltech.edu/applications/MOST/ for options.'))
-    input_type = _config.ConfigItem(
-        'name_input',
-        'Default type of query to run. One of `name_input`, `naifid_input`, '
-        '`mpc_input` or `manual_input` corresponding to Solar System Object '
-        'Name, NAIF ID, MPC one-line element input type or manual input of '
-        'orbital elements.'
-    )
-    output_mode = _config.ConfigItem(
-        'Full',
-        ('Set the verbosity of returned results. See the drop-down menu at '
-         'https://irsa.ipac.caltech.edu/applications/MOST/ for options.'))
-    ephem_step = _config.ConfigItem(
-        0.25,
-        'Ephemeris step size (day).'
+    interface_url = _config.ConfigItem(
+        'https://irsa.ipac.caltech.edu/applications/MOST/',
+        'URL address of the MOST application interface.'
     )
     timeout = _config.ConfigItem(
         120,
@@ -46,6 +31,7 @@ class Conf(_config.ConfigNamespace):
 
 from .core import Most, MOSTClass
 
-__all__ = ['Most', 'MOSTClass',
-           'Conf', 'conf',
-           ]
+__all__ = [
+    'Most', 'MOSTClass',
+    'Conf', 'conf',
+]

astroquery/ipac/irsa/most/core.py

@@ -5,7 +5,7 @@
 </DEFINITIONS>
 <RESOURCE name="MOST Output Tables">
 <TABLE name="imgframes_matched_final_table.tbl">
-<PARAM name="output_url" datatype="char" arraysize="*" value="https://irsa.ipac.caltech.edu/workspace/TMP_XIBNAd_17194/MOST/pid5856"/>
+<PARAM name="output_url" datatype="char" arraysize="*" value="https://irsa.ipac.caltech.edu/workspace/TMP_noPis4_23270/MOST/pid9390"/>
 <PARAM name="catalog" datatype="char" arraysize="*" value="wise_merge"/>
 <PARAM name="user_input_begin_time" datatype="char" arraysize="*" value="2014-05-01"/>
 <PARAM name="user_input_end_time" datatype="char" arraysize="*" value="2014-05-30"/>
@@ -18,7 +18,7 @@
 <PARAM name="semimajor_axis" datatype="char" arraysize="*" value=" 2.333774627713947"/>
 <PARAM name="mean_anomaly" datatype="char" arraysize="*" value="349.752560575505981"/>
 <PARAM name="magnitude_parameters" datatype="char" arraysize="*" value=" 7.34  0.00"/>
-<PARAM name="job_time_stamp" datatype="char" arraysize="*" value="Wed Feb  8 14:40:39 2023"/>
+<PARAM name="job_time_stamp" datatype="char" arraysize="*" value="Fri Mar 24 16:07:12 2023"/>
 <PARAM name="description" datatype="char" arraysize="*" value="MOST ODBC query result"/>
 <PARAM name="fixlen" datatype="char" arraysize="*" value="T"/>
 <FIELD name="ra_obj" datatype="double" unit=""/>

astroquery/ipac/irsa/tests/data/MOST_VOTable.xml

@@ -1,4 +1,4 @@
-\output_url = "https://irsa.ipac.caltech.edu/workspace/TMP_XIBNAd_17194/MOST/pid26504"
+\output_url = "https://irsa.ipac.caltech.edu/workspace/TMP_noPis4_23270/MOST/pid2083"
 \catalog = "wise_merge"
 \user_input_begin_time = "2014-05-01"
 \user_input_end_time = "2014-05-30"
@@ -11,7 +11,7 @@
 \semimajor_axis  =  " 2.333774627713947"
 \mean_anomaly = "349.752560575505981"
 \magnitude_parameters = " 7.34  0.00" 
-\job_time_stamp = "Wed Feb  8 11:00:12 2023"
+\job_time_stamp = "Fri Mar 24 15:36:59 2023"
 \description = MOST ODBC query result
 \ odbc_dsn = postgres
 \ odbc_table = wise.neowiser_merge_p1bm_frm

astroquery/ipac/irsa/tests/data/MOST_application.html

@@ -11,7 +11,7 @@
 from astropy.utils.diff import report_diff_values
 
 
-DATA_FILES = {
+OUTPUTMODE_FILE_MAP = {
     "Regular": "MOST_regular.html",
     "Full": "MOST_full_with_tarballs.html",
     "VOTable": "MOST_VOTable.xml",
@@ -25,57 +25,66 @@ def data_path(filename):
     return os.path.join(data_dir, filename)
 
 
-@pytest.fixture
-def patch_get(request):
-    mp = request.getfixturevalue("monkeypatch")
-    mp.setattr(Most, '_request', get_mockreturn)
-    return mp
-
+def get_mocked_return(method=None, url=None, data=None, timeout=120, **kwargs):
+    if "results.tbl" in url:
+        url = "most_results_table.tbl"
+    elif "imgframes_matched_final_table.tbl" in url:
+        url = "most_imgframes_matched_final_table.tbl"
+    elif "applications" in url:
+        url = "MOST_application.html"
 
-def get_mockreturn(method=None, url=None, data=None, timeout=120, **kwargs):
     if method == "GET":
         filename = data_path(url)
     else:
-        filename = data_path(DATA_FILES[data["output_mode"]])
+        filename = data_path(OUTPUTMODE_FILE_MAP[data["output_mode"]])
+
     with open(filename, 'rb') as infile:
         content = infile.read()
+
     return MockResponse(content, **kwargs)
 
 
-def test_validation(patch_get):
+@pytest.fixture
+def patch_get_regular(request):
+    mp = request.getfixturevalue("monkeypatch")
+    mp.setattr(Most, '_request', get_mocked_return)
+    return mp
+
+
+def test_validation(patch_get_regular):
     with pytest.raises(ValueError):
-        Most.query()
+        Most.query_object()
 
     with pytest.raises(ValueError):
-        Most.query(catalog="wise_allsky_4band")
+        Most.query_object(catalog="wise_allsky_4band")
 
     # make sure no funny business happens with
     # overwriting of default values
-    Most.query(
+    Most.query_object(
         catalog="wise_allsky_4band",
         obj_name="Victoria"
     )
-    Most.query(
+    Most.query_object(
         catalog="wise_allsky_4band",
         obj_name="Victoria",
-        input_type="name_input"
+        input_mode="name_input"
     )
 
     with pytest.raises(ValueError):
         # fails because insufficient orbital parameters specified
-        Most.query(
+        Most.query_object(
             catalog="wise_allsky_4band",
             output_mode="Brief",
-            input_type="manual_input",
+            input_mode="manual_input",
             obj_type="Asteroid",
             perih_dist=1.5,
             eccentricity=0.5
         )
 
-    Most.query(
+    Most.query_object(
         catalog="wise_allsky_4band",
         output_mode="Brief",
-        input_type="manual_input",
+        input_mode="manual_input",
         obj_type="Asteroid",
         semimajor_axis=2.68,
         eccentricity=0.33,
@@ -84,45 +93,45 @@ def test_validation(patch_get):
     with pytest.raises(ValueError):
         # Comets require perihel_dist keyword
         # instead of smimajor_axis
-        Most.query(
+        Most.query_object(
             catalog="wise_allsky_4band",
             output_mode="Brief",
-            input_type="manual_input",
+            input_mode="manual_input",
             obj_type="Comet",
             semimajor_axis=2.68,
             eccentricity=0.33
         )
 
     with pytest.raises(ValueError):
         # object type is case sensitive
-        Most.query(
+        Most.query_object(
             catalog="wise_allsky_4band",
             output_mode="Brief",
-            input_type="manual_input",
+            input_mode="manual_input",
             obj_type="comet",
             semimajor_axis=2.68,
             eccentricity=0.33
         )
 
     with pytest.raises(ValueError):
         # missing mpc_data and obj_type
-        Most.query(
+        Most.query_object(
             catalog="wise_allsky_4band",
             output_mode="Brief",
-            input_type="mpc_input"
+            input_mode="mpc_input"
         )
 
-    Most.query(
+    Most.query_object(
         catalog="wise_allsky_4band",
         output_mode="Brief",
-        input_type="mpc_input",
+        input_mode="mpc_input",
         obj_type="Asteroid",
         mpc_data="K10N010+2010+08+16.1477+1.494525+0.533798+153.4910+113.2118+12.8762+20100621+17.0+4.0+P/2010+N1+(WISE)+MPC+75712"  # noqa: E501
     )
 
 
-def test_regular(patch_get):
-    response = Most.query(obj_name="Victoria")
+def test_regular(patch_get_regular):
+    response = Most.query_object(obj_name="Victoria")
 
     assert "results" in response
     assert "metadata" in response
@@ -132,19 +141,19 @@ def test_regular(patch_get):
 
     results = Table.read(data_path("most_results_table.tbl"), format="ipac")
     metadata = Table.read(data_path("most_imgframes_matched_final_table.tbl"), format="ipac")
-    url = "https://irsa.ipac.caltech.edu/workspace/TMP_XIBNAd_17194/MOST/pid10499/ds9region/ds9_orbit_path.reg"
+    url = "https://irsa.ipac.caltech.edu/workspace/TMP_noPis4_23270/MOST/pid30587/ds9region/ds9_orbit_path.reg"
 
     silent_stream = io.StringIO()
     assert report_diff_values(results, response["results"], silent_stream)
     assert report_diff_values(metadata, response["metadata"], silent_stream)
     assert url == response["region"]
 
 
-def test_get_full_with_tarballs(patch_get):
-    response = Most.query(
+def test_get_full_with_tarballs(patch_get_regular):
+    response = Most.query_object(
         obj_name="Victoria",
         output_mode="Full",
-        fits_region_files=True
+        with_tarballs=True
     )
 
     assert "results" in response
@@ -155,9 +164,9 @@ def test_get_full_with_tarballs(patch_get):
 
     results = Table.read(data_path("most_results_table.tbl"), format="ipac")
     metadata = Table.read(data_path("most_imgframes_matched_final_table.tbl"), format="ipac")
-    url = "https://irsa.ipac.caltech.edu/workspace/TMP_XIBNAd_17194/MOST/pid10499/ds9region/ds9_orbit_path.reg"
-    region_tar = "https://irsa.ipac.caltech.edu/workspace/TMP_XIBNAd_17194/MOST/pid10499/ds9region_A850RA.tar"
-    fits_tar = "https://irsa.ipac.caltech.edu/workspace/TMP_XIBNAd_17194/MOST/pid10499/fitsimage_A850RA.tar.gz"
+    url = "https://irsa.ipac.caltech.edu/workspace/TMP_noPis4_23270/MOST/pid1957/ds9region/ds9_orbit_path.reg"
+    region_tar = "https://irsa.ipac.caltech.edu/workspace/TMP_noPis4_23270/MOST/pid1957/ds9region_A850RA.tar"
+    fits_tar = "https://irsa.ipac.caltech.edu/workspace/TMP_noPis4_23270/MOST/pid1957/fitsimage_A850RA.tar.gz"
 
     silent_stream = io.StringIO()
     assert report_diff_values(results, response["results"], silent_stream)
@@ -167,8 +176,8 @@ def test_get_full_with_tarballs(patch_get):
     assert fits_tar == response["fits_tarball"]
 
 
-def test_votable(patch_get):
-    response = Most.query(
+def test_votable(patch_get_regular):
+    response = Most.query_object(
         output_mode="VOTable",
         obj_name="Victoria"
     )
@@ -178,8 +187,23 @@ def test_votable(patch_get):
     assert report_diff_values(response, vtbl, silent_stream)
 
 
-def test_gator(patch_get):
-    response = Most.query(
+def test_list_catalogs(patch_get_regular):
+    expected = [
+        '2mass', 'spitzer_bcd', 'ptf', 'sofia', 'wise_merge', 'wise_allsky_4band',
+        'wise_allsky_3band', 'wise_allsky_2band', 'wise_neowiser',
+        'wise_neowiser_yr1', 'wise_neowiser_yr2', 'wise_neowiser_yr3',
+        'wise_neowiser_yr4', 'wise_neowiser_yr5', 'wise_neowiser_yr6',
+        'wise_neowiser_yr7', 'wise_neowiser_yr8', 'wise_neowiser_yr9', 'ztf',
+        'wise_merge_int', 'wise_neowiser_int', 'wise_neowiser_yr10'
+    ]
+
+    response = Most.list_catalogs()
+
+    assert response == expected
+
+
+def test_gator(patch_get_regular):
+    response = Most.query_object(
         output_mode="Gator",
         obj_name="Victoria"
     )