Merge pull request #148 from biosimulators/get-values-from-anywhere

Get values from anywhere
biosimulators · Jul 27, 2023 · b8f5e6d · b8f5e6d
2 parents 89fc413 + c66519e
commit b8f5e6d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/biosimulators_utils/_version.py b/biosimulators_utils/_version.py
@@ -1 +1 @@
-__version__ = '0.1.185'
+__version__ = '0.1.186'
diff --git a/biosimulators_utils/sedml/exec.py b/biosimulators_utils/sedml/exec.py
@@ -537,16 +537,23 @@ def exec_task(task, variables, preprocessed_task=None, log=None, config=None, **
             variable_values = {}
             for variable in change.variables:
                 if get_value_executer and preprocessed_task:
-                    value = get_value_executer(change.model, variable, preprocessed_task)
-                    variable_values[variable.id] = value
-                elif not apply_xml_model_changes:
-                    raise NotImplementedError('Set value changes that involve variables of non-XML-encoded models are not supported.')
-                else:
-                    variable_values[variable.id] = get_value_of_variable_model_xml_targets(variable, model_etrees)
+                    try:
+                        value = get_value_executer(change.model, variable, preprocessed_task)
+                        variable_values[variable.id] = value
+                    except Exception:
+                        # Even if the above fails, getting the value from the XML directly might be possible.
+                        pass
+                if variable.id not in variable_values:
+                    if not apply_xml_model_changes:
+                        raise NotImplementedError('Set value changes that involve variables of non-XML-encoded models are not supported.')
+                    else:
+                        variable_values[variable.id] = get_value_of_variable_model_xml_targets(variable, model_etrees)
 
             new_value = calc_compute_model_change_new_value(change, variable_values=variable_values, range_values=current_range_values)
 
             if set_value_executer:
+                # Unlike above, we don't try to set values that the set_value_executer doesn't know about by editing the XML.
+                # This is because there's no good way to set some values this way and some with a model editor.
                 set_value_executer(change.model, change.target, change.symbol, new_value, preprocessed_task)
             else:
                 if new_value == int(new_value):