mathjson-solver 1.20.0__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.0 → 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.0
+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.0 → mathjson_solver-1.20.2}/SECURITY.md

@@ -5,8 +5,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.13.x   | :white_check_mark: |
-| < 1.13.x   | :x:                |
+| 1.20.x   | :white_check_mark: |
+| < 1.20.x   | :x:                |
 
 
 ## Reporting a Vulnerability

{mathjson_solver-1.20.0 → mathjson_solver-1.20.2}/docs/README.md

@@ -327,7 +327,7 @@ If a constant definition raises an exception (e.g. because a referenced paramete
 # Result: 11.25  (c_old was never needed)
 ```
 
-A constant that failed to compute can be detected with `["Equal", "c_old", None]`.
+A constant that failed to compute resolves to `None`, which is falsy. Use `["IsFalse", "c_old"]` to detect it (or `["IsTrue", "c_old"]` to confirm it computed successfully).
 
 ### If Statement
 ```
@@ -824,7 +824,7 @@ The logical complement of `IsDefined`. Returns `True` if the name is not defined
 ["Constants", ["x", 5], ["IsUndefined", "y"]]   # True
 ```
 
-Note: when a `Constants` definition raises an exception, that constant is set to `None` (see null-propagation below). In that case `IsUndefined` still returns `False` — the name is defined, just with a `None` value. Use `["Equal", "val", None]` to test for that explicitly.
+Note: when a `Constants` definition raises an exception, that constant is set to `None` (see null-propagation below). In that case `IsUndefined` still returns `False` — the name is defined, just with a `None` value. Use `["IsFalse", "val"]` to detect a failed constant (since `None` is falsy).
 
 ---
 

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

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

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

@@ -617,6 +617,8 @@ def create_mathjson_solver(solver_parameters):
 
             def Strftime(s):
                 dt = _try_parse_datetime(f(s[1], c))
+                if not isinstance(dt, (datetime.datetime, datetime.date)):
+                    raise ValueError(f"Strftime: could not parse input as datetime: {dt!r}")
                 parameters = f(s[2], c)
                 return dt.strftime(parameters)
 
@@ -1233,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",
@@ -1259,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",
@@ -1282,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.0 → mathjson_solver-1.20.2}/tests/test_datetime.py

@@ -134,6 +134,20 @@ class TestStrftime:
         result = solver(["Strftime", "2025-06-15T14:30:45", "%Y-%m-%d %H:%M:%S"])
         assert result == "2025-06-15 14:30:45"
 
+    def test_strftime_raises_on_unparseable_input(self):
+        """Strftime must raise MathJSONException (not AttributeError) for unparseable input."""
+        from mathjson_solver import MathJSONException
+        solver = create_solver({})
+        with pytest.raises(MathJSONException):
+            solver(["Strftime", "not-a-date", "%Y-%m-%d"])
+
+    def test_strftime_raises_on_none_input(self):
+        """Strftime must raise MathJSONException when input resolves to None."""
+        from mathjson_solver import MathJSONException
+        solver = create_solver({})
+        with pytest.raises(MathJSONException):
+            solver(["Strftime", None, "%Y-%m-%d"])
+
 
 class TestDatetimeChaining:
     """Test complex datetime operation chains."""

{mathjson_solver-1.20.0 → 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.
         (
             {},