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

{mathjson_solver-1.9.0/src/mathjson_solver.egg-info → mathjson_solver-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mathjson-solver
-Version: 1.9.0
+Version: 1.10.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -12,6 +12,15 @@ 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
 

{mathjson_solver-1.9.0 → mathjson_solver-1.10.0}/setup.cfg

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

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

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

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

@@ -6,6 +6,7 @@ from copy import deepcopy
 from statistics import median
 import logging
 import traceback
+import datetime
 
 
 class MathJSONException(Exception):
@@ -141,6 +142,31 @@ def create_mathjson_solver(solver_parameters):
             def Arr(s):
                 return s
 
+            def Add(s):
+                l_res = []
+                tmp = 0
+                for i, x in enumerate(s[1:]):
+                    res = f(x, c)
+                    if i ==0:
+                        tmp = res
+                    else:
+                        tmp = tmp + res
+
+                    # if isinstance(res, list):
+                    #     l_res.append(sum([xx for xx in res[1:]]))
+                    # else:
+                    #     l_res.append(res)
+
+                return tmp
+
+                # tmp = 0
+                # for i, x in enumerate(l):
+                #     if i == 0:
+                #         tmp = x
+                #     else:
+                #         tmp = tmp + x
+                # return tmp
+
             def Sum(s):
                 l_res = []
                 for x in s[1:]:
@@ -343,9 +369,37 @@ def create_mathjson_solver(solver_parameters):
                     conditions=conditions,
                 )
 
+            def Strptime(s):
+                datetime_str = f(s[1], c)
+                parameters = f(s[2], c)
+                return datetime.datetime.strptime(datetime_str, parameters)
+
+            def Strftime(s):
+                dt = f(s[1], c)
+                parameters = f(s[2], c)
+                return dt.strftime(parameters)
+
+            def Now(s):
+                return datetime.datetime.now()
+
+            def Today(s):
+                return datetime.date.today()
+
+            def TimeDeltaDays(s):
+                return datetime.timedelta(days=f(s[1], c))
+
+            def TimeDeltaMinutes(s):
+                return datetime.timedelta(minutes=f(s[1], c))
+
+            def TimeDeltaHours(s):
+                return datetime.timedelta(hours=f(s[1], c))
+
+            def TimeDeltaWeeks(s):
+                return datetime.timedelta(weeks=f(s[1], c))
+
             constructs = {
                 "Sum": Sum,
-                "Add": Sum,
+                "Add": Add,
                 "Subtract": lambda s: reduce(
                     lambda a, b: a - b, [f(x, c) for x in s[1:]]
                 ),
@@ -401,6 +455,14 @@ def create_mathjson_solver(solver_parameters):
                 "IsDefined": lambda s: s[1] in c,
                 "Map": Map,
                 "HasMatchingSublist": HasMatchingSublist,
+                "Strptime": Strptime,
+                "Strftime": Strftime,
+                "Today": Today,
+                "Now": Now,
+                "TimeDeltaWeeks": TimeDeltaWeeks,
+                "TimeDeltaHours": TimeDeltaHours,
+                "TimeDeltaMinutes": TimeDeltaMinutes,
+                "TimeDeltaDays": TimeDeltaDays,
             }
             if s[0] in constructs:
                 try:
@@ -487,6 +549,11 @@ def extract_variables(s: Union[list, int, float, str], li: set, ignore_list: set
                 ignore_list.add(x[0])
                 li.update(extract_variables(x[1], li, ignore_list))
             li.update(extract_variables(x[-1], li, ignore_list))
+        elif s[0] == "If":
+            for elif_block in s[1:-1]:  # s[1] is list
+                for x in elif_block:
+                    li.update(extract_variables(x, li, ignore_list))
+            li.update(extract_variables(s[-1], li, ignore_list))
         else:
             for x in s[1:]:
                 li.update(extract_variables(x, li, ignore_list))

{mathjson_solver-1.9.0 → mathjson_solver-1.10.0/src/mathjson_solver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mathjson-solver
-Version: 1.9.0
+Version: 1.10.0
 Summary: Utilities for MathJSON evaluation
 Home-page: https://github.com/LongenesisLtd/mathjson-solver
 Author: Martins Mednis
@@ -12,6 +12,15 @@ 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
 

{mathjson_solver-1.9.0 → mathjson_solver-1.10.0}/tests/test_with_pytest.py

@@ -259,6 +259,13 @@ from mathjson_solver import create_solver, MathJSONException, extract_variables
             ],
             False,
         ),
+        ({}, ["Strftime", ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"], "%Y"], "2025"),
+        ({}, ["Strftime", ["Today"], "%Y"], "2025"),
+        ({}, ["Strftime", ["Now"], "%Y"], "2025"),
+        ({}, ["Strftime", ["Add", ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"], ["TimeDeltaDays", 3]], "%d"], "13"),
+        ({}, ["Strftime", ["Add", ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"], ["TimeDeltaMinutes", 5]], "%M"], "10"),
+        ({}, ["Strftime", ["Add", ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"], ["TimeDeltaHours", 2]], "%H"], "12"),
+        ({}, ["Strftime", ["Add", ["Strptime", "2025-01-10T10:05", "%Y-%m-%dT%H:%M"], ["TimeDeltaWeeks", 1]], "%d"], "17"),
     ],
 )
 def test_solver_simple(parameters, expression, expected_result):
@@ -319,6 +326,21 @@ def test_handle_exception():
             ["Add", "[slug1][0][question1]", "y", 4, "[slug1][-3:-1][question1]"],
             set(["[slug1][0][question1]", "y", "[slug1][-3:-1][question1]"]),
         ),
+        (
+            {},
+            ["If", [["Equal", "[uzwuoy][-1][question1]", 200], 200], 1],
+            set(["[uzwuoy][-1][question1]"]),
+        ),
+        (
+            {},
+            [
+                "If",
+                [["Equal", "[uzwuoy][-1][question1]", 200], 201],
+                [["Equal", "[uzwuoy][-2][question1]", 100], 101],
+                1,
+            ],
+            set(["[uzwuoy][-1][question1]", "[uzwuoy][-2][question1]"]),
+        ),
     ],
 )
 def test_extract_variables(parameters, expression, expected_result):