From 1fdcc7970dc4fae41cd5378990b843cbd90835af Mon Sep 17 00:00:00 2001 From: Daniel Chang Date: Wed, 24 Jan 2024 17:20:47 -0500 Subject: [PATCH] fix paths --- service/utils/tds.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/service/utils/tds.py b/service/utils/tds.py index 99a63a0..8ba40a7 100644 --- a/service/utils/tds.py +++ b/service/utils/tds.py @@ -20,9 +20,9 @@ TDS_URL = settings.TDS_URL TDS_USER = settings.TDS_USER TDS_PASSWORD = settings.TDS_PASSWORD -TDS_SIMULATIONS = "/simulations/" -TDS_DATASETS = "/datasets/" -TDS_CONFIGURATIONS = "/model-configurations/" +TDS_SIMULATIONS = "/simulations" +TDS_DATASETS = "/datasets" +TDS_CONFIGURATIONS = "/model-configurations" def tds_session(): @@ -48,14 +48,14 @@ def create_tds_job(payload): def cancel_tds_job(job_id): - url = TDS_URL + TDS_SIMULATIONS + str(job_id) + url = TDS_URL + TDS_SIMULATIONS + "/" + str(job_id) tds_payload = tds_session().get(url).json() tds_payload["status"] = "cancelled" return tds_session().put(url, json=json.loads(json.dumps(tds_payload, default=str))) def update_tds_status(job_id, status, result_files=[], start=False, finish=False): - url = TDS_URL + TDS_SIMULATIONS + str(job_id) + url = TDS_URL + TDS_SIMULATIONS + "/" + str(job_id) logging.debug( "Updating simulation `%s` -- %s start: %s; finish: %s; result_files: %s", url, @@ -116,7 +116,7 @@ def fetch_dataset(dataset: dict, job_id): job_dir = get_job_dir(job_id) logging.debug(f"Fetching dataset {dataset['id']}") dataset_url = ( - f"{TDS_URL}{TDS_DATASETS}{dataset['id']}/" + f"{TDS_URL}{TDS_DATASETS}/{dataset['id']}/" f"download-csv?filename={dataset['filename']}" ) response = tds_session().get(dataset_url) @@ -139,7 +139,7 @@ def fetch_inferred_parameters(parameters_id: Optional[str], job_id): return job_dir = get_job_dir(job_id) logging.debug(f"Fetching inferred parameters {parameters_id}") - download_url = f"{TDS_URL}{TDS_SIMULATIONS}{parameters_id}/download-url?filename=parameters.dill" + download_url = f"{TDS_URL}{TDS_SIMULATIONS}/{parameters_id}/download-url?filename=parameters.dill" parameters_url = tds_session().get(download_url).json()["url"] response = tds_session().get(parameters_url) if response.status_code >= 300: @@ -151,7 +151,7 @@ def fetch_inferred_parameters(parameters_id: Optional[str], job_id): def attach_files(output: dict, job_id, status="complete"): - sim_results_url = TDS_URL + TDS_SIMULATIONS + str(job_id) + sim_results_url = TDS_URL + TDS_SIMULATIONS + "/" + str(job_id) job_dir = get_job_dir(job_id) files = {}