Skip to content

setup data lib: improve jobs watching in legacy mode #152

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

setup data lib: improve jobs watching in legacy mode #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions src/ephemeris/setup_data_libraries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def create_legacy(gi, desc):
folder_id = lib['root_folder_id']

def populate_items(base_folder_id, has_items):
job_ids = []
if "items" in has_items:
name = has_items.get("name")
description = has_items.get("description")
Expand All @@ -59,7 +60,8 @@ def populate_items(base_folder_id, has_items):
folder = gi.libraries.create_folder(lib_id, name, description, base_folder_id=base_folder_id)
folder_id = folder[0]["id"]
for item in has_items["items"]:
populate_items(folder_id, item)
new_job_ids = populate_items(folder_id, item)
job_ids += new_job_ids
else:
src = has_items["src"]
if src != "url":
Expand All @@ -71,18 +73,21 @@ def populate_items(base_folder_id, has_items):
file_names.append(item['name'])
if has_items['url'] not in file_names:
try:
gi.libraries.upload_file_from_url(
upped_dataset = gi.libraries.upload_file_from_url(
lib_id,
has_items['url'],
folder_id=base_folder_id,
file_type=has_items['ext']
)
if 'id' in upped_dataset[0]:
upped_dataset = gi.datasets.show_dataset(upped_dataset[0]['id'])
if 'creating_job' in upped_dataset:
job_ids.append(upped_dataset['creating_job'])
except Exception:
log.exception("Could not upload %s to %s/%s", has_items['url'], lib_id, base_folder_id)
return None
return job_ids

populate_items(folder_id, desc)
return []
return populate_items(folder_id, desc)


def create_batch_api(gi, desc):
Expand Down Expand Up @@ -159,12 +164,7 @@ def normalize_items(has_items):

job_ids = []
if legacy:
for job in jc.get_jobs():
# Fetch all upload job IDs, ignoring complete ones.
if job['tool_id'] == 'upload1' and job['state'] not in ('ok', 'error'):
job_ids.append(job['id'])

# Just have to check that all upload1 jobs are termianl.
job_ids = jobs
else:
# Otherwise get back an actual list of jobs
for job in jobs:
Expand Down