routing changes in terarium (#137)

DARPA-ASKEM · Feb 18, 2025 · a342199 · a342199
1 parent 50b8890
commit a342199
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/service/utils/tds.py b/service/utils/tds.py
@@ -24,7 +24,7 @@
 TDS_PASSWORD = settings.TDS_PASSWORD
 TDS_SIMULATIONS = "/simulations"
 TDS_DATASETS = "/datasets"
-TDS_CONFIGURATIONS = "/model-configurations/as-configured-model"
+TDS_CONFIGURATIONS = "/model-configurations"
 TDS_INTERVENTIONS = "/interventions"
 
 
@@ -128,7 +128,7 @@ def fetch_model(model_config_id, job_id):
     job_dir = get_job_dir(job_id)
     logging.debug(f"Fetching model {model_config_id}")
 
-    model_url = TDS_URL + TDS_CONFIGURATIONS + "/" + model_config_id
+    model_url = TDS_URL + TDS_CONFIGURATIONS + "/" + model_config_id + "/model"
 
     model_response = tds_session().get(model_url)
     if model_response.status_code == 404:

diff --git a/tests/integration/test_calibrate.py b/tests/integration/test_calibrate.py
@@ -47,9 +47,7 @@ def test_calibrate_example(
     requests_mock.put(
         f"{TDS_URL}/simulations/{simulation_id}", json={"status": "success"}
     )
-    requests_mock.get(
-        f"{TDS_URL}/model-configurations/as-configured-model/{config_id}", json=model
-    )
+    requests_mock.get(f"{TDS_URL}/model-configurations/{config_id}/model", json=model)
 
     worker.work(burst=True)
 

diff --git a/tests/integration/test_ensemble_calibrate.py b/tests/integration/test_ensemble_calibrate.py
@@ -20,7 +20,7 @@ def test_ensemble_calibrate_example(
     for config_id in config_ids:
         model = json.loads(example_context["fetch"](config_id + ".json"))
         requests_mock.get(
-            f"{TDS_URL}/model-configurations/as-configured-model/{config_id}",
+            f"{TDS_URL}/model-configurations/{config_id}/model",
             json=model,
         )
 

diff --git a/tests/integration/test_ensemble_simulate.py b/tests/integration/test_ensemble_simulate.py
@@ -20,7 +20,7 @@ def test_ensemble_simulate_example(
     for config_id in config_ids:
         model = json.loads(example_context["fetch"](config_id + ".json"))
         requests_mock.get(
-            f"{TDS_URL}/model-configurations/as-configured-model/{config_id}",
+            f"{TDS_URL}/model-configurations/{config_id}/model",
             json=model,
         )
 

diff --git a/tests/integration/test_optimize.py b/tests/integration/test_optimize.py
@@ -37,9 +37,7 @@ def test_optimize_example(
     requests_mock.put(
         f"{TDS_URL}/simulations/{simulation_id}", json={"status": "success"}
     )
-    requests_mock.get(
-        f"{TDS_URL}/model-configurations/as-configured-model/{config_id}", json=model
-    )
+    requests_mock.get(f"{TDS_URL}/model-configurations/{config_id}/model", json=model)
 
     worker.work(burst=True)
 

diff --git a/tests/integration/test_simulate.py b/tests/integration/test_simulate.py
@@ -38,9 +38,7 @@ def test_simulate_example(
     requests_mock.put(
         f"{TDS_URL}/simulations/{simulation_id}", json={"status": "success"}
     )
-    requests_mock.get(
-        f"{TDS_URL}/model-configurations/as-configured-model/{config_id}", json=model
-    )
+    requests_mock.get(f"{TDS_URL}/model-configurations/{config_id}/model", json=model)
 
     worker.work(burst=True)
 

diff --git a/tests/test_conversions.py b/tests/test_conversions.py
@@ -43,7 +43,7 @@ def test_example_conversion(self, example_context, requests_mock):
         config_id = example_context["request"]["model_config_id"]
         model = json.loads(example_context["fetch"](config_id + ".json"))
         requests_mock.get(
-            f"{TDS_URL}/model-configurations/as-configured-model/{config_id}",
+            f"{TDS_URL}/model-configurations/{config_id}/model",
             json=model,
         )
 
@@ -64,7 +64,7 @@ def test_example_conversion(self, example_context, requests_mock):
         config_id = example_context["request"]["model_config_id"]
         model = json.loads(example_context["fetch"](config_id + ".json"))
         requests_mock.get(
-            f"{TDS_URL}/model-configurations/as-configured-model/{config_id}",
+            f"{TDS_URL}/model-configurations/{config_id}/model",
             json=model,
         )
 
@@ -96,7 +96,7 @@ def test_example_conversion(self, example_context, requests_mock):
         for config_id in config_ids:
             model = json.loads(example_context["fetch"](config_id + ".json"))
             requests_mock.get(
-                f"{TDS_URL}/model-configurations/as-configured-model/{config_id}",
+                f"{TDS_URL}/model-configurations/{config_id}/model",
                 json=model,
             )
 
@@ -120,7 +120,7 @@ def test_example_conversion(self, example_context, requests_mock):
         for config_id in config_ids:
             model = json.loads(example_context["fetch"](config_id + ".json"))
             requests_mock.get(
-                f"{TDS_URL}/model-configurations/as-configured-model/{config_id}",
+                f"{TDS_URL}/model-configurations/{config_id}/model",
                 json=model,
             )
 
@@ -150,7 +150,7 @@ def test_example_conversion(self, example_context, requests_mock):
         config_id = example_context["request"]["model_config_id"]
         model = json.loads(example_context["fetch"](config_id + ".json"))
         requests_mock.get(
-            f"{TDS_URL}/model-configurations/as-configured-model/{config_id}",
+            f"{TDS_URL}/model-configurations/{config_id}/model",
             json=model,
         )