extras suck. unrequired but dont double send.

DARPA-ASKEM · Jul 30, 2024 · 0c5e785 · 0c5e785
1 parent 2244703
commit 0c5e785
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/service/models/operations/calibrate.py b/service/models/operations/calibrate.py
@@ -85,7 +85,8 @@ def hook(progress, _loss):
  step_size = extra_options.pop(
  "solver_step_size"
  ) # Need to pop this out of extra.
- if step_size is not None and self.extra.solver_method == "euler":
+ solver_method = extra_options.pop("solver_method")
+ if step_size is not None and solver_method == "euler":
  solver_options = {"step_size": step_size}
 
  return {
@@ -96,7 +97,7 @@ def hook(progress, _loss):
  "data_path": dataset_path,
  "static_parameter_interventions": static_interventions,
  "progress_hook": hook,
- "solver_method": self.extra.solver_method,
+ "solver_method": solver_method,
  "solver_options": solver_options,
  # "visual_options": True,
  **extra_options,

diff --git a/service/models/operations/simulate.py b/service/models/operations/simulate.py
@@ -66,7 +66,8 @@ def gen_pyciemss_args(self, job_id):
  step_size = extra_options.pop(
  "solver_step_size"
  ) # Need to pop this out of extra.
- if step_size is not None and self.extra.solver_method == "euler":
+ solver_method = extra_options.pop("solver_method")
+ if step_size is not None and solver_method == "euler":
  solver_options = {"step_size": step_size}
 
  return {
@@ -77,7 +78,7 @@ def gen_pyciemss_args(self, job_id):
  "static_parameter_interventions": static_interventions,
  "dynamic_parameter_interventions": dynamic_interventions,
  "inferred_parameters": inferred_parameters,
- "solver_method": self.extra.solver_method,
+ "solver_method": solver_method,
  "solver_options": solver_options,
  **extra_options,
  }