mathjson-solver 1.6.0__tar.gz → 1.7.0__tar.gz

{mathjson-solver-1.6.0/src/mathjson_solver.egg-info → mathjson_solver-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mathjson-solver
-Version: 1.6.0
+Version: 1.7.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -97,9 +97,18 @@ We welcome your contributions in the form of pull requests.
 * `LessEqual`
 * `NotEqual`
 
+### Membership operators
+* `In`
+* `NotIn`
+* `ContainsAnyOf`
+* `ContainsAllOf`
+* `ContainsNoneOf`
+
 ### Typecasting
+* `Str`
 * `Int`
 * `Float`
+* `Not`
 
 ### Additional constructs
 * `Constants`
@@ -135,6 +144,8 @@ We welcome your contributions in the form of pull requests.
 ["Max", ["Array", 1, 2, ["Sum", 2, 4, 3], 5, 2]]  # 9
 ["Median", ["Array", 1, 2, 3, 5, 2]]              # 2
 ["Average", ["Array", 1, 2, 3, 5, 2]]             # 2.6
+["Average", ["Array"]]                            # None
+
 ["Length", ["Array", 1, 2, 3, 5, 2, 9]]           # 6
 ["Length", ["Array"]]                             # 0
 ["Any", ["Array", 0, 0, False, 0, 0]]             # False
@@ -145,6 +156,18 @@ We welcome your contributions in the form of pull requests.
 ["Int", "12"]                     # 12
 ["Int", "12.2"]                   # 12
 ["Float", "12.2"]                 # 12.2
+["Str", 12]                       # "12"
+["Str", "12"]                     # "12"
+["Str", "aabb"]                   # "aabb"
+["Not", True]                      # False
+["Not", 0]                         # True
+
+["In", 2, ["Array", 1, 2, 3]]     # True
+["In", 4, ["Array", 1, 2, 3]]     # False
+["ContainsAnyOf", ["Array", 1, 2, 3], ["Array", 3, 4, 5, 6]]     # True
+["ContainsAnyOf", ["Array", 1, 2, 3], ["Array", 4, 5, 6]]        # False
+["ContainsAllOf", ["Array", 1, 2, 3], ["Array", 1, 2, 3]]        # True
+["ContainsAllOf", ["Array", 1, 2], ["Array", 1, 2, 3]]           # False
 ```
 
 ### Constants

{mathjson-solver-1.6.0 → mathjson_solver-1.7.0}/README.md

@@ -82,9 +82,18 @@ We welcome your contributions in the form of pull requests.
 * `LessEqual`
 * `NotEqual`
 
+### Membership operators
+* `In`
+* `NotIn`
+* `ContainsAnyOf`
+* `ContainsAllOf`
+* `ContainsNoneOf`
+
 ### Typecasting
+* `Str`
 * `Int`
 * `Float`
+* `Not`
 
 ### Additional constructs
 * `Constants`
@@ -120,6 +129,8 @@ We welcome your contributions in the form of pull requests.
 ["Max", ["Array", 1, 2, ["Sum", 2, 4, 3], 5, 2]]  # 9
 ["Median", ["Array", 1, 2, 3, 5, 2]]              # 2
 ["Average", ["Array", 1, 2, 3, 5, 2]]             # 2.6
+["Average", ["Array"]]                            # None
+
 ["Length", ["Array", 1, 2, 3, 5, 2, 9]]           # 6
 ["Length", ["Array"]]                             # 0
 ["Any", ["Array", 0, 0, False, 0, 0]]             # False
@@ -130,6 +141,18 @@ We welcome your contributions in the form of pull requests.
 ["Int", "12"]                     # 12
 ["Int", "12.2"]                   # 12
 ["Float", "12.2"]                 # 12.2
+["Str", 12]                       # "12"
+["Str", "12"]                     # "12"
+["Str", "aabb"]                   # "aabb"
+["Not", True]                      # False
+["Not", 0]                         # True
+
+["In", 2, ["Array", 1, 2, 3]]     # True
+["In", 4, ["Array", 1, 2, 3]]     # False
+["ContainsAnyOf", ["Array", 1, 2, 3], ["Array", 3, 4, 5, 6]]     # True
+["ContainsAnyOf", ["Array", 1, 2, 3], ["Array", 4, 5, 6]]        # False
+["ContainsAllOf", ["Array", 1, 2, 3], ["Array", 1, 2, 3]]        # True
+["ContainsAllOf", ["Array", 1, 2], ["Array", 1, 2, 3]]           # False
 ```
 
 ### Constants

{mathjson-solver-1.6.0 → mathjson_solver-1.7.0}/setup.cfg

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

{mathjson-solver-1.6.0 → mathjson_solver-1.7.0}/setup.py

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

{mathjson-solver-1.6.0 → mathjson_solver-1.7.0}/src/mathjson_solver/__main__.py

@@ -3,6 +3,8 @@ from functools import reduce
 import math
 from copy import deepcopy
 from statistics import median
+import logging
+import traceback
 
 
 class MathJSONException(Exception):
@@ -123,8 +125,19 @@ def create_mathjson_solver(solver_parameters):
                 for x in s[1:-1]:
                     if len(x) != 2:
                         raise ValueError(f"Wrong if or elif in 'If'")
-                    if f(x[0], c):
-                        return f(x[1], c)
+                    try:
+                        if f(x[0], c):
+                            try:
+                                return f(x[1], c)
+                            except MathJSONException as e:
+                                logging.error(
+                                    "MathJSONException: %s", traceback.format_exc()
+                                )
+                                continue
+                    except MathJSONException as e:
+                        logging.error("MathJSONException: %s", traceback.format_exc())
+                        return f(s[-1], c)  # return default value (else)
+
                 return f(s[-1], c)
 
             def In(s):
@@ -229,10 +242,15 @@ def create_mathjson_solver(solver_parameters):
                 "Contains_any_of": Contains_any_of,
                 "Contains_all_of": Contains_all_of,
                 "Contains_none_of": Contains_none_of,
+                "NotIn": Not_in,
+                "ContainsAnyOf": Contains_any_of,
+                "ContainsAllOf": Contains_all_of,
+                "ContainsNoneOf": Contains_none_of,
                 "Int": Int,
                 "Float": Float,
                 "Str": Str,
                 "Not": Not,
+                "IsDefined": lambda s: s[1] in c,
             }
             if s[0] in constructs:
                 try:
@@ -249,6 +267,7 @@ def create_mathjson_solver(solver_parameters):
         elif s in c:
             return f(c[s], c)
         else:
+            # raise KeyError(f"Parameter '{s}' is not defined")
             return s
 
     return f

{mathjson-solver-1.6.0 → mathjson_solver-1.7.0/src/mathjson_solver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mathjson-solver
-Version: 1.6.0
+Version: 1.7.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -97,9 +97,18 @@ We welcome your contributions in the form of pull requests.
 * `LessEqual`
 * `NotEqual`
 
+### Membership operators
+* `In`
+* `NotIn`
+* `ContainsAnyOf`
+* `ContainsAllOf`
+* `ContainsNoneOf`
+
 ### Typecasting
+* `Str`
 * `Int`
 * `Float`
+* `Not`
 
 ### Additional constructs
 * `Constants`
@@ -135,6 +144,8 @@ We welcome your contributions in the form of pull requests.
 ["Max", ["Array", 1, 2, ["Sum", 2, 4, 3], 5, 2]]  # 9
 ["Median", ["Array", 1, 2, 3, 5, 2]]              # 2
 ["Average", ["Array", 1, 2, 3, 5, 2]]             # 2.6
+["Average", ["Array"]]                            # None
+
 ["Length", ["Array", 1, 2, 3, 5, 2, 9]]           # 6
 ["Length", ["Array"]]                             # 0
 ["Any", ["Array", 0, 0, False, 0, 0]]             # False
@@ -145,6 +156,18 @@ We welcome your contributions in the form of pull requests.
 ["Int", "12"]                     # 12
 ["Int", "12.2"]                   # 12
 ["Float", "12.2"]                 # 12.2
+["Str", 12]                       # "12"
+["Str", "12"]                     # "12"
+["Str", "aabb"]                   # "aabb"
+["Not", True]                      # False
+["Not", 0]                         # True
+
+["In", 2, ["Array", 1, 2, 3]]     # True
+["In", 4, ["Array", 1, 2, 3]]     # False
+["ContainsAnyOf", ["Array", 1, 2, 3], ["Array", 3, 4, 5, 6]]     # True
+["ContainsAnyOf", ["Array", 1, 2, 3], ["Array", 4, 5, 6]]        # False
+["ContainsAllOf", ["Array", 1, 2, 3], ["Array", 1, 2, 3]]        # True
+["ContainsAllOf", ["Array", 1, 2], ["Array", 1, 2, 3]]           # False
 ```
 
 ### Constants

{mathjson-solver-1.6.0 → mathjson_solver-1.7.0}/tests/test_with_pytest.py

@@ -45,6 +45,10 @@ from mathjson_solver import create_solver, MathJSONException
         ({"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),
+        ({"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),
+        ({"a": 10}, ["If", [["Equal", "a", ["Sum", 1, "b"]], 10], 9000], 9000),
         ({}, ["Array", 1, 2, 3, 5, 2], ["Array", 1, 2, 3, 5, 2]),
         ({}, ["Max", ["Array", 1, 2, 3, 5, 2]], 5),
         ({}, ["Max", ["Array", 1, 2, ["Sum", 2, 4, 3], 5, 2]], 9),
@@ -114,6 +118,7 @@ from mathjson_solver import create_solver, MathJSONException
         ({"a": [10, 20, 30]}, ["In", 21, "a"], False),
         ({}, ["Not_in", 2, ["Array", 1, 2, 3]], False),
         ({}, ["Not_in", 4, ["Array", 1, 2, 3]], True),
+        ({}, ["NotIn", 4, ["Array", 1, 2, 3]], True),
         ({"a": [10, 20, 30]}, ["Not_in", 20, "a"], False),
         ({"a": [10, 20, 30]}, ["Not_in", 21, "a"], True),
         ({}, ["Contains_any_of", ["Array", 1, 2, 3], ["Array", 1, 2, 3]], True),
@@ -140,16 +145,19 @@ from mathjson_solver import create_solver, MathJSONException
         ),
         ({"a": [10, 20, 30]}, ["Contains_any_of", "a", ["Array", 1, 20, 3]], True),
         ({"b": [1, 20, 3]}, ["Contains_any_of", ["Array", 1, 2, 3], "b"], True),
+        ({"b": [1, 20, 3]}, ["ContainsAnyOf", ["Array", 1, 2, 3], "b"], True),
         ({"a": [10, 20, 30], "b": [1, 20, 3]}, ["Contains_any_of", "a", "b"], True),
         ({"a": [10, 20, 30], "b": [1, 2, 3]}, ["Contains_any_of", "a", "b"], False),
         ({}, ["Contains_all_of", ["Array", 1, 2, 3], ["Array", 1, 2, 3]], True),
         ({}, ["Contains_all_of", ["Array", 1, 2], ["Array", 1, 2, 3]], False),
         ({}, ["Contains_all_of", ["Array", 1, 2, 3], ["Array", 1, 2]], True),
         ({}, ["Contains_all_of", ["Array", 1, 2, 3], ["Array", 2]], True),
+        ({}, ["ContainsAllOf", ["Array", 1, 2, 3], ["Array", 2]], True),
         ({"a": [10, 20, 30], "b": [1, 20, 3]}, ["Contains_all_of", "a", "b"], False),
         ({"a": [1, 2, 3], "b": [1, 2]}, ["Contains_all_of", "a", "b"], True),
         ({}, ["Contains_none_of", ["Array", 1, 2, 3], ["Array", 1, 2, 3]], False),
         ({}, ["Contains_none_of", ["Array", 1, 2], ["Array", 2, 3]], False),
+        ({}, ["ContainsNoneOf", ["Array", 1, 2], ["Array", 2, 3]], False),
         ({}, ["Contains_none_of", ["Array", 1, 2, 3], ["Array", 4, 5]], True),
         ({}, ["Not", True], False),
         ({}, ["Not", 0], True),