From eb9ff1495acf481736231dcf18783bf9728f7030 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Fri, 11 Apr 2025 19:38:07 +0200 Subject: [PATCH 1/2] EUCLIDSWRQ-191 include new parameters to set the urls for the tap, datalink and cutout services in the constructor --- astroquery/esa/euclid/core.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index f10c607640..978b10da3e 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -42,7 +42,8 @@ class EuclidClass(TapPlus): __VALID_DATALINK_RETRIEVAL_TYPES = conf.VALID_DATALINK_RETRIEVAL_TYPES def __init__(self, *, environment='PDR', tap_plus_conn_handler=None, datalink_handler=None, cutout_handler=None, - verbose=False, show_server_messages=True): + euclid_tap_server=None, euclid_data_server=None, euclid_cutout_server=None, verbose=False, + show_server_messages=True): """Constructor for EuclidClass. Parameters @@ -55,6 +56,12 @@ def __init__(self, *, environment='PDR', tap_plus_conn_handler=None, datalink_ha HTTP(s) connection hander (creator). If no handler is provided, a new one is created. cutout_handler : cutout connection handler object, optional, default None HTTP(s) connection hander (creator). If no handler is provided, a new one is created. + euclid_tap_server : str, optional, default None + the TAP url + euclid_data_server : str, optional, default None + the datalink url + euclid_cutout_server : str, optional, default None + the cutout url verbose : bool, optional, default 'True' flag to display information about the process show_server_messages : bool, optional, default 'True' @@ -72,7 +79,16 @@ def __init__(self, *, environment='PDR', tap_plus_conn_handler=None, datalink_ha url_server = conf.ENVIRONMENTS[environment]['url_server'] - super(EuclidClass, self).__init__(url=url_server, + if euclid_tap_server is None: + euclid_tap_server = url_server + + if euclid_data_server is None: + euclid_data_server = url_server + + if euclid_cutout_server is None: + euclid_cutout_server = url_server + + super(EuclidClass, self).__init__(url=euclid_tap_server, server_context='tap-server', tap_context="tap", upload_context="Upload", @@ -85,7 +101,7 @@ def __init__(self, *, environment='PDR', tap_plus_conn_handler=None, datalink_ha use_names_over_ids=conf.USE_NAMES_OVER_IDS) if datalink_handler is None: - self.__eucliddata = TapPlus(url=url_server, + self.__eucliddata = TapPlus(url=euclid_data_server, server_context="sas-dd", tap_context="tap-server", upload_context="Upload", @@ -99,7 +115,7 @@ def __init__(self, *, environment='PDR', tap_plus_conn_handler=None, datalink_ha self.__eucliddata = datalink_handler if cutout_handler is None: - self.__euclidcutout = TapPlus(url=url_server, + self.__euclidcutout = TapPlus(url=euclid_cutout_server, server_context="sas-cutout", tap_context="tap-server", upload_context="Upload", From 511d058158f5112815092e3e0fcad2cbc0434b69 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Fri, 11 Apr 2025 20:20:35 +0200 Subject: [PATCH 2/2] EUCLIDSWRQ-191 include change log reference --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index d435ccee97..f57acdd47e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -19,6 +19,11 @@ alma - Bug fix in ``footprint_to_reg`` that did not allow regions to be plotted. [#3285] +esa.euclid +^^^^^^^^^^ + +- New parameters in the EuclidClass constructor to specify non-standard environments. [#3288] + heasarc ^^^^^^^