Skip to content

Commit

Permalink
Update syntax to read requests outptut (#351)
Browse files Browse the repository at this point in the history
  • Loading branch information
JulienPeloton authored Sep 1, 2022
1 parent e58655e commit c7d8166
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion tests/api_bayestar_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def bayestartest(bayestar='bayestar.fits.gz', credible_level=0.1, output_format=
json=payload
)

pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))

return pdf

Expand Down
4 changes: 2 additions & 2 deletions tests/api_classsearch_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def classsearch(myclass='Early SN Ia candidate', n=10, startdate=None, stopdate=

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down Expand Up @@ -164,7 +164,7 @@ def test_query_url() -> None:

url = "{}/api/v1/latests?class=Early SN Ia candidate&n=10&output-format=json".format(APIURL)
r = requests.get(url)
pdf2 = pd.read_json(r.content)
pdf2 = pd.read_json(io.BytesIO(r.content))

# subset of cols to avoid type issues
cols = ['i:ra', 'i:dec']
Expand Down
2 changes: 1 addition & 1 deletion tests/api_conesearch_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def conesearch(ra='193.8217409', dec='2.8973184', radius='5', startdate_conesear

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_cutouts_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def cutouttest(objectId='ZTF21aaxtctv', kind='Science', stretch='sigmoid', color
elif output_format == 'FITS':
data = fits.open(io.BytesIO(r.content), ignore_missing_simple=True)
elif output_format == 'array':
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
data = pdf['b:cutout{}_stampData'.format(kind)].values[0]

return data
Expand Down
2 changes: 1 addition & 1 deletion tests/api_datesearch_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def datesearch(startdate='2021-07-01 05:59:37.000', window='1', output_format='j

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_performance_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def classsearch(myclass='Solar System MPC', n=100000, startdate='2022-03-03', st

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_random_object_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def get_an_object(number=1, output_format='json', columns='*', object_class="",

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_single_object_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def get_an_object(oid='ZTF21abfmbix', output_format='json', columns='*', withupp

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_sso_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def ssosearch(n_or_d='8467', withEphem=False, columns='*', output_format='json')

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_ssocand_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def ssocandsearch(kind='orbParams', trajectory_id=None, start_date=None, stop_da

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_stats_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def statstest(date='2021', columns='*', output_format='json'):

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_tracklet_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def trackletsearch(date='2021-08-10', columns='*', output_format='json'):

if output_format == 'json':
# Format output in a DataFrame
pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))
elif output_format == 'csv':
pdf = pd.read_csv(io.BytesIO(r.content))
elif output_format == 'parquet':
Expand Down
2 changes: 1 addition & 1 deletion tests/api_xmatch_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def xmatchtest(catalog='mycatalog.csv', header='RA,Dec,ID,Time', radius=1.5, win
json=payload
)

pdf = pd.read_json(r.content)
pdf = pd.read_json(io.BytesIO(r.content))

return pdf

Expand Down

0 comments on commit c7d8166

Please sign in to comment.