Skip to content

Fixed login issue. #999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 4, 2017
Merged

Fixed login issue. #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbdc3a9
Fixed login issue, updated dict.keys() issue, and restored check_all_…
agroener Nov 4, 2017
e364d0c
Fixed whitespace issue.
agroener Nov 4, 2017
7b6ea30
Added line to the changelog.
agroener Nov 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- MAST: Added convenience function to list available missions. [#947]
- SIMBAD: adding 'get_query_payload' kwarg to all public methods to return
the request parameters. [#962]
- CosmoSim: Fixed login service. [#999]
- ESO: The upstream API changed. We have adapted. [#970]
- ESO: Added 'destination' keyword to Eso.retrieve_data(), to download files
to a specific location (other than the cache). [#976]
Expand Down
56 changes: 27 additions & 29 deletions astroquery/cosmosim/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ def _login(self, username=None, password=None, store_password=False,

# Delete job; prevent them from piling up with phase PENDING
if authenticated.status_code == 200:
soup = BeautifulSoup(authenticated.content)
self.delete_job(jobid=str(soup.find("uws:jobid").string),
soup = BeautifulSoup(authenticated.content, "lxml")
self.delete_job(jobid=str(soup.find("uws:jobref")["id"]),
squash=True)

return authenticated
Expand Down Expand Up @@ -177,8 +177,8 @@ def check_login_status(self):
if authenticated.status_code == 200:
warnings.warn("Status: You are logged in as {0}."
.format(self.username))
soup = BeautifulSoup(authenticated.content)
self.delete_job(jobid=str(soup.find("uws:jobid").string),
soup = BeautifulSoup(authenticated.content, "lxml")
self.delete_job(jobid=str(soup.find("uws:jobref")["id"]),
squash=True)
else:
warnings.warn("Status: The username/password combination "
Expand Down Expand Up @@ -230,7 +230,7 @@ def run_sql_query(self, query_string, tablename=None, queue=None,
data={'query': query_string, 'phase': 'run',
'queue': queue},
cache=cache)
soup = BeautifulSoup(result.content)
soup = BeautifulSoup(result.content, "lxml")
phase = soup.find("uws:phase").string
if phase in ['ERROR']:
warnings.warn("No table was generated for job with phase "
Expand All @@ -256,8 +256,8 @@ def run_sql_query(self, query_string, tablename=None, queue=None,
cache=cache)
self._existing_tables()

soup = BeautifulSoup(result.content)
self.current_job = str(soup.find("uws:jobid").string)
soup = BeautifulSoup(result.content, "lxml")
self.current_job = str(soup.find("uws:jobref")["id"])
warnings.warn("Job created: {}".format(self.current_job))

if mail or text:
Expand All @@ -271,14 +271,13 @@ def _existing_tables(self):
use for a given set of user credentials. Keys are jobids and values
are the tables which are stored under those keys.
"""

checkalljobs = self.check_all_jobs()
completed_jobs = [key for key in self.job_dict.keys()
if self.job_dict[key] in ['COMPLETED', 'EXECUTING']]
soup = BeautifulSoup(checkalljobs.content)
soup = BeautifulSoup(checkalljobs.content, "lxml")
self.table_dict = {}

for i in soup.find_all("uws:jobref"):
for i in soup.find_all({"uws:jobref"}):
jobid = i.get('xlink:href').split('/')[-1]
if jobid in completed_jobs:
self.table_dict[jobid] = str(i.get('id'))
Expand Down Expand Up @@ -341,15 +340,14 @@ def check_all_jobs(self, phase=None, regex=None, sortby=None):
The requests response for the GET request for finding all
existing jobs.
"""

checkalljobs = self._request('GET', CosmoSim.QUERY_URL,
auth=(self.username, self.password),
params={'print': 'b'}, cache=False)

self.job_dict = {}
soup = BeautifulSoup(checkalljobs.content)
soup = BeautifulSoup(checkalljobs.content, "lxml")

for i in soup.find_all("uws:jobref"):
for i in soup.find_all({"uws:jobref"}):
i_phase = str(i.find('uws:phase').string)
if i_phase in ['COMPLETED', 'EXECUTING', 'ABORTED', 'ERROR']:
self.job_dict['{0}'.format(i.get('xlink:href')
Expand Down Expand Up @@ -448,8 +446,8 @@ def check_all_jobs(self, phase=None, regex=None, sortby=None):
if not phase and not regex:
if not sortby:
t = Table()
t['JobID'] = self.job_dict.keys()
t['Phase'] = self.job_dict.values()
t['JobID'] = list(self.job_dict.keys())
t['Phase'] = list(self.job_dict.values())
t.pprint()
else:
if sortby.upper() == 'TABLENAME':
Expand Down Expand Up @@ -653,7 +651,7 @@ def _starttime_dict(self):
auth=(self.username, self.password),
cache=False)
for i in completed_ids]
soups = [BeautifulSoup(response_list[i].content)
soups = [BeautifulSoup(response_list[i].content, "lxml")
for i in range(len(response_list))]
self.starttime_dict = {}
for i in range(len(soups)):
Expand Down Expand Up @@ -912,7 +910,7 @@ def explore_db(self, db=None, table=None, col=None):
except AttributeError:
self._generate_schema()

projects = np.sort(self.db_dict.keys())
projects = np.sort(list(self.db_dict.keys()))
largest = max([len(projects[i]) for i in range(len(projects))])
t = Table()
# db not specified
Expand All @@ -923,7 +921,7 @@ def explore_db(self, db=None, table=None, col=None):
info_list = []
tmp2_largest = 0
for proj in projects:
size = len(self.db_dict['{0}'.format(proj)].keys())
size = len((self.db_dict['{0}'.format(proj)].keys()))
proj_list += (['@ {}'.format(proj)] +
['' for i in range(size - 1)] +
['-' * (largest + 2)])
Expand Down Expand Up @@ -953,8 +951,8 @@ def explore_db(self, db=None, table=None, col=None):
# db specified
if db:
try:
size1 = len(self.db_dict[str(db)].keys())
slist = [self.db_dict[db][key].keys()
size1 = len(list(self.db_dict[str(db)].keys()))
slist = [list(self.db_dict[db][key].keys())
if isinstance(self.db_dict[db][key], dict)
else key
for key in self.db_dict[db].keys()]
Expand All @@ -966,13 +964,13 @@ def explore_db(self, db=None, table=None, col=None):
# check the max size of any given column in the structure
if table:
try:
size2 = max(size2, len(self.db_dict[db]['tables']
[table]['columns'].keys()))
size2 = max(size2, len(list(self.db_dict[db]['tables']
[table]['columns'].keys())))
if col:
try:
size2 = max(size2, len(self.db_dict[db]['tables']
size2 = max(size2, len(list(self.db_dict[db]['tables']
[table]['columns']
[col].keys()))
[col].keys())))
except(KeyError, NameError):
logging.error("Must first specify a valid column "
"of the `{0}` table within the `{1}`"
Expand All @@ -988,11 +986,11 @@ def explore_db(self, db=None, table=None, col=None):
t['Project Items'] = (
['--> @ {}:'.format(key)
if (isinstance(self.db_dict[db][key], dict) and
(len(self.db_dict[db][key].keys()) ==
len(self.db_dict[db]['tables'].keys())))
(len(list(self.db_dict[db][key].keys())) ==
len(list(self.db_dict[db]['tables'].keys()))))
else '@ {}'.format(key)
if (isinstance(self.db_dict[db][key], dict) and
(len(self.db_dict[db][key].keys()) !=
(len(list(self.db_dict[db][key].keys())) !=
len(self.db_dict[db]['tables'].keys())))
else str(key)
for key in self.db_dict[db].keys()] +
Expand Down Expand Up @@ -1139,9 +1137,9 @@ def download(self, jobid=None, filename=None, format=None, cache=True):
results = self._request(
'GET', self.QUERY_URL + "/{}/results".format(jobid),
auth=(self.username, self.password))
soup = BeautifulSoup(results.content)
soup = BeautifulSoup(results.content, "lxml")
urls = [i.get('xlink:href')
for i in soup.findAll('uws:result')]
for i in soup.findAll({'uws:result'})]
formatlist = [urls[i].split('/')[-1].upper()
for i in range(len(urls))]

Expand Down