mathjson-solver 1.12.1__tar.gz → 1.14.0__tar.gz

{mathjson_solver-1.12.1/src/mathjson_solver.egg-info → mathjson_solver-1.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mathjson-solver
-Version: 1.12.1
+Version: 1.14.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -18,6 +18,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
 Dynamic: summary
@@ -26,7 +27,7 @@ Dynamic: summary
 
 [![PyPI](https://img.shields.io/pypi/v/mathjson-solver.svg)](https://pypi.org/project/mathjson-solver/)
 [![PyPI Downloads](https://static.pepy.tech/badge/mathjson-solver/month)](https://pepy.tech/projects/mathjson-solver)
-![Coverage](https://img.shields.io/badge/coverage-93-green)
+![Coverage](https://img.shields.io/badge/coverage-91-green)
 
 _MathJSON Solver_ is a Python module to numerically evaluate MathJSON expressions, like `["Add", 1, 2]`. It is developed by [Longenesis](https://longenesis.com/team) to enable numerical evaluation of user provided mathematical expressions in Longenesis digital health products. Its development was inspired by [CortexJS](https://cortexjs.io/compute-engine/) Compute Engine.
 
@@ -73,11 +74,3 @@ Make sure you have `pytest` installed. Then `cd` into project directory and run:
 ```bash
 pytest
 ```
-
-## Contributing Code
-
-We welcome your contributions in the form of pull requests.
-
-1. Fork the repo;
-2. Make improvements;
-3. Make a pull request to share your improvements with the community and to include it into official release.

{mathjson_solver-1.12.1 → mathjson_solver-1.14.0}/README.md

@@ -2,7 +2,7 @@
 
 [![PyPI](https://img.shields.io/pypi/v/mathjson-solver.svg)](https://pypi.org/project/mathjson-solver/)
 [![PyPI Downloads](https://static.pepy.tech/badge/mathjson-solver/month)](https://pepy.tech/projects/mathjson-solver)
-![Coverage](https://img.shields.io/badge/coverage-93-green)
+![Coverage](https://img.shields.io/badge/coverage-91-green)
 
 _MathJSON Solver_ is a Python module to numerically evaluate MathJSON expressions, like `["Add", 1, 2]`. It is developed by [Longenesis](https://longenesis.com/team) to enable numerical evaluation of user provided mathematical expressions in Longenesis digital health products. Its development was inspired by [CortexJS](https://cortexjs.io/compute-engine/) Compute Engine.
 
@@ -49,11 +49,3 @@ Make sure you have `pytest` installed. Then `cd` into project directory and run:
 ```bash
 pytest
 ```
-
-## Contributing Code
-
-We welcome your contributions in the form of pull requests.
-
-1. Fork the repo;
-2. Make improvements;
-3. Make a pull request to share your improvements with the community and to include it into official release.

{mathjson_solver-1.12.1 → mathjson_solver-1.14.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mathjson-solver
-version = 1.12.1
+version = 1.14.0
 author = Martins Mednis
 author_email = mrt@mednis.info
 description = Utilities for MathJSON evaluation

{mathjson_solver-1.12.1 → mathjson_solver-1.14.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="mathjson-solver",
-    version="1.12.1",
+    version="1.14.0",
     author="Martins Mednis",
     author_email="mrt@mednis.info",
     description="Utilities for MathJSON evaluation",

{mathjson_solver-1.12.1 → mathjson_solver-1.14.0}/src/mathjson_solver/__main__.py

@@ -1,5 +1,5 @@
 import numbers
-from typing import Union
+from typing import Union, Any
 from functools import reduce
 import math
 from copy import deepcopy
@@ -10,6 +10,7 @@ import datetime
 
 NoneType = type(None)
 
+
 class MathJSONException(Exception):
     """Exception for MathJSON processing issues"""
 
@@ -45,6 +46,8 @@ def is_numeric(x):
         float(x)
     except ValueError:
         return False
+    except TypeError:
+        return False
     else:
         return True
 
@@ -140,6 +143,16 @@ def comparison_safe_converter(x):
     return x
 
 
+def comparison_safe_converter_for_pairs(
+    v1, v2
+) -> (Union[str, float], Union[str, float]):
+    if is_numeric(v1):
+        v1 = float(v1)
+    if is_numeric(v2):
+        v2 = float(v2)
+    return v1, v2
+
+
 def create_mathjson_solver(solver_parameters):
     def f(s, *args):
         if args:
@@ -159,10 +172,15 @@ def create_mathjson_solver(solver_parameters):
                 tmp = 0
                 for i, x in enumerate(s[1:]):
                     res = f(x, c)
+                    if is_numeric(res):
+                        res = float(res)
                     if i == 0:
                         tmp = res
                     else:
-                        tmp = tmp + res
+                        try:
+                            tmp = tmp + res
+                        except TypeError:
+                            pass
 
                     # if isinstance(res, list):
                     #     l_res.append(sum([xx for xx in res[1:]]))
@@ -179,15 +197,25 @@ def create_mathjson_solver(solver_parameters):
                 #         tmp = tmp + x
                 # return tmp
 
+            # def Sum(s):
+            #     l_res = []
+            #     for x in s[1:]:
+            #         res = f(x, c)
+            #         if isinstance(res, list):
+            #             l_res.append(sum([xx for xx in res[1:]]))
+            #         else:
+            #             l_res.append(res)
+            #     return sum(l_res)
+
             def Sum(s):
-                l_res = []
+                l_res = ["Array"]
                 for x in s[1:]:
                     res = f(x, c)
                     if isinstance(res, list):
-                        l_res.append(sum([xx for xx in res[1:]]))
+                        l_res.append(Add(["Array"] + [xx for xx in res[1:]]))
                     else:
                         l_res.append(res)
-                return sum(l_res)
+                return Add(l_res)
 
             def Max(s):
                 if isinstance(s[1], str):
@@ -221,7 +249,6 @@ def create_mathjson_solver(solver_parameters):
 
             def Length(s):
                 if isinstance(s[1], str):
-
                     return len([x for x in f(s[1], c)][1:])
                 else:
                     return len([x for x in s[1][1:]])
@@ -253,6 +280,20 @@ def create_mathjson_solver(solver_parameters):
                         raise ValueError(
                             "Case of 'Switch' should have exactly two parameters"
                         )
+                    if comparison_safe_converter(
+                        expression
+                    ) == comparison_safe_converter(f(x[0], c)):
+                        return f(x[1], c)
+                else:
+                    return f(s[2], c)
+
+            def StrictSwitch(s):
+                expression = f(s[1], c)
+                for x in s[3:]:
+                    if len(x) != 2:
+                        raise ValueError(
+                            "Case of 'StrictSwitch' should have exactly two parameters"
+                        )
                     if expression == f(x[0], c):
                         return f(x[1], c)
                 else:
@@ -337,6 +378,24 @@ def create_mathjson_solver(solver_parameters):
                 return not f(s[1])
 
             def Map(s):
+                """
+                ["Map", list, function, more parameters]
+                The `function` must accept at least one parameter. That is for the current loop element.
+                The `more parameters` are for any additional parameters that function might have.
+                """
+                z = f(s[1], c)
+                if isinstance(z, list):
+                    retlist = ["Array"]
+                    for x in z[1:]:
+                        try:
+                            the_function_name = s[2][0]
+                            ss = [the_function_name, x] + s[3:]
+                            retlist.append(f(ss, c))
+                        except MathJSONException:
+                            retlist.append(x)
+                    return retlist
+
+            def StrictMap(s):
                 """
                 ["Map", list, function, more parameters]
                 The `function` must accept at least one parameter. That is for the current loop element.
@@ -351,6 +410,22 @@ def create_mathjson_solver(solver_parameters):
                         retlist.append(f(ss, c))
                     return retlist
 
+            def Filter(s):
+                """
+                ["Filter", list, function, more parameters]
+                The `function` must accept at least one parameter. That is for the current loop element.
+                The `more parameters` are for any additional parameters that function might have.
+                """
+                z = f(s[1], c)
+                if isinstance(z, list):
+                    retlist = ["Array"]
+                    for x in z[1:]:
+                        the_function_name = s[2][0]
+                        ss = [the_function_name, x] + s[3:]
+                        if f(ss, c):
+                            retlist.append(x)
+                    return retlist
+
             def HasMatchingSublist(s):
                 """
                 ["HasMatchingSublist", list, required_match_count, position, contiguous, function, more parameters]
@@ -423,6 +498,34 @@ def create_mathjson_solver(solver_parameters):
                 # Todo: This does not work
                 return s[1] in c.keys()
 
+            def Greater(s):
+                v1, v2 = comparison_safe_converter_for_pairs(f(s[1], c), f(s[2], c))
+                try:
+                    return v1 > v2
+                except TypeError:
+                    return False
+
+            def GreaterEqual(s):
+                v1, v2 = comparison_safe_converter_for_pairs(f(s[1], c), f(s[2], c))
+                try:
+                    return v1 >= v2
+                except TypeError:
+                    return False
+
+            def Less(s):
+                v1, v2 = comparison_safe_converter_for_pairs(f(s[1], c), f(s[2], c))
+                try:
+                    return v1 < v2
+                except TypeError:
+                    return False
+
+            def LessEqual(s):
+                v1, v2 = comparison_safe_converter_for_pairs(f(s[1], c), f(s[2], c))
+                try:
+                    return v1 <= v2
+                except TypeError:
+                    return False
+
             constructs = {
                 "Sum": Sum,
                 "Add": Add,
@@ -431,6 +534,7 @@ def create_mathjson_solver(solver_parameters):
                 ),
                 "Constants": Constants,
                 "Switch": Switch,
+                "StrictSwitch": StrictSwitch,
                 "If": If,
                 "Multiply": lambda s: reduce(
                     lambda a, b: float(a) * float(b), [f(x, c) for x in s[1:]]
@@ -449,11 +553,17 @@ def create_mathjson_solver(solver_parameters):
                 "Equal": lambda s: comparison_safe_converter(f(s[1], c))
                 == comparison_safe_converter(f(s[2], c)),
                 "StrictEqual": lambda s: f(s[1], c) == f(s[2], c),
-                "Greater": lambda s: f(s[1], c) > f(s[2], c),
-                "GreaterEqual": lambda s: f(s[1], c) >= f(s[2], c),
-                "Less": lambda s: f(s[1], c) < f(s[2], c),
-                "LessEqual": lambda s: f(s[1], c) <= f(s[2], c),
-                "NotEqual": lambda s: f(s[1], c) != f(s[2], c),
+                # "Greater": lambda s: f(s[1], c) > f(s[2], c),
+                "Greater": Greater,
+                # "GreaterEqual": lambda s: f(s[1], c) >= f(s[2], c),
+                "GreaterEqual": GreaterEqual,
+                # "Less": lambda s: f(s[1], c) < f(s[2], c),
+                "Less": Less,
+                # "LessEqual": lambda s: f(s[1], c) <= f(s[2], c),
+                "LessEqual": LessEqual,
+                # "NotEqual": lambda s: f(s[1], c) != f(s[2], c),
+                "NotEqual": lambda s: comparison_safe_converter(f(s[1], c))
+                != comparison_safe_converter(f(s[2], c)),
                 "Abs": lambda s: abs(f(s[1], c)),
                 "Round": lambda s: (
                     round(f(s[1], c), f(s[2], c))
@@ -484,6 +594,8 @@ def create_mathjson_solver(solver_parameters):
                 # "IsDefined": lambda s: s[1] in c,
                 "IsDefined": IsDefined,
                 "Map": Map,
+                "StrictMap": StrictMap,
+                "Filter": Filter,
                 "HasMatchingSublist": HasMatchingSublist,
                 "Strptime": Strptime,
                 "Strftime": Strftime,

{mathjson_solver-1.12.1 → mathjson_solver-1.14.0/src/mathjson_solver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mathjson-solver
-Version: 1.12.1
+Version: 1.14.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -18,6 +18,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
 Dynamic: summary
@@ -26,7 +27,7 @@ Dynamic: summary
 
 [![PyPI](https://img.shields.io/pypi/v/mathjson-solver.svg)](https://pypi.org/project/mathjson-solver/)
 [![PyPI Downloads](https://static.pepy.tech/badge/mathjson-solver/month)](https://pepy.tech/projects/mathjson-solver)
-![Coverage](https://img.shields.io/badge/coverage-93-green)
+![Coverage](https://img.shields.io/badge/coverage-91-green)
 
 _MathJSON Solver_ is a Python module to numerically evaluate MathJSON expressions, like `["Add", 1, 2]`. It is developed by [Longenesis](https://longenesis.com/team) to enable numerical evaluation of user provided mathematical expressions in Longenesis digital health products. Its development was inspired by [CortexJS](https://cortexjs.io/compute-engine/) Compute Engine.
 
@@ -73,11 +74,3 @@ Make sure you have `pytest` installed. Then `cd` into project directory and run:
 ```bash
 pytest
 ```
-
-## Contributing Code
-
-We welcome your contributions in the form of pull requests.
-
-1. Fork the repo;
-2. Make improvements;
-3. Make a pull request to share your improvements with the community and to include it into official release.

{mathjson_solver-1.12.1 → mathjson_solver-1.14.0}/tests/test_with_pytest.py

@@ -13,6 +13,10 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
     [
         ({}, ["Add", 2, 4, 3], 9),
         ({}, ["Sum", 2, 4, 3], 9),
+        ({}, ["Sum", 2, 4, 3, None], 9),
+        ({}, ["Add", 2, 4, "3"], 9),
+        ({}, ["Sum", 2, 4, "3"], 9),
+        ({}, ["Sum", 2, 4, "3", "abc"], 9),
         ({}, ["Sum", ["Array", 1, 1], 4, 3], 9),
         ({}, ["Sum", ["Array", 2, 4, 3]], 9),
         ({"a": 2}, ["Sum", "a", 4, 3], 9),
@@ -33,6 +37,16 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({}, ["Round", ["Log", 2.7183], 3], 1.0),
         ({}, ["Log2", 8], 3),
         ({}, ["Log10", 1000], 3),
+    ],
+)
+def test_solver_arithmetics(parameters, expression, expected_result):
+    solver = create_solver(parameters)
+    assert solver(expression) == expected_result
+
+
+@pytest.mark.parametrize(
+    "parameters, expression, expected_result",
+    [
         ({}, ["Equal", 10, 10], True),
         ({}, ["Equal", 10, 12], False),
         ({}, ["Equal", "aaa", "aaa"], True),
@@ -41,7 +55,6 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({}, ["Equal", None, "1"], False),
         ({}, ["Equal", 1, "1"], True),
         ({}, ["Equal", None, False], True),
-
         ({}, ["StrictEqual", 1, "1"], False),
         ({}, ["StrictEqual", 10, 10], True),
         ({}, ["StrictEqual", 10, 12], False),
@@ -50,12 +63,12 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({}, ["StrictEqual", "aaa", 11], False),
         ({}, ["StrictEqual", None, "1"], False),
         ({}, ["Equal", None, False], True),
-
-
         ({}, ["Greater", 1, 2], False),
         ({}, ["Greater", 2, -2], True),
+        ({}, ["Greater", "2", -2], True),
         ({}, ["GreaterEqual", 1, 1], True),
         ({}, ["GreaterEqual", 2, 1], True),
+        ({}, ["GreaterEqual", 2, "1"], True),
         ({}, ["GreaterEqual", 0, 0], True),
         ({}, ["GreaterEqual", 1, 2], False),
         ({}, ["Less", 1, 1], False),
@@ -67,6 +80,16 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({}, ["NotEqual", 1, 2], True),
         ({}, ["NotEqual", "aaa", "bbb"], True),
         ({}, ["NotEqual", "aaa", 0], True),
+    ],
+)
+def test_solver_comparison(parameters, expression, expected_result):
+    solver = create_solver(parameters)
+    assert solver(expression) == expected_result
+
+
+@pytest.mark.parametrize(
+    "parameters, expression, expected_result",
+    [
         # ({"a": 12}, ["IsDefined", "a"], True),
         ({"a": 12}, ["IsDefined", "b"], False),
         ({}, ["Abs", -3.5], 3.5),
@@ -132,16 +155,20 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         #     ],
         #     13
         # ),
+        # The next tests check the type-forgiving nature of Switch.
+        ({"value": 2}, ["Switch", "value", 0, ["1", 11], ["2", 22]], 22),
+        ({"value": "2"}, ["Switch", "value", 0, [1, 11], [2, 22]], 22),
+        # The next tests verify that the StrictSwitch is not forgiving.
+        ({"value": 2}, ["StrictSwitch", "value", 0, ["1", 11], ["2", 22]], 0),
+        ({"value": "2"}, ["StrictSwitch", "value", 0, [1, 11], [2, 22]], 0),
         ({"color": "red"}, ["Switch", "color", 0, ["blue", 10], ["red", 30]], 30),
         ({"color": "green"}, ["Switch", "color", 0, ["blue", 10], ["red", 30]], 0),
         ({"color": "green"}, ["Switch", "undefined", 0, ["blue", 10], ["red", 30]], 0),
         ({}, ["If", [["Equal", 1, 0], 10], [["Equal", 2, 2], 20], 9000], 20),
         # # The following tests that If don't fail on incompatible data types
         # ({}, ["If", [["Equal", 1, "1"], 10], [["Equal", "1", "1"], 20], -1], 20),
-
         # ({"a": 1}, ["If", [["Equal", "a", "1"], 10], [["Equal", "a", 1], 20], -1], 20),
         # ({"a": 1}, ["If", [["Equal", "a", 1], 10], [["Equal", "a", "1"], 20], -1], 10),
-
         ({"a": 10, "b": 10}, ["If", [["Equal", "a", "b"], 10], 9000], 10),
         ({"a": 10, "b": 20}, ["If", [["Equal", "a", "b"], 10], 9000], 9000),
         ({"a": 10}, ["If", [["Equal", "a", "b"], 10], 9000], 9000),
@@ -186,6 +213,7 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({"a": ["Array", 2, 8]}, ["Average", "a"], 5),
         ({"a": 10, "b": 20}, ["Average", ["Array", "a", "b"]], 15),
         ({}, ["Length", ["Array", 1, 2, 3, 5, 2, 9]], 6),
+        ({}, ["Length", ["Array", 1, 2, 3, None]], 4),
         ({"a": ["Array", 1, 2, 3, 5, 2, 9]}, ["Length", "a"], 6),
         ({}, ["Length", ["Array"]], 0),
         # Next test illustrates an invalid formula, where 'Length' receives an invalid array.
@@ -271,7 +299,15 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
         ({}, ["Not", 0], True),
         ({}, ["Not", ["In", 2, ["Array", 1, 2, 3]]], False),
         ({}, ["Array", 2, 4, 3], ["Array", 2, 4, 3]),
+        ({}, ["StrictMap", ["Array", 1, 2, 3], ["Square"]], ["Array", 1, 4, 9]),
+        ({}, ["Filter", ["Array", 1, 2, 3], ["LessEqual"], 2], ["Array", 1, 2]),
+        ({}, ["Filter", ["Array", 1, 2, 3, "None"], ["LessEqual"], 2], ["Array", 1, 2]),
         ({}, ["Map", ["Array", 1, 2, 3], ["Square"]], ["Array", 1, 4, 9]),
+        (
+            {},
+            ["Map", ["Array", 1, 2, 3, None, "a"], ["Square"]],
+            ["Array", 1, 4, 9, None, "a"],
+        ),
         ({}, ["Map", ["Array", 1, 2, 3], ["Power"], 2], ["Array", 1, 4, 9]),
         (
             {},