Skip to content

Splatalogue: refactor to use cache #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 19, 2016
Merged

Splatalogue: refactor to use cache #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab6e505
refactor splatalogue to use caching
keflavich Sep 14, 2016
c73bf86
remove unnecessary import
keflavich Sep 14, 2016
d1c518d
superinit
keflavich Sep 14, 2016
d0feb3a
fix splatalogue local test monkeypatches
keflavich Sep 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions astroquery/splatalogue/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from astropy.io import ascii
from astropy import units as u
from ..query import BaseQuery
from ..utils import commons, async_to_sync
from ..utils import async_to_sync
from ..utils.docstr_chompers import prepend_docstr_noreturns
from . import conf
from . import load_species_table
Expand Down Expand Up @@ -63,6 +63,7 @@ def __init__(self, **kwargs):
default keyword arguments (see `query_lines`) can be overridden
here.
"""
super(SplatalogueClass, self).__init__()
self.data = self._default_kwargs()
self.set_default_options(**kwargs)

Expand Down Expand Up @@ -355,7 +356,7 @@ def _validate_kwargs(self, min_frequency=None, max_frequency=None,

@prepend_docstr_noreturns("\n" + _parse_kwargs.__doc__)
def query_lines_async(self, min_frequency=None, max_frequency=None,
**kwargs):
cache=True, **kwargs):
"""

Returns
Expand Down Expand Up @@ -385,10 +386,11 @@ def query_lines_async(self, min_frequency=None, max_frequency=None,
if get_query_payload:
return data_payload

response = commons.send_request(
self.QUERY_URL,
data_payload,
self.TIMEOUT)
response = self._request(method='POST',
url=self.QUERY_URL,
data=data_payload,
timeout=self.TIMEOUT,
cache=cache)

self.response = response

Expand Down
7 changes: 5 additions & 2 deletions astroquery/splatalogue/tests/test_splatalogue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ def data_path(filename):
@pytest.fixture
def patch_post(request):
mp = request.getfuncargvalue("monkeypatch")
mp.setattr(requests, 'post', post_mockreturn)
mp.setattr(requests.Session, 'request', post_mockreturn)
return mp


def post_mockreturn(url, data=None, timeout=10, **kwargs):
def post_mockreturn(self, method, url, data=None, timeout=10, files=None,
params=None, headers=None, **kwargs):
if method != 'POST':
raise ValueError("A 'post request' was made with method != POST")
filename = data_path(SPLAT_DATA)
content = open(filename, "rb").read()
return MockResponse(content, **kwargs)
Expand Down