evalis 0.2.0__tar.gz → 0.2.1__tar.gz

{evalis-0.2.0/src/evalis.egg-info → evalis-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evalis
-Version: 0.2.0
+Version: 0.2.1
 Summary: A polyglot, safe, user-friendly expression evaluator.
 Author-email: Paul Slaughter <paul@souldzin.com>
 License-Expression: MIT

{evalis-0.2.0 → evalis-0.2.1}/src/evalis/constants.py

@@ -3,7 +3,7 @@
 # - To change the __version__ in this file, use the `set_version` make target.
 
 # Version of package
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 
 # Evalis expression version that this package supports

{evalis-0.2.0 → evalis-0.2.1}/src/evalis/eval.py

@@ -10,7 +10,13 @@ from evalis.ast import (
 )
 from evalis.error import EvalisError, CODE_TYPE_ERROR
 from evalis.types import EvaluatorOptions
-from evalis.utils import as_str, is_primitive, should_str_concat
+from evalis.utils import (
+    as_str,
+    is_primitive,
+    should_str_concat,
+    as_num,
+    is_numeric_or_null,
+)
 
 
 def get_val_from_context(context: Any, key: Any) -> Any:
@@ -64,13 +70,41 @@ class Evaluator:
                 case BinaryOpType.EQUALS:
                     return left == right
                 case BinaryOpType.GT:
-                    return left > right
+                    if is_numeric_or_null(left) and is_numeric_or_null(right):
+                        return as_num(left) > as_num(right)
+                    if isinstance(left, str) and isinstance(right, str):
+                        return left > right
+                    raise EvalisError(
+                        f"Cannot use > operator with types {type(left).__name__} and {type(right).__name__}",
+                        CODE_TYPE_ERROR,
+                    )
                 case BinaryOpType.GTE:
-                    return left >= right
+                    if is_numeric_or_null(left) and is_numeric_or_null(right):
+                        return as_num(left) >= as_num(right)
+                    if isinstance(left, str) and isinstance(right, str):
+                        return left >= right
+                    raise EvalisError(
+                        f"Cannot use >= operator with types {type(left).__name__} and {type(right).__name__}",
+                        CODE_TYPE_ERROR,
+                    )
                 case BinaryOpType.LT:
-                    return left < right
+                    if is_numeric_or_null(left) and is_numeric_or_null(right):
+                        return as_num(left) < as_num(right)
+                    if isinstance(left, str) and isinstance(right, str):
+                        return left < right
+                    raise EvalisError(
+                        f"Cannot use < operator with types {type(left).__name__} and {type(right).__name__}",
+                        CODE_TYPE_ERROR,
+                    )
                 case BinaryOpType.LTE:
-                    return left <= right
+                    if is_numeric_or_null(left) and is_numeric_or_null(right):
+                        return as_num(left) <= as_num(right)
+                    if isinstance(left, str) and isinstance(right, str):
+                        return left <= right
+                    raise EvalisError(
+                        f"Cannot use <= operator with types {type(left).__name__} and {type(right).__name__}",
+                        CODE_TYPE_ERROR,
+                    )
                 case BinaryOpType.MULTIPLY:
                     return left * right
                 case BinaryOpType.OR:

{evalis-0.2.0 → evalis-0.2.1}/src/evalis/utils.py

@@ -26,3 +26,15 @@ def as_str(val: Any) -> str:
         return ""
 
     return str(val)
+
+
+def is_numeric_or_null(val: Any) -> bool:
+    """Check if a value is numeric or null."""
+    return val is None or isinstance(val, (int, float))
+
+
+def as_num(val: Any) -> Any:
+    """Coerce nullish values to 0 for numeric operations."""
+    if val is None:
+        return 0
+    return val

{evalis-0.2.0 → evalis-0.2.1/src/evalis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evalis
-Version: 0.2.0
+Version: 0.2.1
 Summary: A polyglot, safe, user-friendly expression evaluator.
 Author-email: Paul Slaughter <paul@souldzin.com>
 License-Expression: MIT