Don't convert input to string.

Also, revert tests in case they're actually OK.
biosimulators · Jun 22, 2023 · 4deb90b · 4deb90b
1 parent 006b72a
commit 4deb90b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/biosimulators_utils/sedml/math.py b/biosimulators_utils/sedml/math.py
@@ -184,9 +184,6 @@ def compile_math(math):
     model.allowed_functions.extend(MATHEMATICAL_FUNCTIONS.keys())
 
     math_node = evalidate.Expr(math, model=model)
-    # math_node = evalidate.evalidate(math,
-    #                                 addnodes=VALID_MATH_EXPRESSION_NODES,
-    #                                 funcs=MATHEMATICAL_FUNCTIONS.keys())
     compiled_math = compile(math_node.node, '<math>', 'eval')
     return compiled_math
 

diff --git a/biosimulators_utils/sedml/validation.py b/biosimulators_utils/sedml/validation.py
@@ -1770,7 +1770,10 @@ def validate_calculation(calculation):
                 workspace[calculation.range.id] = 1
 
         try:
-            compiled_math = compile_math(str(calculation.math))
+            compiled_math = compile_math(calculation.math)
+        except TypeError as exception:
+            errors.append(['The mathematical expression must be a `string`, not a `{}`:'.format(calculation.math.__class__), [[str(exception)]]])
+            return (errors, warnings)
         except (SyntaxError, CompilationException) as exception:
             errors.append(['The syntax of the mathematical expression `{}` is invalid.'.format(calculation.math), [[str(exception)]]])
             return (errors, warnings)

diff --git a/tests/sedml/test_sedml_validation.py b/tests/sedml/test_sedml_validation.py
@@ -1476,6 +1476,10 @@ def test_validate_calculation(self):
         calculation_2.math = None
         self.assertIn('must have math', flatten_nested_list_of_strings(validation.validate_calculation(calculation_2)[0]))
 
+        calculation_2 = copy.copy(calculation)
+        calculation_2.math = 10.
+        self.assertIn('must be a `string`', flatten_nested_list_of_strings(validation.validate_calculation(calculation_2)[0]))
+
         calculation_2 = copy.copy(calculation)
         calculation_2.math = 'a * '
         self.assertIn('The syntax', flatten_nested_list_of_strings(validation.validate_calculation(calculation_2)[0]))