Strip interventions from calibrate

api/server.py

@@ -93,6 +93,8 @@ def simulate_model(body: SimulatePostRequest) -> JobResponse:
 
  resp = create_job(operation_name=operation_name, options=options)
 
+ if len(interventions) > 0:
+ logging.info("{resp['id']} used interventions: {interventiosn}")
  response = {"simulation_id": resp["id"]}
 
  return response
@@ -113,9 +115,6 @@ def calibrate_model(body: CalibratePostRequest) -> JobResponse:
  start = body.timespan.start
  end = body.timespan.end
  extra = body.extra.dict()
- interventions = [
- (intervention.timestep, intervention.name, intervention.value) for intervention in body.interventions 
- ]
 
  operation_name = "operations.calibrate_then_simulate"
  options = {
@@ -126,7 +125,6 @@ def calibrate_model(body: CalibratePostRequest) -> JobResponse:
  "dataset": dataset.dict(),
  "extra": extra,
  "visual_options": True,
- "interventions":interventions
  }
 
  resp = create_job(operation_name=operation_name, options=options)

api/utils.py

@@ -110,7 +110,6 @@ def create_job(operation_name: str, options: Optional[Dict[Any, Any]] = None):
  "status": status,
  "simulation_error": job_error,
  "result": job_result,
- "interventions": options["interventions"],
  }
  return response
 

docker-compose.yaml

@@ -3,9 +3,6 @@ networks:
  pyciemss:
  driver: bridge
  name: pyciemss
- data-api:
- #TODO Remove in production
- external: true
 services:
  api:
  container_name: pyciemss-api
@@ -18,7 +15,6 @@ services:
  - api.env
  networks:
  - pyciemss
- - data-api # TODO Remove in production
  depends_on:
  - redis
  volumes:
@@ -43,4 +39,3 @@ services:
  - redis
  networks:
  - pyciemss
- - data-api