mathjson-solver 1.20.1__tar.gz → 1.20.2__tar.gz

mathjson_solver-1.20.2/.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(grep -n \"^OPERATORS\\\\|^operators\\\\|: solve_\\\\|'.*':\\\\s*$\\\\|def solve_\" /home/martins/workspace/longenesis/mathjson-solver/src/mathjson_solver/__main__.py)"
+    ]
+  }
+}

{mathjson_solver-1.20.1 → mathjson_solver-1.20.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: mathjson-solver
-Version: 1.20.1
+Version: 1.20.2
 Summary: Utilities for MathJSON evaluation
 Project-URL: Homepage, https://github.com/LongenesisLtd/mathjson-solver
 Project-URL: Bug Tracker, https://github.com/LongenesisLtd/mathjson-solver/issues

{mathjson_solver-1.20.1 → mathjson_solver-1.20.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mathjson-solver"
-version = "1.20.1"
+version = "1.20.2"
 authors = [{name = "Martins Mednis", email = "mrt@mednis.info"}]
 description = "Utilities for MathJSON evaluation"
 readme = "README.md"

{mathjson_solver-1.20.1 → mathjson_solver-1.20.2}/src/mathjson_solver/__main__.py

@@ -1235,11 +1235,18 @@ def extract_variables(s: Union[list, int, float, str], li: set, ignore_list: set
         "ContainsNoneOf",
         "Int",
         "Float",
+        "Floor",
+        "Ceil",
         "Str",
         "Not",
         "IsDefined",
         "IsUndefined",
+        "StrictEqual",
+        "NotEqual",
+        "StrictSwitch",
         "Map",
+        "StrictMap",
+        "Filter",
         "HasMatchingSublist",
         "Strptime",
         "Strftime",
@@ -1261,10 +1268,13 @@ def extract_variables(s: Union[list, int, float, str], li: set, ignore_list: set
         "AtIndex",
         "Slice",
         "CumulativeProduct",
+        "CumulativeSum",
         "Interp",
         "FindIntervalIndex",
         "TrapezoidalIntegrate",
         "TrapezoidalIntegrate",
+        "Reduce",
+        "Appended",
         "Sin",
         "Cos",
         "Tan",
@@ -1284,7 +1294,7 @@ def extract_variables(s: Union[list, int, float, str], li: set, ignore_list: set
             for x in s[1:-1]:
                 ignore_list.add(x[0])
                 li.update(extract_variables(x[1], li, ignore_list))
-            li.update(extract_variables(x[-1], li, ignore_list))
+            li.update(extract_variables(s[-1], li, ignore_list))
         elif s[0] == "If":
             for elif_block in s[1:-1]:  # s[1] is list
                 for x in elif_block:

{mathjson_solver-1.20.1 → mathjson_solver-1.20.2}/tests/test_extract_variables.py

@@ -15,6 +15,7 @@ from mathjson_solver import extract_variables
         ({"a": 5}, ["Sum", 2, "a", 3], set()),
         ({"a": 5, "b": 6}, ["Sum", 2, "a", "c"], set(["c"])),
         ({}, ["Constants", ["c", 1], ["d", ["Add", 2, "a"]], "d"], set(["a"])),
+        ({}, ["Constants", ["c", 1], ["b", ["Add", 2, "a"]], "d"], set(["a", "d"])),
         # Now with "ugly" variables that mimic the ones used for deep referencing.
         (
             {},