GAIAPCR-1308 Fix the astroquery method launch_job to retrieve the Table from the job when a json format is used

Author: Jorge Fernandez Hernandez

astroquery/gaia/tests/test_gaiatap.py

@@ -362,7 +362,7 @@ def test_launch_job_async_json_format(tmp_path_factory, column_attrs_launch_json
         assert results[colname].dtype == attrs.dtype
 
 
-def test_launch_job_json_format(tmp_path_factory, column_attrs_launch_json, mock_querier_json, ):
+def test_launch_job_json_format(tmp_path_factory, column_attrs_launch_json, mock_querier_json):
     d = tmp_path_factory.mktemp("data") / 'launch_job.json'
     d.write_text(JOB_DATA_QUERIER_ASYNC_JSON, encoding="utf-8")
 
@@ -389,6 +389,28 @@ def test_launch_job_json_format(tmp_path_factory, column_attrs_launch_json, mock
         assert results[colname].unit == attrs.unit
         assert results[colname].dtype == attrs.dtype
 
+def test_launch_job_json_format_no_dump(tmp_path_factory, column_attrs_launch_json, mock_querier_json):
+
+    dump_to_file = False
+    output_format = 'json'
+    query = "SELECT TOP 1 source_id, ra, dec, parallax from gaiadr3.gaia_source"
+
+    job = mock_querier_json.launch_job(query, output_format=output_format, dump_to_file=dump_to_file)
+
+    assert job.async_ is False
+    assert job.get_phase() == "COMPLETED"
+    assert job.failed is False
+    # results
+    results = job.get_results()
+
+    assert type(results) is Table
+    assert 1 == len(results), len(results)
+
+    for colname, attrs in column_attrs_launch_json.items():
+        assert results[colname].name == attrs.name
+        assert results[colname].description == attrs.description
+        assert results[colname].unit == attrs.unit
+        assert results[colname].dtype == attrs.dtype
 
 def test_cone_search_and_changing_MAIN_GAIA_TABLE(mock_querier_async):
     # Regression test for #2093 and #2099 - changing the MAIN_GAIA_TABLE

astroquery/utils/tap/xmlparser/utils.py

@@ -16,9 +16,11 @@
 """
 import gzip
 import io
+import json
 
 from astropy import units as u
 from astropy.table import Table as APTable
+from astropy.table.table import Table
 
 
 def util_create_string_from_buffer(buffer):
@@ -35,8 +37,29 @@ def read_http_response(response, output_format, *, correct_units=True):
         result = APTable.read(io.BytesIO(gzip.decompress(data.read())), format=astropy_format)
     except OSError:
         # data is not a valid gzip file by BadGzipFile.
-        result = APTable.read(data, format=astropy_format)
-        pass
+
+        if output_format == 'json':
+
+            data = json.load(data)
+
+            if data.get('data') and data.get('metadata'):
+
+                column_name = []
+                for name in data['metadata']:
+                    column_name.append(name['name'])
+
+                result = Table(rows=data['data'], names=column_name, masked=True)
+
+                for v in data['metadata']:
+                    col_name = v['name']
+                    result[col_name].unit = v['unit']
+                    result[col_name].description = v['description']
+                    result[col_name].meta = {'metadata': v}
+
+            else:
+                result = APTable.read(data, format=astropy_format)
+        else:
+            result = APTable.read(data, format=astropy_format)
 
     if correct_units:
         modify_unrecognized_table_units(result)