mathjson-solver 1.10.0__tar.gz → 1.12.0__tar.gz

mathjson_solver-1.12.0/PKG-INFO

@@ -0,0 +1,83 @@
+Metadata-Version: 2.2
+Name: mathjson-solver
+Version: 1.12.0
+Summary: Utilities for MathJSON evaluation
+Home-page: https://github.com/LongenesisLtd/mathjson-solver
+Author: Martins Mednis
+Author-email: mrt@mednis.info
+Project-URL: Bug Tracker, https://github.com/LongenesisLtd/mathjson-solver/issues
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
+
+# MathJSON Solver
+
+[![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)
+
+_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.
+
+Please ask questions and share feedback in our Gitter chat [https://gitter.im/mathjson-solver/community](https://gitter.im/mathjson-solver/community).
+[![Gitter](https://badges.gitter.im/mathjson-solver/community.svg)](https://gitter.im/mathjson-solver/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+## How to use
+```python
+from mathjson_solver import create_solver
+
+parameters = {"x": 2, "y": 3}
+expression = ["Add", "x", "y", 4]
+
+solver = create_solver(parameters)
+answer = solver(expression)
+
+print(answer)
+# 9, because 2+3+4=9
+```
+
+## Currently supported constructs
+Find the full list of supported constructs in the [docs/README.md](https://github.com/LongenesisLtd/mathjson-solver/blob/main/docs/README.md).
+
+
+## Exception handling
+
+A `MathJSONException` is raised when expression cannot be evaluated. Import `MathJSONException` to handle it:
+```python
+from mathjson_solver import create_solver, MathJSONException
+
+solver = create_solver({})
+try:
+    solver(["Divide", 1, 0])
+except MathJSONException:
+    pass
+    # invoke your own exception logger here
+```
+
+Left unhandled, the exception will look like `MathJSONException("Problem in Divide. ['Divide', 1, 0]. division by zero")`.
+
+
+## How to run tests
+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.0/README.md

@@ -0,0 +1,59 @@
+# MathJSON Solver
+
+[![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)
+
+_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.
+
+Please ask questions and share feedback in our Gitter chat [https://gitter.im/mathjson-solver/community](https://gitter.im/mathjson-solver/community).
+[![Gitter](https://badges.gitter.im/mathjson-solver/community.svg)](https://gitter.im/mathjson-solver/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+## How to use
+```python
+from mathjson_solver import create_solver
+
+parameters = {"x": 2, "y": 3}
+expression = ["Add", "x", "y", 4]
+
+solver = create_solver(parameters)
+answer = solver(expression)
+
+print(answer)
+# 9, because 2+3+4=9
+```
+
+## Currently supported constructs
+Find the full list of supported constructs in the [docs/README.md](https://github.com/LongenesisLtd/mathjson-solver/blob/main/docs/README.md).
+
+
+## Exception handling
+
+A `MathJSONException` is raised when expression cannot be evaluated. Import `MathJSONException` to handle it:
+```python
+from mathjson_solver import create_solver, MathJSONException
+
+solver = create_solver({})
+try:
+    solver(["Divide", 1, 0])
+except MathJSONException:
+    pass
+    # invoke your own exception logger here
+```
+
+Left unhandled, the exception will look like `MathJSONException("Problem in Divide. ['Divide', 1, 0]. division by zero")`.
+
+
+## How to run tests
+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.10.0 → mathjson_solver-1.12.0}/setup.cfg

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

{mathjson_solver-1.10.0 → mathjson_solver-1.12.0}/setup.py

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

{mathjson_solver-1.10.0 → mathjson_solver-1.12.0}/src/mathjson_solver/__main__.py

@@ -1,4 +1,5 @@
 import numbers
+from types import NoneType
 from typing import Union
 from functools import reduce
 import math
@@ -26,17 +27,17 @@ class MathJSONException(Exception):
         return f"Problem in {self.construct}. {self.expr}. {m}"
 
 
-def requires_array(func):
-    def inner1(*args, **kwargs):
-        try:
-            if args[0][1][0] == "Array" and len(args[0][1]) > 0:
-                return func(*args, **kwargs)
-            else:
-                raise ValueError(f"'{func.__name__}' should receive a list")
-        except TypeError:
-            raise ValueError(f"'{func.__name__}' really should receive a list")
+# def requires_array(func):
+#     def inner1(*args, **kwargs):
+#         try:
+#             if args[0][1][0] == "Array" and len(args[0][1]) > 0:
+#                 return func(*args, **kwargs)
+#             else:
+#                 raise ValueError(f"'{func.__name__}' should receive a list")
+#         except TypeError:
+#             raise ValueError(f"'{func.__name__}' really should receive a list")
 
-    return inner1
+#     return inner1
 
 
 def is_numeric(x):
@@ -92,40 +93,51 @@ def has_matching_sublist(
         return count >= required_match_count
 
 
-def has_sublist2(
-    *,
-    my_list: list,
-    required_match_count: int,
-    position: int,
-    contiguous: bool,
-    condition: callable,
-) -> bool:
-    if contiguous:
-        # Check for contiguous matches based on position
-        if position == 0:
-            # Check if the beginning of the list matches
-            count = sum(1 for x in my_list[:required_match_count] if condition(x))
-            return count == required_match_count
-        elif position > 0:
-            # Skip the first `position` elements
-            count = sum(
-                1
-                for x in my_list[position : position + required_match_count]
-                if condition(x)
-            )
-            return count == required_match_count
-        elif position == -1:
-            # Check if the end of the list matches
-            count = sum(1 for x in my_list[-required_match_count:] if condition(x))
-            return count == required_match_count
-        elif position < -1:
-            # Skip the last `abs(position)` elements
-            count = sum(1 for x in my_list[:position] if condition(x))
-            return count == required_match_count
-    else:
-        # Check for non-contiguous matches
-        count = sum(1 for x in my_list if condition(x))
-        return count >= required_match_count
+# def has_sublist2(
+#     *,
+#     my_list: list,
+#     required_match_count: int,
+#     position: int,
+#     contiguous: bool,
+#     condition: callable,
+# ) -> bool:
+#     if contiguous:
+#         # Check for contiguous matches based on position
+#         if position == 0:
+#             # Check if the beginning of the list matches
+#             count = sum(1 for x in my_list[:required_match_count] if condition(x))
+#             return count == required_match_count
+#         elif position > 0:
+#             # Skip the first `position` elements
+#             count = sum(
+#                 1
+#                 for x in my_list[position : position + required_match_count]
+#                 if condition(x)
+#             )
+#             return count == required_match_count
+#         elif position == -1:
+#             # Check if the end of the list matches
+#             count = sum(1 for x in my_list[-required_match_count:] if condition(x))
+#             return count == required_match_count
+#         elif position < -1:
+#             # Skip the last `abs(position)` elements
+#             count = sum(1 for x in my_list[:position] if condition(x))
+#             return count == required_match_count
+#     else:
+#         # Check for non-contiguous matches
+#         count = sum(1 for x in my_list if condition(x))
+#         return count >= required_match_count
+
+
+def comparison_safe_converter(x):
+    if type(x) in [int, float, str]:
+        return f"{x}"
+    elif type(x) in [bool, NoneType]:
+        if x:
+            return True
+        else:
+            return False
+    return x
 
 
 def create_mathjson_solver(solver_parameters):
@@ -147,7 +159,7 @@ def create_mathjson_solver(solver_parameters):
                 tmp = 0
                 for i, x in enumerate(s[1:]):
                     res = f(x, c)
-                    if i ==0:
+                    if i == 0:
                         tmp = res
                     else:
                         tmp = tmp + res
@@ -177,14 +189,12 @@ def create_mathjson_solver(solver_parameters):
                         l_res.append(res)
                 return sum(l_res)
 
-            # @requires_array
             def Max(s):
                 if isinstance(s[1], str):
                     return max([f(x, c) for x in f(s[1], c) if is_numeric(f(x, c))])
                 else:
                     return max([f(x, c) for x in s[1][1:] if is_numeric(f(x, c))])
 
-            # @requires_array
             def Min(s):
                 if isinstance(s[1], str):
                     return min([f(x, c) for x in f(s[1], c) if is_numeric(f(x, c))])
@@ -203,14 +213,12 @@ def create_mathjson_solver(solver_parameters):
                 except ZeroDivisionError:
                     return None
 
-            # @requires_array
             def Median(s):
                 if isinstance(s[1], str):
                     return median([f(x, c) for x in f(s[1], c) if is_numeric(f(x, c))])
                 else:
                     return median([f(x, c) for x in s[1][1:] if is_numeric(f(x, c))])
 
-            # @requires_array
             def Length(s):
                 if isinstance(s[1], str):
 
@@ -218,11 +226,9 @@ def create_mathjson_solver(solver_parameters):
                 else:
                     return len([x for x in s[1][1:]])
 
-            # @requires_array
             def Any(s):
                 return any([f(x, c) for x in s[1][1:]])
 
-            # @requires_array
             def All(s):
                 return all([f(x, c) for x in s[1][1:]])
 
@@ -397,6 +403,26 @@ def create_mathjson_solver(solver_parameters):
             def TimeDeltaWeeks(s):
                 return datetime.timedelta(weeks=f(s[1], c))
 
+            # def Equal(s):
+            #     a = comparison_safe_converter(f(s[1], c))
+            #     b = comparison_safe_converter(f(s[2], c))
+            #     return a == b
+            #     if type(a) in [int, float, str]:
+            #         a = f"{a}"
+            #     elif type(a) in [bool, NoneType]:
+            #         if a:
+            #             a = True
+            #         else:
+            #             a = None
+
+            #     if is_numeric(a):
+
+            #     lambda s: f"{f(s[1], c)}" == f"{f(s[2], c)}",
+
+            def IsDefined(s):
+                # Todo: This does not work
+                return s[1] in c.keys()
+
             constructs = {
                 "Sum": Sum,
                 "Add": Add,
@@ -419,7 +445,10 @@ def create_mathjson_solver(solver_parameters):
                 "Log": lambda s: math.log(f(s[1], c)),
                 "Log2": lambda s: math.log2(f(s[1], c)),
                 "Log10": lambda s: math.log10(f(s[1], c)),
-                "Equal": lambda s: f(s[1], c) == f(s[2], c),
+                # "Equal": lambda s: f"{f(s[1], c)}" == f"{f(s[2], c)}",
+                "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),
@@ -452,7 +481,8 @@ def create_mathjson_solver(solver_parameters):
                 "Float": Float,
                 "Str": Str,
                 "Not": Not,
-                "IsDefined": lambda s: s[1] in c,
+                # "IsDefined": lambda s: s[1] in c,
+                "IsDefined": IsDefined,
                 "Map": Map,
                 "HasMatchingSublist": HasMatchingSublist,
                 "Strptime": Strptime,
@@ -467,7 +497,17 @@ def create_mathjson_solver(solver_parameters):
             if s[0] in constructs:
                 try:
                     return constructs[s[0]](s)
-                except Exception as e:
+
+                # except RecursionError:
+                #     return s[0]
+                # except Exception as e:
+                except TypeError as e:
+                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                except ValueError as e:
+                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                except IndexError as e:
+                    raise MathJSONException(e, s, mathjson_construct=s[0])
+                except ZeroDivisionError as e:
                     raise MathJSONException(e, s, mathjson_construct=s[0])
             else:
                 # raise MathJSONException(
@@ -475,7 +515,10 @@ def create_mathjson_solver(solver_parameters):
                 # )
                 return s
         elif s in solver_parameters:
-            return f(solver_parameters[s], c)
+            try:
+                return f(solver_parameters[s], c)
+            except RecursionError:
+                return solver_parameters[s]
         elif s in c:
             return f(c[s], c)
         else:
@@ -536,6 +579,14 @@ def extract_variables(s: Union[list, int, float, str], li: set, ignore_list: set
         "IsDefined",
         "Map",
         "HasMatchingSublist",
+        "Strptime",
+        "Strftime",
+        "Today",
+        "Now",
+        "TimeDeltaWeeks",
+        "TimeDeltaHours",
+        "TimeDeltaMinutes",
+        "TimeDeltaDays",
     ]
     if isinstance(s, str):
         if s in ignore_list:

mathjson_solver-1.12.0/src/mathjson_solver.egg-info/PKG-INFO

@@ -0,0 +1,83 @@
+Metadata-Version: 2.2
+Name: mathjson-solver
+Version: 1.12.0
+Summary: Utilities for MathJSON evaluation
+Home-page: https://github.com/LongenesisLtd/mathjson-solver
+Author: Martins Mednis
+Author-email: mrt@mednis.info
+Project-URL: Bug Tracker, https://github.com/LongenesisLtd/mathjson-solver/issues
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
+
+# MathJSON Solver
+
+[![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)
+
+_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.
+
+Please ask questions and share feedback in our Gitter chat [https://gitter.im/mathjson-solver/community](https://gitter.im/mathjson-solver/community).
+[![Gitter](https://badges.gitter.im/mathjson-solver/community.svg)](https://gitter.im/mathjson-solver/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+## How to use
+```python
+from mathjson_solver import create_solver
+
+parameters = {"x": 2, "y": 3}
+expression = ["Add", "x", "y", 4]
+
+solver = create_solver(parameters)
+answer = solver(expression)
+
+print(answer)
+# 9, because 2+3+4=9
+```
+
+## Currently supported constructs
+Find the full list of supported constructs in the [docs/README.md](https://github.com/LongenesisLtd/mathjson-solver/blob/main/docs/README.md).
+
+
+## Exception handling
+
+A `MathJSONException` is raised when expression cannot be evaluated. Import `MathJSONException` to handle it:
+```python
+from mathjson_solver import create_solver, MathJSONException
+
+solver = create_solver({})
+try:
+    solver(["Divide", 1, 0])
+except MathJSONException:
+    pass
+    # invoke your own exception logger here
+```
+
+Left unhandled, the exception will look like `MathJSONException("Problem in Divide. ['Divide', 1, 0]. division by zero")`.
+
+
+## How to run tests
+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.