laipeng/reflex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix boolean to boolen comparisons (#4620)

Browse Source 
* fix boolean to boolen comparisons

* fixes #4618

* fix tests
This commit is contained in:
Khaleel Al-Adhami 2025-01-15 14:23:45 -08:00 committed by GitHub
parent b50b7692b2
commit cb24492371
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
reflex/vars/number.py
View File

@ -20,7 +20,6 @@ from typing import (
from reflex.constants.base import Dirs from reflex.constants.base import Dirs
from reflex.utils.exceptions import PrimitiveUnserializableToJSON, VarTypeError from reflex.utils.exceptions import PrimitiveUnserializableToJSON, VarTypeError
from reflex.utils.imports import ImportDict, ImportVar from reflex.utils.imports import ImportDict, ImportVar
from reflex.utils.types import is_optional
from .base import ( from .base import (
CustomVarOperationReturn, CustomVarOperationReturn,
@ -431,7 +430,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
""" """
if not isinstance(other, NUMBER_TYPES): if not isinstance(other, NUMBER_TYPES):
raise_unsupported_operand_types("<", (type(self), type(other))) raise_unsupported_operand_types("<", (type(self), type(other)))
return less_than_operation(self, +other) return less_than_operation(+self, +other)
@overload @overload
def __le__(self, other: number_types) -> BooleanVar: ... def __le__(self, other: number_types) -> BooleanVar: ...
@ -450,7 +449,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
""" """
if not isinstance(other, NUMBER_TYPES): if not isinstance(other, NUMBER_TYPES):
raise_unsupported_operand_types("<=", (type(self), type(other))) raise_unsupported_operand_types("<=", (type(self), type(other)))
return less_than_or_equal_operation(self, +other) return less_than_or_equal_operation(+self, +other)
def __eq__(self, other: Any): def __eq__(self, other: Any):
"""Equal comparison. """Equal comparison.
@ -462,7 +461,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
The result of the comparison. The result of the comparison.
""" """
if isinstance(other, NUMBER_TYPES): if isinstance(other, NUMBER_TYPES):
return equal_operation(self, +other) return equal_operation(+self, +other)
return equal_operation(self, other) return equal_operation(self, other)
def __ne__(self, other: Any): def __ne__(self, other: Any):
@ -475,7 +474,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
The result of the comparison. The result of the comparison.
""" """
if isinstance(other, NUMBER_TYPES): if isinstance(other, NUMBER_TYPES):
return not_equal_operation(self, +other) return not_equal_operation(+self, +other)
return not_equal_operation(self, other) return not_equal_operation(self, other)
@overload @overload
@ -495,7 +494,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
""" """
if not isinstance(other, NUMBER_TYPES): if not isinstance(other, NUMBER_TYPES):
raise_unsupported_operand_types(">", (type(self), type(other))) raise_unsupported_operand_types(">", (type(self), type(other)))
return greater_than_operation(self, +other) return greater_than_operation(+self, +other)
@overload @overload
def __ge__(self, other: number_types) -> BooleanVar: ... def __ge__(self, other: number_types) -> BooleanVar: ...
@ -514,17 +513,7 @@ class NumberVar(Var[NUMBER_T], python_types=(int, float)):
""" """
if not isinstance(other, NUMBER_TYPES): if not isinstance(other, NUMBER_TYPES):
raise_unsupported_operand_types(">=", (type(self), type(other))) raise_unsupported_operand_types(">=", (type(self), type(other)))
return greater_than_or_equal_operation(self, +other) return greater_than_or_equal_operation(+self, +other)
def bool(self):
"""Boolean conversion.
Returns:
The boolean value of the number.
"""
if is_optional(self._var_type):
return boolify((self != None) & (self != 0)) # noqa: E711
return self != 0
def _is_strict_float(self) -> bool: def _is_strict_float(self) -> bool:
"""Check if the number is a float. """Check if the number is a float.

2
tests/units/test_var.py
View File

@ -1004,7 +1004,7 @@ def test_all_number_operations():
assert ( assert (
str(even_more_complicated_number) str(even_more_complicated_number)
== "!(((Math.abs(Math.floor(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2))) || (2 && Math.round(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2)))) !== 0))" == "!(isTrue((Math.abs(Math.floor(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2))) || (2 && Math.round(((Math.floor(((-((-5.4 + 1)) * 2) / 3) / 2) % 3) ** 2))))))"
) )
assert str(LiteralNumberVar.create(5) > False) == "(5 > 0)" assert str(LiteralNumberVar.create(5) > False) == "(5 > 0)"