Changelog

Co-authored-by: Copilot <copilot@github.com>

Author: snbianco

CHANGES.rst

@@ -24,6 +24,12 @@ esa.emds.einsteinprobe
 
 - New module to access the ESA Einstein Probe Science Archive. [#3511]
 
+mast
+^^^^
+
+- Updated ``Catalogs`` interface for MAST TAP catalogs, including collection/catalog discovery helpers and a unified query workflow across
+  positional and non-positional searches. [#3582]
+
 
 
 API changes
@@ -76,6 +82,19 @@ mast
 - The ``objectname`` keyword is deprecated in ``MastMissions`` in favor of ``object_names``. [#3540]
 - The ``objectname`` parameter in ``Catalogs``, ``Observations``, ``Tesscut``, and ``utils`` is deprecated
   in favor of ``object_name``. [#3567]
+- ``Catalogs`` has been refactored around VO-TAP queries. The new workflow uses ``collection`` + ``catalog`` (instead of HSC/PanSTARRS-specific
+  assumptions), supports discovery helpers (``get_collections``, ``get_catalogs``, ``get_column_metadata``), and 
+  adds ``supports_spatial_queries`` to inspect positional-query support before querying. [#3582]
+- ``Catalogs.query_criteria`` now provides a unified query interface for positional and non-positional searches, with support for 
+  cone searches around coordinates or an object, STC-S regions via the ``region`` parameter, column selection, sorting, count-only queries, 
+  pagination via ``limit``/``offset``, and a ``filters`` dictionary for column names that conflict with method arguments. [#3582]
+- ``Catalogs.query_region`` and ``Catalogs.query_object`` now follow the same unified backend as ``query_criteria``, including support 
+  for ``collection``/``catalog``, ``limit``/``offset``, ``select_cols``, sorting, and advanced criteria filters. [#3582]
+- The legacy ``version``, ``pagesize``, and ``page`` parameters in ``Catalogs`` query methods are now deprecated in favor 
+  of ``collection``/``catalog`` and ``limit``/``offset``. [#3582]
+- Passing a collection name via ``Catalogs(..., catalog=...)`` is deprecated; use the ``collection`` parameter instead. [#3582]
+- ``Catalogs`` legacy HSC-only helper methods (``query_hsc_matchid[_async]``, ``get_hsc_spectra[_async]``, and
+  ``download_hsc_spectra``) are deprecated and will be removed in a future release. [#3582]
 
 vo_conesearch
 ^^^^^^^^^^^^^

astroquery/mast/catalog_collection.py

@@ -512,4 +512,4 @@ def _verify_criteria(self, catalog, **criteria):
                 raise InvalidQueryError(
                     f"Filter '{kwd}' is not recognized for collection '{self.name}' and "
                     f"catalog '{catalog}'.{suggestion}"
-                )
+                )

astroquery/mast/collections.py

@@ -1583,4 +1583,4 @@ def _make_data_url(self, row):
         return f"https://hla.stsci.edu/cgi-bin/ecfproxy?file_id={dataset}.fits"
 
 
-Catalogs = CatalogsClass()
+Catalogs = CatalogsClass()

astroquery/mast/tests/data/README.rst

@@ -82,7 +82,7 @@ To generate `~astroquery.mast.tests.data.tap_catalogs.vot`, use the following:
     >>> import pyvo
     >>> from astropy.io.votable import writeto
     ...
-    >>> tap_service = pyvo.dal.TAPService("https://masttest.stsci.edu/vo-tap/api/v0.1/tic")
+    >>> tap_service = pyvo.dal.TAPService("https://mast.stsci.edu/vo-tap/api/v0.1/tic")
     >>> query = 'SELECT table_name, description FROM tap_schema.tables'
     >>> result = tap_service.run_sync(query)
     >>> writeto(result.votable, 'tap_catalogs.vot')  # doctest: +SKIP
@@ -94,7 +94,7 @@ To generate `~astroquery.mast.tests.data.tap_columns.vot`, use the following:
     >>> import pyvo
     >>> from astropy.io.votable import writeto
     ...
-    >>> tap_service = pyvo.dal.TAPService("https://masttest.stsci.edu/vo-tap/api/v0.1/tic")
+    >>> tap_service = pyvo.dal.TAPService("https://mast.stsci.edu/vo-tap/api/v0.1/tic")
     >>> query = "SELECT column_name, datatype, unit, ucd, description FROM tap_schema.columns WHERE table_name = 'dbo.catalogrecord'"
     >>> result = tap_service.run_sync(query)
     >>> writeto(result.votable, 'tap_columns.vot')  # doctest: +SKIP
@@ -106,7 +106,7 @@ To generate `~astroquery.mast.tests.data.tap_capabilities.vot`, use the followin
     >>> import requests
     >>> import pyvo
     ...
-    >>> tap_service = pyvo.dal.TAPService("https://masttest.stsci.edu/vo-tap/api/v0.1/tic")
+    >>> tap_service = pyvo.dal.TAPService("https://mast.stsci.edu/vo-tap/api/v0.1/tic")
     >>> caps_url = tap_service.baseurl.rstrip("/") + "/capabilities"
     >>> resp = requests.get(caps_url)
     >>> resp.raise_for_status()
@@ -121,7 +121,7 @@ To generate `~astroquery.mast.tests.data.tap_results.vot`, use the following:
     >>> import pyvo
     >>> from astropy.io.votable import writeto
     ...
-    >>> tap_service = pyvo.dal.TAPService("https://masttest.stsci.edu/vo-tap/api/v0.1/tic")
+    >>> tap_service = pyvo.dal.TAPService("https://mast.stsci.edu/vo-tap/api/v0.1/tic")
     >>> query = "SELECT TOP 10 * FROM dbo.catalogrecord WHERE CONTAINS(POINT('ICRS', ra, dec), CIRCLE('ICRS', 23.34086, 60.658, 0.002)) = 1"
     >>> result = tap_service.run_sync(query)
     >>> writeto(result.votable, 'tap_results.vot')  # doctest: +SKIP

astroquery/mast/tests/test_mast.py

@@ -2884,4 +2884,4 @@ def test_download_file_from_cloud_verbose(patch_boto3):
     )
     # Ensure callback was supplied
     _, kwargs = mock_resource.Bucket.return_value.download_file.call_args
-    assert "Callback" in kwargs
+    assert "Callback" in kwargs

astroquery/mast/tests/test_mast_remote.py

@@ -1724,4 +1724,4 @@ def check_cutout_list(cutout_list, data_shape):
         with pytest.warns(NoResultsWarning, match='Missing HAP files for input target. Cutout not performed.'):
             cutout_list = Hapcut.get_cutouts(coordinates=bad_coord)
             assert isinstance(cutout_list, list)
-            assert len(cutout_list) == 0
+            assert len(cutout_list) == 0