Revert "Revert "Pointing to the legacy endpoint for model configs for…

… now. (#…" (#91)

This reverts commit 8def5f6.

service/utils/tds.py

@@ -22,7 +22,7 @@
 TDS_PASSWORD = settings.TDS_PASSWORD
 TDS_SIMULATIONS = "/simulations"
 TDS_DATASETS = "/datasets"
-TDS_CONFIGURATIONS = "/model-configurations"
+TDS_CONFIGURATIONS = "/model-configurations-legacy"
 
 
 def tds_session():

tests/integration/test_calibrate.py

@@ -47,7 +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/{config_id}", json=model)
+ requests_mock.get(f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model)
 
  worker.work(burst=True)
 

tests/integration/test_ensemble_calibrate.py

@@ -19,7 +19,9 @@ 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/{config_id}", json=model)
+ requests_mock.get(
+ f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model
+ )
 
  dataset_id = example_context["request"]["dataset"]["id"]
  filename = example_context["request"]["dataset"]["filename"]

tests/integration/test_ensemble_simulate.py

@@ -19,7 +19,9 @@ 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/{config_id}", json=model)
+ requests_mock.get(
+ f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model
+ )
 
  requests_mock.post(f"{TDS_URL}/simulations", json={"id": str(job_id)})
 

tests/integration/test_optimize.py

@@ -37,7 +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/{config_id}", json=model)
+ requests_mock.get(f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model)
 
  worker.work(burst=True)
 

tests/integration/test_simulate.py

@@ -38,7 +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/{config_id}", json=model)
+ requests_mock.get(f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model)
 
  worker.work(burst=True)
 

tests/test_conversions.py

@@ -42,7 +42,9 @@ 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/{config_id}", json=model)
+ requests_mock.get(
+ f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model
+ )
 
  ### Act and Assert
 
@@ -60,7 +62,9 @@ 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/{config_id}", json=model)
+ requests_mock.get(
+ f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model
+ )
 
  dataset_id = example_context["request"]["dataset"]["id"]
  filename = example_context["request"]["dataset"]["filename"]
@@ -89,7 +93,9 @@ 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/{config_id}", json=model)
+ requests_mock.get(
+ f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model
+ )
 
  ### Act and Assert
 
@@ -110,7 +116,9 @@ 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/{config_id}", json=model)
+ requests_mock.get(
+ f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model
+ )
 
  dataset_id = example_context["request"]["dataset"]["id"]
  filename = example_context["request"]["dataset"]["filename"]
@@ -137,7 +145,9 @@ 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/{config_id}", json=model)
+ requests_mock.get(
+ f"{TDS_URL}/model-configurations-legacy/{config_id}", json=model
+ )
 
  ### Act and Assert