Skip to content

Retrieve program number and category efficiently #1455

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
mfixstsci merged 2 commits into from
Jan 29, 2024
Merged

Retrieve program number and category efficiently #1455

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1db37a
use pyvo to get proposal number:category dict
bhilbert4 Jan 29, 2024
c6b199a
Clarify docstring
bhilbert4 Jan 29, 2024
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
26 changes: 9 additions & 17 deletions jwql/website/apps/jwql/data_containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,7 +1391,7 @@ def get_preview_images_by_rootname(rootname):


def get_proposals_by_category(instrument):
"""Return a dictionary of program numbers based on category type
"""Return a dictionary of program numbers and category type
Parameters
----------
instrument : str
Expand All @@ -1400,24 +1400,16 @@ def get_proposals_by_category(instrument):
Returns
-------
category_sorted_dict : dict
Dictionary with category as the key and a list of program id's as the value
Dictionary with program number as the key and program category as the value
"""
tap_service = vo.dal.TAPService("https://vao.stsci.edu/caomtap/tapservice.aspx")
tap_results = tap_service.search(f"""select distinct prpID,prpProject from CaomObservation where collection='JWST'
and maxLevel>0 and insName like '{instrument.lower()}%'""")
# Put the results into an astropy Table
prop_table = tap_results.to_table()

service = "Mast.Jwst.Filtered.{}".format(instrument)
params = {"columns": "program, category",
"filters": [{'paramName': 'instrume', 'values': [instrument]}]}
response = Mast.service_request_async(service, params)
results = response[0].json()['data']

if len(results) == MAST_QUERY_LIMIT:
logging.error(f"MAST_QUERY_LIMIT of {MAST_QUERY_LIMIT} reached for {instrument} in get_proposals_by_category")

# Get all unique dictionaries
unique_results = list(map(dict, set(tuple(sorted(sub.items())) for sub in results)))

# Make a dictionary of {program: category} to pull from
proposals_by_category = {d['program']: d['category'] for d in unique_results}

# Convert to a dictionary
proposals_by_category = {int(d['prpID']): d['prpProject'] for d in prop_table}
return proposals_by_category


Expand Down