Fixes for PR 2140

Author: “Javier

astroquery/esa/jwst/__init__.py

@@ -26,6 +26,8 @@ class Conf(_config.ConfigNamespace):
 
     JWST_TAP_SERVER = _config.ConfigItem("http://jwstdummytap.com")
     JWST_DATA_SERVER = _config.ConfigItem("http://jwstdummydata.com")
+    JWST_TOKEN = _config.ConfigItem("jwstToken")
+    JWST_MESSAGES = _config.ConfigItem("notification?action=GetNotifications")
 
     JWST_MAIN_TABLE = _config.ConfigItem("jwst.main", "JWST main table, combination of observation and plane tables.")
 

astroquery/esa/jwst/core.py

@@ -14,7 +14,6 @@
 import shutil
 import tarfile
 import zipfile
-from urllib.parse import urlencode, quote_plus
 from builtins import isinstance
 from datetime import datetime
 
@@ -23,27 +22,26 @@
 from astropy.coordinates import SkyCoord
 from astropy.table import vstack
 from astropy.units import Quantity
-from astroquery.exceptions import RemoteServiceError
 from requests.exceptions import ConnectionError
-from astroquery.utils import send_request
 
-from astroquery.query import BaseQuery
+from astroquery.exceptions import RemoteServiceError
 from astroquery.ipac.ned import Ned
+from astroquery.query import BaseQuery
 from astroquery.simbad import Simbad
 from astroquery.utils import commons
 from astroquery.utils.tap import TapPlus
 from astroquery.vizier import Vizier
 from . import conf
 from .data_access import JwstDataHandler
 
-
 __all__ = ['Jwst', 'JwstClass']
 
 
 class JwstClass(BaseQuery):
 
     """
     Proxy class to default TapPlus object (pointing to JWST Archive)
+    THIS MODULE IS NOT OPERATIVE YET. METHODS WILL NOT WORK UNTIL eJWST ARCHIVE IS OFFICIALLY RELEASED
     """
 
     JWST_DEFAULT_COLUMNS = ['observationid', 'calibrationlevel', 'public',
@@ -60,7 +58,7 @@ class JwstClass(BaseQuery):
     CAL_LEVELS = ['ALL', 1, 2, 3, -1]
     REQUESTED_OBSERVATION_ID = "Missing required argument: 'observation_id'"
 
-    def __init__(self, tap_plus_handler=None, data_handler=None):
+    def __init__(self, *, tap_plus_handler=None, data_handler=None):
         if tap_plus_handler is None:
             self.__jwsttap = TapPlus(url=conf.JWST_TAP_SERVER,
                                      data_context='data')
@@ -70,9 +68,9 @@ def __init__(self, tap_plus_handler=None, data_handler=None):
         if data_handler is None:
             self.__jwstdata = JwstDataHandler(
                 base_url=conf.JWST_DATA_SERVER)
-            # self.__jwstdata = self.__jwsttap;
         else:
             self.__jwstdata = data_handler
+        print("THIS MODULE IS NOT OPERATIVE YET. METHODS WILL NOT WORK UNTIL eJWST ARCHIVE IS OFFICIALLY RELEASED")
 
     def load_tables(self, *, only_names=False, include_shared_tables=False,
                     verbose=False):
@@ -677,7 +675,7 @@ def set_token(self, token):
         token: str, mandatory
             MAST token to have access to propietary data
         """
-        subContext = "jwstToken"
+        subContext = conf.JWST_TOKEN
         args = {"token": token}
         connHandler = self.__jwsttap._TapPlus__getconnhandler()
         data = connHandler.url_encode(args)
@@ -689,6 +687,19 @@ def set_token(self, token):
         else:
             print("MAST token has been set successfully")
 
+    def get_status_messages(self):
+        """Retrieve the messages to inform users about
+        the status of JWST TAP
+        """
+
+        subContext = conf.JWST_MESSAGES
+        connHandler = self.__jwsttap._TapPlus__getconnhandler()
+        response = connHandler.execute_tapget(subContext, False)
+        if response.status == 200:
+            for line in response:
+                string_message = line.decode("utf-8")
+                print(string_message[string_message.index('=')+1:])
+
     def get_product_list(self, *, observation_id=None,
                          cal_level="ALL",
                          product_type=None):

astroquery/esa/jwst/tests/test_jwstdata.py

@@ -31,10 +31,7 @@ def get_product_mock(params, *args, **kwargs):
 
 @pytest.fixture(autouse=True)
 def get_product_request(request):
-    try:
-        mp = request.getfixturevalue("monkeypatch")
-    except AttributeError:  # pytest < 3
-        mp = request.getfuncargvalue("monkeypatch")
+    mp = request.getfixturevalue("monkeypatch")
     mp.setattr(JwstClass, '_query_get_product', get_product_mock)
     return mp
 
@@ -43,14 +40,13 @@ class TestData:
 
     def test_get_product(self):
         dummyTapHandler = DummyTapHandler()
-        jwst = JwstClass(dummyTapHandler)
+        jwst = JwstClass(tap_plus_handler=dummyTapHandler)
         # default parameters
         parameters = {}
         parameters['artifact_id'] = None
         with pytest.raises(ValueError) as err:
             jwst.get_product()
         assert "Missing required argument: 'artifact_id'" in err.value.args[0]
-        # dummyDataHandler.check_call('get_product', parameters)
         # test with parameters
         dummyTapHandler.reset()
         parameters = {}
@@ -59,8 +55,7 @@ def test_get_product(self):
         params_dict['DATA_RETRIEVAL_ORIGIN'] = 'ASTROQUERY'
         params_dict['ARTIFACTID'] = '00000000-0000-0000-8740-65e2827c9895'
         parameters['params_dict'] = params_dict
-        parameters['output_file'] = 'jw00617023001_02102_00001_nrcb4_'\
-                                    'uncal.fits'
+        parameters['output_file'] = 'jw00617023001_02102_00001_nrcb4_uncal.fits'
         parameters['verbose'] = False
         jwst.get_product(artifact_id='00000000-0000-0000-8740-65e2827c9895')
         dummyTapHandler.check_call('load_data', parameters)