MAINT: passing on self._session to pyvo

Author: bsipocz

astroquery/alma/core.py

@@ -30,7 +30,7 @@
 from ..exceptions import LoginError
 from ..utils import commons
 from ..utils.process_asyncs import async_to_sync
-from ..query import BaseQuery, QueryWithLogin
+from ..query import BaseQuery, QueryWithLogin, BaseVOQuery
 from .tapsql import (_gen_pos_sql, _gen_str_sql, _gen_numeric_sql,
                      _gen_band_list_sql, _gen_datetime_sql, _gen_pol_sql, _gen_pub_sql,
                      _gen_science_sql, _gen_spec_res_sql, ALMA_DATE_FORMAT)
@@ -212,7 +212,7 @@ def _gen_sql(payload):
     return sql + where
 
 
-class AlmaAuth(BaseQuery):
+class AlmaAuth(BaseVOQuery, BaseQuery):
     """Authentication session information for passing credentials to an OIDC instance
 
     Assumes an OIDC system like Keycloak with a preconfigured client app called "oidc" to validate against.
@@ -366,7 +366,7 @@ def sia_url(self):
     @property
     def tap(self):
         if not self._tap:
-            self._tap = pyvo.dal.tap.TAPService(baseurl=self.tap_url)
+            self._tap = pyvo.dal.tap.TAPService(baseurl=self.tap_url, session=self._session)
         return self._tap
 
     @property

astroquery/cadc/core.py

@@ -17,7 +17,7 @@
 
 from ..utils.class_or_instance import class_or_instance
 from ..utils import async_to_sync, commons
-from ..query import BaseQuery
+from ..query import BaseQuery, BaseVOQuery
 from bs4 import BeautifulSoup
 from astropy import units as u
 from astropy.coordinates import Angle
@@ -37,7 +37,7 @@
 
 
 @async_to_sync
-class CadcClass(BaseQuery):
+class CadcClass(BaseVOQuery, BaseQuery):
     """
     Class for accessing CADC data. Typical usage:
 

astroquery/ipac/irsa/core.py

@@ -13,7 +13,7 @@
 from astropy.utils.decorators import deprecated_renamed_argument
 from pyvo.dal import TAPService
 from astroquery import log
-from astroquery.query import BaseQuery
+from astroquery.query import BaseVOQuery
 from astroquery.utils.commons import parse_coordinates
 from astroquery.ipac.irsa import conf
 from astroquery.exceptions import InvalidQueryError
@@ -22,7 +22,7 @@
 __all__ = ['Irsa', 'IrsaClass']
 
 
-class IrsaClass(BaseQuery):
+class IrsaClass(BaseVOQuery):
 
     def __init__(self):
         super().__init__()
@@ -32,7 +32,7 @@ def __init__(self):
     @property
     def tap(self):
         if not self._tap:
-            self._tap = TAPService(baseurl=self.tap_url)
+            self._tap = TAPService(baseurl=self.tap_url, session=self._session)
         return self._tap
 
     def query_tap(self, query, *, maxrec=None):

astroquery/ipac/nexsci/nasa_exoplanet_archive/core.py

@@ -21,7 +21,7 @@
 
 # Import astroquery utilities
 from astroquery.exceptions import InputWarning, InvalidQueryError, NoResultsWarning, RemoteServiceError
-from astroquery.query import BaseQuery
+from astroquery.query import BaseQuery, BaseVOQuery
 from astroquery.utils import async_to_sync, commons
 from astroquery.utils.class_or_instance import class_or_instance
 from astroquery.ipac.nexsci.nasa_exoplanet_archive import conf
@@ -129,7 +129,7 @@ class InvalidTableError(InvalidQueryError):
 # Class decorator, async_to_sync, modifies NasaExoplanetArchiveClass to convert
 # all query_x_async methods to query_x methods
 @async_to_sync
-class NasaExoplanetArchiveClass(BaseQuery):
+class NasaExoplanetArchiveClass(BaseVOQuery, BaseQuery):
     """
     The interface for querying the NASA Exoplanet Archive TAP and API services
 
@@ -230,7 +230,7 @@ def query_criteria_async(self, table, get_query_payload=False, cache=None, **cri
             cache = self.CACHE
 
         if table in self.TAP_TABLES:
-            tap = pyvo.dal.tap.TAPService(baseurl=self.URL_TAP)
+            tap = pyvo.dal.tap.TAPService(baseurl=self.URL_TAP, session=self._session)
             # construct query from table and request_payload (including format)
             tap_query = self._request_to_sql(request_payload)