Add ESO catalogue functions by ashleythomasbarnes · Pull Request #3531 · astropy/astroquery

ashleythomasbarnes · 2026-02-13T14:44:56Z

We've added functions in the same structure similar to the others to query the ESO catalogues:

list_catalogues -> lists all available catalogues
query_catalogue -> query results for a specific catalogue with constraints

Docs are coming in another PR.

-- Thanks!
@juanmcloaiza @szampier @almicol

szampier · 2026-02-13T15:42:39Z

CHANGES.rst

+eso
+^^^
+
+- Add functionality to list and query ESO catalogues. [#8]
+


I seem to remember that this file is normally edited by the astroquery maintainers

Nope, this is correct, preferably the changelog entry is added in the PR by the PR author.

Let me know if you need more here...

szampier · 2026-02-13T16:16:07Z

General comment: it’s a bit difficult to focus on the new feature since the PR also contains many formatting changes. Splitting these into a separate commit or PR would make the review easier.

bsipocz

I've started reviewing this, but the code style changes are a bit overwhelming, so I stopped when I got to the actual changes in core.py.

Could you please remove any of the style changes (and anyway, please don't force short line length on code) and force push back the actual code changes?

bsipocz · 2026-02-13T16:24:57Z

astroquery/eso/tests/setup_package.py

This file is not needed any more, please remove.

bsipocz · 2026-02-13T17:32:04Z

astroquery/eso/__init__.py

-    tap_url = _config.ConfigItem(
+    tap_obs_url = _config.ConfigItem(


this is technically an API change; but for now it is acceptable as we haven't yet released the ESO refactor work.

bsipocz · 2026-02-13T17:33:42Z

astroquery/eso/core.py

+from ..exceptions import (
+    RemoteServiceError,
+    LoginError,
+    NoResultsWarning,
+    MaxResultsWarning,
+)
 from ..query import QueryWithLogin
 from ..utils import schema
-from .utils import _UserParams, raise_if_coords_not_valid, _reorder_columns, \
-    _raise_if_has_deprecated_keys, _build_adql_string, \
-    DEFAULT_LEAD_COLS_PHASE3, DEFAULT_LEAD_COLS_RAW
+from .utils import (
+    _UserParams,
+    raise_if_coords_not_valid,
+    _reorder_columns,
+    _raise_if_has_deprecated_keys,
+    _build_adql_string,
+    DEFAULT_LEAD_COLS_PHASE3,
+    DEFAULT_LEAD_COLS_RAW,
+)


I really wish these type of style refactorings would not be mixed into feature branches.

Also, we do allow longer lines in astroquery, up to 120 characters, so please don't apply these black type spreads over many lines.

ashleythomasbarnes · 2026-02-13T18:21:25Z

Indeed this should have been a draft PR like we agreed (sorry @szampier)... How should we proceed - shall I revert to draft and make changes, or okay to keep as-in?

ashleythomasbarnes · 2026-02-13T21:00:18Z

Okay, I cleaned up my mess - it should be clearer now. Let me know how you want to proceed...

codecov · 2026-02-13T22:43:38Z

Codecov Report

❌ Patch coverage is 75.00000% with 20 lines in your changes missing coverage. Please review.
✅ Project coverage is 72.69%. Comparing base (de342ea) to head (86877ae).
⚠️ Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
astroquery/eso/core.py	73.68%	20 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3531      +/-   ##
==========================================
- Coverage   72.71%   72.69%   -0.02%     
==========================================
  Files         219      219              
  Lines       20473    20540      +67     
==========================================
+ Hits        14886    14931      +45     
- Misses       5587     5609      +22

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

ashleythomasbarnes · 2026-02-17T09:05:17Z

Just to let you know @bsipocz - I spoke with @juanmcloaiza and @szampier this morning, and we're happy for you to continue the review. I will be away from 1st March until ~ 7th April, so it would be great if we could get this wrapped up by then, otherwise @juanmcloaiza has offered to take over any needed changes whilst I'm gone. Thanks!

updates so query_catalogue and list_catalogues work for both TAP 1.0 and TAP 1.1 - dealing with "safcat." prefix

ashleythomasbarnes · 2026-02-26T15:56:22Z

Sorry @bsipocz, one final commit before I leave tomorrow. This was a very minor one such that @almicol and co can move forward with TAP 1.1 for tap_cap -- still okay now to review when you can. @juanmcloaiza will take over if there is anything urgent while I'm gone.

bsipocz

Unfortunately I see a lot of test failures in this PR for the remote tests. Could you please have a look and fix them before we do more reviews?

The easiest is to test locally with tox -e test-online -- -P eso

bsipocz

There are some naming and API issues that would be nice to address, otherwise the code looks good.

I also still see 3 test failures due to maxrec warnings, but they are also present on the main branch, so this PR doesn't have to fix them.

bsipocz · 2026-03-23T22:42:45Z

astroquery/eso/core.py

            Authentication must be performed beforehand via
            :meth:`astroquery.eso.EsoClass.login`. Authenticated queries
            may be slower. Default is ``False``.
+        which_tap : {"tap_obs", "tap_cat"}, optional


I think this could be named better, more with a descriptor than a question?
E.g tap_endpoint

bsipocz · 2026-03-23T22:45:17Z

astroquery/eso/core.py

        table_to_return = Table()
-        tap_service = self.tap(authenticated)
+        tap_service = self.tap(authenticated, which_tap=which_tap)
        table_to_return = self._try_download_pyvo_table(query, tap_service)


I haven't noticed in the previous review, but I think this method should not be called download as we don't really download a file containing the table but keeping everything in memory. (everywhere else download kind of indicates some file download functionality.

(doesn't have to be part of this PR, but would be nice to change it before a release)

bsipocz · 2026-03-23T22:47:35Z

astroquery/eso/core.py

                     f"\nNumber of records present in the table {table_name}:\n{num_records}\n")

+    @unlimited_maxrec
+    def list_catalogues(self, all_versions: bool = False, cache: bool = True) -> List[str]:


make optional params kwarg only

Suggested change

def list_catalogues(self, all_versions: bool = False, cache: bool = True) -> List[str]:

def list_catalogues(self, *, all_versions: bool = False, cache: bool = True) -> List[str]:

and I hate to say this as I love the 'u's and proper spellings, but it's better for the user experience to have a more uniform API. So, please change the method name to list_catalogs.
British spelling can stay in the narrative docs and comments.

bsipocz · 2026-03-23T22:51:30Z

astroquery/eso/core.py

                                  authenticated=authenticated)
        return self._query_on_allowed_values(user_params)

+    def query_catalogue(self,


same here, please change this to query_catalog

Add ESO catalogue functions (#8)

d194817

ashleythomasbarnes changed the title ~~Add ESO catalogue functions (#8)~~ Add ESO catalogue functions Feb 13, 2026

szampier reviewed Feb 13, 2026

View reviewed changes

bsipocz added the eso label Feb 13, 2026

bsipocz added this to the 0.4.12 milestone Feb 13, 2026

bsipocz reviewed Feb 13, 2026

View reviewed changes

ashleythomasbarnes added 4 commits February 13, 2026 20:51

revert test_eso_remote and remove site_packages

5787caa

revert eso core formatting

22c1cfa

putback catalogue query

8c86e56

minor change

b09b19e

ashleythomasbarnes added 8 commits February 13, 2026 22:05

code style updates

81d609c

more code style updates

fdd6ca1

updated changes.rst with PR #

800de4a

test fixes

0810201

test fixes

8f0d0de

test fixes

caefff0

test fixes

858c58b

test fixes

db96c8b

ashleythomasbarnes added 2 commits February 26, 2026 16:35

Updates for TAP1.1 cat

04c2e78

updates so query_catalogue and list_catalogues work for both TAP 1.0 and TAP 1.1 - dealing with "safcat." prefix

fixing checks

a11a480

bsipocz reviewed Feb 27, 2026

View reviewed changes

included exceptions.MaxResultsWarning

86877ae

bsipocz reviewed Mar 23, 2026

View reviewed changes

		tap_url = _config.ConfigItem(
		tap_obs_url = _config.ConfigItem(

	def list_catalogues(self, all_versions: bool = False, cache: bool = True) -> List[str]:
	def list_catalogues(self, *, all_versions: bool = False, cache: bool = True) -> List[str]:

Uh oh!

Conversation

ashleythomasbarnes commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

szampier commented Feb 13, 2026

Uh oh!

bsipocz left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ashleythomasbarnes commented Feb 13, 2026

Uh oh!

ashleythomasbarnes commented Feb 13, 2026

Uh oh!

codecov bot commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ashleythomasbarnes commented Feb 17, 2026

Uh oh!

ashleythomasbarnes commented Feb 26, 2026

Uh oh!

bsipocz left a comment

Choose a reason for hiding this comment

Uh oh!

bsipocz left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ashleythomasbarnes commented Feb 13, 2026 •

edited

Loading

codecov bot commented Feb 13, 2026 •

edited

Loading