Skip to content

Enable TAP for ESO module #3141

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.

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

Open
wants to merge 155 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
cf8ea03
Delete this commit - message on __init__ EsoClass
juanmcloaiza Feb 4, 2025
ad102bb
Switch to TAP list_surveys and list_instruments
juanmcloaiza Nov 27, 2024
ec96106
Define tap_url as static method
juanmcloaiza Nov 27, 2024
7e2c36d
Deselect ALMA at query level - TEMPORAL SOLUTION
juanmcloaiza Nov 27, 2024
9a5cf77
Mark list_surveys as deprecated; define list_collections
juanmcloaiza Nov 27, 2024
68ace70
Add name of the new function to deprecation warning
juanmcloaiza Nov 27, 2024
54f80f9
Deprecate list_ and query_ _surveys in favor of _collections
juanmcloaiza Nov 27, 2024
dc52dc5
Replace 'survey' by 'collection' accross eso module
juanmcloaiza Nov 28, 2024
e85be83
Make Pep8-compliant
juanmcloaiza Nov 29, 2024
48428bf
Use astroquery deprecated decorator
juanmcloaiza Nov 29, 2024
dc04c58
Accept argument 'surveys=' when calling *_surveys() deprecated functions
juanmcloaiza Nov 29, 2024
b6f908e
Remove unused imports
juanmcloaiza Nov 29, 2024
738bf0e
query_surveys --> query_collections in test_eso.py
juanmcloaiza Nov 29, 2024
269be40
Update CHANGES.rst
juanmcloaiza Nov 29, 2024
381dd21
Add test_tap_url()
juanmcloaiza Nov 29, 2024
787eaf0
Remove hard-coded queries iside user-exposed functions
juanmcloaiza Dec 2, 2024
dda5842
Remove function _activate_form
juanmcloaiza Dec 2, 2024
2bea60c
Develop py2adql function with tests
juanmcloaiza Dec 3, 2024
e5da5c1
Handle coord1 and coord2 arguments in query_collections
juanmcloaiza Dec 4, 2024
b2e4513
Remove intersects arg from py2adql
juanmcloaiza Dec 4, 2024
87baaa0
Write TAP enabled query_collections; pass existing tests
juanmcloaiza Dec 5, 2024
9d915b5
Remove intersects arg from py2adql test - not its responsibility
juanmcloaiza Dec 5, 2024
2f63b5c
Add ATLASGAL to SGRA_COLLECTIONS
juanmcloaiza Dec 5, 2024
1773db6
Write test for func query_tap_service
juanmcloaiza Dec 5, 2024
04ba43d
Define and use _query_tap_service
juanmcloaiza Dec 5, 2024
d57bbbe
fwd query_instrument and _collections to query_instrument_or_collection
juanmcloaiza Dec 5, 2024
e5d4188
Ignore DALOverflowWarning with more granularity
juanmcloaiza Dec 5, 2024
1fb99a5
Remove unused code
juanmcloaiza Dec 5, 2024
0332d00
Take instrument or collection data from the corresponding table
juanmcloaiza Dec 6, 2024
b7a6b9e
Ignore DALOverflowWarning on remote tests
juanmcloaiza Dec 6, 2024
fc04ede
Issue queries based on new QueryOnField class
juanmcloaiza Dec 6, 2024
91de06b
Remove unused function _query
juanmcloaiza Dec 9, 2024
5910d12
Modify test_multicollection to something less arbitrary
juanmcloaiza Dec 9, 2024
7250a76
Make PEP8 linter happy
juanmcloaiza Dec 9, 2024
d9f17c1
Replace mutable default arguments by None
juanmcloaiza Dec 11, 2024
ef7d045
Add type hints to query_instruments and query_collections
juanmcloaiza Dec 11, 2024
bd0f6a8
Rename *_list attributes; add return types
juanmcloaiza Dec 11, 2024
9b82319
Add return types
juanmcloaiza Dec 11, 2024
63c7b09
Refactor QueryOnField classes as dataclasses
juanmcloaiza Dec 11, 2024
9143bdb
correctly pass the dataclass to query_* function
juanmcloaiza Dec 11, 2024
d571eb2
Annotate types of EsoClass.collections and instruments
juanmcloaiza Dec 11, 2024
4784a56
Add type hints to py2adql
juanmcloaiza Dec 11, 2024
5820992
Write utils function sanitize_val; Add top arg in py2adql
juanmcloaiza Dec 11, 2024
0b0ea51
Write TAP version of query_main; sanitize constraints vals
juanmcloaiza Dec 11, 2024
51cdd5d
correct typo in query string
juanmcloaiza Dec 12, 2024
ebaa7ff
Add test_main_SgrAstar
juanmcloaiza Dec 12, 2024
8c6bfc0
Row limit handled at query level. No filterwarnings needed
juanmcloaiza Dec 12, 2024
c2f0f2f
query_main is always against dbo.raw
juanmcloaiza Dec 12, 2024
efd397f
Add assert messages
juanmcloaiza Dec 12, 2024
73019c8
Make linter happy
juanmcloaiza Dec 12, 2024
ea46793
Add cache functionality to tap queries
juanmcloaiza Dec 13, 2024
6472458
Try mimicking the old warning behaviour
juanmcloaiza Dec 13, 2024
477410d
Provisional fix to apex query
juanmcloaiza Dec 13, 2024
bad5db4
Use t1.values_equal(t2) for table equality
juanmcloaiza Dec 13, 2024
cbe513d
Test table equality via t1.values_equal(t2)
juanmcloaiza Dec 16, 2024
d01d49b
Do not exclude ALMA from collection queries
juanmcloaiza Dec 16, 2024
800aa87
Rename request --> table in function from_cache(...)
juanmcloaiza Jan 16, 2025
9d2b786
Remove unused data files
juanmcloaiza Jan 17, 2025
6c8c784
Update monkeypatches in test_eso.py
juanmcloaiza Jan 17, 2025
3cbd357
Add data needed by monkeypatch
juanmcloaiza Jan 17, 2025
2933caf
Cleanup test_eso.py
juanmcloaiza Jan 17, 2025
b1b1841
Make linter heppier
juanmcloaiza Jan 17, 2025
3d06e27
Make the linter happier
juanmcloaiza Jan 17, 2025
20f8758
Add docstrings to utils.py
juanmcloaiza Jan 17, 2025
9cbd9cf
Make linter happy
juanmcloaiza Jan 17, 2025
8f9f1a9
Make linter happy
juanmcloaiza Jan 17, 2025
f6b020a
Fix E502 the backslash is redundant between brackets
juanmcloaiza Jan 17, 2025
2447777
Add changelog; fix docs title underline
juanmcloaiza Jan 17, 2025
99f29b7
Raise NotImplementedError in query_apex_quicklooks
juanmcloaiza Jan 17, 2025
52889c8
Write monkeypatch offline test for apex_quicklooks
juanmcloaiza Jan 17, 2025
63aad7f
Write monkeypatch offline test for apex_quicklooks
juanmcloaiza Jan 17, 2025
0ed63e1
Addressed some TODOs
juanmcloaiza Jan 17, 2025
d8b5506
Bugfix: The print_help message is truncated
juanmcloaiza Jan 31, 2025
0d5f613
put back except Exception
juanmcloaiza Jan 31, 2025
0e16992
Deprecate help arg in favour of print_help
juanmcloaiza Feb 4, 2025
7964e22
retrieve_data handles datasets as astropy.table.column
juanmcloaiza Feb 5, 2025
a1c543a
(box, coord1, coord2) --> (ra, dec, radius)
juanmcloaiza Feb 5, 2025
bbcd360
Pep8
juanmcloaiza Feb 5, 2025
e932414
Take tap_url_dev in config from env vars
juanmcloaiza Feb 5, 2025
c946678
Rewrite query functions; query the ISts
juanmcloaiza Feb 7, 2025
bc9bbd6
clean up log functions
juanmcloaiza Feb 7, 2025
1f49748
http --> https
juanmcloaiza Feb 7, 2025
c57e9b4
Read TAP_URL from environment var
juanmcloaiza Feb 7, 2025
9a08987
Avail: 'top', 'count_only', 'maxrec', 'MaxResultsWarning'
juanmcloaiza Feb 12, 2025
7db0092
Improve MaxResultsWarning message
juanmcloaiza Feb 12, 2025
3bd39c1
Add tests for ROW_LIMIT and top
juanmcloaiza Feb 12, 2025
d8d2009
ignore DALOverflowWarning in setup.cfg
juanmcloaiza Feb 13, 2025
56cad5e
Ignore DALOverflowWarning in tests
juanmcloaiza Feb 13, 2025
ebdf89d
Correct offline tests monkeypatch keys
juanmcloaiza Feb 13, 2025
2eef5e7
Add provisional tests placeholders
juanmcloaiza Feb 13, 2025
826f598
Add test_tap_url
juanmcloaiza Feb 13, 2025
8c72abd
write test_request_file()
juanmcloaiza Feb 13, 2025
5f8c74a
Add tests for cache
juanmcloaiza Feb 13, 2025
43bafcd
add test data file
juanmcloaiza Feb 13, 2025
03680d8
Add test file
juanmcloaiza Feb 13, 2025
6f49b85
Add tests for list instruments and collections
juanmcloaiza Feb 13, 2025
06dd8d8
Add tests for list instruments and collections
juanmcloaiza Feb 13, 2025
6e6a4ba
Add test data for list_ functions
juanmcloaiza Feb 13, 2025
5a80bf1
Remove empty tests
juanmcloaiza Feb 14, 2025
1748422
pep8
juanmcloaiza Feb 14, 2025
af1c88f
Remove cache from query_ functions
juanmcloaiza Feb 26, 2025
365299a
read ESO_TAP_URL from env var; otherwise use the config one
juanmcloaiza Feb 26, 2025
59aa0fe
Define unlimited_max_rec decorator
juanmcloaiza Feb 26, 2025
8ef28e9
Make test_tap_url() consistent
juanmcloaiza Feb 26, 2025
62884ea
Avoid defining msg string before each log message
juanmcloaiza Feb 27, 2025
ae04ea2
Remove apex_quicklooks test
juanmcloaiza Feb 27, 2025
b9e5031
Clean-up code; increase test coverage
juanmcloaiza Feb 27, 2025
9762a4d
Refactor query_tap_service; define maxrec getter+setter
juanmcloaiza Feb 27, 2025
6eae50d
Add test_maxrec
juanmcloaiza Feb 27, 2025
289ac68
Refactor and test try_download_pyvo_table
juanmcloaiza Feb 28, 2025
5d1bf23
Delegate warnings to its own method; write test
juanmcloaiza Feb 28, 2025
dfe6490
pep8
juanmcloaiza Feb 28, 2025
6560368
Add test case to py2adql
juanmcloaiza Feb 28, 2025
537146f
add alpaca to instrument list
juanmcloaiza Mar 3, 2025
f176cf4
Make non-user facing functions private
juanmcloaiza Mar 12, 2025
203fd0c
Make non-user facing functions private
juanmcloaiza Mar 12, 2025
3622606
helpmessage: add xtype, descr, units, nrows
juanmcloaiza Mar 14, 2025
fc02c1a
utils.py small refactor
juanmcloaiza Mar 14, 2025
8afbb33
Clean tests code
juanmcloaiza Mar 14, 2025
a63c26a
Allow returning only the query string without issuing the query
juanmcloaiza Mar 14, 2025
c163fa3
Bugfix: cone search params ignored when no other filters
juanmcloaiza Mar 14, 2025
f7a9e94
Update test_eso_remote.py
juanmcloaiza Mar 14, 2025
94a7364
Update test_eso_remote.py
juanmcloaiza Mar 14, 2025
fe1cdab
Allow authenticated queries; avoid saving password in plain text
juanmcloaiza Mar 17, 2025
49ba5fe
Rename collections --> surveys
juanmcloaiza Mar 26, 2025
d4f10cd
pep-8
juanmcloaiza Mar 26, 2025
c2a072c
Increase default maxrec to 1000
juanmcloaiza Mar 26, 2025
3665555
put back help, open_form, filter_columns arguments
juanmcloaiza Mar 27, 2025
3b6a2f5
pep-8
juanmcloaiza Mar 27, 2025
d4e70d5
doc: revert query_ and list_ _collections to _surveys
juanmcloaiza Mar 27, 2025
5c193ca
Add docstrings to list_instruments and list_surveys
juanmcloaiza Apr 1, 2025
7c9862e
Update query_surveys docstring
juanmcloaiza Apr 1, 2025
84cc4d0
Update docstring: query_surveys
juanmcloaiza Apr 1, 2025
0e42812
Update docstrings for query_main and query_instrument
juanmcloaiza Apr 1, 2025
bd6e4ff
Make tap_url method private
juanmcloaiza Apr 1, 2025
104dea6
Add docstring to query_tap_service
juanmcloaiza Apr 1, 2025
58b02dd
Update docstring query_tap_service
juanmcloaiza Apr 1, 2025
a558961
Remove description col from table help output
juanmcloaiza Apr 2, 2025
c4ad7c0
Update ESO docs
juanmcloaiza Apr 2, 2025
221699b
Update CHANGES.rst
juanmcloaiza Apr 2, 2025
8cbb400
Implement query_apex_quicklooks
juanmcloaiza Apr 7, 2025
c0afc94
Remove args from apex_quicklooks - ra, dec, radius
juanmcloaiza Apr 7, 2025
8ad1f7a
Rename args ra, dec, radius --> cone_[xxx]
juanmcloaiza Apr 8, 2025
6b746e0
Update error message on query fails
juanmcloaiza Apr 8, 2025
04fb17d
fix: cone search ignored when cone_ra=0
juanmcloaiza Apr 10, 2025
bc1ef0b
Check type in maxrec setter
juanmcloaiza Apr 11, 2025
78e7340
Reorder columns before returning results
juanmcloaiza Apr 16, 2025
c015147
Reorder columns before returning the table
juanmcloaiza Apr 17, 2025
6540e36
pep8
juanmcloaiza Apr 17, 2025
55ad1a0
Allow TAP operators on column_filters (#5)
juanmcloaiza Apr 24, 2025
386a72c
Add missing blank line to CHANGES.rst
juanmcloaiza Apr 25, 2025
50199b2
Add 'not in' and 'not like' to supported TAP operators
juanmcloaiza Apr 25, 2025
fb8a216
Update documentation and docstrings
juanmcloaiza Apr 25, 2025
cf2d020
Update documentation
juanmcloaiza Apr 25, 2025
b0f1e32
docs: add warning and column_filters fix
juanmcloaiza Apr 25, 2025
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
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ linelists.cdms

- Add a keyword to control writing of new species cache files. This is needed to prevent tests from overwriting those files. [#3297]

eso
^^^

- Use TAP backend instead of WDB. [#3141]

heasarc
^^^^^^^

Expand Down
8 changes: 4 additions & 4 deletions astroquery/eso/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ class Conf(_config.ConfigNamespace):
"""

row_limit = _config.ConfigItem(
50,
1000,
'Maximum number of rows returned (set to -1 for unlimited).')
username = _config.ConfigItem(
"",
'Optional default username for ESO archive.')
query_instrument_url = _config.ConfigItem(
"http://archive.eso.org/wdb/wdb/eso",
'Root query URL for main and instrument queries.')
tap_url = _config.ConfigItem(
"https://archive.eso.org/tap_obs",
'URL for TAP queries.')


conf = Conf()
Expand Down
Loading
Loading